Merge remote-tracking branch 'origin/main' into fix-test-types

.github/pull_request_template.md

@@ -0,0 +1,30 @@
+<!-- 
+Title format should be:
+[Affected Packages] PR Type: title
+
+Example:
+[lexical-playground][lexical-link] Feature: Add more emojis 
+
+Choose from the following PR Types:
+Breaking change / Refactor / Feature / Bug Fix / Documentation Update / Chore
+-->
+
+## Description
+<!-- 
+- What is the current behavior that you are modifying? 
+- What are the behavior or changes that are being added by this PR?
+-->
+*Describe the changes in this pull request*
+
+**Closes:** #<!-- issue number -->
+
+## Test plan
+
+### Before
+
+*Insert relevant screenshots/recordings/automated-tests*
+
+
+### After
+
+*Insert relevant screenshots/recordings/automated-tests*

packages/lexical-selection/src/__tests__/unit/LexicalSelection.test.tsx

@@ -47,7 +47,6 @@ import {
   invariant,
   TestComposer,
 } from 'lexical/src/__tests__/utils';
-import * as React from 'react';
 import {createRoot} from 'react-dom/client';
 import * as ReactTestUtils from 'react-dom/test-utils';
 

packages/lexical-table/src/__tests__/unit/LexicalTableSelection.test.tsx

@@ -19,7 +19,6 @@ import {
   TextNode,
 } from 'lexical';
 import {createTestEditor} from 'lexical/src/__tests__/utils';
-import * as React from 'react';
 import {createRef, useEffect, useMemo} from 'react';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'react-dom/test-utils';

packages/lexical-utils/src/__tests__/unit/LexicalEventHelpers.test.tsx

@@ -24,7 +24,6 @@ import {
 import {TableCellNode, TableNode, TableRowNode} from '@lexical/table';
 import {LexicalEditor} from 'lexical';
 import {initializeClipboard, TestComposer} from 'lexical/src/__tests__/utils';
-import * as React from 'react';
 import {createRoot} from 'react-dom/client';
 import * as ReactTestUtils from 'react-dom/test-utils';
 

packages/lexical/src/LexicalSelection.ts

@@ -1912,6 +1912,7 @@ function internalResolveSelectionPoint(
     // We use the anchor to find which child node to select
     const childNodes = dom.childNodes;
     const childNodesLength = childNodes.length;
+    const blockCursorElement = editor._blockCursorElement;
     // If the anchor is the same as length, then this means we
     // need to select the very last text node.
     if (resolvedOffset === childNodesLength) {
@@ -1920,11 +1921,20 @@ function internalResolveSelectionPoint(
     }
     let childDOM = childNodes[resolvedOffset];
     let hasBlockCursor = false;
-    if (childDOM === editor._blockCursorElement) {
+    if (childDOM === blockCursorElement) {
       childDOM = childNodes[resolvedOffset + 1];
       hasBlockCursor = true;
-    } else if (editor._blockCursorElement !== null) {
-      resolvedOffset--;
+    } else if (blockCursorElement !== null) {
+      const blockCursorElementParent = blockCursorElement.parentNode;
+      if (dom === blockCursorElementParent) {
+        const blockCursorOffset = Array.prototype.indexOf.call(
+          blockCursorElementParent.children,
+          blockCursorElement,
+        );
+        if (offset > blockCursorOffset) {
+          resolvedOffset--;
+        }
+      }
     }
     resolvedNode = getNodeFromDOM(childDOM);
 

packages/lexical/src/__tests__/unit/LexicalListPlugin.test.tsx

@@ -21,7 +21,6 @@ import {
   html,
   TestComposer,
 } from 'lexical/src/__tests__/utils';
-import * as React from 'react';
 import {createRoot, Root} from 'react-dom/client';
 import * as ReactTestUtils from 'react-dom/test-utils';