ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix focus extension for leaf nodes, fix #223

Browse Source
This commit is contained in:
Philipp Kühn
2021-03-25 08:32:39 +01:00
parent 8bf309bc2a
commit aa93e97359
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/extension-focus/src/focus.ts
View File

@@ -31,13 +31,15 @@ export const FocusClasses = Extension.create<FocusOptions>({
// Maximum Levels
let maxLevels = 0
if (this.options.mode === 'deepest') {
doc.descendants((node, pos) => {
if (node.isText) {
return
}
const isCurrent = anchor >= pos && anchor <= (pos + node.nodeSize)
const isCurrent = anchor >= pos && anchor <= (pos + node.nodeSize - 1)
if (!isCurrent) {
return false
}
@@ -48,12 +50,14 @@ export const FocusClasses = Extension.create<FocusOptions>({
// Loop through current
let currentLevel = 0
doc.descendants((node, pos) => {
if (node.isText) {
return false
}
const isCurrent = anchor >= pos && anchor <= (pos + node.nodeSize)
const isCurrent = anchor >= pos && anchor <= (pos + node.nodeSize - 1)
if (!isCurrent) {
return false
}
@@ -61,7 +65,7 @@ export const FocusClasses = Extension.create<FocusOptions>({
currentLevel += 1
const outOfScope = (this.options.mode === 'deepest' && maxLevels - currentLevel > 0)
|| (this.options.mode === 'shallowest' && currentLevel > 1)
|| (this.options.mode === 'shallowest' && currentLevel > 1)
if (outOfScope) {
return this.options.mode === 'deepest'