@greatapps/common 1.1.641 → 1.1.642

package/dist/hooks/useRouter.mjs

@@ -1,18 +1,14 @@
 "use client";
 import { useRouter as useNextRouter } from "next/navigation";
-import { useNavigationFallback } from "../providers/navigation.provider";
+import { useNavigationContext } from "../providers/navigation.provider";
 function useRouter() {
   const router = useNextRouter();
-  const defaultFallback = useNavigationFallback();
+  const { defaultFallback, internalNavCountRef, expectingBackRef } = useNavigationContext();
   function back(options) {
     const fallback = typeof options === "string" ? options : options?.fallback || defaultFallback;
-    let isInternalReferrer = false;
-    try {
-      isInternalReferrer = !!document.referrer && new URL(document.referrer).origin === window.location.origin;
-    } catch {
-      isInternalReferrer = false;
-    }
-    if (isInternalReferrer && window.history.length > 1) {
+    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 { useNavigationFallback } 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 = useNavigationFallback();\n\n  function back(options?: SafeBackOptions | string) {\n    const fallback =\n      typeof options === \"string\"\n        ? options\n        : options?.fallback || defaultFallback;\n\n    let isInternalReferrer = false;\n\n    try {\n      isInternalReferrer =\n        !!document.referrer &&\n        new URL(document.referrer).origin === window.location.origin;\n    } catch {\n      isInternalReferrer = false;\n    }\n\n    if (isInternalReferrer && window.history.length > 1) {\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,6BAA6B;AAW/B,SAAS,YAA2B;AACzC,QAAM,SAAS,cAAc;AAC7B,QAAM,kBAAkB,sBAAsB;AAE9C,WAAS,KAAK,SAAoC;AAChD,UAAM,WACJ,OAAO,YAAY,WACf,UACA,SAAS,YAAY;AAE3B,QAAI,qBAAqB;AAEzB,QAAI;AACF,2BACE,CAAC,CAAC,SAAS,YACX,IAAI,IAAI,SAAS,QAAQ,EAAE,WAAW,OAAO,SAAS;AAAA,IAC1D,QAAQ;AACN,2BAAqB;AAAA,IACvB;AAEA,QAAI,sBAAsB,OAAO,QAAQ,SAAS,GAAG;AACnD,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, 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":[]}

package/dist/providers/navigation.provider.mjs

@@ -1,20 +1,57 @@
 "use client";
 import { jsx } from "react/jsx-runtime";
-import { createContext, useContext } from "react";
-const NavigationContext = createContext({
-  defaultFallback: "/"
-});
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useRef
+} from "react";
+import { usePathname } from "next/navigation";
+const NavigationContext = createContext(null);
 function NavigationProvider({
   children,
   defaultFallback = "/"
 }) {
-  return /* @__PURE__ */ jsx(NavigationContext.Provider, { value: { defaultFallback }, children });
+  const pathname = usePathname();
+  const internalNavCountRef = useRef(0);
+  const expectingBackRef = useRef(false);
+  const lastPathnameRef = useRef(null);
+  useEffect(() => {
+    if (lastPathnameRef.current === null) {
+      lastPathnameRef.current = pathname;
+      return;
+    }
+    if (lastPathnameRef.current === pathname) return;
+    if (expectingBackRef.current) {
+      expectingBackRef.current = false;
+    } else {
+      internalNavCountRef.current += 1;
+    }
+    lastPathnameRef.current = pathname;
+  }, [pathname]);
+  return /* @__PURE__ */ jsx(
+    NavigationContext.Provider,
+    {
+      value: { defaultFallback, internalNavCountRef, expectingBackRef },
+      children
+    }
+  );
+}
+function useNavigationContext() {
+  const ctx = useContext(NavigationContext);
+  if (!ctx) {
+    throw new Error(
+      "useNavigationContext must be used inside <NavigationProvider>"
+    );
+  }
+  return ctx;
 }
 function useNavigationFallback() {
-  return useContext(NavigationContext).defaultFallback;
+  return useNavigationContext().defaultFallback;
 }
 export {
   NavigationProvider,
+  useNavigationContext,
   useNavigationFallback
 };
 //# sourceMappingURL=navigation.provider.mjs.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/providers/navigation.provider.tsx"],"sourcesContent":["\"use client\";\n\nimport { createContext, ReactNode, useContext } from \"react\";\n\ninterface NavigationContextValue {\n  defaultFallback: string;\n}\n\nconst NavigationContext = createContext<NavigationContextValue>({\n  defaultFallback: \"/\",\n});\n\ninterface NavigationProviderProps {\n  children: ReactNode;\n  defaultFallback?: string;\n}\n\nexport function NavigationProvider({\n  children,\n  defaultFallback = \"/\",\n}: NavigationProviderProps) {\n  return (\n    <NavigationContext.Provider value={{ defaultFallback }}>\n      {children}\n    </NavigationContext.Provider>\n  );\n}\n\nexport function useNavigationFallback(): string {\n  return useContext(NavigationContext).defaultFallback;\n}\n"],"mappings":";AAsBI;AApBJ,SAAS,eAA0B,kBAAkB;AAMrD,MAAM,oBAAoB,cAAsC;AAAA,EAC9D,iBAAiB;AACnB,CAAC;AAOM,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA,kBAAkB;AACpB,GAA4B;AAC1B,SACE,oBAAC,kBAAkB,UAAlB,EAA2B,OAAO,EAAE,gBAAgB,GAClD,UACH;AAEJ;AAEO,SAAS,wBAAgC;AAC9C,SAAO,WAAW,iBAAiB,EAAE;AACvC;","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 } 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":[]}

package/package.json

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

package/src/hooks/useRouter.ts

@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter as useNextRouter } from "next/navigation";
-import { useNavigationFallback } from "../providers/navigation.provider";
+import { useNavigationContext } from "../providers/navigation.provider";
 
 type SafeBackOptions = { fallback?: string };
 
@@ -14,7 +14,8 @@ export interface SafeAppRouter extends Omit<AppRouter, "back"> {
 
 export function useRouter(): SafeAppRouter {
   const router = useNextRouter();
-  const defaultFallback = useNavigationFallback();
+  const { defaultFallback, internalNavCountRef, expectingBackRef } =
+    useNavigationContext();
 
   function back(options?: SafeBackOptions | string) {
     const fallback =
@@ -22,17 +23,9 @@ export function useRouter(): SafeAppRouter {
         ? options
         : options?.fallback || defaultFallback;
 
-    let isInternalReferrer = false;
-
-    try {
-      isInternalReferrer =
-        !!document.referrer &&
-        new URL(document.referrer).origin === window.location.origin;
-    } catch {
-      isInternalReferrer = false;
-    }
-
-    if (isInternalReferrer && window.history.length > 1) {
+    if (internalNavCountRef.current > 0) {
+      internalNavCountRef.current -= 1;
+      expectingBackRef.current = true;
       router.back();
       return;
     }

package/src/providers/navigation.provider.tsx

@@ -1,14 +1,22 @@
 "use client";
 
-import { createContext, ReactNode, useContext } from "react";
+import {
+  createContext,
+  ReactNode,
+  useContext,
+  useEffect,
+  useRef,
+  type RefObject,
+} from "react";
+import { usePathname } from "next/navigation";
 
 interface NavigationContextValue {
   defaultFallback: string;
+  internalNavCountRef: RefObject<number>;
+  expectingBackRef: RefObject<boolean>;
 }
 
-const NavigationContext = createContext<NavigationContextValue>({
-  defaultFallback: "/",
-});
+const NavigationContext = createContext<NavigationContextValue | null>(null);
 
 interface NavigationProviderProps {
   children: ReactNode;
@@ -19,13 +27,45 @@ export function NavigationProvider({
   children,
   defaultFallback = "/",
 }: NavigationProviderProps) {
+  const pathname = usePathname();
+  const internalNavCountRef = useRef(0);
+  const expectingBackRef = useRef(false);
+  const lastPathnameRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (lastPathnameRef.current === null) {
+      lastPathnameRef.current = pathname;
+      return;
+    }
+    if (lastPathnameRef.current === pathname) return;
+
+    if (expectingBackRef.current) {
+      expectingBackRef.current = false;
+    } else {
+      internalNavCountRef.current += 1;
+    }
+    lastPathnameRef.current = pathname;
+  }, [pathname]);
+
   return (
-    <NavigationContext.Provider value={{ defaultFallback }}>
+    <NavigationContext.Provider
+      value={{ defaultFallback, internalNavCountRef, expectingBackRef }}
+    >
       {children}
     </NavigationContext.Provider>
   );
 }
 
+export function useNavigationContext(): NavigationContextValue {
+  const ctx = useContext(NavigationContext);
+  if (!ctx) {
+    throw new Error(
+      "useNavigationContext must be used inside <NavigationProvider>"
+    );
+  }
+  return ctx;
+}
+
 export function useNavigationFallback(): string {
-  return useContext(NavigationContext).defaultFallback;
+  return useNavigationContext().defaultFallback;
 }