@greatapps/common 1.1.642 → 1.1.644

package/dist/hooks/useRouter.mjs

@@ -3,12 +3,10 @@ import { useRouter as useNextRouter } from "next/navigation";
 import { useNavigationContext } from "../providers/navigation.provider";
 function useRouter() {
   const router = useNextRouter();
-  const { defaultFallback, internalNavCountRef, expectingBackRef } = useNavigationContext();
+  const { defaultFallback, internalNavCountRef } = useNavigationContext();
   function back(options) {
     const fallback = typeof options === "string" ? options : options?.fallback || defaultFallback;
     if (internalNavCountRef.current > 0) {
-      internalNavCountRef.current -= 1;
-      expectingBackRef.current = true;
       router.back();
       return;
     }

package/dist/hooks/useRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/useRouter.ts"],"sourcesContent":["\"use client\";\n\nimport { useRouter as useNextRouter } from \"next/navigation\";\nimport { useNavigationContext } from \"../providers/navigation.provider\";\n\ntype SafeBackOptions = { fallback?: string };\n\ntype AppRouter = ReturnType<typeof useNextRouter>;\n\nexport interface SafeAppRouter extends Omit<AppRouter, \"back\"> {\n  back: (options?: SafeBackOptions | string) => void;\n  safeBack: (options?: SafeBackOptions | string) => void;\n}\n\nexport function useRouter(): SafeAppRouter {\n  const router = useNextRouter();\n  const { defaultFallback, internalNavCountRef, expectingBackRef } =\n    useNavigationContext();\n\n  function back(options?: SafeBackOptions | string) {\n    const fallback =\n      typeof options === \"string\"\n        ? options\n        : options?.fallback || defaultFallback;\n\n    if (internalNavCountRef.current > 0) {\n      internalNavCountRef.current -= 1;\n      expectingBackRef.current = true;\n      router.back();\n      return;\n    }\n\n    router.replace(fallback);\n  }\n\n  return {\n    ...router,\n    back,\n    safeBack: back,\n  };\n}\n"],"mappings":";AAEA,SAAS,aAAa,qBAAqB;AAC3C,SAAS,4BAA4B;AAW9B,SAAS,YAA2B;AACzC,QAAM,SAAS,cAAc;AAC7B,QAAM,EAAE,iBAAiB,qBAAqB,iBAAiB,IAC7D,qBAAqB;AAEvB,WAAS,KAAK,SAAoC;AAChD,UAAM,WACJ,OAAO,YAAY,WACf,UACA,SAAS,YAAY;AAE3B,QAAI,oBAAoB,UAAU,GAAG;AACnC,0BAAoB,WAAW;AAC/B,uBAAiB,UAAU;AAC3B,aAAO,KAAK;AACZ;AAAA,IACF;AAEA,WAAO,QAAQ,QAAQ;AAAA,EACzB;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,UAAU;AAAA,EACZ;AACF;","names":[]}
+{"version":3,"sources":["../../src/hooks/useRouter.ts"],"sourcesContent":["\"use client\";\n\nimport { useRouter as useNextRouter } from \"next/navigation\";\nimport { useNavigationContext } from \"../providers/navigation.provider\";\n\ntype SafeBackOptions = { fallback?: string };\n\ntype AppRouter = ReturnType<typeof useNextRouter>;\n\nexport interface SafeAppRouter extends Omit<AppRouter, \"back\"> {\n  back: (options?: SafeBackOptions | string) => void;\n  safeBack: (options?: SafeBackOptions | string) => void;\n}\n\nexport function useRouter(): SafeAppRouter {\n  const router = useNextRouter();\n  const { defaultFallback, internalNavCountRef } = useNavigationContext();\n\n  function back(options?: SafeBackOptions | string) {\n    const fallback =\n      typeof options === \"string\"\n        ? options\n        : options?.fallback || defaultFallback;\n\n    if (internalNavCountRef.current > 0) {\n      router.back();\n      return;\n    }\n\n    router.replace(fallback);\n  }\n\n  return {\n    ...router,\n    back,\n    safeBack: back,\n  };\n}\n"],"mappings":";AAEA,SAAS,aAAa,qBAAqB;AAC3C,SAAS,4BAA4B;AAW9B,SAAS,YAA2B;AACzC,QAAM,SAAS,cAAc;AAC7B,QAAM,EAAE,iBAAiB,oBAAoB,IAAI,qBAAqB;AAEtE,WAAS,KAAK,SAAoC;AAChD,UAAM,WACJ,OAAO,YAAY,WACf,UACA,SAAS,YAAY;AAE3B,QAAI,oBAAoB,UAAU,GAAG;AACnC,aAAO,KAAK;AACZ;AAAA,IACF;AAEA,WAAO,QAAQ,QAAQ;AAAA,EACzB;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,IACA,UAAU;AAAA,EACZ;AACF;","names":[]}

package/dist/providers/navigation.provider.mjs

@@ -6,33 +6,58 @@ import {
   useEffect,
   useRef
 } from "react";
-import { usePathname } from "next/navigation";
+import { usePathname, useSearchParams } from "next/navigation";
 const NavigationContext = createContext(null);
+function seedCountFromReferrer() {
+  if (typeof window === "undefined") return 0;
+  if (window.history.length <= 1) return 0;
+  try {
+    if (!document.referrer) return 0;
+    if (new URL(document.referrer).origin === window.location.origin) {
+      return 1;
+    }
+  } catch {
+  }
+  return 0;
+}
 function NavigationProvider({
   children,
   defaultFallback = "/"
 }) {
   const pathname = usePathname();
-  const internalNavCountRef = useRef(0);
-  const expectingBackRef = useRef(false);
-  const lastPathnameRef = useRef(null);
+  const searchParams = useSearchParams();
+  const currentKey = `${pathname}?${searchParams?.toString() ?? ""}`;
+  const internalNavCountRef = useRef(seedCountFromReferrer());
+  const lastKeyRef = useRef(null);
+  const popStateFiredRef = useRef(false);
+  useEffect(() => {
+    const onPopState = () => {
+      popStateFiredRef.current = true;
+    };
+    window.addEventListener("popstate", onPopState);
+    return () => window.removeEventListener("popstate", onPopState);
+  }, []);
   useEffect(() => {
-    if (lastPathnameRef.current === null) {
-      lastPathnameRef.current = pathname;
+    if (lastKeyRef.current === null) {
+      lastKeyRef.current = currentKey;
       return;
     }
-    if (lastPathnameRef.current === pathname) return;
-    if (expectingBackRef.current) {
-      expectingBackRef.current = false;
+    if (lastKeyRef.current === currentKey) return;
+    if (popStateFiredRef.current) {
+      popStateFiredRef.current = false;
+      internalNavCountRef.current = Math.max(
+        0,
+        internalNavCountRef.current - 1
+      );
     } else {
       internalNavCountRef.current += 1;
     }
-    lastPathnameRef.current = pathname;
-  }, [pathname]);
+    lastKeyRef.current = currentKey;
+  }, [currentKey]);
   return /* @__PURE__ */ jsx(
     NavigationContext.Provider,
     {
-      value: { defaultFallback, internalNavCountRef, expectingBackRef },
+      value: { defaultFallback, internalNavCountRef },
       children
     }
   );

package/dist/providers/navigation.provider.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/providers/navigation.provider.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  createContext,\n  ReactNode,\n  useContext,\n  useEffect,\n  useRef,\n  type RefObject,\n} from \"react\";\nimport { usePathname } from \"next/navigation\";\n\ninterface NavigationContextValue {\n  defaultFallback: string;\n  internalNavCountRef: RefObject<number>;\n  expectingBackRef: RefObject<boolean>;\n}\n\nconst NavigationContext = createContext<NavigationContextValue | null>(null);\n\ninterface NavigationProviderProps {\n  children: ReactNode;\n  defaultFallback?: string;\n}\n\nexport function NavigationProvider({\n  children,\n  defaultFallback = \"/\",\n}: NavigationProviderProps) {\n  const pathname = usePathname();\n  const internalNavCountRef = useRef(0);\n  const expectingBackRef = useRef(false);\n  const lastPathnameRef = useRef<string | null>(null);\n\n  useEffect(() => {\n    if (lastPathnameRef.current === null) {\n      lastPathnameRef.current = pathname;\n      return;\n    }\n    if (lastPathnameRef.current === pathname) return;\n\n    if (expectingBackRef.current) {\n      expectingBackRef.current = false;\n    } else {\n      internalNavCountRef.current += 1;\n    }\n    lastPathnameRef.current = pathname;\n  }, [pathname]);\n\n  return (\n    <NavigationContext.Provider\n      value={{ defaultFallback, internalNavCountRef, expectingBackRef }}\n    >\n      {children}\n    </NavigationContext.Provider>\n  );\n}\n\nexport function useNavigationContext(): NavigationContextValue {\n  const ctx = useContext(NavigationContext);\n  if (!ctx) {\n    throw new Error(\n      \"useNavigationContext must be used inside <NavigationProvider>\"\n    );\n  }\n  return ctx;\n}\n\nexport function useNavigationFallback(): string {\n  return useNavigationContext().defaultFallback;\n}\n"],"mappings":";AAkDI;AAhDJ;AAAA,EACE;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AACP,SAAS,mBAAmB;AAQ5B,MAAM,oBAAoB,cAA6C,IAAI;AAOpE,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA,kBAAkB;AACpB,GAA4B;AAC1B,QAAM,WAAW,YAAY;AAC7B,QAAM,sBAAsB,OAAO,CAAC;AACpC,QAAM,mBAAmB,OAAO,KAAK;AACrC,QAAM,kBAAkB,OAAsB,IAAI;AAElD,YAAU,MAAM;AACd,QAAI,gBAAgB,YAAY,MAAM;AACpC,sBAAgB,UAAU;AAC1B;AAAA,IACF;AACA,QAAI,gBAAgB,YAAY,SAAU;AAE1C,QAAI,iBAAiB,SAAS;AAC5B,uBAAiB,UAAU;AAAA,IAC7B,OAAO;AACL,0BAAoB,WAAW;AAAA,IACjC;AACA,oBAAgB,UAAU;AAAA,EAC5B,GAAG,CAAC,QAAQ,CAAC;AAEb,SACE;AAAA,IAAC,kBAAkB;AAAA,IAAlB;AAAA,MACC,OAAO,EAAE,iBAAiB,qBAAqB,iBAAiB;AAAA,MAE/D;AAAA;AAAA,EACH;AAEJ;AAEO,SAAS,uBAA+C;AAC7D,QAAM,MAAM,WAAW,iBAAiB;AACxC,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,wBAAgC;AAC9C,SAAO,qBAAqB,EAAE;AAChC;","names":[]}
+{"version":3,"sources":["../../src/providers/navigation.provider.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  createContext,\n  ReactNode,\n  useContext,\n  useEffect,\n  useRef,\n  type RefObject,\n} from \"react\";\nimport { usePathname, useSearchParams } from \"next/navigation\";\n\ninterface NavigationContextValue {\n  defaultFallback: string;\n  internalNavCountRef: RefObject<number>;\n}\n\nconst NavigationContext = createContext<NavigationContextValue | null>(null);\n\nfunction seedCountFromReferrer(): number {\n  if (typeof window === \"undefined\") return 0;\n  if (window.history.length <= 1) return 0;\n  try {\n    if (!document.referrer) return 0;\n    if (new URL(document.referrer).origin === window.location.origin) {\n      return 1;\n    }\n  } catch {\n    // ignore\n  }\n  return 0;\n}\n\ninterface NavigationProviderProps {\n  children: ReactNode;\n  defaultFallback?: string;\n}\n\nexport function NavigationProvider({\n  children,\n  defaultFallback = \"/\",\n}: NavigationProviderProps) {\n  const pathname = usePathname();\n  const searchParams = useSearchParams();\n  const currentKey = `${pathname}?${searchParams?.toString() ?? \"\"}`;\n\n  const internalNavCountRef = useRef(seedCountFromReferrer());\n  const lastKeyRef = useRef<string | null>(null);\n  const popStateFiredRef = useRef(false);\n\n  useEffect(() => {\n    const onPopState = () => {\n      popStateFiredRef.current = true;\n    };\n    window.addEventListener(\"popstate\", onPopState);\n    return () => window.removeEventListener(\"popstate\", onPopState);\n  }, []);\n\n  useEffect(() => {\n    if (lastKeyRef.current === null) {\n      lastKeyRef.current = currentKey;\n      return;\n    }\n    if (lastKeyRef.current === currentKey) return;\n\n    if (popStateFiredRef.current) {\n      popStateFiredRef.current = false;\n      internalNavCountRef.current = Math.max(\n        0,\n        internalNavCountRef.current - 1\n      );\n    } else {\n      internalNavCountRef.current += 1;\n    }\n    lastKeyRef.current = currentKey;\n  }, [currentKey]);\n\n  return (\n    <NavigationContext.Provider\n      value={{ defaultFallback, internalNavCountRef }}\n    >\n      {children}\n    </NavigationContext.Provider>\n  );\n}\n\nexport function useNavigationContext(): NavigationContextValue {\n  const ctx = useContext(NavigationContext);\n  if (!ctx) {\n    throw new Error(\n      \"useNavigationContext must be used inside <NavigationProvider>\"\n    );\n  }\n  return ctx;\n}\n\nexport function useNavigationFallback(): string {\n  return useNavigationContext().defaultFallback;\n}\n"],"mappings":";AA8EI;AA5EJ;AAAA,EACE;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AACP,SAAS,aAAa,uBAAuB;AAO7C,MAAM,oBAAoB,cAA6C,IAAI;AAE3E,SAAS,wBAAgC;AACvC,MAAI,OAAO,WAAW,YAAa,QAAO;AAC1C,MAAI,OAAO,QAAQ,UAAU,EAAG,QAAO;AACvC,MAAI;AACF,QAAI,CAAC,SAAS,SAAU,QAAO;AAC/B,QAAI,IAAI,IAAI,SAAS,QAAQ,EAAE,WAAW,OAAO,SAAS,QAAQ;AAChE,aAAO;AAAA,IACT;AAAA,EACF,QAAQ;AAAA,EAER;AACA,SAAO;AACT;AAOO,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA,kBAAkB;AACpB,GAA4B;AAC1B,QAAM,WAAW,YAAY;AAC7B,QAAM,eAAe,gBAAgB;AACrC,QAAM,aAAa,GAAG,QAAQ,IAAI,cAAc,SAAS,KAAK,EAAE;AAEhE,QAAM,sBAAsB,OAAO,sBAAsB,CAAC;AAC1D,QAAM,aAAa,OAAsB,IAAI;AAC7C,QAAM,mBAAmB,OAAO,KAAK;AAErC,YAAU,MAAM;AACd,UAAM,aAAa,MAAM;AACvB,uBAAiB,UAAU;AAAA,IAC7B;AACA,WAAO,iBAAiB,YAAY,UAAU;AAC9C,WAAO,MAAM,OAAO,oBAAoB,YAAY,UAAU;AAAA,EAChE,GAAG,CAAC,CAAC;AAEL,YAAU,MAAM;AACd,QAAI,WAAW,YAAY,MAAM;AAC/B,iBAAW,UAAU;AACrB;AAAA,IACF;AACA,QAAI,WAAW,YAAY,WAAY;AAEvC,QAAI,iBAAiB,SAAS;AAC5B,uBAAiB,UAAU;AAC3B,0BAAoB,UAAU,KAAK;AAAA,QACjC;AAAA,QACA,oBAAoB,UAAU;AAAA,MAChC;AAAA,IACF,OAAO;AACL,0BAAoB,WAAW;AAAA,IACjC;AACA,eAAW,UAAU;AAAA,EACvB,GAAG,CAAC,UAAU,CAAC;AAEf,SACE;AAAA,IAAC,kBAAkB;AAAA,IAAlB;AAAA,MACC,OAAO,EAAE,iBAAiB,oBAAoB;AAAA,MAE7C;AAAA;AAAA,EACH;AAEJ;AAEO,SAAS,uBAA+C;AAC7D,QAAM,MAAM,WAAW,iBAAiB;AACxC,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,wBAAgC;AAC9C,SAAO,qBAAqB,EAAE;AAChC;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.642",
+  "version": "1.1.644",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",

package/src/hooks/useRouter.ts

@@ -14,8 +14,7 @@ export interface SafeAppRouter extends Omit<AppRouter, "back"> {
 
 export function useRouter(): SafeAppRouter {
   const router = useNextRouter();
-  const { defaultFallback, internalNavCountRef, expectingBackRef } =
-    useNavigationContext();
+  const { defaultFallback, internalNavCountRef } = useNavigationContext();
 
   function back(options?: SafeBackOptions | string) {
     const fallback =
@@ -24,8 +23,6 @@ export function useRouter(): SafeAppRouter {
         : options?.fallback || defaultFallback;
 
     if (internalNavCountRef.current > 0) {
-      internalNavCountRef.current -= 1;
-      expectingBackRef.current = true;
       router.back();
       return;
     }

package/src/providers/navigation.provider.tsx

@@ -8,16 +8,29 @@ import {
   useRef,
   type RefObject,
 } from "react";
-import { usePathname } from "next/navigation";
+import { usePathname, useSearchParams } from "next/navigation";
 
 interface NavigationContextValue {
   defaultFallback: string;
   internalNavCountRef: RefObject<number>;
-  expectingBackRef: RefObject<boolean>;
 }
 
 const NavigationContext = createContext<NavigationContextValue | null>(null);
 
+function seedCountFromReferrer(): number {
+  if (typeof window === "undefined") return 0;
+  if (window.history.length <= 1) return 0;
+  try {
+    if (!document.referrer) return 0;
+    if (new URL(document.referrer).origin === window.location.origin) {
+      return 1;
+    }
+  } catch {
+    // ignore
+  }
+  return 0;
+}
+
 interface NavigationProviderProps {
   children: ReactNode;
   defaultFallback?: string;
@@ -28,28 +41,43 @@ export function NavigationProvider({
   defaultFallback = "/",
 }: NavigationProviderProps) {
   const pathname = usePathname();
-  const internalNavCountRef = useRef(0);
-  const expectingBackRef = useRef(false);
-  const lastPathnameRef = useRef<string | null>(null);
+  const searchParams = useSearchParams();
+  const currentKey = `${pathname}?${searchParams?.toString() ?? ""}`;
+
+  const internalNavCountRef = useRef(seedCountFromReferrer());
+  const lastKeyRef = useRef<string | null>(null);
+  const popStateFiredRef = useRef(false);
+
+  useEffect(() => {
+    const onPopState = () => {
+      popStateFiredRef.current = true;
+    };
+    window.addEventListener("popstate", onPopState);
+    return () => window.removeEventListener("popstate", onPopState);
+  }, []);
 
   useEffect(() => {
-    if (lastPathnameRef.current === null) {
-      lastPathnameRef.current = pathname;
+    if (lastKeyRef.current === null) {
+      lastKeyRef.current = currentKey;
       return;
     }
-    if (lastPathnameRef.current === pathname) return;
+    if (lastKeyRef.current === currentKey) return;
 
-    if (expectingBackRef.current) {
-      expectingBackRef.current = false;
+    if (popStateFiredRef.current) {
+      popStateFiredRef.current = false;
+      internalNavCountRef.current = Math.max(
+        0,
+        internalNavCountRef.current - 1
+      );
     } else {
       internalNavCountRef.current += 1;
     }
-    lastPathnameRef.current = pathname;
-  }, [pathname]);
+    lastKeyRef.current = currentKey;
+  }, [currentKey]);
 
   return (
     <NavigationContext.Provider
-      value={{ defaultFallback, internalNavCountRef, expectingBackRef }}
+      value={{ defaultFallback, internalNavCountRef }}
     >
       {children}
     </NavigationContext.Provider>