Simplify

eea · Dec 21, 2022 · 8ca19f0 · 8ca19f0
1 parent 6cfa754
commit 8ca19f0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/searchlib/components/SearchApp/BasicSearchApp.jsx b/searchlib/components/SearchApp/BasicSearchApp.jsx
@@ -11,7 +11,7 @@ import useDeepCompareEffect from 'use-deep-compare-effect';
 import { AppConfigContext, SearchContext } from '@eeacms/search/lib/hocs';
 import { bindOnAutocomplete, bindOnSearch } from '@eeacms/search/lib/request';
 import useSearchApp from './useSearchApp';
-import useWhyDidYouUpdate from '@eeacms/search/lib/hocs/useWhyDidYouUpdate';
+// import useWhyDidYouUpdate from '@eeacms/search/lib/hocs/useWhyDidYouUpdate';
 
 function SearchWrappers(SearchViewComponent) {
   function Wrapper(props) {

diff --git a/searchlib/components/SearchApp/FacetApp.jsx b/searchlib/components/SearchApp/FacetApp.jsx
@@ -3,7 +3,7 @@ import { Facet as SUIFacet } from '@eeacms/search/components';
 import {
   useSearchContext,
   SearchContext,
-  useProxiedSearchContext,
+  // useProxiedSearchContext,
 } from '@eeacms/search/lib/hocs';
 import BasicSearchApp from './BasicSearchApp';
 import { atom, useAtom } from 'jotai';
@@ -18,10 +18,13 @@ const filterFamily = atomFamily(
 function BoostrapFacetView(props) {
   const { field, onChange, value } = props;
   const { appConfig, registry } = props;
-  const {
-    searchContext: facetSearchContext,
-    applySearch,
-  } = useProxiedSearchContext(useSearchContext(), `${field}`);
+  const facetSearchContext = useSearchContext();
+  console.log(facetSearchContext);
+
+  // const {
+  //   searchContext: facetSearchContext,
+  //   applySearch,
+  // } = useProxiedSearchContext(useSearchContext(), `${field}`);
   const { filters } = facetSearchContext;
   // console.log('current applied filters', value, filters);
 
@@ -56,7 +59,7 @@ function BoostrapFacetView(props) {
         });
         onChange(newValue);
         // facetSearchContext.setFilter(value.field, value.values, value.type);
-        applySearch();
+        // facetSearchContext.applySearch();
       } else {
         facetSearchContext.removeFilter(field);
       }
@@ -69,7 +72,7 @@ function BoostrapFacetView(props) {
     setSavedFilters,
     value,
     facetSearchContext,
-    applySearch,
+    // applySearch,
   ]);
 
   return (

diff --git a/searchlib/lib/hocs/useProxiedSearchContext.js b/searchlib/lib/hocs/useProxiedSearchContext.js
@@ -84,14 +84,16 @@ export default function useProxiedSearchContext(
     // searchContext.setResultsPerPage(driver.state.resultsPerPage);
     // searchContext.setSearchTerm(driver.state.searchTerm);
     // console.log(driver.state.filters, driver.filters);
-    const dirtyFilters = dirtyFiltersMap[searchContextId] || [];
-    dirtyFilters.forEach(({ field, type }) => {
-      searchContext.removeFilter(field, null, type);
-    });
-    driver.state.filters.forEach((f) => {
-      searchContext.removeFilter(f.field, null, f.type);
-      searchContext.addFilter(f.field, f.values, f.type);
-    });
+    if (driver) {
+      const dirtyFilters = dirtyFiltersMap[searchContextId] || [];
+      dirtyFilters.forEach(({ field, type }) => {
+        searchContext.removeFilter(field, null, type);
+      });
+      driver.state.filters.forEach((f) => {
+        searchContext.removeFilter(f.field, null, f.type);
+        searchContext.addFilter(f.field, f.values, f.type);
+      });
+    }
   }, [searchContext, driver, searchContextId]);
 
   const sc = driver ? getSearchContext(driver) : searchContext;

diff --git a/src/SearchBlock/FacetValueWidget.jsx b/src/SearchBlock/FacetValueWidget.jsx
@@ -7,7 +7,6 @@ export default function FacetValueWidget(props) {
   const onChangeHandler = React.useCallback(
     (newValue) => {
       if (!isEqual(newValue, value)) {
-        console.log('onchange', value, newValue);
         onChange(id, newValue);
       }
     },