Explorar el Código

refactor EditingClient type

Yuki Takei hace 11 meses
padre
commit
c4985837c5

+ 1 - 1
apps/app/src/client/components/PageEditor/EditorNavbar/EditingUserList.tsx

@@ -32,7 +32,7 @@ export const EditingUserList: FC<Props> = ({ clientList }) => {
         {firstFourUsers.map(editingClient => (
           <div key={editingClient.clientId} className="ms-1">
             <UserPicture
-              user={editingClient.userId}
+              user={editingClient}
               noLink
               className="border border-info"
             />

+ 3 - 1
packages/editor/src/client/stores/use-collaborative-editor-mode.ts

@@ -67,8 +67,10 @@ export const useCollaborativeEditorMode = (
 
       const userLocalState: EditingClient = {
         clientId: primaryDoc.clientID,
-        name: user?.name ? `${user.name}` : `Guest User ${Math.floor(Math.random() * 100)}`,
+        name: user?.name ?? `Guest User ${Math.floor(Math.random() * 100)}`,
         userId: user?._id,
+        username: user?.username,
+        imageUrlCached: user?.imageUrlCached,
         color: userColor.color,
         colorLight: userColor.light,
       };

+ 3 - 2
packages/editor/src/interfaces/editing-client.ts

@@ -1,6 +1,7 @@
-export type EditingClient = {
+import type { IUser } from '@growi/core';
+
+export type EditingClient = Pick<IUser, 'name'> & Partial<Pick<IUser, 'username' | 'imageUrlCached'>> & {
   clientId: number;
-  name: string;
   userId?: string;
   color: string;
   colorLight: string;