@firestitch/form 13.3.3 → 13.3.5

package/fesm2020/firestitch-form.mjs

@@ -483,21 +483,26 @@ class FsFormDirective {
             }
         });
     }
+    _activeDialog(el, dialog) {
+        if (el.isSameNode(dialog)) {
+            return true;
+        }
+        else if (el.parentElement) {
+            return this._activeDialog(el.parentElement, dialog);
+        }
+        return false;
+    }
     _listenHotKeys() {
         this._ngZone.runOutsideAngular(() => {
             fromEvent(document, 'keydown')
                 .pipe(takeUntil(this._destroy$))
                 .subscribe((event) => {
                 if (this._dialogBackdropEscape && event.code === 'Escape') {
-                    const dialog = document.getElementById(this._dialogRef.id);
-                    const paths = event.composedPath();
-                    if (paths) {
-                        paths.forEach((item) => {
-                            if (dialog === item) {
-                                this._ngZone.run(() => {
-                                    this._formClose();
-                                });
-                            }
+                    const activeDialog = this
+                        ._activeDialog(document.activeElement, document.getElementById(this._dialogRef.id));
+                    if (activeDialog) {
+                        this._ngZone.run(() => {
+                            this._formClose();
                         });
                     }
                 }
@@ -599,6 +604,9 @@ class FsFormDirective {
         this.ngForm.form.valueChanges
             .pipe(takeUntil(this._destroy$))
             .subscribe((changes) => {
+            if (this._dialogBackdropEscape && this._dialogRef) {
+                this._dialogRef.disableClose = true;
+            }
             if (this.confirm) {
                 const existing = Object.keys(this._snapshot);
                 Object.keys(changes)
@@ -703,9 +711,8 @@ class FsFormDirective {
         });
     }
     _registerConfirmDialogBackdropEscape() {
-        this._dialogBackdropEscape = this._dialogRef && !this._dialogRef.disableClose;
-        if (this._dialogRef && !this._dialogRef.disableClose) {
-            this._dialogRef.disableClose = true;
+        this._dialogBackdropEscape = !this._dialogRef?.disableClose;
+        if (this._dialogBackdropEscape) {
             this._dialogRef.backdropClick()
                 .pipe(takeUntil(this._destroy$))
                 .subscribe(() => {