@37signals/lexxy 0.9.9-beta.preview2 → 0.9.9-beta.preview3

package/dist/lexxy.esm.js

@@ -2655,6 +2655,13 @@ class RewritableHistoryExtension extends LexxyExtension {
   }
 
   #rewriteHistory(rewrites) {
+    this.#applyRewritesImmediatelyToCurrentState(rewrites);
+    this.#applyRewritesToHistory(rewrites);
+
+    return true
+  }
+
+  #applyRewritesImmediatelyToCurrentState(rewrites) {
     $getEditor().update(() => {
       for (const [ nodeKey, { patch, replace } ] of Object.entries(rewrites)) {
         const node = $getNodeByKey(nodeKey);
@@ -2664,27 +2671,27 @@ class RewritableHistoryExtension extends LexxyExtension {
         if (replace) node.replace(replace);
       }
     }, { discrete: true, tag: this.#getBackgroundUpdateTags() });
+  }
 
+  #applyRewritesToHistory(rewrites) {
     const nodeKeys = Object.keys(rewrites);
 
     for (const entry of this.#allHistoryEntries) {
       if (!this.#entryHasSomeKeys(entry, nodeKeys)) continue
 
+      const editorState = entry.editorState = safeCloneEditorState(entry.editorState);
+
       for (const [ nodeKey, { patch, replace } ] of Object.entries(rewrites)) {
-        const node = entry.editorState._nodeMap.get(nodeKey);
+        const node = editorState._nodeMap.get(nodeKey);
         if (!node) continue
 
-        entry.editorState = safeCloneEditorState(entry.editorState);
-
         if (patch) {
-          entry.editorState._nodeMap.set(nodeKey, $cloneNodeWithPatch(node, patch));
+          this.#patchNodeInEditorState(editorState, node, patch);
         } else if (replace) {
-          entry.editorState._nodeMap.set(nodeKey, $cloneNodeAdoptingKey(replace, node));
+          this.#replaceNodeInEditorState(editorState, node, replace);
         }
       }
     }
-
-    return true
   }
 
   #entryHasSomeKeys(entry, nodeKeys) {
@@ -2696,6 +2703,14 @@ class RewritableHistoryExtension extends LexxyExtension {
     if (!isEditorFocused(this.editorElement.editor)) { tags.push(SKIP_DOM_SELECTION_TAG); }
     return tags
   }
+
+  #patchNodeInEditorState(editorState, node, patch) {
+    editorState._nodeMap.set(node.__key, $cloneNodeWithPatch(node, patch));
+  }
+
+  #replaceNodeInEditorState(editorState, node, replaceWith) {
+    editorState._nodeMap.set(node.__key, $cloneNodeAdoptingKeys(replaceWith, node));
+  }
 }
 
 function $cloneNodeWithPatch(node, patch) {
@@ -2704,12 +2719,12 @@ function $cloneNodeWithPatch(node, patch) {
   return clone
 }
 
-function $cloneNodeAdoptingKey(source, keyNode) {
-  const clone = $cloneWithProperties(source);
-  clone.__key = keyNode.__key;
-  clone.__parent = keyNode.__parent;
-  clone.__prev = keyNode.__prev;
-  clone.__next = keyNode.__next;
+function $cloneNodeAdoptingKeys(node, previousNode) {
+  const clone = $cloneWithProperties(node);
+  clone.__key = previousNode.__key;
+  clone.__parent = previousNode.__parent;
+  clone.__prev = previousNode.__prev;
+  clone.__next = previousNode.__next;
   return clone
 }
 
@@ -6497,6 +6512,15 @@ class EarlyEscapeCodeNode extends CodeNode {
   insertNewAfter(selection, restoreSelection) {
     if (!selection.isCollapsed()) return super.insertNewAfter(selection, restoreSelection)
 
+    // Clamp element-type selection offsets that may have been invalidated
+    // by the code retokenizer. The retokenizer's $updateAndRetainSelection
+    // restores the element offset verbatim after re-tokenizing, but when
+    // highlight splits changed the child count before retokenization, the
+    // restored offset can exceed the current child count. Without clamping,
+    // CodeNode.insertNewAfter passes the stale offset to splice(), which
+    // throws "start + deleteCount > oldSize".
+    this.#clampSelectionOffset(selection);
+
     if (this.#isCursorAtStart(selection)) {
       this.insertBefore($createParagraphNode());
       return null
@@ -6513,6 +6537,15 @@ class EarlyEscapeCodeNode extends CodeNode {
     return super.insertNewAfter(selection, restoreSelection)
   }
 
+  #clampSelectionOffset(selection) {
+    const childrenSize = this.getChildrenSize();
+    for (const point of [ selection.anchor, selection.focus ]) {
+      if (point.type === "element" && point.key === this.__key && point.offset > childrenSize) {
+        point.set(this.__key, childrenSize, "element");
+      }
+    }
+  }
+
   #isCursorAtStart(selection) {
     const { anchor } = selection;
     if (!$isAtNodeStart(anchor)) return false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@37signals/lexxy",
-  "version": "0.9.9-beta.preview2",
+  "version": "0.9.9-beta.preview3",
   "description": "Lexxy - A modern rich text editor for Rails.",
   "module": "dist/lexxy.esm.js",
   "type": "module",