Просмотр исходного кода

rename on on user list to on editors updated

ryoji-s 2 лет назад
Родитель
Сommit
e60befb19a

+ 1 - 1
apps/app/src/components/PageEditor/PageEditor.tsx

@@ -457,7 +457,7 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
             pageId={pageId ?? undefined}
             initialValue={initialValue}
             onOpenEditor={markdown => setMarkdownToPreview(markdown)}
-            onUserList={setUserList}
+            onEditorsUpdated={setUserList}
             editorTheme={editorSettings?.theme}
             editorKeymap={editorSettings?.keymapMode}
           />

+ 3 - 3
packages/editor/src/components/CodeMirrorEditorMain.tsx

@@ -22,7 +22,7 @@ type Props = CodeMirrorEditorProps & {
   pageId?: string,
   initialValue?: string,
   onOpenEditor?: (markdown: string) => void,
-  onUserList?: (userList: IUserHasId[]) => void,
+  onEditorsUpdated?: (userList: IUserHasId[]) => void,
 }
 
 export const CodeMirrorEditorMain = (props: Props): JSX.Element => {
@@ -30,12 +30,12 @@ export const CodeMirrorEditorMain = (props: Props): JSX.Element => {
     acceptedUploadFileType,
     indentSize, user, pageId, initialValue,
     editorTheme, editorKeymap,
-    onSave, onChange, onUpload, onScroll, onOpenEditor, onUserList,
+    onSave, onChange, onUpload, onScroll, onOpenEditor, onEditorsUpdated,
   } = props;
 
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN);
 
-  useCollaborativeEditorMode(user, pageId, initialValue, onOpenEditor, onUserList, codeMirrorEditor);
+  useCollaborativeEditorMode(user, pageId, initialValue, onOpenEditor, onEditorsUpdated, codeMirrorEditor);
 
   // setup additional extensions
   useEffect(() => {

+ 4 - 4
packages/editor/src/stores/use-collaborative-editor-mode.ts

@@ -24,7 +24,7 @@ export const useCollaborativeEditorMode = (
     pageId?: string,
     initialValue?: string,
     onOpenEditor?: (markdown: string) => void,
-    onUserList?: (userList: IUserHasId[]) => void,
+    onEditorsUpdated?: (userList: IUserHasId[]) => void,
     codeMirrorEditor?: UseCodeMirrorEditor,
 ): void => {
   const [ydoc, setYdoc] = useState<Y.Doc | null>(null);
@@ -96,11 +96,11 @@ export const useCollaborativeEditorMode = (
 
     // update args type see: SocketIOProvider.Awareness.awarenessUpdate
     socketIOProvider.awareness.on('update', (update: any) => {
-      if (onUserList) {
+      if (onEditorsUpdated) {
         const { added, removed } = update;
         if (added.length > 0 || removed.length > 0) {
           const userList: IUserHasId[] = Array.from(socketIOProvider.awareness.states.values(), value => value.user.user && value.user.user);
-          onUserList(userList);
+          onEditorsUpdated(userList);
         }
       }
     });
@@ -137,7 +137,7 @@ export const useCollaborativeEditorMode = (
 
   useEffect(cleanupYDocAndProvider, [cPageId, pageId, provider, socket, ydoc]);
   useEffect(setupYDoc, [provider, ydoc]);
-  useEffect(setupProvider, [initialValue, onUserList, pageId, provider, socket, user, ydoc]);
+  useEffect(setupProvider, [initialValue, onEditorsUpdated, pageId, provider, socket, user, ydoc]);
   useEffect(setupYDocExtensions, [codeMirrorEditor, provider, ydoc]);
   useEffect(initializeEditor, [codeMirrorEditor, isInit, onOpenEditor, ydoc]);
 };