Browse Source

use RevisionRenderer in pageviews

reiji-h 1 year ago
parent
commit
555b450bbf

+ 6 - 2
apps/app/src/components/Page/PageView.tsx

@@ -26,6 +26,8 @@ import type { PageSideContentsProps } from '../PageSideContents';
 import { UserInfo } from '../User/UserInfo';
 import type { UsersHomepageFooterProps } from '../UsersHomepageFooter';
 
+import RevisionRenderer from './RevisionRenderer';
+
 import styles from './PageView.module.scss';
 
 
@@ -38,7 +40,7 @@ const Comments = dynamic<CommentsProps>(() => import('../Comments').then(mod =>
 const UsersHomepageFooter = dynamic<UsersHomepageFooterProps>(() => import('../UsersHomepageFooter')
   .then(mod => mod.UsersHomepageFooter), { ssr: false });
 const IdenticalPathPage = dynamic(() => import('../IdenticalPathPage').then(mod => mod.IdenticalPathPage), { ssr: false });
-const ViewRenderer = dynamic(() => import('./ViewRenderer').then(mod => mod.ViewRenderer), { ssr: false });
+const SlideRenderer = dynamic(() => import('./SlideRenderer').then(mod => mod.SlideRenderer), { ssr: false });
 
 
 type Props = {
@@ -136,7 +138,9 @@ export const PageView = (props: Props): JSX.Element => {
 
         <div className="flex-expand-vert justify-content-between">
 
-          <ViewRenderer rendererOptions={rendererOptions} markdown={markdown}></ViewRenderer>
+          <SlideRenderer markdown={markdown}>
+            <RevisionRenderer rendererOptions={rendererOptions} markdown={markdown} />
+          </SlideRenderer>
 
           { !isIdenticalPathPage && !isNotFound && (
             <div id="comments-container" ref={commentsContainerRef}>

+ 8 - 2
apps/app/src/components/ShareLinkPageView.tsx

@@ -13,6 +13,7 @@ import loggerFactory from '~/utils/logger';
 
 import { PagePathNavSticky } from './Common/PagePathNav';
 import { PageViewLayout } from './Common/PageViewLayout';
+import RevisionRenderer from './Page/RevisionRenderer';
 import ShareLinkAlert from './Page/ShareLinkAlert';
 import type { PageSideContentsProps } from './PageSideContents';
 
@@ -22,7 +23,7 @@ const logger = loggerFactory('growi:Page');
 
 const PageSideContents = dynamic<PageSideContentsProps>(() => import('./PageSideContents').then(mod => mod.PageSideContents), { ssr: false });
 const ForbiddenPage = dynamic(() => import('./ForbiddenPage'), { ssr: false });
-const ViewRenderer = dynamic(() => import('./Page/ViewRenderer').then(mod => mod.ViewRenderer), { ssr: false });
+const SlideRenderer = dynamic(() => import('./Page/SlideRenderer').then(mod => mod.SlideRenderer), { ssr: false });
 
 type Props = {
   pagePath: string,
@@ -86,7 +87,12 @@ export const ShareLinkPageView = (props: Props): JSX.Element => {
 
     return (
       <>
-        <ViewRenderer rendererOptions={rendererOptions} markdown={markdown}></ViewRenderer>
+        <SlideRenderer markdown={markdown}>
+          <RevisionRenderer
+            rendererOptions={rendererOptions}
+            markdown={markdown}
+          />
+        </SlideRenderer>
       </>
     );
   };