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

disable to show SSR body temporary to reduce flicker

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

+ 2 - 1
packages/app/src/components/Page/PageView.tsx

@@ -98,7 +98,8 @@ export const PageView = (props: Props): JSX.Element => {
     : (() => {
     : (() => {
       const PageContents = dynamic(() => import('./PageContents').then(mod => mod.PageContents), {
       const PageContents = dynamic(() => import('./PageContents').then(mod => mod.PageContents), {
         ssr: false,
         ssr: false,
-        loading: () => ssrBody ?? <></>,
+        // TODO: show SSR body
+        // loading: () => ssrBody ?? <></>,
       });
       });
       return <PageContents />;
       return <PageContents />;
     })();
     })();

+ 6 - 4
packages/app/src/pages/[[...path]].page.tsx

@@ -20,6 +20,7 @@ import { useRouter } from 'next/router';
 import superjson from 'superjson';
 import superjson from 'superjson';
 
 
 import { useCurrentGrowiLayoutFluidClassName } from '~/client/services/layout';
 import { useCurrentGrowiLayoutFluidClassName } from '~/client/services/layout';
+import { PageView } from '~/components/Page/PageView';
 import RevisionRenderer from '~/components/Page/RevisionRenderer';
 import RevisionRenderer from '~/components/Page/RevisionRenderer';
 import { DrawioViewerScript } from '~/components/Script/DrawioViewerScript';
 import { DrawioViewerScript } from '~/components/Script/DrawioViewerScript';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
@@ -66,7 +67,6 @@ import { NextPageWithLayout } from './_app.page';
 import {
 import {
   CommonProps, getNextI18NextConfig, getServerSideCommonProps, generateCustomTitleForPage,
   CommonProps, getNextI18NextConfig, getServerSideCommonProps, generateCustomTitleForPage,
 } from './utils/commons';
 } from './utils/commons';
-import { PageView } from '~/components/Page/PageView';
 
 
 
 
 declare global {
 declare global {
@@ -295,8 +295,9 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
 
 
   const title = generateCustomTitleForPage(props, pagePath);
   const title = generateCustomTitleForPage(props, pagePath);
 
 
-  const rendererOptions = generateSSRViewOptions(props.rendererConfig, pagePath);
-  const ssrBody = <RevisionRenderer rendererOptions={rendererOptions} markdown={revisionBody ?? ''} />;
+  // TODO: show SSR body
+  // const rendererOptions = generateSSRViewOptions(props.rendererConfig, pagePath);
+  // const ssrBody = <RevisionRenderer rendererOptions={rendererOptions} markdown={revisionBody ?? ''} />;
 
 
   return (
   return (
     <>
     <>
@@ -322,7 +323,8 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
             <PageView
             <PageView
               pagePath={pagePath}
               pagePath={pagePath}
               page={pageWithMeta?.data}
               page={pageWithMeta?.data}
-              ssrBody={ssrBody}
+              // TODO: show SSR body
+              // ssrBody={ssrBody}
             />
             />
           }
           }
         />
         />

+ 5 - 3
packages/app/src/pages/share/[[...path]].page.tsx

@@ -112,8 +112,9 @@ const SharedPage: NextPageWithLayout<Props> = (props: Props) => {
 
 
   const title = generateCustomTitleForPage(props, pagePath);
   const title = generateCustomTitleForPage(props, pagePath);
 
 
-  const rendererOptions = generateSSRViewOptions(props.rendererConfig, pagePath);
-  const ssrBody = <RevisionRenderer rendererOptions={rendererOptions} markdown={revisionBody ?? ''} />;
+  // TODO: show SSR body
+  // const rendererOptions = generateSSRViewOptions(props.rendererConfig, pagePath);
+  // const ssrBody = <RevisionRenderer rendererOptions={rendererOptions} markdown={revisionBody ?? ''} />;
 
 
   const sideContents = shareLink != null
   const sideContents = shareLink != null
     ? <PageSideContents page={shareLink.relatedPage} />
     ? <PageSideContents page={shareLink.relatedPage} />
@@ -132,7 +133,8 @@ const SharedPage: NextPageWithLayout<Props> = (props: Props) => {
       () => import('~/components/ShareLink/ShareLinkPageContents').then(mod => mod.ShareLinkPageContents),
       () => import('~/components/ShareLink/ShareLinkPageContents').then(mod => mod.ShareLinkPageContents),
       {
       {
         ssr: false,
         ssr: false,
-        loading: () => ssrBody,
+        // TODO: show SSR body
+        // loading: () => ssrBody,
       },
       },
     );
     );
     return <ShareLinkPageContents page={props.shareLinkRelatedPage} />;
     return <ShareLinkPageContents page={props.shareLinkRelatedPage} />;