kaori 3 лет назад
Родитель
Сommit
c5e286b824

+ 9 - 15
packages/app/src/components/PageCreateModal.jsx

@@ -1,24 +1,22 @@
 import React, {
 import React, {
   useEffect, useState, useMemo, useCallback,
   useEffect, useState, useMemo, useCallback,
 } from 'react';
 } from 'react';
-import PropTypes from 'prop-types';
 
 
+import { pagePathUtils, pathUtils } from '@growi/core';
+import { format } from 'date-fns';
+import PropTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';
 import { Modal, ModalHeader, ModalBody } from 'reactstrap';
 import { Modal, ModalHeader, ModalBody } from 'reactstrap';
 import { debounce } from 'throttle-debounce';
 import { debounce } from 'throttle-debounce';
 
 
-import { withTranslation } from 'react-i18next';
-import { format } from 'date-fns';
-
-import { pagePathUtils, pathUtils } from '@growi/core';
-
 
 
 import AppContainer from '~/client/services/AppContainer';
 import AppContainer from '~/client/services/AppContainer';
-import { withUnstatedContainers } from './UnstatedUtils';
 import { toastError } from '~/client/util/apiNotification';
 import { toastError } from '~/client/util/apiNotification';
-
 import { usePageCreateModal } from '~/stores/modal';
 import { usePageCreateModal } from '~/stores/modal';
 
 
 import PagePathAutoComplete from './PagePathAutoComplete';
 import PagePathAutoComplete from './PagePathAutoComplete';
+import { withUnstatedContainers } from './UnstatedUtils';
+
 
 
 const {
 const {
   userPageRoot, isCreatablePage, generateEditorPath, isUsersHomePage,
   userPageRoot, isCreatablePage, generateEditorPath, isUsersHomePage,
@@ -87,7 +85,7 @@ const PageCreateModal = (props) => {
    * change pageNameInput
    * change pageNameInput
    * @param {string} value
    * @param {string} value
    */
    */
-  function onChangePageNameInputHandler(value) {
+  function inputChangeHandler(value) {
     setPageNameInput(value);
     setPageNameInput(value);
   }
   }
 
 
@@ -131,10 +129,6 @@ const PageCreateModal = (props) => {
     redirectToEditor(pageNameInput);
     redirectToEditor(pageNameInput);
   }
   }
 
 
-  function ppacInputChangeHandler(value) {
-    setPageNameInput(value);
-  }
-
   function ppacSubmitHandler(input) {
   function ppacSubmitHandler(input) {
     redirectToEditor(input);
     redirectToEditor(input);
   }
   }
@@ -212,7 +206,7 @@ const PageCreateModal = (props) => {
                     initializedPath={pageNameInput}
                     initializedPath={pageNameInput}
                     addTrailingSlash
                     addTrailingSlash
                     onSubmit={ppacSubmitHandler}
                     onSubmit={ppacSubmitHandler}
-                    onInputChange={ppacInputChangeHandler}
+                    onInputChange={inputChangeHandler}
                     autoFocus
                     autoFocus
                   />
                   />
                 )
                 )
@@ -223,7 +217,7 @@ const PageCreateModal = (props) => {
                       value={pageNameInput}
                       value={pageNameInput}
                       className="form-control flex-fill"
                       className="form-control flex-fill"
                       placeholder={t('Input page name')}
                       placeholder={t('Input page name')}
-                      onChange={e => onChangePageNameInputHandler(e.target.value)}
+                      onChange={e => inputChangeHandler(e.target.value)}
                       required
                       required
                     />
                     />
                   </form>
                   </form>

+ 6 - 17
packages/app/src/components/PageDuplicateModal.tsx

@@ -2,22 +2,20 @@ import React, {
   useState, useEffect, useCallback, useMemo,
   useState, useEffect, useCallback, useMemo,
 } from 'react';
 } from 'react';
 
 
+import { useTranslation } from 'react-i18next';
 import {
 import {
   Modal, ModalHeader, ModalBody, ModalFooter,
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 } from 'reactstrap';
-
-import { useTranslation } from 'react-i18next';
 import { debounce } from 'throttle-debounce';
 import { debounce } from 'throttle-debounce';
 
 
-import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client';
 import { toastError } from '~/client/util/apiNotification';
 import { toastError } from '~/client/util/apiNotification';
-
-import { usePageDuplicateModal } from '~/stores/modal';
+import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client';
 import { useIsSearchServiceReachable, useSiteUrl } from '~/stores/context';
 import { useIsSearchServiceReachable, useSiteUrl } from '~/stores/context';
+import { usePageDuplicateModal } from '~/stores/modal';
 
 
-import PagePathAutoComplete from './PagePathAutoComplete';
-import ApiErrorMessageList from './PageManagement/ApiErrorMessageList';
 import DuplicatePathsTable from './DuplicatedPathsTable';
 import DuplicatePathsTable from './DuplicatedPathsTable';
+import ApiErrorMessageList from './PageManagement/ApiErrorMessageList';
+import PagePathAutoComplete from './PagePathAutoComplete';
 
 
 
 
 const PageDuplicateModal = (): JSX.Element => {
 const PageDuplicateModal = (): JSX.Element => {
@@ -82,15 +80,6 @@ const PageDuplicateModal = (): JSX.Element => {
     }
     }
   }, [pageNameInput, subordinatedPages, checkExistPathsDebounce, page]);
   }, [pageNameInput, subordinatedPages, checkExistPathsDebounce, page]);
 
 
-  /**
-   * change pageNameInput for PagePathAutoComplete
-   * @param {string} value
-   */
-  function ppacInputChangeHandler(value) {
-    setErrs(null);
-    setPageNameInput(value);
-  }
-
   /**
   /**
    * change pageNameInput
    * change pageNameInput
    * @param {string} value
    * @param {string} value
@@ -183,7 +172,7 @@ const PageDuplicateModal = (): JSX.Element => {
                   <PagePathAutoComplete
                   <PagePathAutoComplete
                     initializedPath={path}
                     initializedPath={path}
                     onSubmit={duplicate}
                     onSubmit={duplicate}
-                    onInputChange={ppacInputChangeHandler}
+                    onInputChange={inputChangeHandler}
                     autoFocus
                     autoFocus
                   />
                   />
                 )
                 )