Shun Miyazawa 1 год назад
Родитель
Сommit
9f3e6d1052

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

@@ -353,6 +353,7 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
       <div className={`flex-expand-horiz ${props.visibility ? '' : 'd-none'}`}>
         <div className="page-editor-editor-container flex-expand-vert border-end">
           <CodeMirrorEditorMain
+            isEditorMode={editorMode === EditorMode.Editor}
             onChange={markdownChangedHandler}
             onSave={saveWithShortcut}
             onUpload={uploadHandler}

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

@@ -21,18 +21,19 @@ type Props = CodeMirrorEditorProps & {
   user?: IUserHasId,
   pageId?: string,
   initialValue?: string,
+  isEditorMode: boolean,
   onEditorsUpdated?: (userList: IUserHasId[]) => void,
 }
 
 export const CodeMirrorEditorMain = (props: Props): JSX.Element => {
   const {
-    user, pageId, initialValue,
+    user, pageId, initialValue, isEditorMode,
     onSave, onEditorsUpdated, ...otherProps
   } = props;
 
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN);
 
-  useCollaborativeEditorMode(user, pageId, initialValue, onEditorsUpdated, codeMirrorEditor);
+  useCollaborativeEditorMode(isEditorMode, user, pageId, initialValue, onEditorsUpdated, codeMirrorEditor);
 
   // setup additional extensions
   useEffect(() => {

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

@@ -18,6 +18,7 @@ type UserLocalState = {
 }
 
 export const useCollaborativeEditorMode = (
+    isEditorMode: boolean,
     user?: IUserHasId,
     pageId?: string,
     initialValue?: string,
@@ -31,7 +32,7 @@ export const useCollaborativeEditorMode = (
   const { data: socket } = useGlobalSocket();
 
   const cleanupYDoc = () => {
-    if (cPageId === pageId) {
+    if (cPageId === pageId && isEditorMode) {
       return;
     }
 
@@ -52,7 +53,7 @@ export const useCollaborativeEditorMode = (
   };
 
   const setupYDoc = () => {
-    if (ydoc != null) {
+    if (ydoc != null || !isEditorMode) {
       return;
     }
 
@@ -129,8 +130,8 @@ export const useCollaborativeEditorMode = (
     };
   };
 
-  useEffect(cleanupYDoc, [cPageId, onEditorsUpdated, pageId, provider, socket, ydoc]);
-  useEffect(setupYDoc, [provider, ydoc]);
+  useEffect(cleanupYDoc, [cPageId, isEditorMode, onEditorsUpdated, pageId, provider, socket, ydoc]);
+  useEffect(setupYDoc, [isEditorMode, provider, ydoc]);
   useEffect(setupProvider, [initialValue, onEditorsUpdated, pageId, provider, socket, user, ydoc]);
   useEffect(setupYDocExtensions, [codeMirrorEditor, provider, ydoc]);
 };