[search] 'turn on/off semantic search': click outside to close the 's…

…etting' popover (#5937)
haiwen · Feb 4, 2024 · 608de45 · 608de45
1 parent db42086
commit 608de45
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/frontend/src/components/common/switch/index.js b/frontend/src/components/common/switch/index.js
@@ -5,9 +5,9 @@ import classnames from 'classnames';
 import '../../../css/switch.css';
 
 function Switch(props) {
-  const { onChange, checked, placeholder, disabled, className, size, textPosition } = props;
+  const { onChange, checked, placeholder, disabled, className, size, textPosition, setRef } = props;
   return(
-    <div className={classnames('seahub-switch position-relative', className, size)}>
+    <div className={classnames('seahub-switch position-relative', className, size)} ref={setRef}>
       <label className="custom-switch">
         <input
           className="custom-switch-input"
@@ -37,6 +37,7 @@ Switch.propTypes = {
   size: PropTypes.oneOf(['large', 'small', undefined]),
   textPosition: PropTypes.oneOf(['left', 'right', undefined]),
   onChange: PropTypes.func,
+  setRef: PropTypes.func
 };
 
 Switch.defaultProps = {

diff --git a/frontend/src/components/search/ai-search.js b/frontend/src/components/search/ai-search.js
@@ -76,6 +76,7 @@ export default class AISearch extends Component {
     document.addEventListener('keydown', this.onDocumentKeydown);
     document.addEventListener('compositionstart', this.onCompositionStart);
     document.addEventListener('compositionend', this.onCompositionEnd);
+    document.addEventListener('click', this.handleOutsideClick);
     this.queryLibraryIndexState();
   }
 
@@ -96,6 +97,7 @@ export default class AISearch extends Component {
     document.removeEventListener('keydown', this.onDocumentKeydown);
     document.removeEventListener('compositionstart', this.onCompositionStart);
     document.removeEventListener('compositionend', this.onCompositionEnd);
+    document.removeEventListener('click', this.handleOutsideClick);
     this.isChineseInput = false;
     this.clearTimer();
     if (this.indexStateTimer) {
@@ -542,6 +544,10 @@ export default class AISearch extends Component {
     });
   };
 
+  setSettingsContainerRef = (ref) => {
+    this.settingsContainer = ref;
+  }
+
   renderSwitch = () => {
     const { indexState } = this.state;
     if (indexState === INDEX_STATE.RUNNING) {
@@ -552,7 +558,8 @@ export default class AISearch extends Component {
           className="position-absolute p-4 bg-white border rounded shadow-sm search-settings"
           size="small"
           textPosition='right'
-          disabled
+          disabled={true}
+          setRef={this.setSettingsContainerRef}
         />
       );
     } else if (indexState === INDEX_STATE.FINISHED) {
@@ -564,6 +571,7 @@ export default class AISearch extends Component {
           size="small"
           onChange={this.onDeleteIndex}
           textPosition='right'
+          setRef={this.setSettingsContainerRef}
         />
       );
     } else if (indexState === '' || indexState === INDEX_STATE.UNCREATED) {
@@ -575,6 +583,7 @@ export default class AISearch extends Component {
           size="small"
           onChange={this.onCreateIndex}
           textPosition='right'
+          setRef={this.setSettingsContainerRef}
         />
       );
     }
@@ -587,6 +596,15 @@ export default class AISearch extends Component {
     });
   }
 
+  handleOutsideClick = (e) => {
+    const { isSettingsShown } = this.state;
+    if (isSettingsShown &&
+      !this.settingsContainer.contains(e.target) &&
+      !this.settingIcon.contains(e.target)) {
+      this.toggleSettingsShown();
+    }
+  };
+
   render() {
     let width = this.state.width !== 'default' ? this.state.width : '';
     let style = {'width': width};
@@ -630,7 +648,7 @@ export default class AISearch extends Component {
                 {this.state.isCloseShow &&
                   <>
                   {(this.isRepoOwner || this.isAdmin) &&
-                    <button type="button" className="search-icon-right input-icon-addon sf3-font-set-up sf3-font border-0 bg-transparent mr-3" onClick={this.toggleSettingsShown} aria-label={gettext('Settings')}></button>
+                    <button type="button" className="search-icon-right input-icon-addon sf3-font-set-up sf3-font border-0 bg-transparent mr-3" onClick={this.toggleSettingsShown} aria-label={gettext('Settings')} ref={ref => this.settingIcon = ref}></button>
                   }
                   <button type="button" className="search-icon-right input-icon-addon fas fa-times border-0 bg-transparent mr-4" onClick={this.onCloseHandler} aria-label={gettext('Close')}></button>
                   </>