WIP

eea · Feb 28, 2023 · 906a619 · 906a619
1 parent cbd8201
commit 906a619
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/searchlib/components/SearchApp/useSearchApp.js b/searchlib/components/SearchApp/useSearchApp.js
@@ -1,8 +1,6 @@
 import React from 'react';
 
-import useDeepCompareEffect, {
-  useDeepCompareEffectNoCheck,
-} from 'use-deep-compare-effect';
+import { useDeepCompareEffectNoCheck } from 'use-deep-compare-effect'; // useDeepCompareEffect,
 
 import {
   getDefaultFilters,
@@ -18,26 +16,27 @@ import { clearFilters, resetFilters, resetSearch, addFilter } from './request';
 import useFacetsWithAllOptions from './useFacetsWithAllOptions';
 import { useLoadingState } from './state';
 import { SearchDriver } from '@elastic/search-ui';
-// import useWhyDidYouUpdate from '@eeacms/search/lib/hocs/useWhyDidYouUpdate';
-
-export function useStoredSearchDriver({ elasticConfig, appName, uniqueId }) {
-  const [driver, setDriver] = React.useState(null);
-
-  useDeepCompareEffect(() => {
-    setDriver(new SearchDriver(elasticConfig));
-  }, [elasticConfig, appName]);
 
-  // useWhyDidYouUpdate('setStoredSearchDriver', { elasticConfig, appName });
-
-  React.useEffect(() => {
-    return () => {
-      // console.log('unmount useStoredSearchDriver');
-      driver && driver.tearDown();
-    };
-  }, [driver]);
+// import useWhyDidYouUpdate from '@eeacms/search/lib/hocs/useWhyDidYouUpdate';
 
-  return driver;
-}
+// export function useStoredSearchDriver({ elasticConfig, appName, uniqueId }) {
+//   const [driver, setDriver] = React.useState(null);
+//
+//   useDeepCompareEffect(() => {
+//     setDriver(new SearchDriver(elasticConfig));
+//   }, [elasticConfig, appName]);
+//
+//   // useWhyDidYouUpdate('setStoredSearchDriver', { elasticConfig, appName });
+//
+//   React.useEffect(() => {
+//     return () => {
+//       // console.log('unmount useStoredSearchDriver');
+//       driver && driver.tearDown();
+//     };
+//   }, [driver]);
+//
+//   return driver;
+// }
 
 export default function useSearchApp(props) {
   const {

diff --git a/src/SearchBlock/templates/SearchInputView.jsx b/src/SearchBlock/templates/SearchInputView.jsx
@@ -15,7 +15,11 @@ function SearchInputView(props) {
       <SearchInputApp
         {...props}
         onSubmitSearch={(searchTerm) => {
-          history.push(`${url}?q=${searchTerm}`);
+          if (!url && window.searchContext) {
+            window.searchContext.resetSearch({ searchTerm });
+          } else {
+            history.push(`${url}?q=${searchTerm}`);
+          }
         }}
       />
       {props.children}