Checkpoint

eea · Dec 22, 2022 · 923a502 · 923a502
1 parent 1e9c64a
commit 923a502
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 31 deletions.
diff --git a/searchlib/components/SearchApp/BasicSearchApp.jsx b/searchlib/components/SearchApp/BasicSearchApp.jsx
@@ -22,6 +22,7 @@ function SearchWrappers(SearchViewComponent) {
       driver,
       facetOptions,
       mode,
+      children,
       ...searchContext
     } = props;
 
@@ -36,7 +37,9 @@ function SearchWrappers(SearchViewComponent) {
             registry={appConfigContext.registry}
             appConfig={appConfig}
             mode={mode}
-          />
+          >
+            {children}
+          </SearchViewComponent>
         </SearchContext.Provider>
       </AppConfigContext.Provider>
     );
@@ -52,6 +55,7 @@ export default function BasicSearchApp(props) {
     paramOnSearch = bindOnSearch,
     paramOnAutocomplete = bindOnAutocomplete,
     searchViewComponent,
+    children,
     ...rest
   } = props;
 
@@ -79,8 +83,10 @@ export default function BasicSearchApp(props) {
   }, [appConfig, registry]);
 
   const WrappedSearchView = React.useMemo(() => {
-    return withSearch(mapContextToProps)(SearchWrappers(searchViewComponent));
-  }, [mapContextToProps, searchViewComponent]);
+    return withSearch(mapContextToProps)(
+      SearchWrappers(searchViewComponent, children),
+    );
+  }, [mapContextToProps, searchViewComponent, children]);
 
   // useWhyDidYouUpdate('BasicSearchapp', {
   //   mapContextToProps,

diff --git a/searchlib/components/SearchApp/FacetApp.jsx b/searchlib/components/SearchApp/FacetApp.jsx
@@ -1,6 +1,10 @@
 import React from 'react';
 import { Facet as SUIFacet } from '@eeacms/search/components';
-import { useSearchContext, SearchContext } from '@eeacms/search/lib/hocs';
+import {
+  useSearchContext,
+  SearchContext,
+  useAppConfig,
+} from '@eeacms/search/lib/hocs';
 import BasicSearchApp from './BasicSearchApp';
 import { atom, useAtom } from 'jotai';
 import { atomFamily } from 'jotai/utils';
@@ -14,10 +18,11 @@ const filterFamily = atomFamily(
 
 function BoostrapFacetView(props) {
   const { field, onChange, value } = props;
-  const { appConfig, registry } = props;
-  const facetSearchContext = useSearchContext();
+  // const { appConfig, registry } = props;
+  const { appConfig, registry } = useAppConfig();
+  const searchContext = useSearchContext();
 
-  const { filters } = facetSearchContext;
+  const { filters } = searchContext;
 
   const facet = appConfig.facets?.find((f) => f.field === field);
 
@@ -40,9 +45,9 @@ function BoostrapFacetView(props) {
     const activeFilter = filters?.find((filter) => filter.field === field);
     if (value && !activeFilter) {
       console.log('setting filter', value);
-      facetSearchContext.setFilter(value.field, value.values, value.type);
+      searchContext.setFilter(value.field, value.values, value.type);
     }
-  }, [value, filters, field, facetSearchContext]);
+  }, [value, filters, field, searchContext]);
 
   React.useEffect(() => {
     if (!isEqual(filters, savedFilters)) {
@@ -60,7 +65,7 @@ function BoostrapFacetView(props) {
         // facetSearchContext.setFilter(value.field, value.values, value.type);
         // facetSearchContext.applySearch();
       } else {
-        facetSearchContext.removeFilter(field);
+        searchContext.removeFilter(field);
       }
     }
   }, [
@@ -70,12 +75,12 @@ function BoostrapFacetView(props) {
     savedFilters,
     setSavedFilters,
     value,
-    facetSearchContext,
+    searchContext,
     // applySearch,
   ]);
 
   return (
-    <SearchContext.Provider value={facetSearchContext}>
+    <SearchContext.Provider value={searchContext}>
       <SUIFacet
         {...props}
         active={true}

diff --git a/src/SearchBlock/FacetValueWidget.jsx b/src/SearchBlock/FacetValueWidget.jsx
@@ -3,7 +3,7 @@ import { FacetApp } from '@eeacms/search';
 import { isEqual } from 'lodash';
 
 export default function FacetValueWidget(props) {
-  const { facetName, onChange, id, value } = props;
+  const { facetName, value, onChange, id } = props;
   const onChangeHandler = React.useCallback(
     (newValue) => {
       if (!isEqual(newValue, value)) {

diff --git a/src/SearchBlock/SearchBlockEdit.jsx b/src/SearchBlock/SearchBlockEdit.jsx
@@ -30,22 +30,23 @@ const SearchBlockEdit = (props) => {
 
   return (
     <div>
-      <SearchBlockView {...props} mode="edit" />
-      <SidebarPortal selected={props.selected}>
-        <BlockDataForm
-          schema={schema}
-          title={schema.title}
-          block={block}
-          onChangeBlock={onChangeBlock}
-          onChangeField={(id, value) => {
-            onChangeBlock(props.block, {
-              ...props.data,
-              [id]: value,
-            });
-          }}
-          formData={props.data}
-        />
-      </SidebarPortal>
+      <SearchBlockView {...props} mode="edit">
+        <SidebarPortal selected={props.selected}>
+          <BlockDataForm
+            schema={schema}
+            title={schema.title}
+            block={block}
+            onChangeBlock={onChangeBlock}
+            onChangeField={(id, value) => {
+              onChangeBlock(props.block, {
+                ...props.data,
+                [id]: value,
+              });
+            }}
+            formData={props.data}
+          />
+        </SidebarPortal>
+      </SearchBlockView>
     </div>
   );
 };

diff --git a/src/SearchBlock/SearchBlockView.jsx b/src/SearchBlock/SearchBlockView.jsx
@@ -9,7 +9,7 @@ import useWhyDidYouUpdate from '@eeacms/search/lib/hocs/useWhyDidYouUpdate';
 import './less/styles.less';
 
 function SearchBlockView(props) {
-  const { data = {}, mode = 'view', variation } = props;
+  const { data = {}, mode = 'view', variation, children } = props;
   const { appName = 'default' } = data;
   const stableData = useDebouncedStableData(data);
 
@@ -50,7 +50,9 @@ function SearchBlockView(props) {
   return (
     <div>
       {mode !== 'view' && 'EEA Semantic Search block'}
-      <Variation registry={registry} appName={appName} mode={mode} />
+      <Variation registry={registry} appName={appName} mode={mode}>
+        {children}
+      </Variation>
     </div>
   );
 }

diff --git a/src/SearchBlock/templates/SearchResultsView.jsx b/src/SearchBlock/templates/SearchResultsView.jsx
@@ -26,6 +26,7 @@ export default function SearchResultsView(props) {
           <div className="overlay" style={overlayStyle}></div>
         )}
         <SearchResultsApp {...props} />
+        {props.children}
       </div>
     </BodyClass>
   );