Browse Source

clean code

kosei-n 1 year ago
parent
commit
9f29aae0a9

+ 0 - 1
apps/app/src/components/ItemsTree/ItemsTree.tsx

@@ -97,7 +97,6 @@ type ItemsTreeProps = {
   targetAndAncestorsData?: TargetAndAncestors
   targetAndAncestorsData?: TargetAndAncestors
   CustomTreeItem: React.FunctionComponent<TreeItemProps>
   CustomTreeItem: React.FunctionComponent<TreeItemProps>
   onClickTreeItem?: (page: IPageForItem) => void;
   onClickTreeItem?: (page: IPageForItem) => void;
-  // markTarget: (children: ItemNode[], targetPathOrId?: Nullable<string>) => void;
 }
 }
 
 
 /*
 /*

+ 2 - 30
apps/app/src/components/PageSelectModal/PageSelectModal.tsx

@@ -3,9 +3,7 @@ import { Suspense, useState, useCallback } from 'react';
 
 
 import nodePath from 'path';
 import nodePath from 'path';
 
 
-import type { Nullable } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
-import dynamic from 'next/dynamic';
 import {
 import {
   Modal, ModalHeader, ModalBody, ModalFooter, Button,
   Modal, ModalHeader, ModalBody, ModalFooter, Button,
 } from 'reactstrap';
 } from 'reactstrap';
@@ -13,23 +11,15 @@ import {
 import type { IPageForItem } from '~/interfaces/page';
 import type { IPageForItem } from '~/interfaces/page';
 import { useTargetAndAncestors, useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';
 import { useTargetAndAncestors, useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';
 import { usePageSelectModal } from '~/stores/modal';
 import { usePageSelectModal } from '~/stores/modal';
-import { useCurrentPagePath, useCurrentPageId, useSWRxCurrentPage } from '~/stores/page';
-
-// import { ItemsTree } from '../ItemsTree';
+import { useSWRxCurrentPage } from '~/stores/page';
 import { useSWRxPageChildren } from '~/stores/page-listing';
 import { useSWRxPageChildren } from '~/stores/page-listing';
 
 
+import { ItemsTree } from '../ItemsTree';
 import ItemsTreeContentSkeleton from '../ItemsTree/ItemsTreeContentSkeleton';
 import ItemsTreeContentSkeleton from '../ItemsTree/ItemsTreeContentSkeleton';
 import { usePagePathRenameHandler } from '../PageEditor/page-path-rename-utils';
 import { usePagePathRenameHandler } from '../PageEditor/page-path-rename-utils';
-import type { ItemNode } from '../TreeItem';
-
 
 
 import { TreeItemForModal } from './TreeItemForModal';
 import { TreeItemForModal } from './TreeItemForModal';
 
 
-const ItemsTree = dynamic(
-  () => import('../ItemsTree').then(mod => mod.ItemsTree),
-  { ssr: false, loading: ItemsTreeContentSkeleton },
-);
-
 export const PageSelectModal: FC = () => {
 export const PageSelectModal: FC = () => {
   const {
   const {
     data: PageSelectModalData,
     data: PageSelectModalData,
@@ -45,8 +35,6 @@ export const PageSelectModal: FC = () => {
 
 
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isReadOnlyUser } = useIsReadOnlyUser();
   const { data: isReadOnlyUser } = useIsReadOnlyUser();
-  const { data: currentPath } = useCurrentPagePath();
-  const { data: targetId } = useCurrentPageId();
   const { data: targetAndAncestorsData } = useTargetAndAncestors();
   const { data: targetAndAncestorsData } = useTargetAndAncestors();
   const { data: currentPage } = useSWRxCurrentPage();
   const { data: currentPage } = useSWRxCurrentPage();
   const { mutate: mutateChildren } = useSWRxPageChildren(clickedParentPageId);
   const { mutate: mutateChildren } = useSWRxPageChildren(clickedParentPageId);
@@ -90,22 +78,6 @@ export const PageSelectModal: FC = () => {
     return null;
     return null;
   }
   }
 
 
-  // const markTarget = (children: ItemNode[], targetPathOrId?: Nullable<string>): void => {
-  //   if (targetPathOrId == null) {
-  //     return;
-  //   }
-
-  //   children.forEach((node) => {
-  //     if (node.page._id === targetPathOrId || node.page.path === targetPathOrId) {
-  //       node.page.isTarget = true;
-  //     }
-  //     else {
-  //       node.page.isTarget = false;
-  //     }
-  //     return node;
-  //   });
-  // };
-
   return (
   return (
     <Modal
     <Modal
       isOpen={isOpened}
       isOpen={isOpened}