@takazudo/zfb-runtime 2.10.1 → 2.12.0

package/dist/client-router/events.d.ts

@@ -37,5 +37,11 @@ export declare const updateScrollPosition: (positions: {
     scrollX: number;
     scrollY: number;
 }) => void;
-export declare function doSwap(afterPreparation: BeforeEvent, viewTransition: ViewTransition, afterDispatch?: () => Promise<void>): Promise<TransitionBeforeSwapEvent>;
+export declare function doSwap(afterPreparation: BeforeEvent, viewTransition: ViewTransition, afterDispatch?: () => Promise<void>, beforeSwap?: (event: TransitionBeforeSwapEvent) => void): Promise<{
+    swapped: false;
+    event: TransitionBeforeSwapEvent;
+} | {
+    swapped: true;
+    event: TransitionBeforeSwapEvent;
+}>;
 export {};

package/dist/client-router/events.js

@@ -103,13 +103,20 @@ export const updateScrollPosition = (positions) => {
         safeReplaceState({ ...history.state, ...positions }, "");
     }
 };
-export async function doSwap(afterPreparation, viewTransition, afterDispatch) {
+export async function doSwap(afterPreparation, viewTransition, afterDispatch, beforeSwap) {
     const event = new TransitionBeforeSwapEvent(afterPreparation, viewTransition);
     document.dispatchEvent(event);
     if (afterDispatch) {
         await afterDispatch();
     }
+    if (event.signal.aborted) {
+        return { swapped: false, event };
+    }
+    // This callback and event.swap() deliberately form one synchronous commit
+    // section. Once teardown starts, the navigation must finish even if an
+    // observer aborts its signal from inside an overridden swap().
+    beforeSwap?.(event);
     event.swap();
-    return event;
+    return { swapped: true, event };
 }
 //# sourceMappingURL=events.js.map

package/dist/client-router/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/client-router/events.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAG3C,MAAM,CAAC,MAAM,6BAA6B,GAAG,wBAAwB,CAAC;AACtE,MAAM,CAAC,MAAM,4BAA4B,GAAG,uBAAuB,CAAC;AACpE,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,gBAAgB,CAAC;AACtD,MAAM,CAAC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AACpD,MAAM,CAAC,MAAM,6BAA6B,GAAG,wBAAwB,CAAC;AAOtE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACtF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAY,SAAQ,KAAK;IACpB,IAAI,CAAM;IACnB,EAAE,CAAM;IACR,SAAS,CAAqB;IACrB,cAAc,CAAuB;IACrC,aAAa,CAAsB;IACnC,IAAI,CAAM;IACnB,WAAW,CAAW;IACb,MAAM,CAAc;IAE7B,YACE,IAAY,EACZ,aAAoC,EACpC,IAAS,EACT,EAAO,EACP,SAA6B,EAC7B,cAAoC,EACpC,aAAkC,EAClC,IAAS,EACT,WAAqB,EACrB,MAAmB;QAEnB,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAC5B,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC1B,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxC,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC/C,cAAc,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YACpC,aAAa,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YACnC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC1B,WAAW,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;YACjD,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,KAAU,EACiC,EAAE,CAC7C,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,6BAA6B,CAAC;AAC9F,MAAM,OAAO,gCAAiC,SAAQ,WAAW;IAC/D,QAAQ,CAAuB;IAC/B,MAAM,CAAsB;IAC5B,YACE,IAAS,EACT,EAAO,EACP,SAA6B,EAC7B,cAAoC,EACpC,aAAkC,EAClC,IAAS,EACT,WAAqB,EACrB,MAAmB,EACnB,QAA8B,EAC9B,MAAkE;QAElE,KAAK,CACH,6BAA6B,EAC7B,EAAE,UAAU,EAAE,IAAI,EAAE,EACpB,IAAI,EACJ,EAAE,EACF,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,EACJ,WAAW,EACX,MAAM,CACP,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC9B,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC;CACF;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,KAAU,EAAsC,EAAE,CAC5F,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB,CAAC;AACvF,MAAM,OAAO,yBAA0B,SAAQ,WAAW;IACtC,SAAS,CAAqB;IACvC,cAAc,CAAiB;IACxC,IAAI,CAAa;IAEjB,YAAY,gBAA6B,EAAE,cAA8B;QACvE,KAAK,CACH,sBAAsB,EACtB,SAAS,EACT,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,EAAE,EACnB,gBAAgB,CAAC,SAAS,EAC1B,gBAAgB,CAAC,cAAc,EAC/B,gBAAgB,CAAC,aAAa,EAC9B,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,WAAW,EAC5B,gBAAgB,CAAC,MAAM,CACxB,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;QAC5C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEzC,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE;YAC5B,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC/B,cAAc,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YACpC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SAC3C,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAS,EACT,EAAO,EACP,SAA6B,EAC7B,cAAoC,EACpC,aAAkC,EAClC,IAAS,EACT,MAAmB,EACnB,QAA8B,EAC9B,aAAyE;IAEzE,MAAM,KAAK,GAAG,IAAI,gCAAgC,CAChD,IAAI,EACJ,EAAE,EACF,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,EACJ,MAAM,CAAC,QAAQ,EACf,MAAM,EACN,QAAQ,EACR,aAAa,CACd,CAAC;IACF,IAAI,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC5B,YAAY,CAAC,uBAAuB,CAAC,CAAC;YACtC,IAAI,KAAK,CAAC,cAAc,KAAK,UAAU,EAAE,CAAC;gBACxC,2FAA2F;gBAC3F,oBAAoB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,qDAAqD;AACrD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAA+C,EAAE,EAAE;IACtF,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,CAAC,iBAAiB,GAAG,QAAQ,CAAC;QACrC,gBAAgB,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,gBAA6B,EAC7B,cAA8B,EAC9B,aAAmC;IAEnC,MAAM,KAAK,GAAG,IAAI,yBAAyB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC9E,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,aAAa,EAAE,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,IAAI,EAAE,CAAC;IACb,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/// <reference lib=\"dom\" />\nimport { safeReplaceState } from \"./history-safe.js\";\nimport { swap } from \"./swap-functions.js\";\nimport type { Direction, NavigationTypeString } from \"./types.js\";\n\nexport const TRANSITION_BEFORE_PREPARATION = \"zfb:before-preparation\";\nexport const TRANSITION_AFTER_PREPARATION = \"zfb:after-preparation\";\nexport const TRANSITION_BEFORE_SWAP = \"zfb:before-swap\";\nexport const TRANSITION_AFTER_SWAP = \"zfb:after-swap\";\nexport const TRANSITION_PAGE_LOAD = \"zfb:page-load\";\nexport const TRANSITION_NAVIGATION_ABORTED = \"zfb:navigation-aborted\";\n\ntype Events =\n  | \"zfb:after-preparation\"\n  | \"zfb:after-swap\"\n  | \"zfb:page-load\"\n  | \"zfb:navigation-aborted\";\nexport const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));\nexport const onPageLoad = () => triggerEvent(\"zfb:page-load\");\n\n/*\n * Common stuff\n */\nclass BeforeEvent extends Event {\n  readonly from: URL;\n  to: URL;\n  direction: Direction | string;\n  readonly navigationType: NavigationTypeString;\n  readonly sourceElement: Element | undefined;\n  readonly info: any;\n  newDocument: Document;\n  readonly signal: AbortSignal;\n\n  constructor(\n    type: string,\n    eventInitDict: EventInit | undefined,\n    from: URL,\n    to: URL,\n    direction: Direction | string,\n    navigationType: NavigationTypeString,\n    sourceElement: Element | undefined,\n    info: any,\n    newDocument: Document,\n    signal: AbortSignal,\n  ) {\n    super(type, eventInitDict);\n    this.from = from;\n    this.to = to;\n    this.direction = direction;\n    this.navigationType = navigationType;\n    this.sourceElement = sourceElement;\n    this.info = info;\n    this.newDocument = newDocument;\n    this.signal = signal;\n\n    Object.defineProperties(this, {\n      from: { enumerable: true },\n      to: { enumerable: true, writable: true },\n      direction: { enumerable: true, writable: true },\n      navigationType: { enumerable: true },\n      sourceElement: { enumerable: true },\n      info: { enumerable: true },\n      newDocument: { enumerable: true, writable: true },\n      signal: { enumerable: true },\n    });\n  }\n}\n\n/*\n * TransitionBeforePreparationEvent\n\n */\nexport const isTransitionBeforePreparationEvent = (\n  value: any,\n): value is TransitionBeforePreparationEvent =>\n  typeof value === \"object\" && value !== null && value.type === TRANSITION_BEFORE_PREPARATION;\nexport class TransitionBeforePreparationEvent extends BeforeEvent {\n  formData: FormData | undefined;\n  loader: () => Promise<void>;\n  constructor(\n    from: URL,\n    to: URL,\n    direction: Direction | string,\n    navigationType: NavigationTypeString,\n    sourceElement: Element | undefined,\n    info: any,\n    newDocument: Document,\n    signal: AbortSignal,\n    formData: FormData | undefined,\n    loader: (event: TransitionBeforePreparationEvent) => Promise<void>,\n  ) {\n    super(\n      TRANSITION_BEFORE_PREPARATION,\n      { cancelable: true },\n      from,\n      to,\n      direction,\n      navigationType,\n      sourceElement,\n      info,\n      newDocument,\n      signal,\n    );\n    this.formData = formData;\n    this.loader = loader.bind(this, this);\n    Object.defineProperties(this, {\n      formData: { enumerable: true },\n      loader: { enumerable: true, writable: true },\n    });\n  }\n}\n\n/*\n * TransitionBeforeSwapEvent\n */\nexport const isTransitionBeforeSwapEvent = (value: any): value is TransitionBeforeSwapEvent =>\n  typeof value === \"object\" && value !== null && value.type === TRANSITION_BEFORE_SWAP;\nexport class TransitionBeforeSwapEvent extends BeforeEvent {\n  override readonly direction: Direction | string;\n  readonly viewTransition: ViewTransition;\n  swap: () => void;\n\n  constructor(afterPreparation: BeforeEvent, viewTransition: ViewTransition) {\n    super(\n      TRANSITION_BEFORE_SWAP,\n      undefined,\n      afterPreparation.from,\n      afterPreparation.to,\n      afterPreparation.direction,\n      afterPreparation.navigationType,\n      afterPreparation.sourceElement,\n      afterPreparation.info,\n      afterPreparation.newDocument,\n      afterPreparation.signal,\n    );\n    this.direction = afterPreparation.direction;\n    this.viewTransition = viewTransition;\n    this.swap = () => swap(this.newDocument);\n\n    Object.defineProperties(this, {\n      direction: { enumerable: true },\n      viewTransition: { enumerable: true },\n      swap: { enumerable: true, writable: true },\n    });\n  }\n}\n\nexport async function doPreparation(\n  from: URL,\n  to: URL,\n  direction: Direction | string,\n  navigationType: NavigationTypeString,\n  sourceElement: Element | undefined,\n  info: any,\n  signal: AbortSignal,\n  formData: FormData | undefined,\n  defaultLoader: (event: TransitionBeforePreparationEvent) => Promise<void>,\n) {\n  const event = new TransitionBeforePreparationEvent(\n    from,\n    to,\n    direction,\n    navigationType,\n    sourceElement,\n    info,\n    window.document,\n    signal,\n    formData,\n    defaultLoader,\n  );\n  if (document.dispatchEvent(event)) {\n    await event.loader();\n    if (!event.defaultPrevented) {\n      triggerEvent(\"zfb:after-preparation\");\n      if (event.navigationType !== \"traverse\") {\n        // save the current scroll position before we change the DOM and transition to the new page\n        updateScrollPosition({ scrollX, scrollY });\n      }\n    }\n  }\n  return event;\n}\n\n// only update history entries that are managed by us\n// leave other entries alone and do not accidentally add state.\nexport const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) => {\n  if (history.state) {\n    history.scrollRestoration = \"manual\";\n    safeReplaceState({ ...history.state, ...positions }, \"\");\n  }\n};\n\nexport async function doSwap(\n  afterPreparation: BeforeEvent,\n  viewTransition: ViewTransition,\n  afterDispatch?: () => Promise<void>,\n) {\n  const event = new TransitionBeforeSwapEvent(afterPreparation, viewTransition);\n  document.dispatchEvent(event);\n  if (afterDispatch) {\n    await afterDispatch();\n  }\n  event.swap();\n  return event;\n}\n"]}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/client-router/events.ts"],"names":[],"mappings":"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","sourcesContent":["/// <reference lib=\"dom\" />\nimport { safeReplaceState } from \"./history-safe.js\";\nimport { swap } from \"./swap-functions.js\";\nimport type { Direction, NavigationTypeString } from \"./types.js\";\n\nexport const TRANSITION_BEFORE_PREPARATION = \"zfb:before-preparation\";\nexport const TRANSITION_AFTER_PREPARATION = \"zfb:after-preparation\";\nexport const TRANSITION_BEFORE_SWAP = \"zfb:before-swap\";\nexport const TRANSITION_AFTER_SWAP = \"zfb:after-swap\";\nexport const TRANSITION_PAGE_LOAD = \"zfb:page-load\";\nexport const TRANSITION_NAVIGATION_ABORTED = \"zfb:navigation-aborted\";\n\ntype Events =\n  | \"zfb:after-preparation\"\n  | \"zfb:after-swap\"\n  | \"zfb:page-load\"\n  | \"zfb:navigation-aborted\";\nexport const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));\nexport const onPageLoad = () => triggerEvent(\"zfb:page-load\");\n\n/*\n * Common stuff\n */\nclass BeforeEvent extends Event {\n  readonly from: URL;\n  to: URL;\n  direction: Direction | string;\n  readonly navigationType: NavigationTypeString;\n  readonly sourceElement: Element | undefined;\n  readonly info: any;\n  newDocument: Document;\n  readonly signal: AbortSignal;\n\n  constructor(\n    type: string,\n    eventInitDict: EventInit | undefined,\n    from: URL,\n    to: URL,\n    direction: Direction | string,\n    navigationType: NavigationTypeString,\n    sourceElement: Element | undefined,\n    info: any,\n    newDocument: Document,\n    signal: AbortSignal,\n  ) {\n    super(type, eventInitDict);\n    this.from = from;\n    this.to = to;\n    this.direction = direction;\n    this.navigationType = navigationType;\n    this.sourceElement = sourceElement;\n    this.info = info;\n    this.newDocument = newDocument;\n    this.signal = signal;\n\n    Object.defineProperties(this, {\n      from: { enumerable: true },\n      to: { enumerable: true, writable: true },\n      direction: { enumerable: true, writable: true },\n      navigationType: { enumerable: true },\n      sourceElement: { enumerable: true },\n      info: { enumerable: true },\n      newDocument: { enumerable: true, writable: true },\n      signal: { enumerable: true },\n    });\n  }\n}\n\n/*\n * TransitionBeforePreparationEvent\n\n */\nexport const isTransitionBeforePreparationEvent = (\n  value: any,\n): value is TransitionBeforePreparationEvent =>\n  typeof value === \"object\" && value !== null && value.type === TRANSITION_BEFORE_PREPARATION;\nexport class TransitionBeforePreparationEvent extends BeforeEvent {\n  formData: FormData | undefined;\n  loader: () => Promise<void>;\n  constructor(\n    from: URL,\n    to: URL,\n    direction: Direction | string,\n    navigationType: NavigationTypeString,\n    sourceElement: Element | undefined,\n    info: any,\n    newDocument: Document,\n    signal: AbortSignal,\n    formData: FormData | undefined,\n    loader: (event: TransitionBeforePreparationEvent) => Promise<void>,\n  ) {\n    super(\n      TRANSITION_BEFORE_PREPARATION,\n      { cancelable: true },\n      from,\n      to,\n      direction,\n      navigationType,\n      sourceElement,\n      info,\n      newDocument,\n      signal,\n    );\n    this.formData = formData;\n    this.loader = loader.bind(this, this);\n    Object.defineProperties(this, {\n      formData: { enumerable: true },\n      loader: { enumerable: true, writable: true },\n    });\n  }\n}\n\n/*\n * TransitionBeforeSwapEvent\n */\nexport const isTransitionBeforeSwapEvent = (value: any): value is TransitionBeforeSwapEvent =>\n  typeof value === \"object\" && value !== null && value.type === TRANSITION_BEFORE_SWAP;\nexport class TransitionBeforeSwapEvent extends BeforeEvent {\n  override readonly direction: Direction | string;\n  readonly viewTransition: ViewTransition;\n  swap: () => void;\n\n  constructor(afterPreparation: BeforeEvent, viewTransition: ViewTransition) {\n    super(\n      TRANSITION_BEFORE_SWAP,\n      undefined,\n      afterPreparation.from,\n      afterPreparation.to,\n      afterPreparation.direction,\n      afterPreparation.navigationType,\n      afterPreparation.sourceElement,\n      afterPreparation.info,\n      afterPreparation.newDocument,\n      afterPreparation.signal,\n    );\n    this.direction = afterPreparation.direction;\n    this.viewTransition = viewTransition;\n    this.swap = () => swap(this.newDocument);\n\n    Object.defineProperties(this, {\n      direction: { enumerable: true },\n      viewTransition: { enumerable: true },\n      swap: { enumerable: true, writable: true },\n    });\n  }\n}\n\nexport async function doPreparation(\n  from: URL,\n  to: URL,\n  direction: Direction | string,\n  navigationType: NavigationTypeString,\n  sourceElement: Element | undefined,\n  info: any,\n  signal: AbortSignal,\n  formData: FormData | undefined,\n  defaultLoader: (event: TransitionBeforePreparationEvent) => Promise<void>,\n) {\n  const event = new TransitionBeforePreparationEvent(\n    from,\n    to,\n    direction,\n    navigationType,\n    sourceElement,\n    info,\n    window.document,\n    signal,\n    formData,\n    defaultLoader,\n  );\n  if (document.dispatchEvent(event)) {\n    await event.loader();\n    if (!event.defaultPrevented) {\n      triggerEvent(\"zfb:after-preparation\");\n      if (event.navigationType !== \"traverse\") {\n        // save the current scroll position before we change the DOM and transition to the new page\n        updateScrollPosition({ scrollX, scrollY });\n      }\n    }\n  }\n  return event;\n}\n\n// only update history entries that are managed by us\n// leave other entries alone and do not accidentally add state.\nexport const updateScrollPosition = (positions: { scrollX: number; scrollY: number }) => {\n  if (history.state) {\n    history.scrollRestoration = \"manual\";\n    safeReplaceState({ ...history.state, ...positions }, \"\");\n  }\n};\n\nexport async function doSwap(\n  afterPreparation: BeforeEvent,\n  viewTransition: ViewTransition,\n  afterDispatch?: () => Promise<void>,\n  beforeSwap?: (event: TransitionBeforeSwapEvent) => void,\n) {\n  const event = new TransitionBeforeSwapEvent(afterPreparation, viewTransition);\n  document.dispatchEvent(event);\n  if (afterDispatch) {\n    await afterDispatch();\n  }\n  if (event.signal.aborted) {\n    return { swapped: false as const, event };\n  }\n  // This callback and event.swap() deliberately form one synchronous commit\n  // section. Once teardown starts, the navigation must finish even if an\n  // observer aborts its signal from inside an overridden swap().\n  beforeSwap?.(event);\n  event.swap();\n  return { swapped: true as const, event };\n}\n"]}

package/dist/client-router/router.js

@@ -56,8 +56,8 @@ import { safePushState, safeReplaceState } from "./history-safe.js";
 import { detectScriptExecuted } from "./swap-functions.js";
 // Island re-bootstrap and deferred-cancel after body swap (W1B §12.2, §12.5).
 // mountNewIslands() is called after runScripts() and before onPageLoad().
-// cancelPendingIslands() is called before doSwap() so deferred callbacks
-// (rIC/IntersectionObserver) do not fire against orphan elements.
+// cancelPendingIslands() and unmountIslands() run inside doSwap()'s synchronous
+// commit section so deferred callbacks cannot fire against orphan elements.
 import { cancelPendingIslands, mountNewIslands, unmountIslands } from "@takazudo/zfb/runtime";
 // Adapter-specific internal fetch headers. zfb adapters do not currently expose this
 // contract — the empty object preserves the call-shape so the loop in fetchHTML is a
@@ -460,7 +460,7 @@ function preloadStyleLinks(newDocument) {
 // if !popstate, update the history entry and scroll position according to toLocation
 // if popState is given, this holds the scroll position for history navigation
 // if fallback === "animate" then simulate view transitions
-async function updateDOM(preparationEvent, options, currentTransition, historyState, fallback, 
+async function updateDOM(preparationEvent, options, currentNavigation, currentTransition, historyState, fallback, 
 // Forwarded to moveToLocation() — see its parameter doc. #1398.
 historyCommittedEarly = false) {
     async function animate(phase) {
@@ -493,40 +493,71 @@ historyCommittedEarly = false) {
             }
         }
     };
+    const finishAbortedUpdate = () => {
+        notifyNavigationAborted(currentNavigation);
+        // Simulation owns its `finished` promise explicitly. Resolve it on the
+        // no-swap path so transition cleanup still runs.
+        currentTransition.viewTransitionFinished?.();
+        return "aborted";
+    };
+    // A newer navigation or popstate may have won after preparation/history
+    // commit but before the update callback started.
+    if (preparationEvent.signal.aborted)
+        return finishAbortedUpdate();
     const pageTitleForBrowserHistory = document.title; // document.title will be overridden by swap()
-    // Cancel deferred-hydration callbacks for old-body islands before the swap
-    // so rIC / IntersectionObserver fires do not run against orphan elements.
-    // Called before doSwap() which dispatches `zfb:before-swap` then mutates the DOM.
-    cancelPendingIslands();
-    // Unmount mounted islands on the OLD body before the swap so Preact/React
-    // trees receive render(null, element) / root.unmount() and their useEffect
-    // cleanups fire. Must happen after cancelPendingIslands() and before doSwap()
-    // so document.body still points to the old body.
-    //
-    // Pass the incoming body so unmountIslands can SKIP islands that swapBodyElement
-    // will lift into the new body (a persisted marker matched on both sides). Those
-    // nodes are physically moved, not discarded, so their component instance and
-    // state must survive the swap — unmounting them here would empty the container
-    // before the lift and defeat data-zfb-transition-persist entirely (issue #1389).
-    unmountIslands(document.body, preparationEvent.newDocument.body);
-    const swapEvent = await doSwap(preparationEvent, currentTransition.viewTransition, animateFallbackOld);
+    const swapResult = await doSwap(preparationEvent, currentTransition.viewTransition, animateFallbackOld, () => {
+        // Teardown and swap are a synchronous point-of-no-return. doSwap checks
+        // the signal after the animation await and invokes this callback only for
+        // a navigation that still owns the commit.
+        currentNavigation.domCommitStarted = true;
+        cancelPendingIslands();
+        // Unmount mounted islands on the OLD body before the swap so Preact/React
+        // trees receive render(null, element) / root.unmount() and their useEffect
+        // cleanups fire. Pass the incoming body so persisted islands are kept.
+        unmountIslands(document.body, preparationEvent.newDocument.body);
+    });
+    if (!swapResult.swapped)
+        return finishAbortedUpdate();
+    const swapEvent = swapResult.event;
     moveToLocation(swapEvent.to, swapEvent.from, options, pageTitleForBrowserHistory, historyState, historyCommittedEarly);
     triggerEvent("zfb:after-swap");
     // Resolve the finished promise of the simulation's ViewTransition.
     // For 'animate', wait for the new-page animation to complete first.
     // For other fallback modes (e.g. 'swap'), resolve immediately — no animation needed.
-    if (fallback === "animate" && !currentTransition.transitionSkipped && !swapEvent.signal.aborted) {
+    if (fallback === "animate" && !currentTransition.transitionSkipped) {
         animate("new").finally(() => currentTransition.viewTransitionFinished());
     }
     else {
         currentTransition.viewTransitionFinished?.();
     }
+    return "swapped";
+}
+function notifyNavigationAborted(navigation) {
+    // From island teardown onward the navigation is committed and must finish,
+    // even if an overridden event.swap() synchronously starts a newer one.
+    if (navigation.domCommitStarted || navigation.abortEventEmitted)
+        return;
+    navigation.abortEventEmitted = true;
+    triggerEvent("zfb:navigation-aborted");
 }
 function abortAndRecreateMostRecentNavigation() {
-    mostRecentNavigation?.controller.abort();
-    return (mostRecentNavigation = {
+    const previousNavigation = mostRecentNavigation;
+    const nextNavigation = {
         controller: new AbortController(),
-    });
+        domCommitStarted: false,
+        abortEventEmitted: false,
+    };
+    // Install the new owner before abort/event dispatch. Either operation can
+    // synchronously re-enter navigate(); that newer call must remain the winner.
+    mostRecentNavigation = nextNavigation;
+    if (previousNavigation) {
+        previousNavigation.controller.abort();
+        // Native View Transitions may settle updateCallbackDone without ever
+        // invoking the skipped update callback. Emit here so updateDOM is not the
+        // only observer of a real pre-commit abort.
+        notifyNavigationAborted(previousNavigation);
+    }
+    return nextNavigation;
 }
 async function transition(direction, from, to, options, historyState, hasUAVisualTransition = false) {
     // The most recent navigation always has precedence
@@ -535,6 +566,10 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
     // e.g. by calling navigate() from a transition event.
     // Invariant: all but the most recent navigation are already aborted.
     const currentNavigation = abortAndRecreateMostRecentNavigation();
+    // Emitting the previous navigation's abort event is synchronous. A listener
+    // may have started an even newer navigation before this call resumes.
+    if (currentNavigation.controller.signal.aborted)
+        return;
     // not ours
     if (!transitionEnabledOnThisPage() || location.origin !== to.origin) {
         if (currentNavigation === mostRecentNavigation)
@@ -567,7 +602,7 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
     if (prepEvent.defaultPrevented || prepEvent.signal.aborted) {
         if (currentNavigation === mostRecentNavigation)
             mostRecentNavigation = undefined;
-        triggerEvent("zfb:navigation-aborted");
+        notifyNavigationAborted(currentNavigation);
         if (!prepEvent.signal.aborted) {
             // not aborted -> delegate to browser
             location.href = to.href;
@@ -671,6 +706,7 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
     if (prepEvent.signal.aborted) {
         if (currentNavigation === mostRecentNavigation)
             mostRecentNavigation = undefined;
+        notifyNavigationAborted(currentNavigation);
         return;
     }
     document.documentElement.setAttribute(DIRECTION_ATTR, prepEvent.direction);
@@ -722,10 +758,13 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
             safePushState({ ...options.state, index: ++currentHistoryIndex, scrollX: 0, scrollY: 0 }, "", prepEvent.to.href);
         }
     }
+    let domUpdateOutcome;
     if (supportsViewTransitions && !hasUAVisualTransition) {
         // This automatically cancels any previous transition
         // We also already took care that the earlier update callback got through
-        currentTransition.viewTransition = document.startViewTransition(async () => await updateDOM(prepEvent, options, currentTransition, historyState, undefined, historyCommittedEarly));
+        currentTransition.viewTransition = document.startViewTransition(async () => {
+            domUpdateOutcome = await updateDOM(prepEvent, options, currentNavigation, currentTransition, historyState, undefined, historyCommittedEarly);
+        });
     }
     else {
         // Simulation mode requires a bit more manual work.
@@ -735,7 +774,7 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
         const updateDone = (async () => {
             // Immediately paused to set up the ViewTransition object for Fallback mode
             await Promise.resolve(); // hop through the micro task queue
-            await updateDOM(prepEvent, options, currentTransition, historyState, hasUAVisualTransition ? "swap" : getFallback(), historyCommittedEarly);
+            domUpdateOutcome = await updateDOM(prepEvent, options, currentNavigation, currentTransition, historyState, hasUAVisualTransition ? "swap" : getFallback(), historyCommittedEarly);
             return undefined;
         })();
         // When the updateDone promise is settled,
@@ -766,6 +805,8 @@ async function transition(direction, from, to, options, historyState, hasUAVisua
     // In earlier versions was then'ed on viewTransition.ready which would not execute
     // if the visual part of the transition has errors or was skipped
     currentTransition.viewTransition?.updateCallbackDone.finally(async () => {
+        if (domUpdateOutcome !== "swapped")
+            return;
         await runScripts();
         // Mount new island markers introduced by the body swap. Fire-and-forget;
         // each island's scheduleHydrate call is async (idle / visible). Called after