Parcourir la source

pass props directly

kaori il y a 4 ans
Parent
commit
5c241bbce9
1 fichiers modifiés avec 2 ajouts et 14 suppressions
  1. 2 14
      packages/app/src/components/Navbar/SubNavButtons.tsx

+ 2 - 14
packages/app/src/components/Navbar/SubNavButtons.tsx

@@ -92,14 +92,10 @@ const SubNavButtonsSubstance = (props: SubNavButtonsSubstanceProps): JSX.Element
   }, [isGuestUser, mutateBookmarkInfo, mutatePageInfo, pageId, pageInfo]);
   }, [isGuestUser, mutateBookmarkInfo, mutatePageInfo, pageId, pageInfo]);
 
 
   const renameMenuItemClickHandler = useCallback(async(_pageId: string): Promise<void> => {
   const renameMenuItemClickHandler = useCallback(async(_pageId: string): Promise<void> => {
-    if (onClickRenameMenuItem == null) {
+    if (onClickRenameMenuItem == null || path == null) {
       return;
       return;
     }
     }
 
 
-    if (path == null) {
-      throw Error('path must not be null.');
-    }
-
     onClickRenameMenuItem(pageId, revisionId, path);
     onClickRenameMenuItem(pageId, revisionId, path);
   }, [onClickRenameMenuItem, pageId, path, revisionId]);
   }, [onClickRenameMenuItem, pageId, path, revisionId]);
 
 
@@ -177,14 +173,6 @@ export const SubNavButtons = (props: SubNavButtonsProps): JSX.Element => {
 
 
   const { data: pageInfo, error } = useSWRxPageInfo(pageId ?? null, shareLinkId);
   const { data: pageInfo, error } = useSWRxPageInfo(pageId ?? null, shareLinkId);
 
 
-
-  const renameItemClickedHandler = useCallback(async(pageId, revisionId, path) => {
-    if (onClickRenameMenuItem == null) {
-      return;
-    }
-    await onClickRenameMenuItem(pageId, revisionId, path);
-  }, [onClickRenameMenuItem]);
-
   if (revisionId == null || error != null) {
   if (revisionId == null || error != null) {
     return <></>;
     return <></>;
   }
   }
@@ -201,7 +189,7 @@ export const SubNavButtons = (props: SubNavButtonsProps): JSX.Element => {
       pageId={pageId}
       pageId={pageId}
       revisionId={revisionId}
       revisionId={revisionId}
       path={path}
       path={path}
-      onClickRenameMenuItem={renameItemClickedHandler}
+      onClickRenameMenuItem={onClickRenameMenuItem}
       onClickDeleteMenuItem={onClickDeleteMenuItem}
       onClickDeleteMenuItem={onClickDeleteMenuItem}
     />
     />
   );
   );