feat: search input

haiwen · Dec 26, 2024 · 1bf3350 · 1bf3350
1 parent 7b87b75
commit 1bf3350
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/frontend/src/components/common/group-select/select-option-group.js b/frontend/src/components/common/group-select/select-option-group.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { SearchInput } from '@seafile/sf-metadata-ui-component';
+import SearchInput from '../search-input';
 import Option from './option';
 import KeyCodes from '../../../constants/keyCodes';
 import ClickOutside from './click-outside';
@@ -45,7 +45,6 @@ class SelectOptionGroup extends Component {
         this.optionGroupRef.style.top = (position.y - height) + 'px';
       }
       this.optionGroupRef.style.opacity = 1;
-      this.searchInputRef.current && this.searchInputRef.current.inputRef.focus();
     }
     else {
       if (height + top > window.innerHeight) {
@@ -181,6 +180,7 @@ class SelectOptionGroup extends Component {
           <div className="option-group-search position-relative">
             <SearchInput
               className="option-search-control"
+              autoFocus={isInModal}
               placeholder={searchPlaceholder}
               onChange={this.onChangeSearch}
               ref={this.searchInputRef}

diff --git a/frontend/src/components/common/search-input.js b/frontend/src/components/common/search-input.js
@@ -1,6 +1,7 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import { Utils } from '../../utils/utils';
 
 const propTypes = {
   placeholder: PropTypes.string,
@@ -87,19 +88,14 @@ class SearchInput extends Component {
     }
   };
 
-  isFunction = (functionToCheck) => {
-    const getType = {};
-    return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
-  };
-
   renderClear = () => {
     const { isClearable, clearClassName, components = {} } = this.props;
     const { searchValue } = this.state;
     if (!isClearable || !searchValue) return null;
     const { ClearIndicator } = components;
     if (React.isValidElement(ClearIndicator)) {
       return React.cloneElement(ClearIndicator, { clearValue: this.clearSearch });
-    } else if (this.isFunction(ClearIndicator)) {
+    } else if (Utils.isFunction(ClearIndicator)) {
       return <ClearIndicator clearValue={this.clearSearch} />;
     }
     return (