소스 검색

add sidebar mode to context extractor

yuken 4 년 전
부모
커밋
150d3f8d5c
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      packages/app/src/client/services/ContextExtractor.tsx
  2. 1 0
      packages/app/src/server/models/config.ts

+ 1 - 1
packages/app/src/client/services/ContextExtractor.tsx

@@ -99,7 +99,7 @@ const ContextExtractorOnce: FC = () => {
   useCurrentUser(currentUser);
 
   // UserUISettings
-  usePreferDrawerModeByUser(userUISettings?.preferDrawerModeByUser);
+  usePreferDrawerModeByUser(userUISettings?.preferDrawerModeByUser ?? configByContextHydrate.isSidebarDrawerMode);
   usePreferDrawerModeOnEditByUser(userUISettings?.preferDrawerModeOnEditByUser);
   useSidebarCollapsed(userUISettings?.isSidebarCollapsed);
   useCurrentSidebarContents(userUISettings?.currentSidebarContents);

+ 1 - 0
packages/app/src/server/models/config.ts

@@ -243,6 +243,7 @@ schema.statics.getLocalconfig = function(crowi) {
     globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
     pageLimitationL: crowi.configManager.getConfig('crowi', 'customize:showPageLimitationL'),
     pageLimitationXL: crowi.configManager.getConfig('crowi', 'customize:showPageLimitationXL'),
+    isSidebarDrawerMode: crowi.configManager.getConfig('crowi', 'customize:isSidebarDrawerMode'),
   };
 
   return localConfig;