@okyrychenko-dev/react-action-guard-router 0.2.3 → 1.0.0

package/dist/tanstack-router/index.cjs

@@ -2,20 +2,19 @@
 
 var reactRouter = require('@tanstack/react-router');
 var react = require('react');
+var typeUtils = require('@okyrychenko-dev/type-utils');
 var reactActionGuard = require('@okyrychenko-dev/react-action-guard');
 
 // src/tanstack-router/useNavigationBlocker.ts
-
-// src/core/utils.ts
 function resolveCondition(condition) {
-  return typeof condition === "function" ? condition() : condition;
+  return typeUtils.isFunction(condition) ? condition() : condition;
 }
-var hasThen = (value) => typeof value === "object" && value !== null && "then" in value;
+var hasThen = (value) => typeUtils.isObject(value) && "then" in value;
 function isThenable(value) {
   if (!hasThen(value)) {
     return false;
   }
-  return typeof value.then === "function";
+  return typeUtils.isFunction(value.then);
 }
 function resolveConfirmResult(message, onConfirm, fallbackConfirm) {
   if (!onConfirm) {
@@ -27,144 +26,97 @@ function resolveConfirmResult(message, onConfirm, fallbackConfirm) {
   }
   return { kind: "sync", confirmed: result };
 }
-function isDefined(value) {
-  return value !== void 0 && value !== null;
-}
 function normalizeScope(scope) {
   if (!scope) {
     return [];
   }
-  return Array.isArray(scope) ? scope : [scope];
+  return typeUtils.isArray(scope) ? scope : [scope];
 }
-
-// src/core/useBeforeUnload.ts
-var DEFAULT_UNLOAD_MESSAGE = "Changes you made may not be saved.";
-function useBeforeUnload(when, message = DEFAULT_UNLOAD_MESSAGE) {
-  react.useEffect(() => {
-    const shouldBlock = resolveCondition(when);
-    if (!shouldBlock) {
-      return;
-    }
-    const handleBeforeUnload = (event) => {
-      event.preventDefault();
-      if ("returnValue" in event) {
-        event.returnValue = message;
-      }
-    };
-    window.addEventListener("beforeunload", handleBeforeUnload);
-    return () => {
-      window.removeEventListener("beforeunload", handleBeforeUnload);
-    };
-  }, [when, message]);
+function createScopeKey(scope) {
+  return JSON.stringify([...new Set(normalizeScope(scope))].sort());
 }
 function useShouldBlock(when, scope) {
   const scopes = react.useMemo(() => normalizeScope(scope), [scope]);
   const isScopeBlocked = reactActionGuard.useIsBlocked(scopes.length === 1 ? scopes[0] : scopes);
   const warnedMissingConditionRef = react.useRef(false);
-  const warnedFunctionRef = react.useRef(false);
   react.useEffect(() => {
     if (process.env.NODE_ENV !== "development") {
       return;
     }
-    if (!warnedMissingConditionRef.current && !isDefined(when) && !scope) {
+    if (!warnedMissingConditionRef.current && !typeUtils.isDefined(when) && !scope) {
       warnedMissingConditionRef.current = true;
       console.warn(
         '[react-action-guard-router] useShouldBlock: Neither "when" nor "scope" provided. This hook will always return false. Please provide at least one condition.'
       );
     }
-    if (!warnedFunctionRef.current && typeof when === "function") {
-      warnedFunctionRef.current = true;
-      console.warn(
-        '[react-action-guard-router] useShouldBlock: "when" is a function. Make sure to wrap it with useCallback to avoid unnecessary re-computations.'
-      );
-    }
   }, [when, scope]);
-  const shouldBlock = react.useMemo(() => {
-    let blockCondition = false;
-    if (isDefined(when)) {
-      blockCondition = resolveCondition(when);
-    }
-    if (scope && isScopeBlocked) {
-      blockCondition = true;
-    }
-    return blockCondition;
-  }, [when, scope, isScopeBlocked]);
-  return shouldBlock;
+  const blockCondition = typeUtils.isDefined(when) && resolveCondition(when);
+  return blockCondition || Boolean(scope && isScopeBlocked);
 }
 
-// src/tanstack-router/useNavigationBlocker.ts
-var hasBlockingHistory = (value) => {
-  if (!value || typeof value !== "object") {
-    return false;
-  }
-  if (!("history" in value)) {
-    return false;
+// src/core/confirmationOwner.utils.ts
+function createConfirmationOwner() {
+  let currentAttempt = 0;
+  function invalidate() {
+    currentAttempt += 1;
   }
-  const history = value.history;
-  if (!history || typeof history !== "object") {
-    return false;
-  }
-  if (!("block" in history)) {
-    return false;
-  }
-  return typeof history.block === "function";
-};
-var hasRetry = (value) => typeof value.retry === "function";
-var attemptRetry = (update) => {
-  if (hasRetry(update)) {
-    try {
-      update.retry();
-    } catch {
+  function begin() {
+    const attempt = ++currentAttempt;
+    function settle() {
+      if (attempt !== currentAttempt) {
+        return false;
+      }
+      invalidate();
+      return true;
     }
+    return settle;
   }
-};
+  return { begin, invalidate };
+}
+
+// src/tanstack-router/useNavigationBlocker.ts
 function useNavigationBlocker(options) {
   const { when, scope, message, onBlock, onAllow, blockBrowserUnload = true, onConfirm } = options;
-  const router = reactRouter.useRouter();
   const shouldBlock = useShouldBlock(when, scope);
+  const scopeKey = createScopeKey(scope);
+  const [confirmationOwner] = react.useState(createConfirmationOwner);
+  const { begin, invalidate } = confirmationOwner;
   react.useEffect(() => {
-    if (!shouldBlock || !hasBlockingHistory(router)) {
-      return;
+    return invalidate;
+  }, [when, scopeKey, shouldBlock, message, onConfirm, invalidate]);
+  const shouldBlockFn = react.useCallback(async () => {
+    const settle = begin();
+    onBlock?.();
+    if (!message) {
+      return true;
     }
-    const unblock = router.history.block((update) => {
-      if (!message) {
-        return;
-      }
-      onBlock?.();
+    try {
       const confirmation = resolveConfirmResult(
         message,
         onConfirm,
         (value) => window.confirm(value)
       );
+      let confirmed;
       if (confirmation.kind === "async") {
-        confirmation.promise.then((confirmed) => {
-          if (confirmed) {
-            onAllow?.();
-            unblock();
-            attemptRetry(update);
-          }
-        }).catch((error) => {
-          unblock();
-          if (process.env.NODE_ENV !== "production") {
-            console.error("[react-action-guard-router] Confirmation error:", error);
-          }
-        });
-        return;
+        confirmed = await confirmation.promise;
+      } else {
+        confirmed = confirmation.confirmed;
       }
-      if (confirmation.confirmed) {
-        onAllow?.();
-        unblock();
-        attemptRetry(update);
+      if (!settle() || !confirmed) {
+        return true;
       }
-    });
-    return () => {
-      unblock();
-    };
-  }, [shouldBlock, message, onBlock, onAllow, router, onConfirm]);
-  useBeforeUnload(blockBrowserUnload && shouldBlock, message ?? DEFAULT_UNLOAD_MESSAGE);
-  return {
-    isBlocking: shouldBlock
-  };
+      onAllow?.();
+      return false;
+    } catch {
+      return true;
+    }
+  }, [message, onBlock, onAllow, onConfirm, begin]);
+  reactRouter.useBlocker({
+    shouldBlockFn,
+    enableBeforeUnload: blockBrowserUnload && shouldBlock,
+    disabled: !shouldBlock
+  });
+  return { isBlocking: shouldBlock };
 }
 
 exports.useNavigationBlocker = useNavigationBlocker;

package/dist/tanstack-router/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/utils.ts","../../src/core/useBeforeUnload.ts","../../src/core/useShouldBlock.ts","../../src/tanstack-router/useNavigationBlocker.ts"],"names":["useEffect","useMemo","useIsBlocked","useRef","useRouter"],"mappings":"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","file":"index.cjs","sourcesContent":["/**\n * Resolves a condition value (boolean or function returning boolean)\n *\n * @param condition - Boolean value or function\n * @returns Resolved boolean value\n */\nexport function resolveCondition(condition: boolean | (() => boolean)): boolean {\n  return typeof condition === \"function\" ? condition() : condition;\n}\n\ninterface Thenable {\n  then: (...args: Array<unknown>) => unknown;\n}\n\nconst hasThen = (value: unknown): value is Thenable =>\n  typeof value === \"object\" && value !== null && \"then\" in value;\n\n/**\n * Checks if a value behaves like a Promise (thenable)\n */\nexport function isThenable<T>(value: unknown): value is PromiseLike<T> {\n  if (!hasThen(value)) {\n    return false;\n  }\n  return typeof value.then === \"function\";\n}\n\nexport interface ConfirmResultSync {\n  kind: \"sync\";\n  confirmed: boolean;\n}\n\nexport interface ConfirmResultAsync {\n  kind: \"async\";\n  promise: Promise<boolean>;\n}\n\nexport type ConfirmResult = ConfirmResultSync | ConfirmResultAsync;\n\n/**\n * Normalizes custom confirm result into sync or async branch.\n */\nexport function resolveConfirmResult(\n  message: string,\n  onConfirm: ((message: string) => boolean | PromiseLike<boolean>) | undefined,\n  fallbackConfirm: (message: string) => boolean\n): ConfirmResult {\n  if (!onConfirm) {\n    return { kind: \"sync\", confirmed: fallbackConfirm(message) };\n  }\n\n  const result = onConfirm(message);\n  if (isThenable<boolean>(result)) {\n    return { kind: \"async\", promise: Promise.resolve(result) };\n  }\n\n  return { kind: \"sync\", confirmed: result };\n}\n\n/**\n * Generates a unique blocker ID based on scope and timestamp\n *\n * @param prefix - Prefix for the ID\n * @param scope - Optional scope\n * @returns Unique blocker ID\n */\nexport function createBlockerId(prefix: string, scope?: string | Array<string>): string {\n  const scopePart = scope ? `-${Array.isArray(scope) ? scope.join(\"-\") : scope}` : \"\";\n  const timestamp = String(Date.now());\n  return `${prefix}${scopePart}-${timestamp}`;\n}\n\n/**\n * Checks if a value is defined and not empty\n *\n * @param value - Value to check\n * @returns True if value is defined and not empty\n */\nexport function isDefined<T>(value: T | undefined | null): value is T {\n  return value !== undefined && value !== null;\n}\n\n/**\n * Normalizes scope to an array\n *\n * @param scope - String or array of strings\n * @returns Array of scope strings\n */\nexport function normalizeScope(scope: string | Array<string> | undefined): Array<string> {\n  if (!scope) {\n    return [];\n  }\n  return Array.isArray(scope) ? scope : [scope];\n}\n","import { useEffect } from \"react\";\nimport { resolveCondition } from \"./utils\";\n\n/**\n * Default message shown when preventing browser unload\n */\nexport const DEFAULT_UNLOAD_MESSAGE = \"Changes you made may not be saved.\";\n\n/**\n * Blocks browser tab close/refresh when condition is met.\n *\n * This hook adds a `beforeunload` event listener to warn users\n * before they close or refresh the browser tab. Modern browsers\n * may ignore custom messages and show their own generic warning.\n *\n * @param when - Boolean or function returning boolean to determine if blocking should be active\n * @param message - Optional custom message (may be ignored by browsers)\n *\n * @example\n * ```tsx\n * function MyForm() {\n *   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);\n *\n *   useBeforeUnload(hasUnsavedChanges, 'You have unsaved changes');\n *\n *   return <form>...</form>;\n * }\n * ```\n *\n * @example\n * ```tsx\n * // With function condition\n * function EditPage() {\n *   const isFormDirty = useIsBlocked('form');\n *\n *   useBeforeUnload(() => isFormDirty);\n *\n *   return <div>...</div>;\n * }\n * ```\n */\nexport function useBeforeUnload(\n  when: boolean | (() => boolean),\n  message = DEFAULT_UNLOAD_MESSAGE\n): void {\n  useEffect(() => {\n    const shouldBlock = resolveCondition(when);\n\n    if (!shouldBlock) {\n      return;\n    }\n\n    const handleBeforeUnload = (event: BeforeUnloadEvent): void => {\n      // Prevent default to trigger the browser's confirmation dialog\n      event.preventDefault();\n\n      // Fallback for legacy browsers/WebViews that still rely on returnValue.\n      if (\"returnValue\" in event) {\n        // eslint-disable-next-line @typescript-eslint/no-deprecated\n        event.returnValue = message;\n      }\n    };\n\n    window.addEventListener(\"beforeunload\", handleBeforeUnload);\n\n    return () => {\n      window.removeEventListener(\"beforeunload\", handleBeforeUnload);\n    };\n  }, [when, message]);\n}\n","import { useIsBlocked } from \"@okyrychenko-dev/react-action-guard\";\nimport { useEffect, useMemo, useRef } from \"react\";\nimport { isDefined, normalizeScope, resolveCondition } from \"./utils\";\n\n/**\n * Shared hook to determine if blocking should be active based on\n * condition and/or scope state.\n *\n * This hook uses `useMemo` for optimal performance, ensuring blocking state\n * is computed synchronously without additional re-renders.\n *\n * @param when - Optional condition (boolean or function)\n * @param scope - Optional scope(s) to check\n * @returns Whether blocking should be active\n *\n * @internal\n */\nexport function useShouldBlock(\n  when?: boolean | (() => boolean),\n  scope?: string | Array<string>\n): boolean {\n  // Memoize scope normalization to avoid recalculation on every render\n  const scopes = useMemo(() => normalizeScope(scope), [scope]);\n\n  // Check if any specified scopes are blocked\n  const isScopeBlocked = useIsBlocked(scopes.length === 1 ? scopes[0] : scopes);\n\n  // Development-only validation\n  const warnedMissingConditionRef = useRef(false);\n  const warnedFunctionRef = useRef(false);\n\n  useEffect(() => {\n    if (process.env.NODE_ENV !== \"development\") {\n      return;\n    }\n\n    if (!warnedMissingConditionRef.current && !isDefined(when) && !scope) {\n      warnedMissingConditionRef.current = true;\n      console.warn(\n        '[react-action-guard-router] useShouldBlock: Neither \"when\" nor \"scope\" provided. ' +\n          \"This hook will always return false. Please provide at least one condition.\"\n      );\n    }\n\n    if (!warnedFunctionRef.current && typeof when === \"function\") {\n      warnedFunctionRef.current = true;\n      console.warn(\n        '[react-action-guard-router] useShouldBlock: \"when\" is a function. ' +\n          \"Make sure to wrap it with useCallback to avoid unnecessary re-computations.\"\n      );\n    }\n  }, [when, scope]);\n\n  // Compute blocking state synchronously using useMemo\n  // This avoids the useState + useEffect pattern which causes an extra render\n  const shouldBlock = useMemo(() => {\n    let blockCondition = false;\n\n    // Check manual condition\n    if (isDefined(when)) {\n      blockCondition = resolveCondition(when);\n    }\n\n    // Check scope-based blocking (OR logic - block if either condition is true)\n    if (scope && isScopeBlocked) {\n      blockCondition = true;\n    }\n\n    return blockCondition;\n  }, [when, scope, isScopeBlocked]);\n\n  return shouldBlock;\n}\n","import { useRouter } from \"@tanstack/react-router\";\nimport { useEffect } from \"react\";\nimport {\n  DEFAULT_UNLOAD_MESSAGE,\n  resolveConfirmResult,\n  useBeforeUnload,\n  useShouldBlock,\n} from \"../core\";\nimport type { NavigationBlockerReturn } from \"../core/types\";\nimport type { SafeTanStackRouter, UseNavigationBlockerOptions } from \"./types\";\n\ninterface RetryableUpdate {\n  [key: string]: unknown;\n  retry: () => void;\n}\n\nconst hasBlockingHistory = (value: unknown): value is SafeTanStackRouter => {\n  if (!value || typeof value !== \"object\") {\n    return false;\n  }\n  if (!(\"history\" in value)) {\n    return false;\n  }\n  const history = value.history;\n  if (!history || typeof history !== \"object\") {\n    return false;\n  }\n  if (!(\"block\" in history)) {\n    return false;\n  }\n  return typeof history.block === \"function\";\n};\n\nconst hasRetry = (value: Record<string, unknown>): value is RetryableUpdate =>\n  typeof value.retry === \"function\";\n\nconst attemptRetry = (update: Record<string, unknown>): void => {\n  if (hasRetry(update)) {\n    try {\n      update.retry();\n    } catch {\n      // Swallow retry errors to avoid breaking blocking flow.\n    }\n  }\n};\n\n/**\n * Blocks navigation in TanStack Router applications based on conditions or scope state.\n *\n * This hook integrates with TanStack Router's history blocking mechanism and\n * react-action-guard's scope system to prevent navigation when certain conditions\n * are met or when specific scopes are blocked.\n *\n * **Features:**\n * - Block navigation based on boolean condition or function\n * - Automatically block when react-action-guard scopes are active\n * - Support for browser `beforeunload` event (tab close/refresh)\n * - Customizable confirmation dialog\n * - Callbacks for block/allow events\n *\n * @param options - Configuration options\n * @returns Object with `isBlocking` state\n *\n * @example\n * ```tsx\n * // Block based on scope\n * function EditForm() {\n *   useNavigationBlocker({\n *     scope: 'form',\n *     message: 'You have unsaved changes. Leave anyway?',\n *   });\n *\n *   return <form>...</form>;\n * }\n * ```\n *\n * @example\n * ```tsx\n * // Block based on condition\n * function UnsavedChanges() {\n *   const [hasChanges, setHasChanges] = useState(false);\n *\n *   useNavigationBlocker({\n *     when: hasChanges,\n *     message: 'Discard changes?',\n *     onBlock: () => console.log('Navigation blocked'),\n *   });\n * }\n * ```\n *\n * @example\n * ```tsx\n * // Type-safe with scopes\n * import { createTypedHooks } from '@okyrychenko-dev/react-action-guard';\n *\n * type AppScopes = 'global' | 'form' | 'checkout';\n * const { useBlocker } = createTypedHooks<AppScopes>();\n *\n * function MyComponent() {\n *   useBlocker('blocker-id', { scope: 'form' });\n *\n *   useNavigationBlocker({\n *     scope: 'form', // Type-safe!\n *     message: 'Leave?',\n *   });\n * }\n * ```\n */\nexport function useNavigationBlocker(\n  options: UseNavigationBlockerOptions\n): NavigationBlockerReturn {\n  const { when, scope, message, onBlock, onAllow, blockBrowserUnload = true, onConfirm } = options;\n\n  const router = useRouter();\n\n  // Use shared logic to determine if blocking should be active\n  const shouldBlock = useShouldBlock(when, scope);\n\n  // Block navigation using TanStack Router's history\n  useEffect(() => {\n    if (!shouldBlock || !hasBlockingHistory(router)) {\n      return;\n    }\n\n    // Block navigation with properly typed update parameter\n    type NavigationUpdate = Record<string, unknown> & { retry?: () => void };\n    const unblock = router.history.block((update: NavigationUpdate) => {\n      // Early return if no message\n      if (!message) {\n        return;\n      }\n\n      // Trigger onBlock callback\n      onBlock?.();\n\n      const confirmation = resolveConfirmResult(message, onConfirm, (value) =>\n        window.confirm(value)\n      );\n\n      if (confirmation.kind === \"async\") {\n        confirmation.promise\n          .then((confirmed) => {\n            if (confirmed) {\n              onAllow?.();\n              unblock();\n              attemptRetry(update);\n            }\n          })\n          .catch((error: unknown) => {\n            // On error, unblock but don't retry\n            unblock();\n            if (process.env.NODE_ENV !== \"production\") {\n              console.error(\"[react-action-guard-router] Confirmation error:\", error);\n            }\n          });\n        return;\n      }\n\n      if (confirmation.confirmed) {\n        onAllow?.();\n        unblock();\n        attemptRetry(update);\n      }\n    });\n\n    return () => {\n      unblock();\n    };\n  }, [shouldBlock, message, onBlock, onAllow, router, onConfirm]);\n\n  // Also block browser unload if requested\n  useBeforeUnload(blockBrowserUnload && shouldBlock, message ?? DEFAULT_UNLOAD_MESSAGE);\n\n  return {\n    isBlocking: shouldBlock,\n  };\n}\n"]}
+{"version":3,"sources":["../../src/core/utils.ts","../../src/core/useShouldBlock.ts","../../src/core/confirmationOwner.utils.ts","../../src/tanstack-router/useNavigationBlocker.ts"],"names":["isFunction","isObject","isArray","useMemo","useIsBlocked","useRef","useEffect","isDefined","useState","useCallback","useBlocker"],"mappings":"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","file":"index.cjs","sourcesContent":["import { isArray, isFunction, isObject } from \"@okyrychenko-dev/type-utils\";\nimport type { Optional } from \"@okyrychenko-dev/type-utils\";\n\n/**\n * Resolves a condition value (boolean or function returning boolean)\n *\n * @param condition - Boolean value or function\n * @returns Resolved boolean value\n */\nexport function resolveCondition(condition: boolean | (() => boolean)): boolean {\n  return isFunction(condition) ? condition() : condition;\n}\n\ninterface Thenable {\n  then: (...args: Array<unknown>) => unknown;\n}\n\nconst hasThen = (value: unknown): value is Thenable => isObject(value) && \"then\" in value;\n\n/**\n * Checks if a value behaves like a Promise (thenable)\n */\nexport function isThenable<T>(value: unknown): value is PromiseLike<T> {\n  if (!hasThen(value)) {\n    return false;\n  }\n\n  return isFunction(value.then);\n}\n\nexport interface ConfirmResultSync {\n  kind: \"sync\";\n  confirmed: boolean;\n}\n\nexport interface ConfirmResultAsync {\n  kind: \"async\";\n  promise: Promise<boolean>;\n}\n\nexport type ConfirmResult = ConfirmResultSync | ConfirmResultAsync;\n\n/**\n * Normalizes custom confirm result into sync or async branch.\n */\nexport function resolveConfirmResult(\n  message: string,\n  onConfirm: Optional<(message: string) => boolean | PromiseLike<boolean>>,\n  fallbackConfirm: (message: string) => boolean\n): ConfirmResult {\n  if (!onConfirm) {\n    return { kind: \"sync\", confirmed: fallbackConfirm(message) };\n  }\n\n  const result = onConfirm(message);\n\n  if (isThenable<boolean>(result)) {\n    return { kind: \"async\", promise: Promise.resolve(result) };\n  }\n\n  return { kind: \"sync\", confirmed: result };\n}\n\n/**\n * Generates a unique blocker ID based on scope and timestamp\n *\n * @param prefix - Prefix for the ID\n * @param scope - Optional scope\n * @returns Unique blocker ID\n */\nexport function createBlockerId(prefix: string, scope?: string | Array<string>): string {\n  const scopePart = scope ? `-${isArray(scope) ? scope.join(\"-\") : scope}` : \"\";\n  const timestamp = String(Date.now());\n\n  return `${prefix}${scopePart}-${timestamp}`;\n}\n\n/**\n * Checks if a value is defined and not empty\n *\n * @param value - Value to check\n * @returns True if value is defined and not empty\n */\nexport { isDefined } from \"@okyrychenko-dev/type-utils\";\n\n/**\n * Normalizes scope to an array\n *\n * @param scope - String or array of strings\n * @returns Array of scope strings\n */\nexport function normalizeScope(scope: Optional<string | Array<string>>): Array<string> {\n  if (!scope) {\n    return [];\n  }\n\n  return isArray(scope) ? scope : [scope];\n}\n\n/** Identifies protection independently of scope order and duplicate entries. */\nexport function createScopeKey(scope: Optional<string | Array<string>>): string {\n  return JSON.stringify([...new Set(normalizeScope(scope))].sort());\n}\n","import { useIsBlocked } from \"@okyrychenko-dev/react-action-guard\";\nimport { isDefined } from \"@okyrychenko-dev/type-utils\";\nimport { useEffect, useMemo, useRef } from \"react\";\nimport { normalizeScope, resolveCondition } from \"./utils\";\n\n/**\n * Shared hook to determine if blocking should be active based on\n * condition and/or scope state.\n *\n * Pure function conditions are evaluated synchronously on every render.\n * Mutating a ref alone does not trigger a render.\n *\n * @param when - Optional condition (boolean or function)\n * @param scope - Optional scope(s) to check\n * @returns Whether blocking should be active\n *\n * @internal\n */\nexport function useShouldBlock(\n  when?: boolean | (() => boolean),\n  scope?: string | Array<string>\n): boolean {\n  // Memoize scope normalization to avoid recalculation on every render\n  const scopes = useMemo(() => normalizeScope(scope), [scope]);\n\n  // Check if any specified scopes are blocked\n  const isScopeBlocked = useIsBlocked(scopes.length === 1 ? scopes[0] : scopes);\n\n  // Development-only validation\n  const warnedMissingConditionRef = useRef(false);\n\n  useEffect(() => {\n    if (process.env.NODE_ENV !== \"development\") {\n      return;\n    }\n\n    if (!warnedMissingConditionRef.current && !isDefined(when) && !scope) {\n      warnedMissingConditionRef.current = true;\n      console.warn(\n        '[react-action-guard-router] useShouldBlock: Neither \"when\" nor \"scope\" provided. ' +\n          \"This hook will always return false. Please provide at least one condition.\"\n      );\n    }\n  }, [when, scope]);\n\n  const blockCondition = isDefined(when) && resolveCondition(when);\n\n  return blockCondition || Boolean(scope && isScopeBlocked);\n}\n","import type { ConfirmationOwner } from \"./confirmationOwner.types\";\n\nexport function createConfirmationOwner(): ConfirmationOwner {\n  let currentAttempt = 0;\n\n  function invalidate(): void {\n    currentAttempt += 1;\n  }\n\n  function begin(): () => boolean {\n    const attempt = ++currentAttempt;\n\n    function settle(): boolean {\n      if (attempt !== currentAttempt) {\n        return false;\n      }\n      invalidate();\n\n      return true;\n    }\n\n    return settle;\n  }\n\n  return { begin, invalidate };\n}\n","import { useBlocker } from \"@tanstack/react-router\";\nimport { useCallback, useEffect, useState } from \"react\";\nimport {\n  createConfirmationOwner,\n  createScopeKey,\n  resolveConfirmResult,\n  useShouldBlock,\n} from \"../core\";\nimport type { NavigationBlockerReturn } from \"../core\";\nimport type { UseNavigationBlockerOptions } from \"./types\";\n\n/** Blocks native TanStack transitions while retaining protection after confirmation. */\nexport function useNavigationBlocker(\n  options: UseNavigationBlockerOptions\n): NavigationBlockerReturn {\n  const { when, scope, message, onBlock, onAllow, blockBrowserUnload = true, onConfirm } = options;\n\n  const shouldBlock = useShouldBlock(when, scope);\n  const scopeKey = createScopeKey(scope);\n  const [confirmationOwner] = useState(createConfirmationOwner);\n\n  const { begin, invalidate } = confirmationOwner;\n\n  useEffect(() => {\n    return invalidate;\n  }, [when, scopeKey, shouldBlock, message, onConfirm, invalidate]);\n\n  const shouldBlockFn = useCallback(async () => {\n    const settle = begin();\n\n    onBlock?.();\n\n    if (!message) {\n      return true;\n    }\n\n    try {\n      const confirmation = resolveConfirmResult(message, onConfirm, (value) =>\n        window.confirm(value)\n      );\n      let confirmed: boolean;\n\n      if (confirmation.kind === \"async\") {\n        confirmed = await confirmation.promise;\n      } else {\n        confirmed = confirmation.confirmed;\n      }\n\n      if (!settle() || !confirmed) {\n        return true;\n      }\n\n      onAllow?.();\n\n      return false;\n    } catch {\n      return true;\n    }\n  }, [message, onBlock, onAllow, onConfirm, begin]);\n\n  useBlocker({\n    shouldBlockFn,\n    enableBeforeUnload: blockBrowserUnload && shouldBlock,\n    disabled: !shouldBlock,\n  });\n\n  return { isBlocking: shouldBlock };\n}\n"]}

package/dist/tanstack-router/index.d.cts

@@ -1,4 +1,4 @@
-import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from '../types-C3CPuZip.cjs';
+import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from '../types-xxRwsJ1N.cjs';
 
 /**
  * Options for TanStack Router navigation blocker
@@ -8,68 +8,7 @@ import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from
  */
 type UseNavigationBlockerOptions = BaseNavigationBlockerOptions;
 
-/**
- * Blocks navigation in TanStack Router applications based on conditions or scope state.
- *
- * This hook integrates with TanStack Router's history blocking mechanism and
- * react-action-guard's scope system to prevent navigation when certain conditions
- * are met or when specific scopes are blocked.
- *
- * **Features:**
- * - Block navigation based on boolean condition or function
- * - Automatically block when react-action-guard scopes are active
- * - Support for browser `beforeunload` event (tab close/refresh)
- * - Customizable confirmation dialog
- * - Callbacks for block/allow events
- *
- * @param options - Configuration options
- * @returns Object with `isBlocking` state
- *
- * @example
- * ```tsx
- * // Block based on scope
- * function EditForm() {
- *   useNavigationBlocker({
- *     scope: 'form',
- *     message: 'You have unsaved changes. Leave anyway?',
- *   });
- *
- *   return <form>...</form>;
- * }
- * ```
- *
- * @example
- * ```tsx
- * // Block based on condition
- * function UnsavedChanges() {
- *   const [hasChanges, setHasChanges] = useState(false);
- *
- *   useNavigationBlocker({
- *     when: hasChanges,
- *     message: 'Discard changes?',
- *     onBlock: () => console.log('Navigation blocked'),
- *   });
- * }
- * ```
- *
- * @example
- * ```tsx
- * // Type-safe with scopes
- * import { createTypedHooks } from '@okyrychenko-dev/react-action-guard';
- *
- * type AppScopes = 'global' | 'form' | 'checkout';
- * const { useBlocker } = createTypedHooks<AppScopes>();
- *
- * function MyComponent() {
- *   useBlocker('blocker-id', { scope: 'form' });
- *
- *   useNavigationBlocker({
- *     scope: 'form', // Type-safe!
- *     message: 'Leave?',
- *   });
- * }
- * ```
- */
+/** Blocks native TanStack transitions while retaining protection after confirmation. */
 declare function useNavigationBlocker(options: UseNavigationBlockerOptions): NavigationBlockerReturn;
 
 export { type UseNavigationBlockerOptions, useNavigationBlocker };

package/dist/tanstack-router/index.d.ts

@@ -1,4 +1,4 @@
-import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from '../types-C3CPuZip.js';
+import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from '../types-xxRwsJ1N.js';
 
 /**
  * Options for TanStack Router navigation blocker
@@ -8,68 +8,7 @@ import { B as BaseNavigationBlockerOptions, N as NavigationBlockerReturn } from
  */
 type UseNavigationBlockerOptions = BaseNavigationBlockerOptions;
 
-/**
- * Blocks navigation in TanStack Router applications based on conditions or scope state.
- *
- * This hook integrates with TanStack Router's history blocking mechanism and
- * react-action-guard's scope system to prevent navigation when certain conditions
- * are met or when specific scopes are blocked.
- *
- * **Features:**
- * - Block navigation based on boolean condition or function
- * - Automatically block when react-action-guard scopes are active
- * - Support for browser `beforeunload` event (tab close/refresh)
- * - Customizable confirmation dialog
- * - Callbacks for block/allow events
- *
- * @param options - Configuration options
- * @returns Object with `isBlocking` state
- *
- * @example
- * ```tsx
- * // Block based on scope
- * function EditForm() {
- *   useNavigationBlocker({
- *     scope: 'form',
- *     message: 'You have unsaved changes. Leave anyway?',
- *   });
- *
- *   return <form>...</form>;
- * }
- * ```
- *
- * @example
- * ```tsx
- * // Block based on condition
- * function UnsavedChanges() {
- *   const [hasChanges, setHasChanges] = useState(false);
- *
- *   useNavigationBlocker({
- *     when: hasChanges,
- *     message: 'Discard changes?',
- *     onBlock: () => console.log('Navigation blocked'),
- *   });
- * }
- * ```
- *
- * @example
- * ```tsx
- * // Type-safe with scopes
- * import { createTypedHooks } from '@okyrychenko-dev/react-action-guard';
- *
- * type AppScopes = 'global' | 'form' | 'checkout';
- * const { useBlocker } = createTypedHooks<AppScopes>();
- *
- * function MyComponent() {
- *   useBlocker('blocker-id', { scope: 'form' });
- *
- *   useNavigationBlocker({
- *     scope: 'form', // Type-safe!
- *     message: 'Leave?',
- *   });
- * }
- * ```
- */
+/** Blocks native TanStack transitions while retaining protection after confirmation. */
 declare function useNavigationBlocker(options: UseNavigationBlockerOptions): NavigationBlockerReturn;
 
 export { type UseNavigationBlockerOptions, useNavigationBlocker };

package/dist/tanstack-router/index.js

@@ -1,19 +1,18 @@
-import { useRouter } from '@tanstack/react-router';
-import { useEffect, useMemo, useRef } from 'react';
+import { useBlocker } from '@tanstack/react-router';
+import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
+import { isDefined, isArray, isFunction, isObject } from '@okyrychenko-dev/type-utils';
 import { useIsBlocked } from '@okyrychenko-dev/react-action-guard';
 
 // src/tanstack-router/useNavigationBlocker.ts
-
-// src/core/utils.ts
 function resolveCondition(condition) {
-  return typeof condition === "function" ? condition() : condition;
+  return isFunction(condition) ? condition() : condition;
 }
-var hasThen = (value) => typeof value === "object" && value !== null && "then" in value;
+var hasThen = (value) => isObject(value) && "then" in value;
 function isThenable(value) {
   if (!hasThen(value)) {
     return false;
   }
-  return typeof value.then === "function";
+  return isFunction(value.then);
 }
 function resolveConfirmResult(message, onConfirm, fallbackConfirm) {
   if (!onConfirm) {
@@ -25,41 +24,19 @@ function resolveConfirmResult(message, onConfirm, fallbackConfirm) {
   }
   return { kind: "sync", confirmed: result };
 }
-function isDefined(value) {
-  return value !== void 0 && value !== null;
-}
 function normalizeScope(scope) {
   if (!scope) {
     return [];
   }
-  return Array.isArray(scope) ? scope : [scope];
+  return isArray(scope) ? scope : [scope];
 }
-
-// src/core/useBeforeUnload.ts
-var DEFAULT_UNLOAD_MESSAGE = "Changes you made may not be saved.";
-function useBeforeUnload(when, message = DEFAULT_UNLOAD_MESSAGE) {
-  useEffect(() => {
-    const shouldBlock = resolveCondition(when);
-    if (!shouldBlock) {
-      return;
-    }
-    const handleBeforeUnload = (event) => {
-      event.preventDefault();
-      if ("returnValue" in event) {
-        event.returnValue = message;
-      }
-    };
-    window.addEventListener("beforeunload", handleBeforeUnload);
-    return () => {
-      window.removeEventListener("beforeunload", handleBeforeUnload);
-    };
-  }, [when, message]);
+function createScopeKey(scope) {
+  return JSON.stringify([...new Set(normalizeScope(scope))].sort());
 }
 function useShouldBlock(when, scope) {
   const scopes = useMemo(() => normalizeScope(scope), [scope]);
   const isScopeBlocked = useIsBlocked(scopes.length === 1 ? scopes[0] : scopes);
   const warnedMissingConditionRef = useRef(false);
-  const warnedFunctionRef = useRef(false);
   useEffect(() => {
     if (process.env.NODE_ENV !== "development") {
       return;
@@ -70,99 +47,74 @@ function useShouldBlock(when, scope) {
         '[react-action-guard-router] useShouldBlock: Neither "when" nor "scope" provided. This hook will always return false. Please provide at least one condition.'
       );
     }
-    if (!warnedFunctionRef.current && typeof when === "function") {
-      warnedFunctionRef.current = true;
-      console.warn(
-        '[react-action-guard-router] useShouldBlock: "when" is a function. Make sure to wrap it with useCallback to avoid unnecessary re-computations.'
-      );
-    }
   }, [when, scope]);
-  const shouldBlock = useMemo(() => {
-    let blockCondition = false;
-    if (isDefined(when)) {
-      blockCondition = resolveCondition(when);
-    }
-    if (scope && isScopeBlocked) {
-      blockCondition = true;
-    }
-    return blockCondition;
-  }, [when, scope, isScopeBlocked]);
-  return shouldBlock;
+  const blockCondition = isDefined(when) && resolveCondition(when);
+  return blockCondition || Boolean(scope && isScopeBlocked);
 }
 
-// src/tanstack-router/useNavigationBlocker.ts
-var hasBlockingHistory = (value) => {
-  if (!value || typeof value !== "object") {
-    return false;
-  }
-  if (!("history" in value)) {
-    return false;
+// src/core/confirmationOwner.utils.ts
+function createConfirmationOwner() {
+  let currentAttempt = 0;
+  function invalidate() {
+    currentAttempt += 1;
   }
-  const history = value.history;
-  if (!history || typeof history !== "object") {
-    return false;
-  }
-  if (!("block" in history)) {
-    return false;
-  }
-  return typeof history.block === "function";
-};
-var hasRetry = (value) => typeof value.retry === "function";
-var attemptRetry = (update) => {
-  if (hasRetry(update)) {
-    try {
-      update.retry();
-    } catch {
+  function begin() {
+    const attempt = ++currentAttempt;
+    function settle() {
+      if (attempt !== currentAttempt) {
+        return false;
+      }
+      invalidate();
+      return true;
     }
+    return settle;
   }
-};
+  return { begin, invalidate };
+}
+
+// src/tanstack-router/useNavigationBlocker.ts
 function useNavigationBlocker(options) {
   const { when, scope, message, onBlock, onAllow, blockBrowserUnload = true, onConfirm } = options;
-  const router = useRouter();
   const shouldBlock = useShouldBlock(when, scope);
+  const scopeKey = createScopeKey(scope);
+  const [confirmationOwner] = useState(createConfirmationOwner);
+  const { begin, invalidate } = confirmationOwner;
   useEffect(() => {
-    if (!shouldBlock || !hasBlockingHistory(router)) {
-      return;
+    return invalidate;
+  }, [when, scopeKey, shouldBlock, message, onConfirm, invalidate]);
+  const shouldBlockFn = useCallback(async () => {
+    const settle = begin();
+    onBlock?.();
+    if (!message) {
+      return true;
     }
-    const unblock = router.history.block((update) => {
-      if (!message) {
-        return;
-      }
-      onBlock?.();
+    try {
       const confirmation = resolveConfirmResult(
         message,
         onConfirm,
         (value) => window.confirm(value)
       );
+      let confirmed;
       if (confirmation.kind === "async") {
-        confirmation.promise.then((confirmed) => {
-          if (confirmed) {
-            onAllow?.();
-            unblock();
-            attemptRetry(update);
-          }
-        }).catch((error) => {
-          unblock();
-          if (process.env.NODE_ENV !== "production") {
-            console.error("[react-action-guard-router] Confirmation error:", error);
-          }
-        });
-        return;
+        confirmed = await confirmation.promise;
+      } else {
+        confirmed = confirmation.confirmed;
       }
-      if (confirmation.confirmed) {
-        onAllow?.();
-        unblock();
-        attemptRetry(update);
+      if (!settle() || !confirmed) {
+        return true;
       }
-    });
-    return () => {
-      unblock();
-    };
-  }, [shouldBlock, message, onBlock, onAllow, router, onConfirm]);
-  useBeforeUnload(blockBrowserUnload && shouldBlock, message ?? DEFAULT_UNLOAD_MESSAGE);
-  return {
-    isBlocking: shouldBlock
-  };
+      onAllow?.();
+      return false;
+    } catch {
+      return true;
+    }
+  }, [message, onBlock, onAllow, onConfirm, begin]);
+  useBlocker({
+    shouldBlockFn,
+    enableBeforeUnload: blockBrowserUnload && shouldBlock,
+    disabled: !shouldBlock
+  });
+  return { isBlocking: shouldBlock };
 }
 
 export { useNavigationBlocker };