5b0b7d9102
this fixes a bug introduced a few months ago that caused positions not resolving on the most recent transaction but the editor state that was existing before the last transactions beforehand existed causing the editor to crash
84 lines
2.1 KiB
TypeScript
84 lines
2.1 KiB
TypeScript
import { isTextSelection } from '../helpers/isTextSelection'
|
||
import { resolveFocusPosition } from '../helpers/resolveFocusPosition'
|
||
import { FocusPosition, RawCommands } from '../types'
|
||
import { isiOS } from '../utilities/isiOS'
|
||
|
||
declare module '@tiptap/core' {
|
||
interface Commands<ReturnType> {
|
||
focus: {
|
||
/**
|
||
* Focus the editor at the given position.
|
||
*/
|
||
focus: (
|
||
position?: FocusPosition,
|
||
options?: {
|
||
scrollIntoView?: boolean,
|
||
},
|
||
) => ReturnType,
|
||
}
|
||
}
|
||
}
|
||
|
||
export const focus: RawCommands['focus'] = (position = null, options = {}) => ({
|
||
editor,
|
||
view,
|
||
tr,
|
||
dispatch,
|
||
}) => {
|
||
options = {
|
||
scrollIntoView: true,
|
||
...options,
|
||
}
|
||
|
||
const delayedFocus = () => {
|
||
// focus within `requestAnimationFrame` breaks focus on iOS
|
||
// so we have to call this
|
||
if (isiOS()) {
|
||
(view.dom as HTMLElement).focus()
|
||
}
|
||
|
||
// For React we have to focus asynchronously. Otherwise wild things happen.
|
||
// see: https://github.com/ueberdosis/tiptap/issues/1520
|
||
requestAnimationFrame(() => {
|
||
if (!editor.isDestroyed) {
|
||
view.focus()
|
||
|
||
if (options?.scrollIntoView) {
|
||
editor.commands.scrollIntoView()
|
||
}
|
||
}
|
||
})
|
||
}
|
||
|
||
if ((view.hasFocus() && position === null) || position === false) {
|
||
return true
|
||
}
|
||
|
||
// we don’t try to resolve a NodeSelection or CellSelection
|
||
if (dispatch && position === null && !isTextSelection(editor.state.selection)) {
|
||
delayedFocus()
|
||
return true
|
||
}
|
||
|
||
// pass through tr.doc instead of editor.state.doc
|
||
// since transactions could change the editors state before this command has been run
|
||
const selection = resolveFocusPosition(tr.doc, position) || editor.state.selection
|
||
const isSameSelection = editor.state.selection.eq(selection)
|
||
|
||
if (dispatch) {
|
||
if (!isSameSelection) {
|
||
tr.setSelection(selection)
|
||
}
|
||
|
||
// `tr.setSelection` resets the stored marks
|
||
// so we’ll restore them if the selection is the same as before
|
||
if (isSameSelection && tr.storedMarks) {
|
||
tr.setStoredMarks(tr.storedMarks)
|
||
}
|
||
|
||
delayedFocus()
|
||
}
|
||
|
||
return true
|
||
}
|