Taichi Masuyama 4 лет назад
Родитель
Сommit
f7fbc0f4ff

+ 2 - 2
packages/app/src/components/Sidebar/PageTree.tsx

@@ -22,7 +22,7 @@ const PageTree: FC = memo(() => {
   const [isDeleteModalOpen, setDeleteModalOpen] = useState(false);
   const [pagesToDelete, setPagesToDelete] = useState<IPageForPageDeleteModal[]>([]);
 
-  const onClickDelete = (page: IPageForPageDeleteModal) => {
+  const onClickDeleteByPage = (page: IPageForPageDeleteModal) => {
     setDeleteModalOpen(true);
     setPagesToDelete([page]);
   };
@@ -49,7 +49,7 @@ const PageTree: FC = memo(() => {
           isAbleToDeleteCompletely={false} // TODO: pass isAbleToDeleteCompletely
           isDeleteCompletelyModal={false} // TODO: pass isDeleteCompletelyModal
           onCloseDelete={onCloseDelete}
-          onClickDelete={onClickDelete}
+          onClickDeleteByPage={onClickDeleteByPage}
         />
       </div>
 

+ 6 - 6
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -16,7 +16,7 @@ interface ItemProps {
   itemNode: ItemNode
   targetId?: string
   isOpen?: boolean
-  onClickDelete?(page: IPageForPageDeleteModal): void
+  onClickDeleteByPage?(page: IPageForPageDeleteModal): void
 }
 
 // Utility to mark target
@@ -87,7 +87,7 @@ const ItemCount: FC = () => {
 const Item: FC<ItemProps> = (props: ItemProps) => {
   const { t } = useTranslation();
   const {
-    itemNode, targetId, isOpen: _isOpen = false, onClickDelete,
+    itemNode, targetId, isOpen: _isOpen = false, onClickDeleteByPage,
   } = props;
 
   const { page, children } = itemNode;
@@ -108,7 +108,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
   }, [isOpen]);
 
   const onClickDeleteButtonHandler = useCallback(() => {
-    if (onClickDelete == null) {
+    if (onClickDeleteByPage == null) {
       return;
     }
 
@@ -124,8 +124,8 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
       path,
     };
 
-    onClickDelete(pageToDelete);
-  }, [page, onClickDelete]);
+    onClickDeleteByPage(pageToDelete);
+  }, [page, onClickDeleteByPage]);
 
   const inputValidator = (title: string | null): AlertInfo | null => {
     if (title == null || title === '') {
@@ -213,7 +213,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
             key={node.page._id}
             itemNode={node}
             isOpen={false}
-            onClickDelete={onClickDelete}
+            onClickDeleteByPage={onClickDeleteByPage}
           />
         ))
       }

+ 6 - 6
packages/app/src/components/Sidebar/PageTree/ItemsTree.tsx

@@ -53,15 +53,15 @@ type ItemsTreeProps = {
   isAbleToDeleteCompletely: boolean
   isDeleteCompletelyModal: boolean
   onCloseDelete(): void
-  onClickDelete(page: IPageForPageDeleteModal): void
+  onClickDeleteByPage(page: IPageForPageDeleteModal): void
 }
 
 const renderByInitialNode = (
-    initialNode: ItemNode, DeleteModal: JSX.Element, targetId?: string, onClickDelete?: (page: IPageForPageDeleteModal) => void,
+    initialNode: ItemNode, DeleteModal: JSX.Element, targetId?: string, onClickDeleteByPage?: (page: IPageForPageDeleteModal) => void,
 ): JSX.Element => {
   return (
     <div className="grw-pagetree p-3">
-      <Item key={initialNode.page.path} targetId={targetId} itemNode={initialNode} isOpen onClickDelete={onClickDelete} />
+      <Item key={initialNode.page.path} targetId={targetId} itemNode={initialNode} isOpen onClickDeleteByPage={onClickDeleteByPage} />
       {DeleteModal}
     </div>
   );
@@ -74,7 +74,7 @@ const renderByInitialNode = (
 const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
   const {
     targetPath, targetId, targetAndAncestorsData, isDeleteModalOpen, pagesToDelete, isAbleToDeleteCompletely, isDeleteCompletelyModal, onCloseDelete,
-    onClickDelete,
+    onClickDeleteByPage,
   } = props;
 
   const { data: ancestorsChildrenData, error: error1 } = useSWRxPageAncestorsChildren(targetPath);
@@ -101,7 +101,7 @@ const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
    */
   if (ancestorsChildrenData != null && rootPageData != null) {
     const initialNode = generateInitialNodeAfterResponse(ancestorsChildrenData.ancestorsChildren, new ItemNode(rootPageData.rootPage));
-    return renderByInitialNode(initialNode, DeleteModal, targetId, onClickDelete);
+    return renderByInitialNode(initialNode, DeleteModal, targetId, onClickDeleteByPage);
   }
 
   /*
@@ -109,7 +109,7 @@ const ItemsTree: FC<ItemsTreeProps> = (props: ItemsTreeProps) => {
    */
   if (targetAndAncestorsData != null) {
     const initialNode = generateInitialNodeBeforeResponse(targetAndAncestorsData.targetAndAncestors);
-    return renderByInitialNode(initialNode, DeleteModal, targetId, onClickDelete);
+    return renderByInitialNode(initialNode, DeleteModal, targetId, onClickDeleteByPage);
   }
 
   return null;