@rpcbase/client 0.337.0 → 0.338.0

package/dist/index.js

@@ -112,17 +112,19 @@ const getWindowState = () => {
   const key = "__rpcbaseNavigationGuardWindowState";
   const globalAny = window;
   if (globalAny[key]) {
-    return globalAny[key];
+    const existing = globalAny[key];
+    if (typeof existing.suppressBeforeUnloadFromKey === "undefined") {
+      existing.suppressBeforeUnloadFromKey = null;
+    }
+    return existing;
   }
   const created = {
-    suppressBeforeUnloadUntil: 0,
-    lastBeforeUnloadAt: 0
+    suppressBeforeUnloadFromKey: null,
+    nativePromptActive: false
   };
   globalAny[key] = created;
   return created;
 };
-const NATIVE_PROMPT_COOLDOWN_MS = 1e3;
-const SUPPRESS_BEFOREUNLOAD_MS = 1e3;
 const getGlobalGuardWeakSet = () => {
   const key = "__rpcbaseNavigationGuardInstalledRouters";
   const globalAny = globalThis;
@@ -146,9 +148,18 @@ const installGlobalNavigationGuard = (router) => {
   let lastPromptedLocationKey = null;
   router.getBlocker(blockerKey, (args) => {
     lastArgs = args;
+    if (windowState?.nativePromptActive && args.historyAction !== "POP") {
+      windowState.nativePromptActive = false;
+    }
     return pickNavigationGuard(args) !== null;
   });
   router.subscribe((state) => {
+    if (windowState?.suppressBeforeUnloadFromKey && state?.location) {
+      const currentKey = getLocationDedupKey(state.location);
+      if (currentKey !== windowState.suppressBeforeUnloadFromKey) {
+        windowState.suppressBeforeUnloadFromKey = null;
+      }
+    }
     const blocker = state.blockers.get(blockerKey);
     if (!blocker || blocker.state !== "blocked") {
       lastPromptedLocationKey = null;
@@ -160,12 +171,17 @@ const installGlobalNavigationGuard = (router) => {
       return;
     }
     lastPromptedLocationKey = dedupKey;
-    if (windowState && Date.now() - windowState.lastBeforeUnloadAt < NATIVE_PROMPT_COOLDOWN_MS) {
+    if (windowState?.nativePromptActive && lastArgs?.historyAction === "POP") {
+      windowState.nativePromptActive = false;
       blocker.reset();
       return;
     }
     const args = lastArgs;
-    const guard = args ? pickNavigationGuard(args) : null;
+    if (!args) {
+      blocker.proceed();
+      return;
+    }
+    const guard = pickNavigationGuard(args);
     if (!guard) {
       blocker.proceed();
       return;
@@ -173,7 +189,7 @@ const installGlobalNavigationGuard = (router) => {
     const ok = window.confirm(guard.message);
     if (ok) {
       if (windowState) {
-        windowState.suppressBeforeUnloadUntil = Date.now() + SUPPRESS_BEFOREUNLOAD_MS;
+        windowState.suppressBeforeUnloadFromKey = getLocationDedupKey(args.currentLocation);
       }
       blocker.proceed();
     } else {
@@ -187,15 +203,15 @@ const installGlobalNavigationGuard = (router) => {
       globalAny[key] = true;
       window.addEventListener("beforeunload", (event) => {
         const state = getWindowState();
-        if (state && state.suppressBeforeUnloadUntil > 0 && Date.now() < state.suppressBeforeUnloadUntil) {
-          state.suppressBeforeUnloadUntil = 0;
+        if (state && state.suppressBeforeUnloadFromKey) {
+          state.suppressBeforeUnloadFromKey = null;
           return;
         }
         if (!hasUnloadBlockers()) {
           return;
         }
         if (state) {
-          state.lastBeforeUnloadAt = Date.now();
+          state.nativePromptActive = true;
         }
         event.preventDefault();
         event.returnValue = "";

package/dist/navigationGuard/installGlobalNavigationGuard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installGlobalNavigationGuard.d.ts","sourceRoot":"","sources":["../../src/navigationGuard/installGlobalNavigationGuard.ts"],"names":[],"mappings":"AAAA,OAAQ,EAAuB,KAAK,UAAU,EAAuB,MAAM,iBAAiB,CAAA;AA2F5F,eAAO,MAAM,4BAA4B,GAAI,QAAQ,UAAU,KAAG,IAoFjE,CAAA"}
+{"version":3,"file":"installGlobalNavigationGuard.d.ts","sourceRoot":"","sources":["../../src/navigationGuard/installGlobalNavigationGuard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,UAAU,EAAwB,MAAM,iBAAiB,CAAA;AA4F5F,eAAO,MAAM,4BAA4B,GAAI,QAAQ,UAAU,KAAG,IAoGjE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.337.0",
+  "version": "0.338.0",
   "type": "module",
   "files": [
     "dist"