@firestitch/form 12.4.17 → 12.4.19

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

@@ -1,17 +1,17 @@
-import { AfterContentInit, ElementRef, EventEmitter, NgZone, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges } from '@angular/core';
+import { AfterContentInit, ChangeDetectorRef, ElementRef, EventEmitter, NgZone, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { MatDialogRef } from '@angular/material/dialog';
 import { MatTabGroup } from '@angular/material/tabs';
+import { DrawerRef } from '@firestitch/drawer';
 import { FsMessage } from '@firestitch/message';
 import { FsPrompt } from '@firestitch/prompt';
-import { DrawerRef } from '@firestitch/drawer';
 import { Observable } from 'rxjs';
-import { FsFormDialogCloseDirective } from '../form-dialog-close.directive';
+import { FsForm } from '../../services/fsform.service';
 import { FsButtonDirective } from '../button.directive';
-import { ConfirmConfig } from './../../interfaces';
+import { FsFormDialogCloseDirective } from '../form-dialog-close.directive';
 import { ConfirmResult } from './../../enums/confirm-result';
-import { FsForm } from '../../services/fsform.service';
+import { ConfirmConfig } from './../../interfaces';
 import { SubmitEvent } from './../../interfaces/submit-event';
 import * as i0 from "@angular/core";
 export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentInit, OnChanges {
@@ -21,6 +21,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _message;
     private _prompt;
     private _ngZone;
+    private _cdRef;
     private _dialogRef;
     private _drawerRef;
     private _route;
@@ -47,6 +48,7 @@ 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;
@@ -59,7 +61,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _status$;
     private _destroy$;
     private _confirmed;
-    constructor(ngForm: NgForm, _form: FsForm, _element: ElementRef, _message: FsMessage, _prompt: FsPrompt, _ngZone: NgZone, _dialogRef: MatDialogRef<any>, _drawerRef: DrawerRef<any>, _route: ActivatedRoute);
+    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;
     get completing(): boolean;
@@ -69,6 +71,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private get _submitter();
     ngOnInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
+    registerSubmit(fn: () => Observable<any>): void;
     ngAfterContentInit(): void;
     ngOnDestroy(): void;
     createSnapshot(): void;
@@ -117,6 +120,6 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _handleError;
     private _registerCanDeactivateGuard;
     private _cleanupCanDeactivate;
-    static ɵfac: i0.ɵɵFactoryDeclaration<FsFormDirective, [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"; }, ["formDialogClose", "_tabGroups"]>;
+    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"]>;
 }

package/bundles/firestitch-form.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/forms'), require('@angular/material/button'), require('@angular/material/dialog'), require('@angular/material/core'), require('@angular/material/tabs'), require('@firestitch/message'), require('@firestitch/common'), require('@firestitch/drawer'), require('rxjs'), require('rxjs/operators'), require('@firestitch/prompt'), require('@angular/router'), require('lodash-es'), require('date-fns')) :
-    typeof define === 'function' && define.amd ? define('@firestitch/form', ['exports', '@angular/core', '@angular/common', '@angular/forms', '@angular/material/button', '@angular/material/dialog', '@angular/material/core', '@angular/material/tabs', '@firestitch/message', '@firestitch/common', '@firestitch/drawer', 'rxjs', 'rxjs/operators', '@firestitch/prompt', '@angular/router', 'lodash-es', 'date-fns'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.form = {}), global.ng.core, global.ng.common, global.ng.forms, global.ng.material.button, global.ng.material.dialog, global.ng.material.core, global.ng.material.tabs, global.i2, global.common, global.i7, global.rxjs, global.rxjs.operators, global.i1$1, global.ng.router, global.lodashEs, global.dateFns));
-})(this, (function (exports, i0, i4, i1, i1$2, i2$1, core, tabs, i2, common, i7, rxjs, operators, i1$1, i3, lodashEs, dateFns) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/forms'), require('@angular/material/button'), require('@angular/material/dialog'), require('@angular/material/core'), require('@angular/material/tabs'), require('@firestitch/common'), require('@firestitch/drawer'), require('@firestitch/message'), require('rxjs'), require('rxjs/operators'), require('@firestitch/prompt'), require('@angular/router'), require('lodash-es'), require('date-fns')) :
+    typeof define === 'function' && define.amd ? define('@firestitch/form', ['exports', '@angular/core', '@angular/common', '@angular/forms', '@angular/material/button', '@angular/material/dialog', '@angular/material/core', '@angular/material/tabs', '@firestitch/common', '@firestitch/drawer', '@firestitch/message', 'rxjs', 'rxjs/operators', '@firestitch/prompt', '@angular/router', 'lodash-es', 'date-fns'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.firestitch = global.firestitch || {}, global.firestitch.form = {}), global.ng.core, global.ng.common, global.ng.forms, global.ng.material.button, global.ng.material.dialog, global.ng.material.core, global.ng.material.tabs, global.common, global.i7, global.i2, global.rxjs, global.rxjs.operators, global.i1, global.ng.router, global.lodashEs, global.dateFns));
+})(this, (function (exports, i0, i4, i1$1, i1$2, i2$1, core, tabs, common, i7, i2, rxjs, operators, i1, i3, lodashEs, dateFns) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -24,12 +24,12 @@
 
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
     var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
-    var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1);
+    var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1$1);
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
     var i2__namespace$1 = /*#__PURE__*/_interopNamespace(i2$1);
-    var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var i7__namespace = /*#__PURE__*/_interopNamespace(i7);
-    var i1__namespace = /*#__PURE__*/_interopNamespace(i1$1);
+    var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
+    var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
     var i3__namespace = /*#__PURE__*/_interopNamespace(i3);
 
     /*! *****************************************************************************
@@ -428,77 +428,10 @@
         });
     }
 
-    var FsFormDialogCloseDirective = /** @class */ (function () {
-        function FsFormDialogCloseDirective() {
-            this.clicked$ = new rxjs.Subject();
-            this.registered = false;
-            this.type = 'button';
-        }
-        FsFormDialogCloseDirective.prototype.click = function () {
-            this.clicked$.next();
-        };
-        FsFormDialogCloseDirective.prototype.ngOnDestroy = function () {
-            this.clicked$.complete();
-        };
-        return FsFormDialogCloseDirective;
-    }());
-    FsFormDialogCloseDirective.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogCloseDirective, deps: [], target: i0__namespace.ɵɵFactoryTarget.Directive });
-    FsFormDialogCloseDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDialogCloseDirective, selector: "[fsFormDialogClose],[fs-form-dialog-close]", host: { listeners: { "click": "click($event.target)" }, properties: { "attr.type": "this.type" } }, ngImport: i0__namespace });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogCloseDirective, decorators: [{
-                type: i0.Directive,
-                args: [{
-                        selector: '[fsFormDialogClose],[fs-form-dialog-close]'
-                    }]
-            }], propDecorators: { type: [{
-                    type: i0.HostBinding,
-                    args: ['attr.type']
-                }], click: [{
-                    type: i0.HostListener,
-                    args: ['click', ['$event.target']]
-                }] } });
-
-    exports.FormStatus = void 0;
-    (function (FormStatus) {
-        FormStatus["Valid"] = "valid";
-        FormStatus["Invalid"] = "invalid";
-        FormStatus["Validating"] = "validating";
-        FormStatus["Submitting"] = "submitting";
-        FormStatus["Submitted"] = "submitted";
-        FormStatus["Error"] = "error";
-        FormStatus["Success"] = "success";
-        FormStatus["Completing"] = "completing";
-    })(exports.FormStatus || (exports.FormStatus = {}));
-
     function confirmResultContinue(result) {
         return result === exports.ConfirmResult.Discard || result === exports.ConfirmResult.Save || result === exports.ConfirmResult.Pristine;
     }
 
-    function getFormErrors(control, key) {
-        var _a;
-        var errors = null;
-        if (control.invalid && control.errors) {
-            errors = (_a = {},
-                _a[key] = Object.assign({}, control.errors),
-                _a);
-        }
-        if (control instanceof i1.FormGroup) {
-            Object.entries(control.controls)
-                .forEach(function (_a) {
-                var _b = __read(_a, 2), name = _b[0], childControl = _b[1];
-                var childErrors = getFormErrors(childControl, name);
-                if (childErrors) {
-                    if (!errors) {
-                        errors = Object.assign({}, childErrors);
-                    }
-                    else {
-                        Object.assign(errors, childErrors);
-                    }
-                }
-            });
-        }
-        return errors;
-    }
-
     function getActiveRoute(route) {
         while (route.firstChild) {
             route = route.firstChild;
@@ -576,14 +509,82 @@
                     }]
             }], ctorParameters: function () { return [{ type: i1__namespace.FsPrompt }, { type: FsForm }, { type: i3__namespace.ActivatedRoute }]; } });
 
+    function getFormErrors(control, key) {
+        var _a;
+        var errors = null;
+        if (control.invalid && control.errors) {
+            errors = (_a = {},
+                _a[key] = Object.assign({}, control.errors),
+                _a);
+        }
+        if (control instanceof i1$1.FormGroup) {
+            Object.entries(control.controls)
+                .forEach(function (_a) {
+                var _b = __read(_a, 2), name = _b[0], childControl = _b[1];
+                var childErrors = getFormErrors(childControl, name);
+                if (childErrors) {
+                    if (!errors) {
+                        errors = Object.assign({}, childErrors);
+                    }
+                    else {
+                        Object.assign(errors, childErrors);
+                    }
+                }
+            });
+        }
+        return errors;
+    }
+
+    var FsFormDialogCloseDirective = /** @class */ (function () {
+        function FsFormDialogCloseDirective() {
+            this.clicked$ = new rxjs.Subject();
+            this.registered = false;
+            this.type = 'button';
+        }
+        FsFormDialogCloseDirective.prototype.click = function () {
+            this.clicked$.next();
+        };
+        FsFormDialogCloseDirective.prototype.ngOnDestroy = function () {
+            this.clicked$.complete();
+        };
+        return FsFormDialogCloseDirective;
+    }());
+    FsFormDialogCloseDirective.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogCloseDirective, deps: [], target: i0__namespace.ɵɵFactoryTarget.Directive });
+    FsFormDialogCloseDirective.ɵdir = i0__namespace.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDialogCloseDirective, selector: "[fsFormDialogClose],[fs-form-dialog-close]", host: { listeners: { "click": "click($event.target)" }, properties: { "attr.type": "this.type" } }, ngImport: i0__namespace });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogCloseDirective, decorators: [{
+                type: i0.Directive,
+                args: [{
+                        selector: '[fsFormDialogClose],[fs-form-dialog-close]'
+                    }]
+            }], propDecorators: { type: [{
+                    type: i0.HostBinding,
+                    args: ['attr.type']
+                }], click: [{
+                    type: i0.HostListener,
+                    args: ['click', ['$event.target']]
+                }] } });
+
+    exports.FormStatus = void 0;
+    (function (FormStatus) {
+        FormStatus["Valid"] = "valid";
+        FormStatus["Invalid"] = "invalid";
+        FormStatus["Validating"] = "validating";
+        FormStatus["Submitting"] = "submitting";
+        FormStatus["Submitted"] = "submitted";
+        FormStatus["Error"] = "error";
+        FormStatus["Success"] = "success";
+        FormStatus["Completing"] = "completing";
+    })(exports.FormStatus || (exports.FormStatus = {}));
+
     var FsFormDirective = /** @class */ (function () {
-        function FsFormDirective(ngForm, _form, _element, _message, _prompt, _ngZone, _dialogRef, _drawerRef, _route) {
+        function FsFormDirective(ngForm, _form, _element, _message, _prompt, _ngZone, _cdRef, _dialogRef, _drawerRef, _route) {
             this.ngForm = ngForm;
             this._form = _form;
             this._element = _element;
             this._message = _message;
             this._prompt = _prompt;
             this._ngZone = _ngZone;
+            this._cdRef = _cdRef;
             this._dialogRef = _dialogRef;
             this._drawerRef = _drawerRef;
             this._route = _route;
@@ -608,6 +609,7 @@
             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();
@@ -718,6 +720,11 @@
                 this._updateDirtySubmitButtons();
             }
         };
+        FsFormDirective.prototype.registerSubmit = function (fn) {
+            this.submit = fn;
+            this.submitRegistered.emit();
+            this._cdRef.markForCheck();
+        };
         FsFormDirective.prototype.ngAfterContentInit = function () {
             this._registerConfirm();
             this._registerConfirmDialogClose();
@@ -1212,8 +1219,8 @@
         };
         return FsFormDirective;
     }());
-    FsFormDirective.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDirective, deps: [{ token: i1.NgForm }, { token: FsForm }, { token: i0__namespace.ElementRef }, { token: i2__namespace.FsMessage }, { token: i1__namespace.FsPrompt }, { token: i0__namespace.NgZone }, { 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" }, 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.ɵ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 });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDirective, decorators: [{
                 type: i0.Directive,
                 args: [{
@@ -1222,8 +1229,8 @@
             }], ctorParameters: function () {
             return [{ type: i1__namespace$1.NgForm, decorators: [{
                             type: i0.Inject,
-                            args: [i1.NgForm]
-                        }] }, { type: FsForm }, { type: i0__namespace.ElementRef }, { type: i2__namespace.FsMessage }, { type: i1__namespace.FsPrompt }, { type: i0__namespace.NgZone }, { type: i2__namespace$1.MatDialogRef, decorators: [{
+                            args: [i1$1.NgForm]
+                        }] }, { type: FsForm }, { type: i0__namespace.ElementRef }, { type: i2__namespace.FsMessage }, { type: i1__namespace.FsPrompt }, { type: i0__namespace.NgZone }, { type: i0__namespace.ChangeDetectorRef }, { type: i2__namespace$1.MatDialogRef, decorators: [{
                             type: i0.Optional
                         }, {
                             type: i0.Inject,
@@ -1281,6 +1288,8 @@
                     type: i0.Output
                 }], cleared: [{
                     type: i0.Output
+                }], submitRegistered: [{
+                    type: i0.Output
                 }], fsFormClass: [{
                     type: i0.HostBinding,
                     args: ['class.fs-form']
@@ -1614,7 +1623,7 @@
         };
         FsFormRequiredDirective.prototype.validate = function (control) {
             if (this.required) {
-                return i1.Validators.required(this._control);
+                return i1$1.Validators.required(this._control);
             }
             else {
                 return null;
@@ -1773,7 +1782,7 @@
             this._control.updateValueAndValidity();
         };
         FsFormMinDirective.prototype.validate = function (control) {
-            return FsValidators.numeric(this._control) || i1.Validators.min(parseFloat(this.fsFormMin))(this._control);
+            return FsValidators.numeric(this._control) || i1$1.Validators.min(parseFloat(this.fsFormMin))(this._control);
         };
         return FsFormMinDirective;
     }(FsControlDirective));
@@ -1812,7 +1821,7 @@
             this._control.updateValueAndValidity();
         };
         FsFormMaxDirective.prototype.validate = function (control) {
-            return FsValidators.numeric(this._control) || i1.Validators.max(this.fsFormMax)(this._control);
+            return FsValidators.numeric(this._control) || i1$1.Validators.max(this.fsFormMax)(this._control);
         };
         return FsFormMaxDirective;
     }(FsControlDirective));
@@ -1851,7 +1860,7 @@
             this._control.updateValueAndValidity();
         };
         FsFormMinLengthDirective.prototype.validate = function (control) {
-            return i1.Validators.minLength(this.fsFormMinLength)(this._control);
+            return i1$1.Validators.minLength(this.fsFormMinLength)(this._control);
         };
         return FsFormMinLengthDirective;
     }(FsControlDirective));
@@ -1890,7 +1899,7 @@
             this._control.updateValueAndValidity();
         };
         FsFormMaxLengthDirective.prototype.validate = function (control) {
-            return i1.Validators.maxLength(this.fsFormMaxLength)(this._control);
+            return i1$1.Validators.maxLength(this.fsFormMaxLength)(this._control);
         };
         return FsFormMaxLengthDirective;
     }(FsControlDirective));
@@ -2205,7 +2214,7 @@
             this._control.updateValueAndValidity();
         };
         FsFormPatternDirective.prototype.validate = function (control) {
-            return i1.Validators.pattern(this.fsFormPattern)(this._control);
+            return i1$1.Validators.pattern(this.fsFormPattern)(this._control);
         };
         return FsFormPatternDirective;
     }(FsControlDirective));
@@ -2695,7 +2704,7 @@
         return FsFormDialogActionsComponent;
     }());
     FsFormDialogActionsComponent.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogActionsComponent, deps: [{ token: FsFormDirective, optional: true }, { token: i2__namespace$1.MatDialogRef, optional: true }, { token: i0__namespace.ChangeDetectorRef }], target: i0__namespace.ɵɵFactoryTarget.Component });
-    FsFormDialogActionsComponent.ɵcmp = i0__namespace.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDialogActionsComponent, selector: "fs-form-dialog-actions", inputs: { save: "save", create: "create", close: "close", done: "done", closeData: "closeData", name: "name" }, ngImport: i0__namespace, template: "<div class=\"form-buttons\" [ngClass]=\"{ 'save-create': save || create }\">\n  <ng-container *ngIf=\"save\">\n    <button\n        mat-button\n        type=\"submit\"\n        color=\"primary\"\n        [name]=\"name\">\n      {{create ? 'Create' : 'Save'}}\n    </button>\n    <button\n        mat-button\n        type=\"button\"\n        [disabled]=\"close && !dirty && !create\"\n        [matDialogClose]=\"null\">\n      Cancel\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"done\">\n    <button\n        mat-button\n        type=\"button\"\n        color=\"primary\"\n        [matDialogClose]=\"null\">\n      Done\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"save || create\">\n    <ng-template [ngTemplateOutlet]=\"content\"></ng-template>\n  </ng-container>\n\n  <ng-container *ngIf=\"close\">\n    <button\n        mat-button\n        type=\"button\"\n        class=\"close\"\n        [color]=\"dirty ? 'basic' : 'primary'\"\n        (click)=\"closeClick()\">\n      Close\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"!(save || create)\">\n    <ng-template [ngTemplateOutlet]=\"content\"></ng-template>\n  </ng-container>\n</div>\n\n<ng-template #content>\n  <ng-content></ng-content>\n</ng-template>\n", styles: [":host{width:100%}.form-buttons.save-create .close{float:right}\n"], components: [{ type: i1__namespace$2.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }], directives: [{ type: i4__namespace.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i4__namespace.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: FsButtonDirective, selector: "[mat-raised-button],[mat-button],[mat-flat-button],[mat-stroked-button]", inputs: ["name", "dirtySubmit", "form"] }, { type: i2__namespace$1.MatDialogClose, selector: "[mat-dialog-close], [matDialogClose]", inputs: ["type", "mat-dialog-close", "aria-label", "matDialogClose"], exportAs: ["matDialogClose"] }, { type: i4__namespace.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }], changeDetection: i0__namespace.ChangeDetectionStrategy.OnPush });
+    FsFormDialogActionsComponent.ɵcmp = i0__namespace.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.16", type: FsFormDialogActionsComponent, selector: "fs-form-dialog-actions", inputs: { save: "save", create: "create", close: "close", done: "done", closeData: "closeData", name: "name" }, ngImport: i0__namespace, template: "<div class=\"form-buttons\" [ngClass]=\"{ 'save-create': save || create }\">\n  <ng-container *ngIf=\"save || create\">\n    <button\n        mat-button\n        type=\"submit\"\n        color=\"primary\"\n        [name]=\"name\">\n      {{create ? 'Create' : 'Save'}}\n    </button>\n    <button\n        mat-button\n        type=\"button\"\n        [disabled]=\"close && !dirty && !create\"\n        [matDialogClose]=\"null\">\n      Cancel\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"done\">\n    <button\n        mat-button\n        type=\"button\"\n        color=\"primary\"\n        [matDialogClose]=\"null\">\n      Done\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"save || create\">\n    <ng-template [ngTemplateOutlet]=\"content\"></ng-template>\n  </ng-container>\n\n  <ng-container *ngIf=\"close\">\n    <button\n        mat-button\n        type=\"button\"\n        class=\"close\"\n        [color]=\"dirty ? 'basic' : 'primary'\"\n        (click)=\"closeClick()\">\n      Close\n    </button>\n  </ng-container>\n\n  <ng-container *ngIf=\"!(save || create)\">\n    <ng-template [ngTemplateOutlet]=\"content\"></ng-template>\n  </ng-container>\n</div>\n\n<ng-template #content>\n  <ng-content></ng-content>\n</ng-template>\n", styles: [":host{width:100%}.form-buttons.save-create .close{float:right}\n"], components: [{ type: i1__namespace$2.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }], directives: [{ type: i4__namespace.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: i4__namespace.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: FsButtonDirective, selector: "[mat-raised-button],[mat-button],[mat-flat-button],[mat-stroked-button]", inputs: ["name", "dirtySubmit", "form"] }, { type: i2__namespace$1.MatDialogClose, selector: "[mat-dialog-close], [matDialogClose]", inputs: ["type", "mat-dialog-close", "aria-label", "matDialogClose"], exportAs: ["matDialogClose"] }, { type: i4__namespace.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }], changeDetection: i0__namespace.ChangeDetectionStrategy.OnPush });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FsFormDialogActionsComponent, decorators: [{
                 type: i0.Component,
                 args: [{
@@ -2830,7 +2839,7 @@
             FsFormNoFsValidatorsDirective,
             FsButtonDirective,
             FsSubmitButtonDirective], imports: [i4.CommonModule,
-            i1.FormsModule,
+            i1$1.FormsModule,
             i1$2.MatButtonModule,
             i2$1.MatDialogModule], exports: [FsFormDirective,
             FsControlDirective,
@@ -2864,7 +2873,7 @@
             },
         ], imports: [[
                 i4.CommonModule,
-                i1.FormsModule,
+                i1$1.FormsModule,
                 i1$2.MatButtonModule,
                 i2$1.MatDialogModule,
             ]] });
@@ -2873,7 +2882,7 @@
                 args: [{
                         imports: [
                             i4.CommonModule,
-                            i1.FormsModule,
+                            i1$1.FormsModule,
                             i1$2.MatButtonModule,
                             i2$1.MatDialogModule,
                         ],