Merge pull request #373 from IntersectMBO/fix/usersnap-pathname-issue

fix: usersnap showing all on path change
IntersectMBO · Sep 24, 2024 · 9aadffc · 9aadffc
2 parents a3808f1 + 112c100
commit 9aadffc
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/frontend/src/context/usersnap.tsx b/frontend/src/context/usersnap.tsx
@@ -1,6 +1,7 @@
 "use client";
 import React, { useEffect, useState, useContext } from "react";
 import { InitOptions, loadSpace, SpaceApi } from "@usersnap/browser";
+import { usePathname } from "next/navigation";
 
 export const UsersnapContext = React.createContext<SpaceApi | null>(null);
 
@@ -11,26 +12,41 @@ export const UsersnapProvider = ({
   children,
 }: UsersnapProviderProps) => {
   const [usersnapApi, setUsersnapApi] = useState<SpaceApi | null>(null);
+  const pathname = usePathname();
 
   useEffect(() => {
+    let api: SpaceApi | null = null;
+
+    const hideHiddenProjects = () => {
+      if (api) {
+        const hiddenProjects = process.env.NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS?.split("||") || [];
+        hiddenProjects.forEach(p => {
+          api.hide(p);
+        });
+      }
+    };
+
     if (process.env.NEXT_PUBLIC_USERSNAP_SPACE_API_KEY) {
-      const hiddenProjects = process.env.NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS?.split("||") || []
       loadSpace(process.env.NEXT_PUBLIC_USERSNAP_SPACE_API_KEY).then(
-        (api: SpaceApi) => {
+        (loadedApi: SpaceApi) => {
+          api = loadedApi;
           api.init(initParams);
           setUsersnapApi(api);
-          const hideHiddenProjects = () => {
-            hiddenProjects.forEach(p => {
-              api.hide(p);
-            });
-          };
+
+          api.on("submit", hideHiddenProjects);
+          api.on("open", hideHiddenProjects);
           hideHiddenProjects();
-          api.on("close", hideHiddenProjects)
-          api.on("submit", hideHiddenProjects)
         }
       );
     }
-  }, [initParams]);
+
+    return () => {
+      if (api) {
+        api.off("submit", hideHiddenProjects);
+        api.off("open", hideHiddenProjects);
+      }
+    };
+  }, [initParams, pathname]);
 
   return (
     <UsersnapContext.Provider value={usersnapApi}>