Fix warning about unsync state changes

eea · Dec 16, 2022 · df68d01 · df68d01
1 parent ff39593
commit df68d01
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/searchlib/components/SearchApp/useSearchApp.js b/searchlib/components/SearchApp/useSearchApp.js
@@ -20,6 +20,11 @@ import { loadingFamily, driverFamily } from './state';
 function useSearchDriver({ elasticConfig, appName }) {
   const driverAtom = driverFamily({ elasticConfig, appName });
   const driver = useAtomValue(driverAtom);
+
+  React.useEffect(() => {
+    return () => driver.tearDown();
+  }, [driver]);
+
   return driver;
 }
 
@@ -78,8 +83,6 @@ function useSearchApp({
           ? { filters: getDefaultFilters(appConfig) }
           : {}),
       },
-      // trackUrlState: false,
-      // debug: true,
     }),
     [appConfig, onAutocomplete, onSearch, locationSearchTerm],
   );

diff --git a/searchlib/components/SearchView/SearchView.jsx b/searchlib/components/SearchView/SearchView.jsx
@@ -22,11 +22,7 @@ export const SearchView = (props) => {
   const { driver } = React.useContext(SUISearchContext);
   const [, setIsLandingPageAtom] = useAtom(isLandingPageAtom);
 
-  const layoutComponent =
-    appConfig.layoutVariation === 'full'
-      ? appConfig.layoutComponent
-      : appConfig.layoutComponent; // layoutVariation
-  const Layout = registry.resolve[layoutComponent].component;
+  const Layout = registry.resolve[appConfig.layoutComponent].component;
 
   const searchedTerm = driver.URLManager.getStateFromURL().searchTerm;
 

diff --git a/searchlib/lib/hocs/useProxiedSearchContext.js b/searchlib/lib/hocs/useProxiedSearchContext.js
@@ -74,6 +74,7 @@ export default function useProxiedSearchContext(
       driver[name] = wrapper[func_name];
     });
     setDriver(driver);
+    return () => driver.tearDown();
   }, [searchContext, setDriver, searchContextId]); // dirtyFilters, setDirtyFilters
 
   const applySearch = React.useCallback(() => {

diff --git a/searchlib/registry.js b/searchlib/registry.js
@@ -246,7 +246,11 @@ const config = {
       headline: '', // main headline
       subheadline: '', // text under the headline
       demoquestion: '', // Question used as example under the search input
+
+      // These are ElasticSearch driver options:
       // debug: true,
+      // trackUrlState: false,
+
       hasA11yNotifications: true,
 
       // broad global layout (header, side, etc)