@firestitch/form 12.4.1 → 12.4.2

package/app/directives/form/form.directive.d.ts

@@ -58,6 +58,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _activatedRouteConfig;
     private _status$;
     private _destroy$;
+    private _confirmSubmit;
     constructor(ngForm: NgForm, _form: FsForm, _element: ElementRef, _message: FsMessage, _prompt: FsPrompt, _ngZone: NgZone, _dialogRef: MatDialogRef<any>, _drawerRef: DrawerRef<any>, _route: ActivatedRoute);
     get submitting(): boolean;
     get validating(): boolean;
@@ -77,7 +78,9 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     reset(): void;
     clear(): void;
     dirty(): void;
-    triggerSubmit(): void;
+    triggerSubmit(options?: {
+        confirmSubmit: boolean;
+    }): void;
     triggerConfirm(): Observable<ConfirmResult>;
     enable(): void;
     disable(): void;

package/app/interfaces/submit-event.d.ts

@@ -2,4 +2,5 @@ import { NgForm } from '@angular/forms';
 export interface SubmitEvent {
     ngForm: NgForm;
     submitter: string;
+    confirmed?: boolean;
 }

package/app/interfaces/submitted-event.d.ts

@@ -3,4 +3,5 @@ export interface SubmittedEvent {
     ngForm: NgForm;
     submitter: string;
     response: any;
+    confirmed?: boolean;
 }

package/bundles/firestitch-form.umd.js

@@ -419,7 +419,7 @@
                         observer.complete();
                     });
                     form.ngForm.control.markAsPristine();
-                    form.ngForm.ngSubmit.emit();
+                    form.triggerSubmit({ confirmSubmit: true });
                 }
             }, function (error) {
                 observer.next(exports.ConfirmResult.Review);
@@ -615,6 +615,7 @@
             this._snapshot = {};
             this._status$ = new rxjs.BehaviorSubject(exports.FormStatus.Valid);
             this._destroy$ = new rxjs.Subject();
+            this._confirmSubmit = false;
         }
         Object.defineProperty(FsFormDirective.prototype, "submitting", {
             get: function () {
@@ -754,8 +755,9 @@
             this.ngForm.form.markAsDirty();
             this._updateDirtySubmitButtons();
         };
-        FsFormDirective.prototype.triggerSubmit = function () {
-            this.ngForm.ngSubmit.next();
+        FsFormDirective.prototype.triggerSubmit = function (options) {
+            this._confirmSubmit = options === null || options === void 0 ? void 0 : options.confirmSubmit;
+            this.ngForm.ngSubmit.emit();
         };
         FsFormDirective.prototype.triggerConfirm = function () {
             var _this = this;
@@ -788,13 +790,18 @@
                 .ngSubmit
                 .pipe(operators.tap(function (event) {
                 event === null || event === void 0 ? void 0 : event.preventDefault();
-            }), operators.filter(function () {
+            }), operators.map(function (event) {
+                return { event: event, confirmSubmit: _this._confirmSubmit };
+            }), operators.tap(function () { return _this._confirmSubmit = false; }), operators.filter(function () {
                 return [exports.FormStatus.Valid, exports.FormStatus.Invalid]
                     .includes(_this._status$.getValue());
-            }), operators.tap(function () { return _this._broadcasValidatingEvents(); }), operators.tap(function () { return _this._markControlsAsTouchedAndUpdateValidity(); }), operators.tap(function () { return _this._broadcastSubmittingEvents(); }), operators.switchMap(function () { return _this._waitUntilStatusPending(); }), operators.tap(function () { return _this._setupActiveSubmitButton(); }), operators.tap(function () { return _this._disableButtons(); }), operators.mergeMap(function () {
-                return _this.ngForm.status === 'INVALID'
-                    ? _this._formInvalidState$
-                    : _this._formValidState$;
+            }), operators.tap(function () { return _this._broadcasValidatingEvents(); }), operators.tap(function () { return _this._markControlsAsTouchedAndUpdateValidity(); }), operators.tap(function () { return _this._broadcastSubmittingEvents(); }), operators.switchMap(function (data) { return _this._waitUntilStatusPending()
+                .pipe(operators.mapTo(data)); }), operators.tap(function () { return _this._setupActiveSubmitButton(); }), operators.tap(function () { return _this._disableButtons(); }), operators.mergeMap(function (data) {
+                if (_this.ngForm.status === 'INVALID') {
+                    return _this._formInvalidState$;
+                }
+                return _this._formValidState$
+                    .pipe(operators.map(function (submitEvent) { return (Object.assign(Object.assign({}, submitEvent), { confirmSubmit: data.confirmSubmit })); }));
             }), operators.catchError(function (e, source$) {
                 _this._handleError(e);
                 return source$;