binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: editor user config (#5974)

Browse source
This commit is contained in:
Aaryan Khandelwal 2024-11-08 13:30:06 +05:30 • committed by GitHub
parent 4c6ab984c3
commit 2193e8c79c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/editor/src/core/hooks/use-collaborative-editor.ts
View file

@ -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

21
web/core/components/pages/editor/editor-body.tsx
View file

@ -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>