feat: wait until modal is destroyed

BBVAEngineering · Nov 24, 2021 · b84d425 · b84d425
1 parent 579cc8f
commit b84d425
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/addon/components/modal.js b/addon/components/modal.js
@@ -126,4 +126,10 @@ export default class ModalComponent extends Component.extend({
 	reject(data, label = `Component '${this.model.fullname}': rejection`) {
 		this.model.reject(data, label);
 	}
+
+	willDestroy() {
+		super.willDestroy(...arguments);
+
+		this.modal.trigger('will-destroy', this.model);
+	}
 }
diff --git a/addon/services/modal.js b/addon/services/modal.js
@@ -25,7 +25,15 @@ export default class ModalService extends Service.extend(Evented) {
 	}
 
 	_closeByModel(model) {
-		this.trigger('close', model);
+		const destroyCallback = (destroyedModal) => {
+			if (destroyedModal === model) {
+				this.trigger('close', model);
+			}
+		};
+
+		// Setup DOM removal listener
+		this.one('will-destroy', destroyCallback);
+		// Remove from DOM
 		this.content.removeObject(model);
 	}