Keep selection if state was not cloned (facebook#3294)

vanmeegen · Oct 31, 2022 · fa2f31e · fa2f31e
1 parent b829f49
commit fa2f31e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/lexical/src/LexicalUpdates.ts b/packages/lexical/src/LexicalUpdates.ts
@@ -807,10 +807,14 @@ function beginUpdate(
   activeEditor = editor;
 
   try {
-    if (editorStateWasCloned && !editor._headless) {
-      pendingEditorState._selection = internalCreateSelection(editor);
-    } else if (editor._headless && currentEditorState._selection != null) {
-      pendingEditorState._selection = currentEditorState._selection.clone();
+    if (editorStateWasCloned) {
+      if (editor._headless) {
+        if (currentEditorState._selection != null) {
+          pendingEditorState._selection = currentEditorState._selection.clone();
+        }
+      } else {
+        pendingEditorState._selection = internalCreateSelection(editor);
+      }
     }
 
     const startingCompositionKey = editor._compositionKey;