Merge pull request #412 from simplabs/modal-count

fix backdrop not animating immediately after the last modal is closed

addon/modal.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line ember/no-computed-properties-in-native-classes
+import { computed, set } from '@ember/object';
 import { waitForPromise } from '@ember/test-waiters';
 
 import { defer } from 'rsvp';
@@ -18,6 +20,11 @@ export default class Modal {
     return this._result;
   }
 
+  @computed('_deferredOutAnimation')
+  get isClosing() {
+    return Boolean(this._deferredOutAnimation);
+  }
+
   close(result) {
     if (this._componentInstance) {
       this._componentInstance.closeModal(result);
@@ -30,7 +37,7 @@ export default class Modal {
 
   _resolve(result) {
     if (!this._deferredOutAnimation) {
-      this._deferredOutAnimation = defer();
+      set(this, '_deferredOutAnimation', defer());
 
       this._result = result;
       this._deferred.resolve(result);

addon/services/modals.js

@@ -1,12 +1,14 @@
 import { A } from '@ember/array';
-import { set } from '@ember/object';
+import { computed, set } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import Service from '@ember/service';
 
 import Modal from '../modal';
 
 export default Service.extend({
-  count: alias('_stack.length'),
+  count: computed('[email protected]', function () {
+    return this._stack.filter(modal => !modal.isClosing).length;
+  }),
   top: alias('_stack.lastObject'),
 
   clickOutsideDeactivates: true,

config/ember-try.js

@@ -11,6 +11,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.4.0',
+            'ember-decorators-polyfill': '^1.1.5',
           },
         },
       },
@@ -19,6 +20,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.8.0',
+            'ember-decorators-polyfill': '^1.1.5',
           },
         },
       },

tests/unit/services/modals-test.js

@@ -57,4 +57,19 @@ module('Service | modals', function (hooks) {
 
     modal._remove();
   });
+
+  test('modals do not show up in openCount when closing', async function (assert) {
+    let modals = this.owner.lookup('service:modals');
+    let modal = modals.open('modal');
+
+    assert.equal(modals.count, 1);
+
+    modal._resolve();
+
+    assert.equal(modals.count, 0);
+
+    modal._remove();
+
+    assert.equal(modals.count, 0);
+  });
 });