jam411 3 лет назад
Родитель
Сommit
fe058ffd90

+ 16 - 8
packages/app/src/components/PageContentFooter.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
+import { IPage, IUser } from '@growi/core';
 import dynamic from 'next/dynamic';
 
-import { IUser } from '~/interfaces/user';
 import { useSWRxCurrentPage } from '~/stores/page';
 
 import { Skelton } from './Skelton';
@@ -14,17 +14,17 @@ const AuthorInfo = dynamic(() => import('./Navbar/AuthorInfo'), {
   loading: () => <Skelton additionalClass={`${styles['page-content-footer-skelton']} mb-3`} />,
 });
 
-export const PageContentFooter = (): JSX.Element => {
+type PageContentFooterProps = {
+  page: IPage,
+}
 
-  const { data: currentPage } = useSWRxCurrentPage();
+export const PageContentFooter = (props: PageContentFooterProps): JSX.Element => {
 
-  if (currentPage == null) {
-    return <></>;
-  }
+  const { page } = props;
 
   const {
     creator, lastUpdateUser, createdAt, updatedAt,
-  } = currentPage;
+  } = page;
 
   return (
     <div className={`${styles['page-content-footer']} page-content-footer py-4 d-edit-none d-print-none}`}>
@@ -38,4 +38,12 @@ export const PageContentFooter = (): JSX.Element => {
   );
 };
 
-PageContentFooter.displayName = 'PageContentFooter';
+export const PageContentFooterWrapper = (): JSX.Element => {
+  const { data: currentPage } = useSWRxCurrentPage();
+
+  if (currentPage == null) {
+    return <></>;
+  }
+
+  return <PageContentFooter page={currentPage} />;
+};

+ 3 - 1
packages/app/src/components/SearchPage/SearchResultContent.tsx

@@ -223,7 +223,9 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
           isReadOnly
           hideIfEmpty
         />
-        <PageContentFooter />
+        <PageContentFooter
+          page={page}
+        />
       </div>
     </div>
   );

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

@@ -20,7 +20,7 @@ import superjson from 'superjson';
 import { Comments } from '~/components/Comments';
 import { PageAlerts } from '~/components/PageAlert/PageAlerts';
 // import { useTranslation } from '~/i18n';
-import { PageContentFooter } from '~/components/PageContentFooter';
+import { PageContentFooterWrapper } from '~/components/PageContentFooter';
 import { UsersHomePageFooterProps } from '~/components/UsersHomePageFooter';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 // import { renderScriptTagByName, renderHighlightJsStyleTag } from '~/service/cdn-resources-loader';
@@ -331,7 +331,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
               { (pageWithMeta != null && isUsersHomePage(pageWithMeta.data.path)) && (
                 <UsersHomePageFooter creatorId={pageWithMeta.data.creator._id}/>
               ) }
-              <PageContentFooter />
+              <PageContentFooterWrapper />
             </footer>
           )}