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

cynamic import ShortcutsModal and SystemVersion

Yuki Takei 3 лет назад
Родитель
Сommit
97f5ab0566

+ 6 - 3
packages/app/src/components/BasicLayout.tsx

@@ -1,6 +1,6 @@
 import React, { ReactNode } from 'react';
 
-// import dynamic from 'next/dynamic';
+import dynamic from 'next/dynamic';
 
 // import GrowiNavbar from '~/client/js/components/Navbar/GrowiNavbar';
 // import GrowiNavbarBottom from '~/client/js/components/Navbar/GrowiNavbarBottom';
@@ -19,7 +19,8 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
   // const Sidebar = dynamic(() => import('../client/js/components/Sidebar'), { ssr: false });
   // const HotkeysManager = dynamic(() => import('../client/js/components/Hotkeys/HotkeysManager'), { ssr: false });
   // const PageCreateModal = dynamic(() => import('../client/js/components/PageCreateModal'), { ssr: false });
-  // const SystemVersion = dynamic(() => import('./SystemVersion'), { ssr: false });
+  const ShortcutsModal = dynamic(() => import('./ShortcutsModal'), { ssr: false });
+  const SystemVersion = dynamic(() => import('./SystemVersion'), { ssr: false });
 
   return (
     <>
@@ -44,7 +45,9 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
 
       {/* <PageCreateModal /> */}
       {/* <HotkeysManager /> */}
-      {/* <SystemVersion /> */}
+
+      <ShortcutsModal />
+      <SystemVersion />
     </>
   );
 };

+ 2 - 2
packages/app/src/pages/_app.page.tsx

@@ -8,12 +8,12 @@ import '~/styles/style-next.scss';
 import '~/styles/theme/default.scss';
 // import InterceptorManager from '~/service/interceptor-manager';
 
-// import { useGrowiVersion } from '../stores/context';
+import { useGrowiVersion } from '../stores/context';
 // import { useInterceptorManager } from '~/stores/interceptor';
 
 function GrowiApp({ Component, pageProps }: AppProps): JSX.Element {
   // useInterceptorManager(new InterceptorManager());
-  // useGrowiVersion(pageProps.growiVersion);
+  useGrowiVersion(pageProps.growiVersion);
 
   return (
     <Component {...pageProps} />