pass PageView element with props

packages/app/src/components/Page/DisplaySwitcher.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { type IPagePopulatedToShowRevision } from '@growi/core';
 import dynamic from 'next/dynamic';
 
 
@@ -12,7 +11,6 @@ import { EditorMode, useEditorMode } from '~/stores/ui';
 
 import { LazyRenderer } from '../Common/LazyRenderer';
 
-import { PageView } from './PageView';
 
 
 const PageEditor = dynamic(() => import('../PageEditor'), { ssr: false });
@@ -21,12 +19,11 @@ const EditorNavbarBottom = dynamic(() => import('../PageEditor/EditorNavbarBotto
 
 
 type Props = {
-  pagePath: string,
-  page?: IPagePopulatedToShowRevision,
-  ssrBody?: JSX.Element,
+  pageView: JSX.Element,
 }
 
 export const DisplaySwitcher = (props: Props): JSX.Element => {
+  const { pageView } = props;
 
   const { data: editorMode = EditorMode.View } = useEditorMode();
   const { data: isEditable } = useIsEditable();
@@ -39,7 +36,7 @@ export const DisplaySwitcher = (props: Props): JSX.Element => {
 
   return (
     <>
-      { isViewMode && <PageView {...props} /> }
+      { isViewMode && pageView }
 
       <LazyRenderer shouldRender={isEditable === true && editorMode === EditorMode.Editor}>
         <div data-testid="page-editor" id="page-editor" className="editor-root">

packages/app/src/pages/[[...path]].page.tsx

@@ -66,6 +66,7 @@ import { NextPageWithLayout } from './_app.page';
 import {
   CommonProps, getNextI18NextConfig, getServerSideCommonProps, generateCustomTitleForPage,
 } from './utils/commons';
+import { PageView } from '~/components/Page/PageView';
 
 
 declare global {
@@ -317,9 +318,13 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
         <div id="grw-fav-sticky-trigger" className="sticky-top"></div>
 
         <DisplaySwitcher
-          pagePath={pagePath}
-          page={pageWithMeta?.data}
-          ssrBody={ssrBody}
+          pageView={
+            <PageView
+              pagePath={pagePath}
+              page={pageWithMeta?.data}
+              ssrBody={ssrBody}
+            />
+          }
         />
 
         <PageStatusAlert />