ember-source 7.3.0-alpha.4 → 7.3.0-beta.1

package/dist/dev/packages/router_js/index.js

@@ -1,6 +1,6 @@
 import RouteRecognizer from '../route-recognizer/index.js';
-import { P as Promise$1 } from '../shared-chunks/rsvp.es-DR7yS7qg.js';
-import { Q as QUERY_PARAMS_SYMBOL, m as merge, i as isTransition, a as isParam, t as throwIfAborted, P as PARAMS_SYMBOL, p as prepareResult, b as isPromise, f as forEach, c as promiseLabel, U as UnrecognizedURLError, T as Transition, S as STATE_SYMBOL, g as getChangelist, d as log, l as logAbort, e as isTransitionAborted, h as extractQueryParams } from '../shared-chunks/unrecognized-url-error-B8loxkay.js';
+import { P as Promise$1 } from '../shared-chunks/rsvp-aLN_pQtn.js';
+import { Q as QUERY_PARAMS_SYMBOL, m as merge, i as isTransition, a as isParam, t as throwIfAborted, P as PARAMS_SYMBOL, p as prepareResult, b as isPromise, f as forEach, c as promiseLabel, U as UnrecognizedURLError, T as Transition, S as STATE_SYMBOL, g as getChangelist, d as log, l as logAbort, e as isTransitionAborted, h as extractQueryParams } from '../shared-chunks/unrecognized-url-error-cXUp-SK3.js';
 
 /* eslint-disable no-prototype-builtins */
 let ROUTE_INFOS = new WeakMap();
@@ -851,14 +851,22 @@ class Router {
     if (routeInfosEqual(newState.routeInfos, oldState.routeInfos)) {
       // This is a no-op transition. See if query params changed.
       if (queryParamChangelist) {
-        let newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
-        newTransition.queryParamsOnly = true;
-        // SAFETY: The returned OpaqueTransition should actually be this.
-        return newTransition;
+        if (!wasTransitioning) {
+          // Not in an active transition — use the QP-only fast path
+          // which updates the URL without re-resolving route hooks.
+          let newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
+          newTransition.queryParamsOnly = true;
+          // SAFETY: The returned OpaqueTransition should actually be this.
+          return newTransition;
+        }
+        // When a query-param-only transition is started during an active
+        // transition (for example, from beforeModel/afterModel), avoid the
+        // QP-only fast path and intentionally fall through to the normal
+        // transition path so it can abort and replace the active transition.
+      } else {
+        // No-op. No need to create a new transition.
+        return this.activeTransition || new Transition(this, undefined, undefined);
       }
-
-      // No-op. No need to create a new transition.
-      return this.activeTransition || new Transition(this, undefined, undefined);
     }
     if (isIntermediate) {
       let transition = new Transition(this, undefined, newState);