Merge branch 'next' of https://github.com/carbon-design-system/carbon-components-angular into component-factory-resolver

Author: Akshat55

src/modal/base-modal.service.ts

@@ -48,7 +48,7 @@ export class BaseModalService {
 				component.instance.open = false;
 			}),
 			// delay closing by an arbitrary amount to allow the animation to finish
-			delay(150)
+			delay(240)
 		).subscribe(() => {
 			this.placeholderService.destroyComponent(component);
 			// filter out our component
@@ -81,7 +81,7 @@ export class BaseModalService {
 		// Let animation finish before component is removed
 		setTimeout(() => {
 			this.placeholderService.destroyComponent(BaseModalService.modalList[index]);
-		}, 300);
-		BaseModalService.modalList.splice(index, 1);
+			BaseModalService.modalList.splice(index, 1);
+		}, 240);
 	}
 }

src/modal/modal.component.ts

@@ -196,8 +196,10 @@ export class Modal implements AfterViewInit, OnChanges, OnDestroy {
 		switch (event.key) {
 			case "Escape": {
 				event.stopImmediatePropagation();  // prevents events being fired for multiple modals if more than 2 open
-				this.modalService.destroy();  // destroy top (latest) modal
+				// Manually close modal
+				this.open = false;
 				this.close.emit();
+				this.modalService.destroy();  // destroy top (latest) modal
 				break;
 			}