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

rename usePagePresentationModalStatus
to usePagePresentationModal and
use it instead of usePagePresentationModalOpened

kaori 4 лет назад
Родитель
Сommit
d37a325143

+ 2 - 2
packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -10,7 +10,7 @@ import EditorContainer from '~/client/services/EditorContainer';
 import {
   EditorMode, useDrawerMode, useEditorMode, useIsDeviceSmallerThanMd, useIsAbleToShowPageManagement, useIsAbleToShowTagLabel,
   useIsAbleToShowPageEditorModeManager, useIsAbleToShowPageAuthors, usePageAccessoriesModal, PageAccessoriesModalContents,
-  usePageDuplicateModalStatus, usePageRenameModalStatus, usePageDeleteModal, usePagePresentationModalStatus,
+  usePageDuplicateModalStatus, usePageRenameModalStatus, usePageDeleteModal, usePagePresentationModal,
 } from '~/stores/ui';
 import {
   useCurrentCreatedAt, useCurrentUpdatedAt, useCurrentPageId, useRevisionId, useCurrentPagePath,
@@ -57,7 +57,7 @@ const AdditionalMenuItems = (props: AdditionalMenuItemsProps): JSX.Element => {
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isSharedUser } = useIsSharedUser();
 
-  const { open: openPresentationModal } = usePagePresentationModalStatus();
+  const { open: openPresentationModal } = usePagePresentationModal();
   const { open: openAccessoriesModal } = usePageAccessoriesModal();
 
   const hrefForPresentationModal = '?presentation=1';

+ 3 - 4
packages/app/src/components/PagePresentationModal.jsx

@@ -3,15 +3,14 @@ import {
   Modal, ModalBody,
 } from 'reactstrap';
 
-import { usePagePresentationModalStatus, usePagePresentationModalOpened } from '~/stores/ui';
+import { usePagePresentationModal } from '~/stores/ui';
 
 const PagePresentationModal = () => {
 
-  const { data: presentationData, close: closePresentationModal } = usePagePresentationModalStatus();
-  const { data: isOpened } = usePagePresentationModalOpened();
+  const { data: presentationData, close: closePresentationModal } = usePagePresentationModal();
 
   return (
-    <Modal isOpen={isOpened} toggle={closePresentationModal} className="grw-presentation-modal" unmountOnClose={false}>
+    <Modal isOpen={presentationData.isOpened} toggle={closePresentationModal} className="grw-presentation-modal" unmountOnClose={false}>
       <ModalBody className="modal-body">
         <iframe src={presentationData.href} />
       </ModalBody>

+ 1 - 11
packages/app/src/stores/ui.tsx

@@ -436,7 +436,7 @@ type PresentationModalStatusUtils = {
   close(): Promise<PresentationModalStatus | undefined>
 }
 
-export const usePagePresentationModalStatus = (
+export const usePagePresentationModal = (
     status?: PresentationModalStatus,
 ): SWRResponse<PresentationModalStatus, Error> & PresentationModalStatusUtils => {
   const initialData: PresentationModalStatus = {
@@ -451,16 +451,6 @@ export const usePagePresentationModalStatus = (
   };
 };
 
-export const usePagePresentationModalOpened = (): SWRResponse<boolean, Error> => {
-  const { data } = usePagePresentationModalStatus();
-  return useSWRImmutable(
-    data != null ? ['isPresentationModalOpened', data] : null,
-    () => {
-      return data != null ? data.isOpened : false;
-    },
-  );
-};
-
 
 type DescendantsPageListModalStatus = {
   isOpened: boolean,