From 9787b876fe270d66ff6c3080bb2a800167309189 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Fri, 3 May 2019 19:08:50 +0200 Subject: [PATCH] fix endPosition in getMarkRange getMarkRange() will not return the actual end position of the current mark. might reintroduce bug from #156 (i cannot reproduce #156 so i cannot check) fixes in this commit: A) work around a possible bug in indexAfter()?: $pos.indexAfter() seems to return the same index as $pos.index() at some point -> fixed by increasing startIndex by 1 instead of using indexAfter() B) endPos needs to be initialized with initial startPos + nodeSize and not with resulting startPos: -> moved initialization right after setting startPos --- packages/tiptap-utils/src/utils/getMarkRange.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/tiptap-utils/src/utils/getMarkRange.js b/packages/tiptap-utils/src/utils/getMarkRange.js index 115f8b6b..b3b02977 100644 --- a/packages/tiptap-utils/src/utils/getMarkRange.js +++ b/packages/tiptap-utils/src/utils/getMarkRange.js @@ -17,13 +17,14 @@ export default function ($pos = null, type = null) { let startIndex = $pos.index() let startPos = $pos.start() + start.offset + let endIndex = startIndex + 1 + let endPos = startPos + start.node.nodeSize + while (startIndex > 0 && link.isInSet($pos.parent.child(startIndex - 1).marks)) { startIndex -= 1 startPos -= $pos.parent.child(startIndex).nodeSize } - let endIndex = $pos.indexAfter() - let endPos = startPos + start.node.nodeSize while (endIndex < $pos.parent.childCount && link.isInSet($pos.parent.child(endIndex).marks)) { endPos += $pos.parent.child(endIndex).nodeSize endIndex += 1