فهرست منبع

add mutate in wide view switch

Yuken Tezuka 3 سال پیش
والد
کامیت
2a43935244
2فایلهای تغییر یافته به همراه4 افزوده شده و 5 حذف شده
  1. 4 4
      packages/app/src/components/Navbar/SubNavButtons.tsx
  2. 0 1
      packages/app/src/pages/[[...path]].page.tsx

+ 4 - 4
packages/app/src/components/Navbar/SubNavButtons.tsx

@@ -14,7 +14,7 @@ import { useIsContainerFluid, useIsGuestUser } from '~/stores/context';
 import { IPageForPageDuplicateModal } from '~/stores/modal';
 import { IPageForPageDuplicateModal } from '~/stores/modal';
 
 
 import { useSWRBookmarkInfo } from '../../stores/bookmark';
 import { useSWRBookmarkInfo } from '../../stores/bookmark';
-import { useSWRxPageInfo } from '../../stores/page';
+import { useSWRxCurrentPage, useSWRxPageInfo } from '../../stores/page';
 import { useSWRxUsersList } from '../../stores/user';
 import { useSWRxUsersList } from '../../stores/user';
 import BookmarkButtons from '../BookmarkButtons';
 import BookmarkButtons from '../BookmarkButtons';
 import {
 import {
@@ -92,6 +92,7 @@ const SubNavButtonsSubstance = (props: SubNavButtonsSubstanceProps): JSX.Element
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isGuestUser } = useIsGuestUser();
 
 
   const { mutate: mutatePageInfo } = useSWRxPageInfo(pageId, shareLinkId);
   const { mutate: mutatePageInfo } = useSWRxPageInfo(pageId, shareLinkId);
+  const { mutate: mutateCrrentPage } = useSWRxCurrentPage();
 
 
   const { data: bookmarkInfo, mutate: mutateBookmarkInfo } = useSWRBookmarkInfo(pageId);
   const { data: bookmarkInfo, mutate: mutateBookmarkInfo } = useSWRBookmarkInfo(pageId);
 
 
@@ -192,13 +193,12 @@ const SubNavButtonsSubstance = (props: SubNavButtonsSubstanceProps): JSX.Element
     }
     }
     try {
     try {
       await updateContentWidth(pageId, newValue);
       await updateContentWidth(pageId, newValue);
-      // TODO: mutate wide view info
-      mutatePageInfo();
+      mutateCrrentPage();
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
     }
     }
-  }, [isGuestUser, mutatePageInfo, pageId, pageInfo]);
+  }, [isGuestUser, mutateCrrentPage, pageId, pageInfo]);
 
 
   const additionalMenuItemOnTopRenderer = useMemo(() => {
   const additionalMenuItemOnTopRenderer = useMemo(() => {
     if (!isIPageInfoForEntity(pageInfo)) {
     if (!isIPageInfoForEntity(pageInfo)) {

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

@@ -245,7 +245,6 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   const { data: currentPage } = useSWRxCurrentPage(undefined, pageWithMeta?.data ?? null); // store initial data
   const { data: currentPage } = useSWRxCurrentPage(undefined, pageWithMeta?.data ?? null); // store initial data
   useEditingMarkdown(pageWithMeta?.data.revision?.body ?? '');
   useEditingMarkdown(pageWithMeta?.data.revision?.body ?? '');
 
 
-  const { data: dataPageInfo } = useSWRxPageInfo(pageId);
   const { data: grantData } = useSWRxIsGrantNormalized(pageId);
   const { data: grantData } = useSWRxIsGrantNormalized(pageId);
   const { mutate: mutateSelectedGrant } = useSelectedGrant();
   const { mutate: mutateSelectedGrant } = useSelectedGrant();