WIP

eea · Mar 6, 2023 · 2a88bf2 · 2a88bf2
1 parent 37269f2
commit 2a88bf2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 11 deletions.
diff --git a/searchlib/components/SearchView/BackToHome.jsx b/searchlib/components/SearchView/BackToHome.jsx
@@ -1,4 +1,6 @@
-import { Link, useLocation } from 'react-router-dom';
+import React from 'react';
+import { SearchContext as SUISearchContext } from '@elastic/react-search-ui';
+import { Link, useHistory } from 'react-router-dom';
 import { Icon } from 'semantic-ui-react';
 
 export default function BackToHome({
@@ -17,12 +19,13 @@ export default function BackToHome({
       backToHome = url.pathname;
     }
   }
-  const location = useLocation();
+  const history = useHistory();
 
-  const isLocal = backToHome && location.pathname === backToHome;
+  const isLocal = backToHome && history.location.pathname === backToHome;
+  const { driver } = React.useContext(SUISearchContext);
 
   const resetSearch = (e) => {
-    e.preventDefault();
+    driver.URLManager.history.replace(history.location.pathname);
     resetInteracted();
     searchContext.resetSearch({});
   };
@@ -36,8 +39,7 @@ export default function BackToHome({
         className="back-link"
         onClick={() => {
           if (isLocal) {
-            searchContext.resetSearch({});
-            resetInteracted();
+            resetSearch();
           }
         }}
       >
@@ -50,8 +52,7 @@ export default function BackToHome({
         className="back-link"
         onClick={() => {
           if (isLocal) {
-            searchContext.resetSearch({});
-            resetInteracted();
+            resetSearch();
           }
         }}
       >
@@ -63,8 +64,14 @@ export default function BackToHome({
     <a
       className="back-link"
       as="a"
-      onClick={resetSearch}
-      onKeyDown={resetSearch}
+      onClick={(e) => {
+        resetSearch();
+        e.preventDefault();
+      }}
+      onKeyDown={(e) => {
+        resetSearch();
+        e.preventDefault();
+      }}
       role="button"
       href="./"
     >

diff --git a/searchlib/components/SearchView/SearchView.jsx b/searchlib/components/SearchView/SearchView.jsx
@@ -36,13 +36,32 @@ const useWasInteracted = ({ searchedTerm, searchContext, appConfig }) => {
   );
 
   React.useEffect(() => {
-    if (wasInteracted && !cached) setCached(true);
+    if (wasInteracted && !cached) {
+      setCached(true);
+    }
+    // else if (!wasInteracted && cached === true) {
+    //   setCached(false);
+    // }
   }, [wasInteracted, cached]);
 
   const resetInteracted = React.useCallback(() => {
+    console.log('reset');
     setCached(false);
   }, []);
 
+  // console.log('wasInteracted', {
+  //   wasInteracted,
+  //   searchedTerm,
+  //
+  //   check: checkInteracted({
+  //     searchContext,
+  //     appConfig,
+  //   }),
+  //   cached,
+  // });
+
+  React.useEffect(() => () => console.log('unmount'), []);
+
   return {
     wasInteracted: cached || wasInteracted,
     resetInteracted,
@@ -51,6 +70,7 @@ const useWasInteracted = ({ searchedTerm, searchContext, appConfig }) => {
 
 export const SearchView = (props) => {
   const { appConfig, appName, mode = 'view' } = props;
+  // React.useEffect(() => () => console.log('unmount searchview'), []);
 
   const searchContext = useSearchContext();
   const { driver } = React.useContext(SUISearchContext);
@@ -68,6 +88,12 @@ export const SearchView = (props) => {
     appConfig,
   });
 
+  // console.log(
+  //   'searchedTerm',
+  //   `-[${searchedTerm}]-[${searchContext.searchTerm}]-`,
+  //   wasInteracted,
+  // );
+
   React.useEffect(() => {
     window.searchContext = searchContext;
   }, [searchContext]);