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

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, 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, $onUpdate, 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';
@@ -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
 }
 
@@ -6932,7 +6947,7 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   get #isContentFocused() {
-    return !!this.editorContentElement && this.editorContentElement.contains(document.activeElement)
+    return !!this.editor && isEditorFocused(this.editor)
   }
 
   get value() {
@@ -6946,14 +6961,24 @@ 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, tag: SKIP_DOM_SELECTION_TAG });
+    }, { discrete: true });
   }
 
   get canUndo() {

package/package.json

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