@firestitch/form 13.3.5 → 13.3.7

package/fesm2020/firestitch-form.mjs

@@ -498,8 +498,10 @@ class FsFormDirective {
                 .pipe(takeUntil(this._destroy$))
                 .subscribe((event) => {
                 if (this._dialogBackdropEscape && event.code === 'Escape') {
+                    const cdkOverlayPane = Array
+                        .from(document.querySelectorAll('.cdk-overlay-pane')).pop();
                     const activeDialog = this
-                        ._activeDialog(document.activeElement, document.getElementById(this._dialogRef.id));
+                        ._activeDialog(document.getElementById(this._dialogRef.id), cdkOverlayPane);
                     if (activeDialog) {
                         this._ngZone.run(() => {
                             this._formClose();
@@ -692,36 +694,34 @@ class FsFormDirective {
             };
         }
         confirmTabGroup._handlClick$
-            .pipe(takeUntil(this._destroy$))
-            .subscribe((event) => {
-            if (!this.submitting) {
-                if (this.confirm && this.confirmTabs) {
-                    this.triggerConfirm()
-                        .pipe(takeUntil(this._destroy$))
-                        .subscribe((result) => {
-                        if (confirmResultContinue(result)) {
-                            confirmTabGroup.selectedIndex = event.idx;
-                        }
-                    });
-                }
-                else {
-                    confirmTabGroup._originalHandleClick(event.tab, event.tabHeader, event.idx);
-                }
+            .pipe(filter(() => !this.submitting), switchMap((event) => {
+            if (this.confirm && this.confirmTabs) {
+                return this.triggerConfirm()
+                    .pipe(tap((result) => {
+                    if (confirmResultContinue(result)) {
+                        confirmTabGroup.selectedIndex = event.idx;
+                    }
+                }));
             }
-        });
+            confirmTabGroup._originalHandleClick(event.tab, event.tabHeader, event.idx);
+            return of(null);
+        }), takeUntil(this._destroy$))
+            .subscribe();
     }
     _registerConfirmDialogBackdropEscape() {
-        this._dialogBackdropEscape = !this._dialogRef?.disableClose;
-        if (this._dialogBackdropEscape) {
-            this._dialogRef.backdropClick()
-                .pipe(takeUntil(this._destroy$))
-                .subscribe(() => {
-                this._formClose();
-            });
-            this._destroy$
-                .subscribe(() => {
-                this._dialogRef.disableClose = false;
-            });
+        if (this._dialogRef) {
+            this._dialogBackdropEscape = !this._dialogRef?.disableClose;
+            if (this._dialogBackdropEscape) {
+                this._dialogRef.backdropClick()
+                    .pipe(takeUntil(this._destroy$))
+                    .subscribe(() => {
+                    this._formClose();
+                });
+                this._destroy$
+                    .subscribe(() => {
+                    this._dialogRef.disableClose = false;
+                });
+            }
         }
     }
     _registerAutocomplete() {