Fix popstate event is not correctly accepted

LayerXcom · Oct 7, 2024 · 09f9386 · 09f9386
1 parent 0d004a9
commit 09f9386
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/hooks/useInterceptPopState.ts b/src/hooks/useInterceptPopState.ts
@@ -111,8 +111,17 @@ function createHandlePopState(
 
     // Wait for all callbacks to be resolved
     (async () => {
+      let i = -1;
+
       for (const def of defs) {
+        i++;
+
         if (!def.enabled({ to, type: "popstate" })) continue;
+        if (DEBUG) {
+          console.log(
+            `useInterceptPopState(): confirmation for listener index ${i}`
+          );
+        }
 
         const confirm = await def.callback({ to, type: "popstate" });
         // TODO: check cancel while waiting for navigation guard
@@ -125,17 +134,21 @@ function createHandlePopState(
             );
           }
           if (delta !== 0) {
+            // discard event
             window.history.go(-delta);
           }
           return;
         }
+      }
 
-        // accept
-        dispatchedState = nextState;
-        window.dispatchEvent(
-          new PopStateEvent("popstate", { state: nextState })
+      if (DEBUG) {
+        console.log(
+          `useInterceptPopState(): Accept popstate event, ${nextIndex}`
         );
       }
+      // accept
+      dispatchedState = nextState;
+      window.dispatchEvent(new PopStateEvent("popstate", { state: nextState }));
     })();
 
     // Return false to call stopImmediatePropagation()