[lexical-react] Refactor: Ensure disconnect is called after connectio…

…n is established in useYjsCollaboration (#6619) Co-authored-by: Bob Ippolito <bob@redivi.com>
facebook · Sep 11, 2024 · f50f168 · f50f168
1 parent 01e2ae4
commit f50f168
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/lexical-react/src/shared/useYjsCollaboration.tsx b/packages/lexical-react/src/shared/useYjsCollaboration.tsx
@@ -57,9 +57,7 @@ export function useYjsCollaboration(
 ): JSX.Element {
   const isReloadingDoc = useRef(false);
 
-  const connect = useCallback(() => {
-    provider.connect();
-  }, [provider]);
+  const connect = useCallback(() => provider.connect(), [provider]);
 
   const disconnect = useCallback(() => {
     try {
@@ -152,11 +150,14 @@ export function useYjsCollaboration(
         }
       },
     );
-    connect();
+
+    const connectionPromise = connect();
 
     return () => {
       if (isReloadingDoc.current === false) {
-        disconnect();
+        Promise.resolve(connectionPromise).then(() => {
+          disconnect();
+        });
       }
 
       provider.off('sync', onSync);