lexical 0.25.1-nightly.20250228.0 → 0.26.0

package/Lexical.dev.js

@@ -1837,6 +1837,7 @@ let isInsertLineBreak = false;
 let isFirefoxEndingComposition = false;
 let isSafariEndingComposition = false;
 let safariEndCompositionEventData = '';
+let postDeleteSelectionToRestore = null;
 let collapsedSelectionFormat = [0, '', 0, 'root', 0];
 
 // This function is used to determine if Lexical should attempt to override
@@ -1905,7 +1906,7 @@ function onSelectionChange(domSelection, editor, isActive) {
     // We also need to check if the offset is at the boundary,
     // because in this case, we might need to normalize to a
     // sibling instead.
-    if (shouldSkipSelectionChange(anchorDOM, anchorOffset) && shouldSkipSelectionChange(focusDOM, focusOffset)) {
+    if (shouldSkipSelectionChange(anchorDOM, anchorOffset) && shouldSkipSelectionChange(focusDOM, focusOffset) && !postDeleteSelectionToRestore) {
       return;
     }
   }
@@ -1919,7 +1920,23 @@ function onSelectionChange(domSelection, editor, isActive) {
     if (!isSelectionWithinEditor(editor, anchorDOM, focusDOM)) {
       return;
     }
-    const selection = $getSelection();
+    let selection = $getSelection();
+
+    // Restore selection in the event of incorrect rightward shift after deletion
+    if (postDeleteSelectionToRestore && $isRangeSelection(selection) && selection.isCollapsed()) {
+      const curAnchor = selection.anchor;
+      const prevAnchor = postDeleteSelectionToRestore.anchor;
+      if (
+      // Rightward shift in same node
+      curAnchor.key === prevAnchor.key && curAnchor.offset === prevAnchor.offset + 1 ||
+      // Or rightward shift into sibling node
+      curAnchor.offset === 1 && prevAnchor.getNode().is(curAnchor.getNode().getPreviousSibling())) {
+        // Restore selection
+        selection = postDeleteSelectionToRestore.clone();
+        $setSelection(selection);
+      }
+    }
+    postDeleteSelectionToRestore = null;
 
     // Update the selection format
     if ($isRangeSelection(selection)) {
@@ -2156,6 +2173,14 @@ function onBeforeInput(event, editor) {
           }
           if (!shouldLetBrowserHandleDelete) {
             dispatchCommand(editor, DELETE_CHARACTER_COMMAND, true);
+            // When deleting across paragraphs, Chrome on Android incorrectly shifts the selection rightwards
+            // We save the correct selection to restore later during handling of selectionchange event
+            const selectionAfterDelete = $getSelection();
+            if (IS_ANDROID_CHROME && $isRangeSelection(selectionAfterDelete) && selectionAfterDelete.isCollapsed()) {
+              postDeleteSelectionToRestore = selectionAfterDelete;
+              // Cleanup in case selectionchange does not fire
+              setTimeout(() => postDeleteSelectionToRestore = null);
+            }
           }
         }
         return;
@@ -3869,6 +3894,9 @@ class LineBreakNode extends LexicalNode {
   updateDOM() {
     return false;
   }
+  isInline() {
+    return true;
+  }
   static importDOM() {
     return {
       br: node => {
@@ -4246,6 +4274,13 @@ class TextNode extends LexicalNode {
     return true;
   }
 
+  /**
+   * @returns true if the text node is inline, false otherwise.
+   */
+  isInline() {
+    return true;
+  }
+
   // View
 
   createDOM(config, editor) {
@@ -5138,22 +5173,12 @@ class Point {
     return this.key === point.key && this.offset === point.offset && this.type === point.type;
   }
   isBefore(b) {
-    let aNode = this.getNode();
-    let bNode = b.getNode();
-    const aOffset = this.offset;
-    const bOffset = b.offset;
-    if ($isElementNode(aNode)) {
-      const aNodeDescendant = aNode.getDescendantByIndex(aOffset);
-      aNode = aNodeDescendant != null ? aNodeDescendant : aNode;
-    }
-    if ($isElementNode(bNode)) {
-      const bNodeDescendant = bNode.getDescendantByIndex(bOffset);
-      bNode = bNodeDescendant != null ? bNodeDescendant : bNode;
-    }
-    if (aNode === bNode) {
-      return aOffset < bOffset;
+    if (this.key === b.key) {
+      return this.offset < b.offset;
     }
-    return aNode.isBefore(bNode);
+    const aCaret = $normalizeCaret($caretFromPoint(this, 'next'));
+    const bCaret = $normalizeCaret($caretFromPoint(b, 'next'));
+    return $comparePointCaretNext(aCaret, bCaret) < 0;
   }
   getNode() {
     const key = this.key;
@@ -10256,7 +10281,7 @@ class LexicalEditor {
     };
   }
 }
-LexicalEditor.version = "0.25.1-nightly.20250228.0+dev.cjs";
+LexicalEditor.version = "0.26.0+dev.cjs";
 
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -12568,8 +12593,10 @@ function $caretRangeFromSelection(selection) {
     anchor,
     focus
   } = selection;
-  const direction = focus.isBefore(anchor) ? 'previous' : 'next';
-  return $getCaretRange($caretFromPoint(anchor, direction), $caretFromPoint(focus, direction));
+  const anchorCaret = $caretFromPoint(anchor, 'next');
+  const focusCaret = $caretFromPoint(focus, 'next');
+  const direction = $comparePointCaretNext(anchorCaret, focusCaret) <= 0 ? 'next' : 'previous';
+  return $getCaretRange($getCaretInDirection(anchorCaret, direction), $getCaretInDirection(focusCaret, direction));
 }
 
 /**

package/Lexical.dev.mjs

@@ -1835,6 +1835,7 @@ let isInsertLineBreak = false;
 let isFirefoxEndingComposition = false;
 let isSafariEndingComposition = false;
 let safariEndCompositionEventData = '';
+let postDeleteSelectionToRestore = null;
 let collapsedSelectionFormat = [0, '', 0, 'root', 0];
 
 // This function is used to determine if Lexical should attempt to override
@@ -1903,7 +1904,7 @@ function onSelectionChange(domSelection, editor, isActive) {
     // We also need to check if the offset is at the boundary,
     // because in this case, we might need to normalize to a
     // sibling instead.
-    if (shouldSkipSelectionChange(anchorDOM, anchorOffset) && shouldSkipSelectionChange(focusDOM, focusOffset)) {
+    if (shouldSkipSelectionChange(anchorDOM, anchorOffset) && shouldSkipSelectionChange(focusDOM, focusOffset) && !postDeleteSelectionToRestore) {
       return;
     }
   }
@@ -1917,7 +1918,23 @@ function onSelectionChange(domSelection, editor, isActive) {
     if (!isSelectionWithinEditor(editor, anchorDOM, focusDOM)) {
       return;
     }
-    const selection = $getSelection();
+    let selection = $getSelection();
+
+    // Restore selection in the event of incorrect rightward shift after deletion
+    if (postDeleteSelectionToRestore && $isRangeSelection(selection) && selection.isCollapsed()) {
+      const curAnchor = selection.anchor;
+      const prevAnchor = postDeleteSelectionToRestore.anchor;
+      if (
+      // Rightward shift in same node
+      curAnchor.key === prevAnchor.key && curAnchor.offset === prevAnchor.offset + 1 ||
+      // Or rightward shift into sibling node
+      curAnchor.offset === 1 && prevAnchor.getNode().is(curAnchor.getNode().getPreviousSibling())) {
+        // Restore selection
+        selection = postDeleteSelectionToRestore.clone();
+        $setSelection(selection);
+      }
+    }
+    postDeleteSelectionToRestore = null;
 
     // Update the selection format
     if ($isRangeSelection(selection)) {
@@ -2154,6 +2171,14 @@ function onBeforeInput(event, editor) {
           }
           if (!shouldLetBrowserHandleDelete) {
             dispatchCommand(editor, DELETE_CHARACTER_COMMAND, true);
+            // When deleting across paragraphs, Chrome on Android incorrectly shifts the selection rightwards
+            // We save the correct selection to restore later during handling of selectionchange event
+            const selectionAfterDelete = $getSelection();
+            if (IS_ANDROID_CHROME && $isRangeSelection(selectionAfterDelete) && selectionAfterDelete.isCollapsed()) {
+              postDeleteSelectionToRestore = selectionAfterDelete;
+              // Cleanup in case selectionchange does not fire
+              setTimeout(() => postDeleteSelectionToRestore = null);
+            }
           }
         }
         return;
@@ -3867,6 +3892,9 @@ class LineBreakNode extends LexicalNode {
   updateDOM() {
     return false;
   }
+  isInline() {
+    return true;
+  }
   static importDOM() {
     return {
       br: node => {
@@ -4244,6 +4272,13 @@ class TextNode extends LexicalNode {
     return true;
   }
 
+  /**
+   * @returns true if the text node is inline, false otherwise.
+   */
+  isInline() {
+    return true;
+  }
+
   // View
 
   createDOM(config, editor) {
@@ -5136,22 +5171,12 @@ class Point {
     return this.key === point.key && this.offset === point.offset && this.type === point.type;
   }
   isBefore(b) {
-    let aNode = this.getNode();
-    let bNode = b.getNode();
-    const aOffset = this.offset;
-    const bOffset = b.offset;
-    if ($isElementNode(aNode)) {
-      const aNodeDescendant = aNode.getDescendantByIndex(aOffset);
-      aNode = aNodeDescendant != null ? aNodeDescendant : aNode;
-    }
-    if ($isElementNode(bNode)) {
-      const bNodeDescendant = bNode.getDescendantByIndex(bOffset);
-      bNode = bNodeDescendant != null ? bNodeDescendant : bNode;
-    }
-    if (aNode === bNode) {
-      return aOffset < bOffset;
+    if (this.key === b.key) {
+      return this.offset < b.offset;
     }
-    return aNode.isBefore(bNode);
+    const aCaret = $normalizeCaret($caretFromPoint(this, 'next'));
+    const bCaret = $normalizeCaret($caretFromPoint(b, 'next'));
+    return $comparePointCaretNext(aCaret, bCaret) < 0;
   }
   getNode() {
     const key = this.key;
@@ -10254,7 +10279,7 @@ class LexicalEditor {
     };
   }
 }
-LexicalEditor.version = "0.25.1-nightly.20250228.0+dev.esm";
+LexicalEditor.version = "0.26.0+dev.esm";
 
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
@@ -12566,8 +12591,10 @@ function $caretRangeFromSelection(selection) {
     anchor,
     focus
   } = selection;
-  const direction = focus.isBefore(anchor) ? 'previous' : 'next';
-  return $getCaretRange($caretFromPoint(anchor, direction), $caretFromPoint(focus, direction));
+  const anchorCaret = $caretFromPoint(anchor, 'next');
+  const focusCaret = $caretFromPoint(focus, 'next');
+  const direction = $comparePointCaretNext(anchorCaret, focusCaret) <= 0 ? 'next' : 'previous';
+  return $getCaretRange($getCaretInDirection(anchorCaret, direction), $getCaretInDirection(focusCaret, direction));
 }
 
 /**

package/Lexical.js.flow

@@ -623,6 +623,7 @@ declare export class TextNode extends LexicalNode {
   getFormat(): number;
   getStyle(): string;
   isComposing(): boolean;
+  isInline(): true;
   isToken(): boolean;
   isSegmented(): boolean;
   isDirectionless(): boolean;
@@ -698,6 +699,7 @@ declare export class LineBreakNode extends LexicalNode {
   getTextContent(): '\n';
   createDOM(): HTMLElement;
   updateDOM(): false;
+  isInline(): true;
   static importJSON(
     serializedLineBreakNode: SerializedLineBreakNode,
   ): LineBreakNode;