2
0
Yuki Takei 4 жил өмнө
parent
commit
e664091a82

+ 0 - 13
packages/app/src/components/PageCreateModal.jsx

@@ -3,7 +3,6 @@ import React, {
   useEffect, useState, useMemo, useCallback,
   useEffect, useState, useMemo, useCallback,
 } from 'react';
 } from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
-import assert from 'assert';
 
 
 import { Modal, ModalHeader, ModalBody } from 'reactstrap';
 import { Modal, ModalHeader, ModalBody } from 'reactstrap';
 import { debounce } from 'throttle-debounce';
 import { debounce } from 'throttle-debounce';
@@ -132,17 +131,6 @@ const PageCreateModal = (props) => {
     redirectToEditor(pageNameInput);
     redirectToEditor(pageNameInput);
   }
   }
 
 
-  const ppacChangeHandler = useCallback((data) => {
-    assert(data.length > 0);
-
-    const page = data[0].data; // should be single page selected
-
-    // navigate to page
-    if (page != null) {
-      window.location.href = `/${page._id}`;
-    }
-  }, []);
-
   function ppacInputChangeHandler(value) {
   function ppacInputChangeHandler(value) {
     setPageNameInput(value);
     setPageNameInput(value);
   }
   }
@@ -223,7 +211,6 @@ const PageCreateModal = (props) => {
                   <PagePathAutoComplete
                   <PagePathAutoComplete
                     initializedPath={pageNameInput}
                     initializedPath={pageNameInput}
                     addTrailingSlash
                     addTrailingSlash
-                    onChange={ppacChangeHandler}
                     onSubmit={ppacSubmitHandler}
                     onSubmit={ppacSubmitHandler}
                     onInputChange={ppacInputChangeHandler}
                     onInputChange={ppacInputChangeHandler}
                     autoFocus
                     autoFocus

+ 0 - 13
packages/app/src/components/PageDuplicateModal.tsx

@@ -1,7 +1,6 @@
 import React, {
 import React, {
   useState, useEffect, useCallback, useMemo,
   useState, useEffect, useCallback, useMemo,
 } from 'react';
 } from 'react';
-import assert from 'assert';
 
 
 import {
 import {
   Modal, ModalHeader, ModalBody, ModalFooter,
   Modal, ModalHeader, ModalBody, ModalFooter,
@@ -83,17 +82,6 @@ const PageDuplicateModal = (): JSX.Element => {
     }
     }
   }, [pageNameInput, subordinatedPages, checkExistPathsDebounce, page]);
   }, [pageNameInput, subordinatedPages, checkExistPathsDebounce, page]);
 
 
-  const ppacChangeHandler = useCallback((data) => {
-    assert(data.length > 0);
-
-    const page = data[0].data; // should be single page selected
-
-    // navigate to page
-    if (page != null) {
-      window.location.href = `/${page._id}`;
-    }
-  }, []);
-
   /**
   /**
    * change pageNameInput for PagePathAutoComplete
    * change pageNameInput for PagePathAutoComplete
    * @param {string} value
    * @param {string} value
@@ -194,7 +182,6 @@ const PageDuplicateModal = (): JSX.Element => {
                 ? (
                 ? (
                   <PagePathAutoComplete
                   <PagePathAutoComplete
                     initializedPath={path}
                     initializedPath={path}
-                    onChange={ppacChangeHandler}
                     onSubmit={duplicate}
                     onSubmit={duplicate}
                     onInputChange={ppacInputChangeHandler}
                     onInputChange={ppacInputChangeHandler}
                     autoFocus
                     autoFocus

+ 5 - 4
packages/app/src/components/SearchTypeahead.tsx

@@ -130,11 +130,12 @@ const SearchTypeahead: ForwardRefRenderFunction<IFocusable, Props> = (props: Pro
   const timeoutIdRef = useRef<NodeJS.Timeout>();
   const timeoutIdRef = useRef<NodeJS.Timeout>();
 
 
   const changeHandler = useCallback((selectedItems: IPageWithMeta<IPageSearchMeta>[]) => {
   const changeHandler = useCallback((selectedItems: IPageWithMeta<IPageSearchMeta>[]) => {
+    // cancel schedule to submit
+    if (timeoutIdRef.current != null) {
+      clearTimeout(timeoutIdRef.current);
+    }
+
     if (onChange != null && selectedItems.length > 0) {
     if (onChange != null && selectedItems.length > 0) {
-      // cancel schedule to submit
-      if (timeoutIdRef.current != null) {
-        clearTimeout(timeoutIdRef.current);
-      }
       onChange(selectedItems);
       onChange(selectedItems);
     }
     }
   }, [onChange]);
   }, [onChange]);