@37signals/lexxy 0.9.9-beta.preview3.domselection1 → 0.9.9-beta.preview4

package/dist/lexxy.esm.js

@@ -2,7 +2,7 @@ import { isActiveAndVisible, createElement, extractPlainTextFromHtml, createAtta
 export { highlightCode } from './lexxy_helpers.esm.js';
 import DOMPurify from 'dompurify';
 import { getStyleObjectFromCSS, getCSSFromStyleObject, $isAtNodeEnd, $getSelectionStyleValueForProperty, $patchStyleText, $ensureForwardRangeSelection, $setBlocksType, $forEachSelectedTextNode } from '@lexical/selection';
-import { SKIP_DOM_SELECTION_TAG, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, CAN_REDO_COMMAND, $getSelection, $isRangeSelection, DecoratorNode, $createParagraphNode, $getNodeByKey, $isTextNode, $createRangeSelection, $setSelection, $createTextNode, $isElementNode, $isRootOrShadowRoot, $isRootNode, $createNodeSelection, $isDecoratorNode, $isLineBreakNode, TextNode, createCommand, createState, defineExtension, COMMAND_PRIORITY_NORMAL, $getState, $setState, $hasUpdateTag, PASTE_TAG, FORMAT_TEXT_COMMAND, UNDO_COMMAND, REDO_COMMAND, PASTE_COMMAND, KEY_ARROW_RIGHT_COMMAND, KEY_TAB_COMMAND, OUTDENT_CONTENT_COMMAND, INDENT_CONTENT_COMMAND, COMMAND_PRIORITY_EDITOR, $getEditor, HISTORY_MERGE_TAG, SKIP_SCROLL_INTO_VIEW_TAG, $cloneWithProperties, $getNearestRootOrShadowRoot, $isNodeSelection, $getRoot, KEY_ARROW_LEFT_COMMAND, KEY_ARROW_UP_COMMAND, KEY_ARROW_DOWN_COMMAND, DELETE_CHARACTER_COMMAND, SELECTION_CHANGE_COMMAND, CLICK_COMMAND, isDOMNode, $getNearestNodeFromDOMNode, $addUpdateTag, ElementNode, $splitNode, $getChildCaretAtIndex, $createLineBreakNode, $isParagraphNode, ParagraphNode, RootNode, COMMAND_PRIORITY_HIGH, DRAGSTART_COMMAND, DROP_COMMAND, INSERT_PARAGRAPH_COMMAND, mergeRegister as mergeRegister$1, $findMatchingParent, CLEAR_HISTORY_COMMAND, $onUpdate, KEY_ENTER_COMMAND, COMMAND_PRIORITY_CRITICAL, KEY_SPACE_COMMAND, KEY_BACKSPACE_COMMAND, KEY_DOWN_COMMAND } from 'lexical';
+import { SKIP_DOM_SELECTION_TAG, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, CAN_REDO_COMMAND, $getSelection, $isRangeSelection, DecoratorNode, $createParagraphNode, $getNodeByKey, $isTextNode, $createRangeSelection, $setSelection, $createTextNode, $isElementNode, $isRootOrShadowRoot, $isRootNode, $createNodeSelection, $isDecoratorNode, $isLineBreakNode, TextNode, createCommand, createState, defineExtension, COMMAND_PRIORITY_NORMAL, $getState, $setState, $hasUpdateTag, PASTE_TAG, FORMAT_TEXT_COMMAND, UNDO_COMMAND, REDO_COMMAND, PASTE_COMMAND, KEY_ARROW_RIGHT_COMMAND, KEY_TAB_COMMAND, OUTDENT_CONTENT_COMMAND, INDENT_CONTENT_COMMAND, COMMAND_PRIORITY_EDITOR, $getEditor, HISTORY_MERGE_TAG, SKIP_SCROLL_INTO_VIEW_TAG, $cloneWithProperties, $getNearestRootOrShadowRoot, $isNodeSelection, $getRoot, KEY_ARROW_LEFT_COMMAND, KEY_ARROW_UP_COMMAND, KEY_ARROW_DOWN_COMMAND, DELETE_CHARACTER_COMMAND, SELECTION_CHANGE_COMMAND, CLICK_COMMAND, isDOMNode, $getNearestNodeFromDOMNode, $addUpdateTag, ElementNode, $splitNode, $getChildCaretAtIndex, $createLineBreakNode, $isParagraphNode, ParagraphNode, RootNode, COMMAND_PRIORITY_HIGH, DRAGSTART_COMMAND, DROP_COMMAND, INSERT_PARAGRAPH_COMMAND, mergeRegister as mergeRegister$1, $findMatchingParent, CLEAR_HISTORY_COMMAND, KEY_ENTER_COMMAND, COMMAND_PRIORITY_CRITICAL, KEY_SPACE_COMMAND, KEY_BACKSPACE_COMMAND, KEY_DOWN_COMMAND } from 'lexical';
 import { buildEditorFromExtensions } from '@lexical/extension';
 import { ListNode, ListItemNode, $getListDepth, INSERT_UNORDERED_LIST_COMMAND, INSERT_ORDERED_LIST_COMMAND, $isListItemNode, $isListNode, registerList } from '@lexical/list';
 import { LinkNode, $createAutoLinkNode, $toggleLink, $createLinkNode, $isLinkNode, AutoLinkNode } from '@lexical/link';
@@ -6512,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
@@ -6528,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
@@ -6947,7 +6965,7 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   get #isContentFocused() {
-    return !!this.editor && isEditorFocused(this.editor)
+    return !!this.editorContentElement && this.editorContentElement.contains(document.activeElement)
   }
 
   get value() {
@@ -6961,24 +6979,14 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   set value(html) {
-    const editorHasFocus = this.#isContentFocused;
-
     this.editor.update(() => {
-      if (editorHasFocus) {
-        // Address Safari inconsistently placing the cursor in the contenteditable by forcing focus back onto the editor
-        // Use direct `editor.focus` to bypass the pre-existing focus optimization and skip the callback
-        $onUpdate(() => this.editor.focus());
-      } else {
-        $addUpdateTag(SKIP_DOM_SELECTION_TAG);
-      }
-
       $getRoot()
         .clear()
         .selectEnd()
         .insertNodes(this.#parseHtmlIntoLexicalNodes(html));
 
       this.#toggleEmptyStatus();
-    }, { discrete: true });
+    }, { discrete: true, tag: SKIP_DOM_SELECTION_TAG });
   }
 
   get canUndo() {

package/package.json

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