ember-nav-stack 6.0.3 → 6.1.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v6.1.1 (2025-12-02)
+
+## v6.1.0 (2025-10-30)
+
 ## v6.0.3 (2024-03-01)
 
 ## v6.0.2 (2023-12-15)

package/README.md

@@ -25,6 +25,11 @@ Usage
 
 [Longer description of how to use the addon in apps.]
 
+Testing
+------------------------------------------------------------------------------
+
+`ember-nav-stack` registers waiters for stack recomputes and transition animations. Ember's built-in test helpers such as `visit` and `click` wait for these operations automatically, so downstream apps should not need custom "nav stack idle" helpers or manual `waitFor` calls.
+
 
 Contributing
 ------------------------------------------------------------------------------

package/addon/components/nav-stack/component.js

@@ -520,7 +520,6 @@ export default class NavStack extends Component {
           this.parentHeaderElement,
           this.currentHeaderElement,
         );
-        run(this.args, this.args.back);
       } else {
         setTransform(this.containerElement, `translateX(${this.startingX}px)`);
         styleHeaderElements(
@@ -544,6 +543,9 @@ export default class NavStack extends Component {
       }
       this.navStacksService.notifyTransitionEnd();
       this._activeSpring = null;
+      if (shouldNavigateBack) {
+        run(this.args, this.args.back);
+      }
     };
     if (fromValue === toValue && initialVelocity === 0) {
       finalize();

package/addon/services/nav-stacks.js

@@ -5,10 +5,13 @@ import EmberObject from '@ember/object';
 import { Promise as EmberPromise } from 'rsvp';
 import { buildWaiter } from '@ember/test-waiters';
 import { set } from '@ember/object';
-let waiter = buildWaiter('ember-nav-stack:transition-waiter');
+let transitionWaiter = buildWaiter('ember-nav-stack:transition');
+let stackWaiter = buildWaiter('ember-nav-stack:stack-update');
 
 export default class NavStacks extends Service {
-  waiterToken;
+  transitionToken;
+  _stackUpdateToken;
+  _initialRenderToken;
 
   constructor() {
     super(...arguments);
@@ -18,6 +21,7 @@ export default class NavStacks extends Service {
     this._counter = 1;
     this._runningTransitions = 0;
     this.isInitialRender = true;
+    this._initialRenderToken = stackWaiter.beginAsync();
   }
 
   pushItem(sourceId, layer, component, headerComponent) {
@@ -46,15 +50,20 @@ export default class NavStacks extends Service {
   notifyTransitionStart() {
     this._runningTransitions++;
     if (this._runningTransitions === 1) {
-      this.waiterToken = waiter.beginAsync();
+      this.transitionToken = transitionWaiter.beginAsync();
     }
   }
 
   notifyTransitionEnd() {
     this._runningTransitions--;
+    if (this._runningTransitions < 0) {
+      this._runningTransitions = 0;
+    }
     if (this._runningTransitions === 0) {
-      waiter.endAsync(this.waiterToken);
-      this.waiterToken = undefined;
+      if (this.transitionToken) {
+        transitionWaiter.endAsync(this.transitionToken);
+      }
+      this.transitionToken = undefined;
     }
     next(() => {
       this._maybeResolveIdle();
@@ -84,7 +93,12 @@ export default class NavStacks extends Service {
   didUpdate() {} // hook
 
   _maybeResolveIdle() {
-    if (this._runningTransitions === 0 && this._resolveWaiting) {
+    if (
+      this._runningTransitions === 0 &&
+      !this._stackUpdateToken &&
+      !this._initialRenderToken &&
+      this._resolveWaiting
+    ) {
       let resolveWaiting = this._resolveWaiting;
       this._resolveWaiting = null;
       this._waitingPromise = null;
@@ -93,12 +107,16 @@ export default class NavStacks extends Service {
   }
 
   _schedule() {
+    if (!this._stackUpdateToken) {
+      this._stackUpdateToken = stackWaiter.beginAsync();
+    }
     scheduleOnce('afterRender', this, this._process);
   }
 
   _process() {
     let newStacks = {};
     let itemsById = this._itemsById;
+    let wasInitialRender = this.isInitialRender === true;
 
     for (var sourceId in itemsById) {
       let { layer, component, headerComponent, order } = itemsById[sourceId];
@@ -117,6 +135,17 @@ export default class NavStacks extends Service {
     }
     this._listeners.invoke('stackItemsDidChange');
     this.didUpdate();
+    next(() => {
+      if (wasInitialRender && this._initialRenderToken) {
+        stackWaiter.endAsync(this._initialRenderToken);
+        this._initialRenderToken = undefined;
+      }
+      if (this._stackUpdateToken) {
+        stackWaiter.endAsync(this._stackUpdateToken);
+        this._stackUpdateToken = undefined;
+      }
+      this._maybeResolveIdle();
+    });
   }
 
   _clearIsInitialRender() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-nav-stack",
-  "version": "6.0.3",
+  "version": "6.1.1",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"