update

packages/app/src/components/Page.tsx

@@ -13,7 +13,7 @@ import { HtmlElementNode } from 'rehype-toc';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import { getOptionsToSave } from '~/client/util/editor';
 import {
-  useIsGuestUser, useShareLinkId, useIsLatestRevision, useStaticPageData,
+  useIsGuestUser, useShareLinkId, useIsLatestRevision,
 } from '~/stores/context';
 import {
   useSWRxSlackChannels, useIsSlackEnabled, usePageTagsForEditors, useIsEnabledUnsavedWarning,
@@ -22,7 +22,7 @@ import { useSWRxCurrentPage } from '~/stores/page';
 import { useViewOptions } from '~/stores/renderer';
 import {
   useCurrentPageTocNode,
-  useEditorMode, useIsMobile,
+  useEditorMode, useIsMobile, useRequestRevisionPage,
 } from '~/stores/ui';
 import loggerFactory from '~/utils/logger';
 
@@ -226,7 +226,7 @@ export const Page = (props) => {
 
   // for History "View this version" function on PageAccessoryModal
   const { data: isLatestRevision } = useIsLatestRevision();
-  const { data: pageWithMetaData } = useStaticPageData();
+  const { data: requestRevisionPage } = useRequestRevisionPage();
 
   const pageRef = useRef(null);
 
@@ -274,7 +274,7 @@ export const Page = (props) => {
     return null;
   }
 
-  const page = ((pageWithMetaData != null && isLatestRevision != null) && !isLatestRevision) ? pageWithMetaData : currentPage;
+  const page = ((requestRevisionPage != null && isLatestRevision != null) && !isLatestRevision) ? requestRevisionPage : currentPage;
 
   return (
     <PageSubstance

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

@@ -42,6 +42,7 @@ import {
   EditorMode,
   useEditorMode, useSelectedGrant,
   usePreferDrawerModeByUser, usePreferDrawerModeOnEditByUser, useSidebarCollapsed, useCurrentSidebarContents, useCurrentProductNavWidth,
+  useRequestRevisionPage,
 } from '~/stores/ui';
 import loggerFactory from '~/utils/logger';
 
@@ -66,7 +67,6 @@ import {
   useCsrfToken, useIsSearchScopeChildrenAsDefault, useCurrentPageId, useCurrentPathname,
   useIsSlackConfigured, useRendererConfig, useEditingMarkdown,
   useEditorConfig, useIsAllReplyShown, useIsUploadableFile, useIsUploadableImage, useCustomizedLogoSrc, useIsContainerFluid,
-  useStaticPageData,
 } from '../stores/context';
 
 import {
@@ -245,7 +245,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
 
   const { data: currentPage } = useSWRxCurrentPage(undefined, pageWithMeta?.data ?? null); // store initial data
   useEditingMarkdown(pageWithMeta?.data.revision?.body ?? '');
-  useStaticPageData(pageWithMeta?.data); // store page data statically for History function on PageAccessoryModal
+  useRequestRevisionPage(pageWithMeta?.data); // store page data statically for History function on PageAccessoryModal
 
   const { data: grantData } = useSWRxIsGrantNormalized(pageId);
   const { mutate: mutateSelectedGrant } = useSelectedGrant();

packages/app/src/stores/context.tsx

@@ -1,4 +1,4 @@
-import { IUser, pagePathUtils, IPagePopulatedToShowRevision } from '@growi/core';
+import { IUser, pagePathUtils } from '@growi/core';
 import { HtmlElementNode } from 'rehype-toc';
 import { Key, SWRResponse } from 'swr';
 import useSWRImmutable from 'swr/immutable';
@@ -225,10 +225,6 @@ export const useIsContainerFluid = (initialData?: boolean): SWRResponse<boolean,
   return useStaticSWR('isContainerFluid', initialData);
 };
 
-export const useStaticPageData = (initialData?: IPagePopulatedToShowRevision): SWRResponse<IPagePopulatedToShowRevision, Error> => {
-  return useStaticSWR('staticPageData', initialData);
-};
-
 /** **********************************************************
  *                     Computed contexts
  *********************************************************** */

packages/app/src/stores/ui.tsx

@@ -1,6 +1,7 @@
 import { RefObject, useCallback, useEffect } from 'react';
 
 import {
+  IPagePopulatedToShowRevision,
   isClient, isServer, pagePathUtils, Nullable, PageGrant,
 } from '@growi/core';
 import { withUtils, SWRResponseWithUtils } from '@growi/core/src/utils/with-utils';
@@ -396,6 +397,10 @@ export const usePageTreeDescCountMap = (initialData?: UpdateDescCountData): SWRR
   };
 };
 
+export const useRequestRevisionPage = (initialData?: IPagePopulatedToShowRevision): SWRResponse<IPagePopulatedToShowRevision, Error> => {
+  return useStaticSWR('requestRevisionPage', initialData);
+};
+
 
 /** **********************************************************
  *                          SWR Hooks