From 2193e8c79cc0a6a5c4fcb9cf8ab1b62d9ea8e7f4 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:30:06 +0530
Subject: [PATCH] fix: editor user config (#5974)

---
 .../core/hooks/use-collaborative-editor.ts    |  2 +-
 .../components/pages/editor/editor-body.tsx   | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/editor/src/core/hooks/use-collaborative-editor.ts b/packages/editor/src/core/hooks/use-collaborative-editor.ts
index 798581b37..5bee8c0c3 100644
--- a/packages/editor/src/core/hooks/use-collaborative-editor.ts
+++ b/packages/editor/src/core/hooks/use-collaborative-editor.ts
@@ -55,7 +55,7 @@ export const useCollaborativeEditor = (props: TCollaborativeEditorProps) => {
         },
         onSynced: () => setHasServerSynced(true),
       }),
-    [id, realtimeConfig, serverHandler, user.id]
+    [id, realtimeConfig, serverHandler, user]
   );
 
   // destroy and disconnect connection on unmount
diff --git a/web/core/components/pages/editor/editor-body.tsx b/web/core/components/pages/editor/editor-body.tsx
index 37ce3ac48..0d299104f 100644
--- a/web/core/components/pages/editor/editor-body.tsx
+++ b/web/core/components/pages/editor/editor-body.tsx
@@ -149,6 +149,15 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
     }
   }, [projectId, workspaceSlug]);
 
+  const userConfig = useMemo(
+    () => ({
+      id: currentUser?.id ?? "",
+      name: currentUser?.display_name ?? "",
+      color: generateRandomColor(currentUser?.id ?? ""),
+    }),
+    [currentUser]
+  );
+
   if (pageId === undefined || !realtimeConfig) return <PageContentLoader />;
 
   return (
@@ -214,11 +223,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
               }}
               realtimeConfig={realtimeConfig}
               serverHandler={serverHandler}
-              user={{
-                id: currentUser?.id ?? "",
-                name: currentUser?.display_name ?? "",
-                color: generateRandomColor(currentUser?.id ?? ""),
-              }}
+              user={userConfig}
               disabledExtensions={documentEditor}
               aiHandler={{
                 menu: getAIMenu,
@@ -245,11 +250,7 @@ export const PageEditorBody: React.FC<Props> = observer((props) => {
                 },
               }}
               realtimeConfig={realtimeConfig}
-              user={{
-                id: currentUser?.id ?? "",
-                name: currentUser?.display_name ?? "",
-                color: generateRandomColor(currentUser?.id ?? ""),
-              }}
+              user={userConfig}
             />
           )}
         </div>