Quellcode durchsuchen

remove unnecessary code

WNomunomu vor 2 Jahren
Ursprung
Commit
85a714b302

+ 1 - 2
apps/app/src/components/Sidebar/PageTree/ItemsTree.tsx

@@ -30,7 +30,6 @@ import PageTreeContentSkeleton from '../Skeleton/PageTreeContentSkeleton';
 
 import { ItemNode } from './ItemNode';
 import { PageTreeItem } from './PageTreeItem';
-import { PageTreeItemForModal } from './PageTreeItemForModal';
 
 import styles from './ItemsTree.module.scss';
 
@@ -274,7 +273,7 @@ const ItemsTree = (props: ItemsTreeProps): JSX.Element => {
   if (initialItemNode != null) {
     return (
       <ul className={`grw-pagetree ${styles['grw-pagetree']} list-group py-3`} ref={rootElemRef}>
-        <PageTreeItemForModal
+        <PageTreeItem
           key={initialItemNode.page.path}
           targetPathOrId={targetPathOrId}
           itemNode={initialItemNode}

+ 4 - 5
apps/app/src/components/Sidebar/PageTree/PageTreeItem.tsx

@@ -191,7 +191,7 @@ export const useNewPageInput = () => {
 
   const NewPageCreateButton = (props) => {
     const {
-      page, isOpen: _isOpen = false, children, stateHandlers,
+      page, children, stateHandlers,
     } = props;
 
     const { setIsOpen } = stateHandlers;
@@ -207,12 +207,11 @@ export const useNewPageInput = () => {
 
     const onClickPlusButton = useCallback(() => {
       setNewPageInputShown(true);
-      // openNewPageInput();
 
       if (hasDescendants) {
         setIsOpen(true);
       }
-    }, [hasDescendants]);
+    }, [hasDescendants, setIsOpen]);
 
     return (
       <>
@@ -238,14 +237,14 @@ export const useNewPageInput = () => {
     const { t } = useTranslation();
 
     const {
-      page, isOpen: _isOpen = false, isEnableActions, children, stateHandlers,
+      page, isEnableActions, children, stateHandlers,
     } = props;
 
     const { isOpen, setIsOpen, setCreating } = stateHandlers;
 
     const currentChildren = children;
 
-    const { data, mutate: mutateChildren } = useSWRxPageChildren(isOpen ? page._id : null);
+    const { mutate: mutateChildren } = useSWRxPageChildren(isOpen ? page._id : null);
 
     const { getDescCount } = usePageTreeDescCountMap();
     const descendantCount = getDescCount(page._id) || page.descendantCount || 0;

+ 3 - 28
apps/app/src/components/Sidebar/PageTree/PageTreeItemForModal.tsx

@@ -1,37 +1,12 @@
-import React, {
-  useCallback, useState, FC, ReactNode,
-} from 'react';
+import React, { FC } from 'react';
 
-import nodePath from 'path';
-
-import { pathUtils, pagePathUtils } from '@growi/core';
-import { useTranslation } from 'next-i18next';
-import { useDrag, useDrop } from 'react-dnd';
-
-import { apiv3Put, apiv3Post } from '~/client/util/apiv3-client';
-import { ValidationTarget } from '~/client/util/input-validator';
-import { toastWarning, toastError, toastSuccess } from '~/client/util/toastr';
-import { NotAvailableForGuest } from '~/components/NotAvailableForGuest';
-import { NotAvailableForReadOnlyUser } from '~/components/NotAvailableForReadOnlyUser';
-import { IPageHasId } from '~/interfaces/page';
-import { mutatePageTree, useSWRxPageChildren } from '~/stores/page-listing';
-import { usePageTreeDescCountMap } from '~/stores/ui';
-import loggerFactory from '~/utils/logger';
-
-
-import ClosableTextInput from '../../Common/ClosableTextInput';
-
-import { ItemNode } from './ItemNode';
-// import { SimpleItem, SimpleItemProps } from './SimpleItem';
 import { useNewPageInput } from './PageTreeItem';
-import SimpleItem, { SimpleItemProps, SimpleItemTool, NotDraggableForClosableTextInput } from './SimpleItem';
-
-const logger = loggerFactory('growi:cli:Item');
+import SimpleItem, { SimpleItemProps, SimpleItemTool } from './SimpleItem';
 
 type Optional = 'itemRef' | 'itemClass' | 'mainClassName';
 type PageTreeItemProps = Omit<SimpleItemProps, Optional> & {key};
 
-export const PageTreeItemForModal = (props) => {
+export const PageTreeItemForModal: FC<PageTreeItemProps> = (props) => {
 
   const { NewPageInput, NewPageCreateButton } = useNewPageInput();
 

+ 2 - 10
apps/app/src/components/Sidebar/PageTree/SimpleItem.tsx

@@ -5,25 +5,19 @@ import React, {
 import nodePath from 'path';
 
 import {
-  pathUtils, pagePathUtils, Nullable,
+  pathUtils, Nullable,
 } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 import { UncontrolledTooltip } from 'reactstrap';
 
-import { apiv3Post } from '~/client/util/apiv3-client';
-import { ValidationTarget } from '~/client/util/input-validator';
-import { toastWarning, toastError, toastSuccess } from '~/client/util/toastr';
 import { TriangleIcon } from '~/components/Icons/TriangleIcon';
-import { NotAvailableForGuest } from '~/components/NotAvailableForGuest';
-import { NotAvailableForReadOnlyUser } from '~/components/NotAvailableForReadOnlyUser';
 import { IPageToDeleteWithMeta, IPageForItem } from '~/interfaces/page';
 import { IPageForPageDuplicateModal } from '~/stores/modal';
 import { useSWRxPageChildren } from '~/stores/page-listing';
 import { usePageTreeDescCountMap } from '~/stores/ui';
 import { shouldRecoverPagePaths } from '~/utils/page-operation';
 
-import ClosableTextInput from '../../Common/ClosableTextInput';
 import CountBadge from '../../Common/CountBadge';
 
 import { ItemNode } from './ItemNode';
@@ -139,8 +133,6 @@ export const SimpleItemTool: FC<SimpleItemToolProps> = (props) => {
 };
 
 const SimpleItem: FC<SimpleItemProps> = (props) => {
-  const { t } = useTranslation();
-
   const {
     itemNode, targetPathOrId, isOpen: _isOpen = false,
     onRenamed, onClickDuplicateMenuItem, onClickDeleteMenuItem, isEnableActions, isReadOnlyUser,
@@ -153,7 +145,7 @@ const SimpleItem: FC<SimpleItemProps> = (props) => {
   const [isOpen, setIsOpen] = useState(_isOpen);
   const [isCreating, setCreating] = useState(false);
 
-  const { data, mutate: mutateChildren } = useSWRxPageChildren(isOpen ? page._id : null);
+  const { data } = useSWRxPageChildren(isOpen ? page._id : null);
 
   const stateHandlers = {
     isOpen,