mirror/tiptap
1
0
Fork 0
mirror of https://github.com/ueberdosis/tiptap.git synced 2025-01-06 02:17:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix focus issue, fix #404

Browse Source
This commit is contained in:
Philipp Kühn 2019-07-25 11:42:26 +02:00
parent 3e75703200
commit 6408653d4c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/tiptap/src/Editor.js
View File

@ -73,6 +73,7 @@ export default class Editor extends Emitter {
...this.defaultOptions, ...this.defaultOptions,
...options, ...options,
}) })
this.selection = null
this.element = document.createElement('div') this.element = document.createElement('div')
this.extensions = this.createExtensions() this.extensions = this.createExtensions()
this.nodes = this.createNodes() this.nodes = this.createNodes()
@ -95,7 +96,7 @@ export default class Editor extends Emitter {
} }
this.events.forEach(name => { this.events.forEach(name => {
this.on(name, this.options[camelCase(`on ${name}`)] || (() => {})) this.on(name, this.options[camelCase(`on ${name}`)] || (() => {}))
}) })
this.emit('init', { this.emit('init', {
@ -319,6 +320,10 @@ export default class Editor extends Emitter {
dispatchTransaction(transaction) { dispatchTransaction(transaction) {
const newState = this.state.apply(transaction) const newState = this.state.apply(transaction)
this.view.updateState(newState) this.view.updateState(newState)
this.selection = {
from: this.state.selection.from,
to: this.state.selection.to,
}
this.setActiveNodesAndMarks() this.setActiveNodesAndMarks()
this.emit('transaction', { this.emit('transaction', {
@ -351,7 +356,9 @@ export default class Editor extends Emitter {
let pos = position let pos = position
if (position === 'start' || position === null) { if (this.selection && position === null) {
pos = this.selection.from
} else if (position === 'start') {
pos = 0 pos = 0
} else if (position === 'end') { } else if (position === 'end') {
pos = this.state.doc.nodeSize - 2 pos = this.state.doc.nodeSize - 2
@ -359,7 +366,7 @@ export default class Editor extends Emitter {
// selection should be inside of the document range // selection should be inside of the document range
pos = Math.max(0, pos) pos = Math.max(0, pos)
pos = Math.min(this.state.doc.nodeSize - 2, pos) pos = Math.min(this.state.doc.content.size, pos)
const selection = TextSelection.near(this.state.doc.resolve(pos)) const selection = TextSelection.near(this.state.doc.resolve(pos))
const transaction = this.state.tr.setSelection(selection) const transaction = this.state.tr.setSelection(selection)