kaori 4 лет назад
Родитель
Сommit
8bcc1d654c
1 измененных файлов с 8 добавлено и 13 удалено
  1. 8 13
      packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

+ 8 - 13
packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
@@ -14,7 +14,7 @@ import {
 } from '~/stores/ui';
 } from '~/stores/ui';
 import {
 import {
   useCurrentCreatedAt, useCurrentUpdatedAt, useCurrentPageId, useRevisionId, useCurrentPagePath,
   useCurrentCreatedAt, useCurrentUpdatedAt, useCurrentPageId, useRevisionId, useCurrentPagePath,
-  useCreator, useRevisionAuthor, useCurrentUser, useIsGuestUser, useIsSharedUser, useShareLinkId,
+  useCreator, useRevisionAuthor, useIsGuestUser, useIsSharedUser, useShareLinkId,
 } from '~/stores/context';
 } from '~/stores/context';
 import { useSWRTagsInfo } from '~/stores/page';
 import { useSWRTagsInfo } from '~/stores/page';
 
 
@@ -38,7 +38,6 @@ type AdditionalMenuItemsProps = AdditionalMenuItemsRendererProps & {
   pageId: string,
   pageId: string,
   revisionId: string,
   revisionId: string,
   isLinkSharingDisabled?: boolean,
   isLinkSharingDisabled?: boolean,
-  onClickPresentationMenuItem: (isPagePresentationModalShown: boolean) => void,
 }
 }
 
 
 const AdditionalMenuItems = (props: AdditionalMenuItemsProps): JSX.Element => {
 const AdditionalMenuItems = (props: AdditionalMenuItemsProps): JSX.Element => {
@@ -53,12 +52,13 @@ const AdditionalMenuItems = (props: AdditionalMenuItemsProps): JSX.Element => {
   const { open: openPresentationModal } = usePagePresentationModalStatus();
   const { open: openPresentationModal } = usePagePresentationModalStatus();
 
 
   const { open } = usePageAccessoriesModal();
   const { open } = usePageAccessoriesModal();
-  const href = '?presentation=1';
+
+  const hrefForPresentationModal = '?presentation=1';
 
 
   return (
   return (
     <>
     <>
       {/* Presentation */}
       {/* Presentation */}
-      <DropdownItem onClick={() => openPresentationModal(href)}>
+      <DropdownItem onClick={() => openPresentationModal(hrefForPresentationModal)}>
         <i className="icon-fw"><PresentationIcon /></i>
         <i className="icon-fw"><PresentationIcon /></i>
         { t('Presentation Mode') }
         { t('Presentation Mode') }
       </DropdownItem>
       </DropdownItem>
@@ -120,7 +120,6 @@ const GrowiContextualSubNavigation = (props) => {
   const { data: path } = useCurrentPagePath();
   const { data: path } = useCurrentPagePath();
   const { data: creator } = useCreator();
   const { data: creator } = useCreator();
   const { data: revisionAuthor } = useRevisionAuthor();
   const { data: revisionAuthor } = useRevisionAuthor();
-  const { data: currentUser } = useCurrentUser();
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isSharedUser } = useIsSharedUser();
   const { data: isSharedUser } = useIsSharedUser();
   const { data: shareLinkId } = useShareLinkId();
   const { data: shareLinkId } = useShareLinkId();
@@ -136,8 +135,6 @@ const GrowiContextualSubNavigation = (props) => {
   const { open: openRenameModal } = usePageRenameModalStatus();
   const { open: openRenameModal } = usePageRenameModalStatus();
   const { open: openDeleteModal } = usePageDeleteModal();
   const { open: openDeleteModal } = usePageDeleteModal();
 
 
-  const [isPagePresentationModalShown, setIsPagePresentationModalShown] = useState(false);
-
   const {
   const {
     editorContainer, isCompactMode, isLinkSharingDisabled,
     editorContainer, isCompactMode, isLinkSharingDisabled,
   } = props;
   } = props;
@@ -178,9 +175,9 @@ const GrowiContextualSubNavigation = (props) => {
     openDeleteModal([pageToDelete]);
     openDeleteModal([pageToDelete]);
   }, [openDeleteModal]);
   }, [openDeleteModal]);
 
 
-  const presentationMenuItemClickHandler = useCallback(() => {
-    setIsPagePresentationModalShown(true);
-  }, []);
+  // const presentationMenuItemClickHandler = useCallback(() => {
+  //   onClickPresentationMenuItem();
+  // }, []);
 
 
   const ControlComponents = useCallback(() => {
   const ControlComponents = useCallback(() => {
     function onPageEditorModeButtonClicked(viewType) {
     function onPageEditorModeButtonClicked(viewType) {
@@ -205,7 +202,6 @@ const GrowiContextualSubNavigation = (props) => {
                   pageId={pageId}
                   pageId={pageId}
                   revisionId={revisionId}
                   revisionId={revisionId}
                   isLinkSharingDisabled={isLinkSharingDisabled}
                   isLinkSharingDisabled={isLinkSharingDisabled}
-                  onClickPresentationMenuItem={presentationMenuItemClickHandler}
                 />
                 />
               )}
               )}
               onClickDuplicateMenuItem={duplicateItemClickedHandler}
               onClickDuplicateMenuItem={duplicateItemClickedHandler}
@@ -231,7 +227,6 @@ const GrowiContextualSubNavigation = (props) => {
     isLinkSharingDisabled, isDeviceSmallerThanMd, isGuestUser, isSharedUser,
     isLinkSharingDisabled, isDeviceSmallerThanMd, isGuestUser, isSharedUser,
     isViewMode, isAbleToShowPageEditorModeManager, isAbleToShowPageManagement,
     isViewMode, isAbleToShowPageEditorModeManager, isAbleToShowPageManagement,
     duplicateItemClickedHandler, renameItemClickedHandler, deleteItemClickedHandler, path,
     duplicateItemClickedHandler, renameItemClickedHandler, deleteItemClickedHandler, path,
-    presentationMenuItemClickHandler,
   ]);
   ]);