Yuken Tezuka пре 3 година
родитељ
комит
84a481ea7b
1 измењених фајлова са 7 додато и 4 уклоњено
  1. 7 4
      packages/app/src/components/PageEditor/Editor.tsx

+ 7 - 4
packages/app/src/components/PageEditor/Editor.tsx

@@ -260,14 +260,17 @@ const Editor: ForwardRefRenderFunction<IEditorMethods, EditorPropsType> = (props
     );
     );
   }, [isCheatsheetModalShown]);
   }, [isCheatsheetModalShown]);
 
 
+  const isReadyToRenderEditor = editorSettings != null;
+  const editorRef = editorSubstance();
+
   useEffect(() => {
   useEffect(() => {
-    if (editorSubstance != null && editorSettings != null) {
-      const editorNavBarItems = editorSubstance()?.getNavbarItems() ?? [];
+    if (isReadyToRenderEditor && editorRef != null) {
+      const editorNavBarItems = editorRef.getNavbarItems() ?? [];
       setNavBarItems(editorNavBarItems);
       setNavBarItems(editorNavBarItems);
     }
     }
-  }, [editorSettings, editorSubstance]);
+  }, [editorRef, isReadyToRenderEditor]);
 
 
-  if (editorSettings == null) {
+  if (!isReadyToRenderEditor) {
     return <></>;
     return <></>;
   }
   }