ember-nav-stack 5.0.1 → 6.0.1

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "eslint.validate": [
+    "glimmer-ts",
+    "glimmer-js"
+  ]
+}

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v6.0.1 (2023-12-15)
+
+#### :bug: Bug Fix
+* [#74](https://github.com/yapplabs/ember-nav-stack/pull/74) Add some more checks to make sure element is not destroyed before accessing it ([@lukemelia](https://github.com/lukemelia))
+* [#73](https://github.com/yapplabs/ember-nav-stack/pull/73) Avoid trying to access this.element when component has been torn down ([@lukemelia](https://github.com/lukemelia))
+
+#### Committers: 1
+- Luke Melia ([@lukemelia](https://github.com/lukemelia))
+
+## v6.0.0 (2023-12-03)
+
+#### :boom: Breaking Change
+* [#71](https://github.com/yapplabs/ember-nav-stack/pull/71) Update to ember 3.28 and address deprecations ([@lukemelia](https://github.com/lukemelia))
+
+#### :house: Internal
+* [#71](https://github.com/yapplabs/ember-nav-stack/pull/71) Update to ember 3.28 and address deprecations ([@lukemelia](https://github.com/lukemelia))
+
+#### Committers: 1
+- Luke Melia ([@lukemelia](https://github.com/lukemelia))
+
 ## v5.0.1 (2023-11-30)
 
 ## v5.0.0 (2023-09-19)

package/README.md

@@ -7,9 +7,9 @@ This addon's current status is "opensource, but unpolished". It lacks tests, doc
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.16 or above
-* Ember CLI v2.13 or above
-* Node.js v10 or above
+* Ember.js v3.24 or above
+* Ember CLI v3.24 or above
+* Node.js v12 or above
 
 
 Installation

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

@@ -5,8 +5,6 @@ import { run, scheduleOnce } from '@ember/runloop';
 import { nextTick } from 'ember-nav-stack/utils/animation';
 import BackSwipeRecognizer from 'ember-nav-stack/utils/back-swipe-recognizer';
 import Hammer from 'hammerjs';
-// import { argument } from '@ember-decorators/argument';
-// import { Action, optional } from '@ember-decorators/argument/types';
 import { Spring } from 'wobble';
 import { getOwner } from '@ember/application';
 import { DEBUG } from '@glimmer/env';
@@ -159,10 +157,12 @@ export default class NavStack extends Component {
   @action
   tearDownHammer() {
     let { hammer, gesture } = this;
-    gesture.unregister(this, hammer.get('pan'));
-    hammer.off('pan');
-    hammer.destroy();
-    this.hammer = null;
+    if (hammer) {
+      gesture.unregister(this, hammer.get('pan'));
+      hammer.off('pan');
+      hammer.destroy();
+      this.hammer = null;
+    }
   }
 
   @action
@@ -171,6 +171,10 @@ export default class NavStack extends Component {
   }
 
   handleStackDepthChange(isInitialRender) {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     let stackItems = this.stackItems || [];
     let stackDepth = stackItems.length;
     let rootComponentRef = stackItems[0] && stackItems[0].component;
@@ -236,6 +240,10 @@ export default class NavStack extends Component {
   }
 
   cut() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     this.horizontalTransition({
       toValue: this.computeXPosition(),
       animate: false,
@@ -251,6 +259,9 @@ export default class NavStack extends Component {
   }
 
   slideForward() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
     this.horizontalTransition({
       toValue: this.computeXPosition(),
       finishCallback: () => {
@@ -260,6 +271,9 @@ export default class NavStack extends Component {
   }
 
   slideBack() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
     this.horizontalTransition({
       toValue: this.computeXPosition(),
       finishCallback: () => {
@@ -270,6 +284,10 @@ export default class NavStack extends Component {
   }
 
   slideUp() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
     let debug = this.birdsEyeDebugging;
     this.verticalTransition({
       element: this.element,
@@ -279,6 +297,9 @@ export default class NavStack extends Component {
   }
 
   slideDown() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
     let debug = this.birdsEyeDebugging;
     let clonedElement = this.clones.elements[this.clones.elements.length - 1];
     let y = debug ? 480 : clonedElement.getBoundingClientRect().height;

package/addon/components/nav-stack/template.hbs

@@ -22,11 +22,11 @@
   <div class="NavStack-header">
     {{#if this.parentItemHeaderComponent}}
       <div class="NavStack-headerContainer NavStack-parentItemHeaderContainer">
-        {{component this.parentItemHeaderComponent class="NavStack-headerComponent"}}
+        {{component this.parentItemHeaderComponent class="NavStack-headerComponent" back=@back}}
       </div>
     {{/if}}
     <div class="NavStack-headerContainer NavStack-currentHeaderContainer">
-      {{component this.headerComponent class="NavStack-headerComponent"}}
+      {{component this.headerComponent class="NavStack-headerComponent" back=@back}}
     </div>
   </div>
   {{#if this.hasFooter}}

package/addon/{mixins → routes}/stackable-route.js

@@ -1,6 +1,6 @@
-/* eslint-disable ember/no-new-mixins */
-import Mixin from '@ember/object/mixin';
-import { computed } from '@ember/object';
+import Route from '@ember/routing/route';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 export function getParentRoute(router, route) {
   // eslint-disable-next-line ember/no-private-routing-service
@@ -17,17 +17,21 @@ export function getParentRoute(router, route) {
   }
 }
 
-export default Mixin.create({
-  templateName: 'stackable',
+export default class StackableRoute extends Route {
+  @service router;
+  templateName = 'stackable';
+
   getRouteComponent(/* model */) {
     return `routable-components/${(
       this.routableTemplateName || this.routeName
     ).replace(/\./g, '/')}`;
-  },
+  }
+
   getHeaderComponent(model) {
     return `${this.getRouteComponent(model)}/header`;
-  },
-  layerIndex: computed('_router', 'newLayer', function () {
+  }
+
+  get layerIndex() {
     let parentRoute = getParentRoute(this._router, this);
     let parentRouteLayerIndex = parentRoute.get('layerIndex');
     let currentLayerIndex = parentRouteLayerIndex || 0;
@@ -35,22 +39,23 @@ export default Mixin.create({
       return currentLayerIndex + 1;
     }
     return currentLayerIndex;
-  }),
+  }
+
   setupController(controller, model) {
-    this._super(controller, model);
+    super.setupController(controller, model);
     controller.setProperties({
       layerIndex: this.layerIndex,
       routeComponent: this.getRouteComponent(model),
       headerComponent: this.getHeaderComponent(model),
       routeName: this.routeName,
     });
-  },
+  }
+
   getParentRouteName() {
     return getParentRoute(this._router, this).routeName;
-  },
-  actions: {
-    back() {
-      this.transitionTo(this.getParentRouteName());
-    },
-  },
-});
+  }
+
+  @action back() {
+    this.router.transitionTo(this.getParentRouteName());
+  }
+}

package/addon/services/nav-stacks.js

@@ -1,6 +1,6 @@
 import { A } from '@ember/array';
 import Service from '@ember/service';
-import { run, next } from '@ember/runloop';
+import { next, scheduleOnce } from '@ember/runloop';
 import EmberObject from '@ember/object';
 import { Promise as EmberPromise } from 'rsvp';
 import { buildWaiter } from '@ember/test-waiters';
@@ -65,6 +65,10 @@ export default class NavStacks extends Service {
     return this._runningTransitions;
   }
 
+  isRunningTransitions() {
+    return this._runningTransitions > 0;
+  }
+
   waitUntilTransitionIdle() {
     if (this._waitingPromise) {
       return this._waitingPromise;
@@ -89,7 +93,7 @@ export default class NavStacks extends Service {
   }
 
   _schedule() {
-    run.scheduleOnce('afterRender', this, this._process);
+    scheduleOnce('afterRender', this, this._process);
   }
 
   _process() {
@@ -109,7 +113,7 @@ export default class NavStacks extends Service {
     }
     set(this, 'stacks', EmberObject.create(newStacks));
     if (this.isInitialRender === true) {
-      run.next(this, this._clearIsInitialRender);
+      next(this, this._clearIsInitialRender);
     }
     this._listeners.invoke('stackItemsDidChange');
     this.didUpdate();

package/addon/utils/animation.js

@@ -1,7 +1,7 @@
 // Thanks ember-css-transitions
 // https://github.com/peec/ember-css-transitions/blob/master/addon/mixins/transition-mixin.js
 
-import { run } from '@ember/runloop';
+import { later, schedule } from '@ember/runloop';
 import RSVP from 'rsvp';
 import Ember from 'ember';
 
@@ -20,7 +20,7 @@ const TICK = 17;
  */
 function rAF(cb) {
   if (Ember.testing || !window.requestAnimationFrame) {
-    return run.later(cb, TICK);
+    return later(cb, TICK);
   } else {
     return window.requestAnimationFrame(cb);
   }
@@ -33,7 +33,7 @@ function rAF(cb) {
  */
 export function nextTick() {
   return new RSVP.Promise((resolve) => {
-    run.schedule('afterRender', () => {
+    schedule('afterRender', () => {
       rAF(() => {
         resolve();
       });

package/app/templates/stackable.hbs

@@ -1,7 +1,8 @@
-{{to-nav-stack
-    layer=layerIndex
-    item=(component routeComponent model=model controller=this)
-    header=(component headerComponent model=model controller=this)
-}}
+<ToNavStack
+  @layer={{this.layerIndex}}
+  @item={{component this.routeComponent model=this.model controller=this}}
+  @header={{component this.headerComponent model=this.model controller=this}}
+/>
+
 
 {{outlet}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-nav-stack",
-  "version": "5.0.1",
+  "version": "6.0.1",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,8 +17,9 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "release": "release-it",
@@ -44,13 +45,14 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.4.0",
+    "@ember/test-helpers": "^2.6.0",
     "@ember/test-waiters": "^3.0.2",
+    "@embroider/test-setup": "^0.48.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.24.0",
+    "ember-cli": "~3.28.6",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-deploy": "^2.0.0",
     "ember-cli-deploy-build": "^3.0.0",
@@ -67,17 +69,18 @@
     "ember-page-title": "^8.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^11.0.1",
-    "ember-route-action-helper": "^2.0.8",
+    "ember-set-helper": "^2.0.1",
     "ember-simulant-test-helpers": "^0.3.2",
-    "ember-source": "~3.24.0",
+    "ember-source": "~3.28.8",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.11.2",
+    "ember-template-lint": "^5.13.0",
     "ember-try": "^3.0.0",
-    "eslint": "^7.26.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-ember": "^10.4.2",
+    "eslint-plugin-ember": "^10.5.8",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-qunit": "^6.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.2",
@@ -88,7 +91,7 @@
     "sass": "^1.66.1"
   },
   "engines": {
-    "node": ">= 14"
+    "node": "12.* || 14.* || >= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/.prettierignore

@@ -1,21 +0,0 @@
-# unconventional js
-/blueprints/*/files/
-/vendor/
-
-# compiled output
-/dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
-
-# misc
-/coverage/
-!.*
-.eslintcache
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

package/.prettierrc.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  singleQuote: true,
-};