feat: add scrollIntoView option to focus command, fix #2172

This commit is contained in:
Philipp Kühn 2021-11-25 17:18:30 +01:00
parent 62197ce459
commit e0f64904b6
3 changed files with 21 additions and 4 deletions

View File

@ -10,6 +10,10 @@ See also: [setTextSelection](/api/commands/set-text-selection), [blur](/api/comm
By default, its restoring the cursor position (and text selection). Pass a position to move the cursor too.
`options: { scrollIntoView: boolen }`
Defines whether to scroll to the cursor when focusing. Defaults to `true`.
## Usage
```js
// Set the focus to the editor

View File

@ -44,17 +44,27 @@ declare module '@tiptap/core' {
/**
* Focus the editor at the given position.
*/
focus: (position?: FocusPosition) => ReturnType,
focus: (
position?: FocusPosition,
options?: {
scrollIntoView?: boolean,
},
) => ReturnType,
}
}
}
export const focus: RawCommands['focus'] = (position = null) => ({
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
@ -67,7 +77,10 @@ export const focus: RawCommands['focus'] = (position = null) => ({
requestAnimationFrame(() => {
if (!editor.isDestroyed) {
view.focus()
editor.commands.scrollIntoView()
if (options?.scrollIntoView) {
editor.commands.scrollIntoView()
}
}
})
}

View File

@ -118,7 +118,7 @@ export const TaskItem = Node.create<TaskItemOptions>({
if (editor.isEditable && typeof getPos === 'function') {
editor
.chain()
.focus()
.focus(undefined, { scrollIntoView: false })
.command(({ tr }) => {
tr.setNodeMarkup(getPos(), undefined, {
checked,