@firestitch/form 12.4.20 → 12.4.21

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

@@ -37,7 +37,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     confirmBrowser: boolean;
     confirmTabs: boolean;
     dirtySubmitButton: boolean;
-    submit: (event: SubmitEvent) => Observable<any>;
+    set submit(submit$: (event: SubmitEvent) => Observable<any>);
     successDelay: number;
     errorDelay: number;
     tabGroup: MatTabGroup;
@@ -48,7 +48,6 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     submitted: EventEmitter<SubmitEvent>;
     reseted: EventEmitter<SubmitEvent>;
     cleared: EventEmitter<SubmitEvent>;
-    submitRegistered: EventEmitter<any>;
     fsFormClass: boolean;
     formDialogClose: QueryList<FsFormDialogCloseDirective>;
     private _tabGroups;
@@ -61,6 +60,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _status$;
     private _destroy$;
     private _confirmed;
+    private _submit$;
     constructor(ngForm: NgForm, _form: FsForm, _element: ElementRef, _message: FsMessage, _prompt: FsPrompt, _ngZone: NgZone, _cdRef: ChangeDetectorRef, _dialogRef: MatDialogRef<any>, _drawerRef: DrawerRef<any>, _route: ActivatedRoute);
     get submitting(): boolean;
     get validating(): boolean;
@@ -71,7 +71,9 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private get _submitter();
     ngOnInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
-    registerSubmit(fn: () => Observable<any>): void;
+    get hasSubmit(): boolean;
+    clearSubmit(): void;
+    registerSubmit(submit$: Observable<any>): void;
     ngAfterContentInit(): void;
     ngOnDestroy(): void;
     createSnapshot(): void;
@@ -121,5 +123,5 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _registerCanDeactivateGuard;
     private _cleanupCanDeactivate;
     static ɵfac: i0.ɵɵFactoryDeclaration<FsFormDirective, [null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, null]>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<FsFormDirective, "[fsForm]", never, { "wrapperSelector": "wrapperSelector"; "messageSelector": "messageSelector"; "hintSelector": "hintSelector"; "labelSelector": "labelSelector"; "autocomplete": "autocomplete"; "shortcuts": "shortcuts"; "confirm": "confirm"; "confirmDialog": "confirmDialog"; "confirmDrawer": "confirmDrawer"; "confirmBrowser": "confirmBrowser"; "confirmTabs": "confirmTabs"; "dirtySubmitButton": "dirtySubmitButton"; "submit": "submit"; "successDelay": "successDelay"; "errorDelay": "errorDelay"; "tabGroup": "tabGroup"; "deactivationGuard": "deactivationGuard"; }, { "submitEvent": "fsForm"; "invalid": "invalid"; "valid": "valid"; "submitted": "submitted"; "reseted": "reseted"; "cleared": "cleared"; "submitRegistered": "submitRegistered"; }, ["formDialogClose", "_tabGroups"]>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<FsFormDirective, "[fsForm]", never, { "wrapperSelector": "wrapperSelector"; "messageSelector": "messageSelector"; "hintSelector": "hintSelector"; "labelSelector": "labelSelector"; "autocomplete": "autocomplete"; "shortcuts": "shortcuts"; "confirm": "confirm"; "confirmDialog": "confirmDialog"; "confirmDrawer": "confirmDrawer"; "confirmBrowser": "confirmBrowser"; "confirmTabs": "confirmTabs"; "dirtySubmitButton": "dirtySubmitButton"; "submit": "submit"; "successDelay": "successDelay"; "errorDelay": "errorDelay"; "tabGroup": "tabGroup"; "deactivationGuard": "deactivationGuard"; }, { "submitEvent": "fsForm"; "invalid": "invalid"; "valid": "valid"; "submitted": "submitted"; "reseted": "reseted"; "cleared": "cleared"; }, ["formDialogClose", "_tabGroups"]>;
 }

package/bundles/firestitch-form.umd.js

@@ -609,7 +609,6 @@
             this.submitted = new i0.EventEmitter();
             this.reseted = new i0.EventEmitter();
             this.cleared = new i0.EventEmitter();
-            this.submitRegistered = new i0.EventEmitter();
             this.fsFormClass = true;
             this._tabGroups = new i0.QueryList();
             this._buttons = new i0.QueryList();
@@ -618,7 +617,15 @@
             this._status$ = new rxjs.BehaviorSubject(exports.FormStatus.Valid);
             this._destroy$ = new rxjs.Subject();
             this._confirmed = false;
+            this._submit$ = null;
         }
+        Object.defineProperty(FsFormDirective.prototype, "submit", {
+            set: function (submit$) {
+                this._submit$ = submit$;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(FsFormDirective.prototype, "submitting", {
             get: function () {
                 return this._status$.getValue() === exports.FormStatus.Submitting;
@@ -658,20 +665,15 @@
                 var submittedEvent = {
                     ngForm: this.ngForm,
                     submitter: this._submitter,
-                    response: null
+                    response: null,
                 };
-                if (!this.submit) {
-                    return rxjs.of(submittedEvent);
-                }
-                var result = this.submit(this._submitEvent);
-                if (!rxjs.isObservable(result)) {
-                    return rxjs.of(submittedEvent);
-                }
-                return result
+                var submit$ = this._submit$ ?
+                    this._submit$(this._submitEvent) : rxjs.of(submittedEvent);
+                return submit$
                     .pipe(operators.map(function (response) {
                     submittedEvent.response = response;
                     return submittedEvent;
-                }));
+                }), operators.takeUntil(this._destroy$));
             },
             enumerable: false,
             configurable: true
@@ -720,11 +722,24 @@
                 this._updateDirtySubmitButtons();
             }
         };
-        FsFormDirective.prototype.registerSubmit = function (fn) {
+        Object.defineProperty(FsFormDirective.prototype, "hasSubmit", {
+            get: function () {
+                return this._submit$ !== null;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        FsFormDirective.prototype.clearSubmit = function () {
+            var _this = this;
+            this._submit$ = null;
+            setTimeout(function () {
+                _this._cdRef.markForCheck();
+            });
+        };
+        FsFormDirective.prototype.registerSubmit = function (submit$) {
             var _this = this;
-            this.submit = fn;
+            this._submit$ = function () { return submit$; };
             setTimeout(function () {
-                _this.submitRegistered.emit();
                 _this._cdRef.markForCheck();
             });
         };
@@ -1107,7 +1122,7 @@
         };
         FsFormDirective.prototype._registerConfirmDialogBackdropEscape = function () {
             var _this = this;
-            this._dialogBackdropEscape = this._dialogRef && this._dialogRef.disableClose !== true;
+            this._dialogBackdropEscape = this._dialogRef && !this._dialogRef.disableClose;
             if (this._dialogRef && !this._dialogRef.disableClose) {
                 this._dialogRef.disableClose = true;
                 this._dialogRef.backdropClick()
@@ -1127,7 +1142,7 @@
             this.ngForm.form.registerControl = function (name, control) {
                 var el = _this._element.nativeElement.querySelector("input[name='" + name + "']");
                 if (el) {
-                    el.setAttribute('name', name + '_' + common.guid());
+                    el.setAttribute('name', name + "_" + common.guid());
                     if (!el.getAttribute('autocomplete')) {
                         el.setAttribute('autocomplete', 'none');
                     }
@@ -1223,7 +1238,7 @@
         return FsFormDirective;
     }());
     FsFormDirective.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDirective, deps: [{ token: i1$1.NgForm }, { token: FsForm }, { token: i0__namespace.ElementRef }, { token: i2__namespace.FsMessage }, { token: i1__namespace.FsPrompt }, { token: i0__namespace.NgZone }, { token: i0__namespace.ChangeDetectorRef }, { token: i2$1.MatDialogRef, optional: true }, { token: i7.DrawerRef, optional: true }, { token: i3__namespace.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Directive });
-    FsFormDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDirective, selector: "[fsForm]", inputs: { wrapperSelector: "wrapperSelector", messageSelector: "messageSelector", hintSelector: "hintSelector", labelSelector: "labelSelector", autocomplete: "autocomplete", shortcuts: "shortcuts", confirm: "confirm", confirmDialog: "confirmDialog", confirmDrawer: "confirmDrawer", confirmBrowser: "confirmBrowser", confirmTabs: "confirmTabs", dirtySubmitButton: "dirtySubmitButton", submit: "submit", successDelay: "successDelay", errorDelay: "errorDelay", tabGroup: "tabGroup", deactivationGuard: "deactivationGuard" }, outputs: { submitEvent: "fsForm", invalid: "invalid", valid: "valid", submitted: "submitted", reseted: "reseted", cleared: "cleared", submitRegistered: "submitRegistered" }, host: { properties: { "class.fs-form": "this.fsFormClass" } }, queries: [{ propertyName: "formDialogClose", predicate: FsFormDialogCloseDirective, descendants: true }, { propertyName: "_tabGroups", predicate: tabs.MatTabGroup, descendants: true }], usesOnChanges: true, ngImport: i0__namespace });
+    FsFormDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDirective, selector: "[fsForm]", inputs: { wrapperSelector: "wrapperSelector", messageSelector: "messageSelector", hintSelector: "hintSelector", labelSelector: "labelSelector", autocomplete: "autocomplete", shortcuts: "shortcuts", confirm: "confirm", confirmDialog: "confirmDialog", confirmDrawer: "confirmDrawer", confirmBrowser: "confirmBrowser", confirmTabs: "confirmTabs", dirtySubmitButton: "dirtySubmitButton", submit: "submit", successDelay: "successDelay", errorDelay: "errorDelay", tabGroup: "tabGroup", deactivationGuard: "deactivationGuard" }, outputs: { submitEvent: "fsForm", invalid: "invalid", valid: "valid", submitted: "submitted", reseted: "reseted", cleared: "cleared" }, host: { properties: { "class.fs-form": "this.fsFormClass" } }, queries: [{ propertyName: "formDialogClose", predicate: FsFormDialogCloseDirective, descendants: true }, { propertyName: "_tabGroups", predicate: tabs.MatTabGroup, descendants: true }], usesOnChanges: true, ngImport: i0__namespace });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDirective, decorators: [{
                 type: i0.Directive,
                 args: [{
@@ -1291,8 +1306,6 @@
                     type: i0.Output
                 }], cleared: [{
                     type: i0.Output
-                }], submitRegistered: [{
-                    type: i0.Output
                 }], fsFormClass: [{
                     type: i0.HostBinding,
                     args: ['class.fs-form']