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

move PutbackPageModal to [[...path]].page.tsx

yohei0125 3 лет назад
Родитель
Сommit
655e1688a6

+ 0 - 2
packages/app/src/components/Layout/BasicLayout.tsx

@@ -26,7 +26,6 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
   const PageDuplicateModal = dynamic(() => import('../PageDuplicateModal'), { ssr: false });
   const PageDeleteModal = dynamic(() => import('../PageDeleteModal'), { ssr: false });
   const PageRenameModal = dynamic(() => import('../PageRenameModal'), { ssr: false });
-  const PutbackPageModal = dynamic(() => import('../PutbackPageModal'), { ssr: false });
 
   return (
     <RawLayout title={title} className={className}>
@@ -48,7 +47,6 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
       <PageDuplicateModal />
       <PageDeleteModal />
       <PageRenameModal />
-      <PutbackPageModal />
       {/* <HotkeysManager /> */}
 
       <ShortcutsModal />

+ 2 - 0
packages/app/src/pages/[[...path]].page.tsx

@@ -132,6 +132,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   const router = useRouter();
 
   const UnsavedAlertDialog = dynamic(() => import('./UnsavedAlertDialog'), { ssr: false });
+  const PutbackPageModal = dynamic(() => import('../components/PutbackPageModal'), { ssr: false });
 
   const { data: currentUser } = useCurrentUser(props.currentUser != null ? JSON.parse(props.currentUser) : null);
 
@@ -289,6 +290,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
 
         <UnsavedAlertDialog />
 
+        {_isTrashPage(props.currentPathname) && <PutbackPageModal />}
       </BasicLayout>
     </>
   );