Yuki Takei 4 лет назад
Родитель
Сommit
31bcc73b42

+ 6 - 8
packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -23,8 +23,8 @@ type CommonProps = {
   isEnableActions?: boolean,
   hideBookmarkMenuItem?: boolean,
   onClickBookmarkMenuItem?: (pageId: string, newValue?: boolean) => Promise<void>,
-  onClickRenameMenuItem?: (pageId: string) => Promise<void>,
-  onClickDeleteMenuItem?: (pageId: string) => Promise<void>,
+  onClickRenameMenuItem?: (pageId: string) => void,
+  onClickDeleteMenuItem?: (pageId: string) => void,
 
   additionalMenuItemRenderer?: React.FunctionComponent<AdditionalMenuItemsRendererProps>,
 }
@@ -44,15 +44,13 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
   } = props;
 
 
-  const isEmpty = !isExistPageInfo(pageInfo);
-
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const bookmarkItemClickedHandler = useCallback(async() => {
-    if (isEmpty || onClickBookmarkMenuItem == null) {
+    if (!isExistPageInfo(pageInfo) || onClickBookmarkMenuItem == null) {
       return;
     }
     await onClickBookmarkMenuItem(pageId, !pageInfo.isBookmarked);
-  }, [isEmpty, onClickBookmarkMenuItem, pageId, pageInfo]);
+  }, [onClickBookmarkMenuItem, pageId, pageInfo]);
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const renameItemClickedHandler = useCallback(async() => {
@@ -64,7 +62,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const deleteItemClickedHandler = useCallback(async() => {
-    if (isEmpty || onClickDeleteMenuItem == null) {
+    if (!isExistPageInfo(pageInfo) || onClickDeleteMenuItem == null) {
       return;
     }
     if (!pageInfo.isDeletable) {
@@ -72,7 +70,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
       return;
     }
     await onClickDeleteMenuItem(pageId);
-  }, [isEmpty, onClickDeleteMenuItem, pageId, pageInfo]);
+  }, [onClickDeleteMenuItem, pageId, pageInfo]);
 
   if (pageId == null || pageInfo == null) {
     return <></>;

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

@@ -100,7 +100,6 @@ const GrowiContextualSubNavigation = (props) => {
   } = props;
 
   const isViewMode = editorMode === EditorMode.View;
-  const isPageExists = pageId != null;
 
   const tagsUpdatedHandler = useCallback(async(newTags: string[]) => {
     // It will not be reflected in the DB until the page is refreshed
@@ -132,7 +131,7 @@ const GrowiContextualSubNavigation = (props) => {
     return (
       <>
         <div className="h-50 d-flex flex-column align-items-end justify-content-center">
-          { isPageExists && isViewMode && (
+          { pageId != null && isViewMode && (
             <SubNavButtons
               isCompactMode={isCompactMode}
               pageId={pageId}
@@ -156,7 +155,7 @@ const GrowiContextualSubNavigation = (props) => {
       </>
     );
   }, [
-    pageId, revisionId, isPageExists,
+    pageId, revisionId,
     editorMode, mutateEditorMode,
     isCompactMode, isDeviceSmallerThanMd, isGuestUser, isSharedUser,
     isViewMode, isAbleToShowPageEditorModeManager, isAbleToShowPageManagement,

+ 3 - 3
packages/app/src/components/PageList/PageListItemL.tsx

@@ -17,9 +17,9 @@ type Props = {
   isEnableActions?: boolean,
   shortBody?: string
   showPageUpdatedTime?: boolean, // whether to show page's updated time at the top-right corner of item
-  onClickCheckbox?: (pageId: string) => Promise<void>,
-  onClickItem?: (pageId: string) => Promise<void>,
-  onClickDeleteButton?: (pageId: string) => Promise<void>,
+  onClickCheckbox?: (pageId: string) => void,
+  onClickItem?: (pageId: string) => void,
+  onClickDeleteButton?: (pageId: string) => void,
 }
 
 export const PageListItemL: FC<Props> = memo((props:Props) => {