Merge pull request #298 from teamdigitale/develop

Road to v1.6.0
teamdigitale · Feb 10, 2022 · 51697e0 · 51697e0
2 parents bf2f2ac + 8e8c8c9
commit 51697e0
Show file tree

Hide file tree

Showing 3 changed files with 11,329 additions and 11,644 deletions.
diff --git a/src/layouts/ComeFunzionaPage.jsx b/src/layouts/ComeFunzionaPage.jsx
@@ -20,13 +20,15 @@ export const ComeFunzionaPage = () => {
   useEffect(() => {
     if (howId) {
       const element = document.querySelector('#' + howId);
-      const elDistanceToTop = window.pageYOffset + element.getBoundingClientRect().top;
-      window.scrollTo(0, elDistanceToTop);
-      element.setAttribute('tabindex', '-1');
-      element.focus();
-      return () => {
-        dispatch({ type: 'SET:HOW_SECTION_ID' });
-      };
+      if (element) {
+        const elDistanceToTop = window.pageYOffset + element.getBoundingClientRect().top;
+        window.scrollTo(0, elDistanceToTop);
+        element.setAttribute('tabindex', '-1');
+        element.focus();
+        return () => {
+          dispatch({ type: 'SET:HOW_SECTION_ID' });
+        };
+      }
     }
   }, [howId, dispatch]);
 

diff --git a/src/pages/misure.jsx b/src/pages/misure.jsx
@@ -8,10 +8,20 @@ const Page = ({ location }) => {
   const [, dispatch] = useContext(GlobalStateContext);
 
   useEffect(() => {
+    const currentHash = location.hash?.split('#')[1];
+    if (currentHash) {
+      const filter = {
+        label: '',
+        value: '',
+      };
+      filter.label = currentHash.charAt(0).toUpperCase() + currentHash.slice(1);
+      filter.value = currentHash;
+      setFilter(filter);
+    }
     if (location.state !== null) {
       setFilter(location.state.filter);
     }
-  }, [location.state]);
+  }, [location.state, location.hash]);
 
   useEffect(() => {
     dispatch({ type: 'SET:ACTIVE_HEADER', payload: { activeItem: 'misure' } });