Closes QOM when file or project search opens (#5417)

Author: Łukasz Sobek

src/actions/ui.js

@@ -4,7 +4,12 @@
 
 // @flow
 
-import { getSource, getActiveSearch, getPaneCollapse } from "../selectors";
+import {
+  getActiveSearch,
+  getPaneCollapse,
+  getQuickOpenEnabled,
+  getSource
+} from "../selectors";
 import { getProjectDirectoryRoot } from "../reducers/ui";
 import type { ThunkArgs, panelPositionType } from "./types";
 import { getRawSourceURL } from "../utils/source";
@@ -39,6 +44,10 @@ export function setActiveSearch(activeSearch?: ActiveSearchType) {
       return;
     }
 
+    if (getQuickOpenEnabled(getState())) {
+      dispatch({ type: "CLOSE_QUICK_OPEN" });
+    }
+
     dispatch({
       type: "TOGGLE_ACTIVE_SEARCH",
       value: activeSearch

src/components/Editor/SearchBar.js

@@ -137,10 +137,10 @@ class SearchBar extends Component<Props, State> {
   };
 
   closeSearch = (e: SyntheticEvent<HTMLElement>) => {
-    const { editor, searchOn } = this.props;
+    const { closeFileSearch, editor, searchOn } = this.props;
     if (editor && searchOn) {
       this.clearSearch();
-      this.props.closeFileSearch(editor);
+      closeFileSearch(editor);
       e.stopPropagation();
       e.preventDefault();
     }
@@ -150,13 +150,13 @@ class SearchBar extends Component<Props, State> {
   toggleSearch = (e: SyntheticKeyboardEvent<HTMLElement>) => {
     e.stopPropagation();
     e.preventDefault();
-    const { editor } = this.props;
+    const { editor, searchOn, setActiveSearch } = this.props;
 
-    if (!this.props.searchOn) {
-      this.props.setActiveSearch("file");
+    if (!searchOn) {
+      setActiveSearch("file");
     }
 
-    if (this.props.searchOn && editor) {
+    if (searchOn && editor) {
       const query = editor.codeMirror.getSelection() || this.state.query;
 
       if (query !== "") {

src/components/ProjectSearch.js

@@ -125,6 +125,7 @@ export class ProjectSearch extends Component<Props, State> {
     if (this.isProjectSearchEnabled()) {
       return closeProjectSearch();
     }
+
     return setActiveSearch("project");
   };