@firestitch/form 18.0.13 → 18.0.14

package/fesm2022/firestitch-form.mjs

@@ -11,8 +11,8 @@ import * as i1 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialog, MatDialogRef } from '@angular/material/dialog';
 import * as i2 from '@firestitch/dialog';
 import { FsDialogModule } from '@firestitch/dialog';
-import { Subject, of, filter, BehaviorSubject, throwError, fromEvent, iif, defer, from, isObservable } from 'rxjs';
-import { switchMap, map, catchError, takeUntil, tap, take, mergeMap, filter as filter$1, delay, first, startWith, mapTo } from 'rxjs/operators';
+import { Subject, of, BehaviorSubject, throwError, fromEvent, iif, defer, from, isObservable } from 'rxjs';
+import { switchMap, map, catchError, takeUntil, filter, delay, tap, take, mergeMap, first, startWith, mapTo } from 'rxjs/operators';
 import * as i2$1 from '@angular/router';
 import { guid, email, isEmpty, isNumeric, phone, url } from '@firestitch/common';
 import * as i7 from '@firestitch/drawer';
@@ -81,7 +81,9 @@ var ConfirmResult;
 })(ConfirmResult || (ConfirmResult = {}));
 
 function confirmResultContinue(result) {
-    return result === ConfirmResult.Discard || result === ConfirmResult.Save || result === ConfirmResult.Pristine;
+    return (result === ConfirmResult.Discard ||
+        result === ConfirmResult.Save ||
+        result === ConfirmResult.Pristine);
 }
 
 function getActiveRoute(route) {
@@ -119,7 +121,7 @@ class FsForm {
         this._formDirectiveStore.delete(routeComponent);
     }
     confirmUnsaved(form) {
-        if (!form.confirm || !form.ngForm.dirty) {
+        if (!form.confirm) {
             return of(ConfirmResult.Pristine);
         }
         let title = 'You Have Unsaved Changes';
@@ -134,7 +136,8 @@ class FsForm {
             discardLabel = form.confirm.discardLabel || discardLabel;
             cancelLabel = form.confirm.cancelLabel || cancelLabel;
         }
-        return this._dialog.open(ConfirmUnsavedComponent, {
+        return this._dialog
+            .open(ConfirmUnsavedComponent, {
             data: {
                 title,
                 message,
@@ -156,7 +159,12 @@ class FsForm {
             if (result === 'save') {
                 form.ngForm.control.markAsPristine();
                 return form.submit$({ confirmed: true })
-                    .pipe(map(() => ConfirmResult.Save), catchError(() => {
+                    .pipe(map((submitEvent) => {
+                    if (submitEvent.error) {
+                        return ConfirmResult.Invalid;
+                    }
+                    return ConfirmResult.Save;
+                }), catchError(() => {
                     return of(ConfirmResult.Invalid);
                 }));
             }
@@ -285,32 +293,31 @@ class FsFormBaseDirective {
             this._registerConfirmTabGroup(tabGroup);
         });
     }
+    _currentTabIndex;
+    _tabConfirming;
     _registerConfirmTabGroup(tabGroup) {
-        const confirmTabGroup = tabGroup;
-        if (!confirmTabGroup._originalHandleClick) {
-            confirmTabGroup._originalHandleClick = tabGroup._handleClick;
-            confirmTabGroup._handlClick$ = new Subject();
-            confirmTabGroup._handleClick = (tab, tabHeader, idx) => {
-                if (confirmTabGroup._handlClick$.observers.length) {
-                    confirmTabGroup._handlClick$.next({ tab, tabHeader, idx });
-                }
-                else {
-                    confirmTabGroup._originalHandleClick(tab, tabHeader, idx);
-                }
-            };
-        }
-        confirmTabGroup._handlClick$
-            .pipe(filter(() => !this.submitting), switchMap((event) => {
+        this._currentTabIndex = tabGroup.selectedIndex;
+        tabGroup.selectedIndexChange
+            .pipe(filter(() => !this._tabConfirming), switchMap((selectedIndex) => {
             if (this.confirm && this.confirmTabs) {
+                tabGroup.selectedIndex = this._currentTabIndex;
+                this._tabConfirming = true;
                 return this.triggerConfirm()
-                    .pipe(tap((result) => {
+                    .pipe(map((result) => {
                     if (confirmResultContinue(result)) {
-                        confirmTabGroup.selectedIndex = event.idx;
+                        tabGroup.selectedIndex = selectedIndex;
+                        return selectedIndex;
                     }
+                    return null;
+                }), delay(50), tap(() => {
+                    this._tabConfirming = false;
                 }));
             }
-            confirmTabGroup._originalHandleClick(event.tab, event.tabHeader, event.idx);
-            return of(null);
+            return of(selectedIndex);
+        }), tap((selectedIndex) => {
+            if (selectedIndex !== null) {
+                this._currentTabIndex = selectedIndex;
+            }
         }), takeUntil(this._destroy$))
             .subscribe();
     }
@@ -571,9 +578,12 @@ class FsFormDirective extends FsFormBaseDirective {
             return this._formValidState$;
         }), catchError((e) => {
             this._handleError(e);
-            return of(null);
+            return of({
+                ...this._submitEvent,
+                error: e.message,
+            });
         }), tap((submittedEvent) => {
-            if (submittedEvent) {
+            if (!submittedEvent.error) {
                 this._completeSubmit(true, submittedEvent);
             }
         }));
@@ -584,7 +594,7 @@ class FsFormDirective extends FsFormBaseDirective {
             .ngSubmit
             .pipe(tap((event) => {
             event?.preventDefault();
-        }), filter$1(() => {
+        }), filter(() => {
             return [FormStatus.Valid, FormStatus.Invalid]
                 .includes(this._status$.getValue());
         }), switchMap(() => this.submit$(this._submitEvent)), takeUntil(this.destroy$))
@@ -650,7 +660,7 @@ class FsFormDirective extends FsFormBaseDirective {
     _formClose() {
         if (this.confirm && this.confirmDialog) {
             this.triggerConfirm()
-                .pipe(filter$1((result) => confirmResultContinue(result)), switchMap((result) => {
+                .pipe(filter((result) => confirmResultContinue(result)), switchMap((result) => {
                 return result === ConfirmResult.Pristine || result === ConfirmResult.Discard
                     ? of(null)
                     : this.submitted.asObservable();
@@ -754,7 +764,7 @@ class FsFormDirective extends FsFormBaseDirective {
                 .subscribe((subscriber) => {
                 if (this.submitting) {
                     this._status$
-                        .pipe(filter$1((status) => status === FormStatus.Success || status === FormStatus.Error), takeUntil(this.destroy$))
+                        .pipe(filter((status) => status === FormStatus.Success || status === FormStatus.Error), takeUntil(this.destroy$))
                         .subscribe((status) => {
                         if (status === FormStatus.Success) {
                             subscriber.next(null);
@@ -991,7 +1001,7 @@ class FsFormDialogCloseDirective {
     closeClick() {
         if (this._form) {
             this._form.triggerConfirm()
-                .pipe(filter$1((confirmResult) => (confirmResult !== ConfirmResult.Review)), takeUntil(this._destroy$))
+                .pipe(filter((confirmResult) => (confirmResult !== ConfirmResult.Review)), takeUntil(this._destroy$))
                 .subscribe(() => {
                 this._dialogRef.close(this.closeData);
             });
@@ -1182,7 +1192,7 @@ class FsFormDialogActionsComponent {
     ngOnInit() {
         if (this._form) {
             this._form.ngForm.valueChanges
-                .pipe(filter$1(() => (!this.dirty)), takeUntil(this._destroy$))
+                .pipe(filter(() => (!this.dirty)), takeUntil(this._destroy$))
                 .subscribe(() => {
                 this.dirty = this._form.ngForm.dirty;
                 this._cdRef.markForCheck();