Yuki Takei 4 лет назад
Родитель
Сommit
93c81816d4
1 измененных файлов с 4 добавлено и 5 удалено
  1. 4 5
      packages/app/src/stores/ui.tsx

+ 4 - 5
packages/app/src/stores/ui.tsx

@@ -113,17 +113,16 @@ export const useEditorMode = (): SWRResponse<EditorMode, Error> => {
 
 
   const isLoading = _isEditable === undefined;
   const isLoading = _isEditable === undefined;
   const isEditable = !isLoading && _isEditable;
   const isEditable = !isLoading && _isEditable;
+  const initialData = isEditable ? editorModeByHash : EditorMode.View;
 
 
   const swrResponse = useSWRImmutable(
   const swrResponse = useSWRImmutable(
     isLoading ? null : ['editorMode', isEditable],
     isLoading ? null : ['editorMode', isEditable],
-    isEditable
-      ? null
-      : () => EditorMode.View, // fixed if not editable
-    { fallbackData: editorModeByHash },
+    null,
+    { fallbackData: initialData },
   );
   );
 
 
   // initial updating
   // initial updating
-  if (!isEditorModeLoaded && swrResponse.data != null) {
+  if (!isEditorModeLoaded && !isLoading && swrResponse.data != null) {
     if (isEditable) {
     if (isEditable) {
       updateBodyClassesForEditorMode(swrResponse.data);
       updateBodyClassesForEditorMode(swrResponse.data);
     }
     }