remove cursors from dom when reload (facebook#1449)

* remove cursors from dom when reload * address feedback
shahboz100 · Apr 9, 2022 · 3fee5aa · 3fee5aa
1 parent be98b6c
commit 3fee5aa
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -60,7 +60,8 @@ module.exports = {
           '<rootDir>/packages/lexical-react/src/useLexicalEditor.js',
         '^@lexical/react/withSubscriptions$':
           '<rootDir>/packages/lexical-react/src/withSubscriptions.js',
-        '^@lexical/selection$': '<rootDir>/packages/lexical-selection/src/index.js',
+        '^@lexical/selection$':
+          '<rootDir>/packages/lexical-selection/src/index.js',
         '^@lexical/table$': '<rootDir>/packages/lexical-table/src/index.js',
         '^@lexical/text$': '<rootDir>/packages/lexical-text/src/index.js',
         '^@lexical/yjs$': '<rootDir>/packages/lexical-yjs/src/index.js',

diff --git a/packages/lexical-react/src/shared/useYjsCollaboration.js b/packages/lexical-react/src/shared/useYjsCollaboration.js
@@ -95,7 +95,7 @@ export function useYjsCollaboration(
     );
 
     const onProviderDocReload = (ydoc) => {
-      clearEditorSkipCollab(editor);
+      clearEditorSkipCollab(editor, binding);
       setDoc(ydoc);
       docMap.set(id, ydoc);
       isReloadingDoc.current = true;
@@ -278,7 +278,8 @@ function initializeEditor(editor: LexicalEditor): void {
   );
 }
 
-function clearEditorSkipCollab(editor) {
+function clearEditorSkipCollab(editor, binding) {
+  // reset editor state
   editor.update(
     () => {
       const root = $getRoot();
@@ -289,4 +290,26 @@ function clearEditorSkipCollab(editor) {
       tag: 'skip-collab',
     },
   );
+
+  if (binding.cursors == null) {
+    return;
+  }
+
+  const cursorsContainer = binding.cursorsContainer;
+  if (cursorsContainer == null) {
+    return;
+  }
+
+  // reset cursors in dom
+  const cursors = Array.from(binding.cursors.values());
+  for (let i = 0; i < cursors.length; i++) {
+    const cursor = cursors[i];
+    const selection = cursor.selection;
+    if (selection && selection.selections != null) {
+      const selections = selection.selections;
+      for (let j = 0; j < selections.length; j++) {
+        cursorsContainer.removeChild(selections[i]);
+      }
+    }
+  }
 }