@firestitch/form 9.6.7 → 9.7.2

package/app/components/form-dialog-actions/form-dialog-actions.component.d.ts

@@ -3,8 +3,10 @@ import { FsFormDirective } from '../../directives/form/form.directive';
 export declare class FsFormDialogActionsComponent implements OnInit, OnDestroy {
     private _form;
     private _cdRef;
+    save: boolean;
     create: boolean;
     close: boolean;
+    name: string;
     dirty: boolean;
     private _destroy$;
     constructor(_form: FsFormDirective, _cdRef: ChangeDetectorRef);

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

@@ -1,4 +1,4 @@
-import { AfterContentInit, ChangeDetectorRef, ElementRef, EventEmitter, NgZone, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges } from '@angular/core';
+import { AfterContentInit, ElementRef, EventEmitter, NgZone, OnChanges, OnDestroy, OnInit, QueryList, SimpleChanges } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { MatTabGroup } from '@angular/material/tabs';
@@ -18,7 +18,6 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _element;
     private _message;
     private _prompt;
-    private _cdRef;
     private _ngZone;
     private _dialogRef;
     private _drawerRef;
@@ -52,7 +51,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _snapshot;
     private _status$;
     private _destroy$;
-    constructor(ngForm: NgForm, _form: FsForm, _element: ElementRef, _message: FsMessage, _prompt: FsPrompt, _cdRef: ChangeDetectorRef, _ngZone: NgZone, _dialogRef: MatDialogRef<any>, _drawerRef: DrawerRef<any>);
+    constructor(ngForm: NgForm, _form: FsForm, _element: ElementRef, _message: FsMessage, _prompt: FsPrompt, _ngZone: NgZone, _dialogRef: MatDialogRef<any>, _drawerRef: DrawerRef<any>);
     get submitting(): boolean;
     get completing(): boolean;
     private get _submitEvent();

package/app/directives/submit-button.directive.d.ts

@@ -1,18 +1,18 @@
-import { OnInit, ElementRef, OnDestroy } from '@angular/core';
+import { OnInit, ElementRef, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { MatButton } from '@angular/material/button';
 import { FsFormDirective } from '../directives/form/form.directive';
 export declare class FsSubmitButtonDirective implements OnInit, OnDestroy {
     private _matButton;
     private _form;
     private _elementRef;
+    private _cdRef;
     name: any;
     dirtySubmit: boolean;
     transitionStyle: any;
     active: boolean;
     private _destroy$;
-    constructor(_matButton: MatButton, _form: FsFormDirective, _elementRef: ElementRef);
+    constructor(_matButton: MatButton, _form: FsFormDirective, _elementRef: ElementRef, _cdRef: ChangeDetectorRef);
     ngOnInit(): void;
-    setFormRef(formRef: FsFormDirective): void;
     disable(): void;
     enable(): void;
     process(): void;

package/bundles/firestitch-form.umd.js

@@ -386,13 +386,12 @@
     }
 
     var FsFormDirective = /** @class */ (function () {
-        function FsFormDirective(ngForm, _form, _element, _message, _prompt, _cdRef, _ngZone, _dialogRef, _drawerRef) {
+        function FsFormDirective(ngForm, _form, _element, _message, _prompt, _ngZone, _dialogRef, _drawerRef) {
             this.ngForm = ngForm;
             this._form = _form;
             this._element = _element;
             this._message = _message;
             this._prompt = _prompt;
-            this._cdRef = _cdRef;
             this._ngZone = _ngZone;
             this._dialogRef = _dialogRef;
             this._drawerRef = _drawerRef;
@@ -898,18 +897,15 @@
         };
         FsFormDirective.prototype._updateDirtySubmitButtons = function () {
             var _this = this;
-            if (this._submitButtons) {
-                this._submitButtons.forEach(function (button) {
-                    button.setFormRef(_this);
-                    if (!_this.confirm || !_this.dirtySubmitButton || _this.ngForm.dirty || !button.dirtySubmit) {
-                        button.enable();
-                    }
-                    else {
-                        button.disable();
-                    }
-                });
-                this._cdRef.markForCheck();
-            }
+            this._submitButtons
+                .forEach(function (submitButton) {
+                if (!_this.confirm || !_this.dirtySubmitButton || _this.ngForm.dirty || !submitButton.dirtySubmit) {
+                    submitButton.enable();
+                }
+                else {
+                    submitButton.disable();
+                }
+            });
         };
         FsFormDirective.prototype._broadcastSubmittingEvents = function () {
             this._status$.next(exports.FormStatus.Submitting);
@@ -952,7 +948,6 @@
             { type: core.ElementRef },
             { type: message.FsMessage },
             { type: prompt.FsPrompt },
-            { type: core.ChangeDetectorRef },
             { type: core.NgZone },
             { type: dialog.MatDialogRef, decorators: [{ type: core.Optional }, { type: core.Inject, args: [dialog.MatDialogRef,] }] },
             { type: drawer.DrawerRef, decorators: [{ type: core.Optional }, { type: core.Inject, args: [drawer.DrawerRef,] }] }
@@ -1054,14 +1049,13 @@
                 selector: '[fsForm]',
             }),
             __param(0, core.Inject(forms.NgForm)),
-            __param(7, core.Optional()), __param(7, core.Inject(dialog.MatDialogRef)),
-            __param(8, core.Optional()), __param(8, core.Inject(drawer.DrawerRef)),
+            __param(6, core.Optional()), __param(6, core.Inject(dialog.MatDialogRef)),
+            __param(7, core.Optional()), __param(7, core.Inject(drawer.DrawerRef)),
             __metadata("design:paramtypes", [forms.NgForm,
                 FsForm,
                 core.ElementRef,
                 message.FsMessage,
                 prompt.FsPrompt,
-                core.ChangeDetectorRef,
                 core.NgZone,
                 dialog.MatDialogRef,
                 drawer.DrawerRef])
@@ -2218,10 +2212,11 @@
     }(FsControlDirective));
 
     var FsSubmitButtonDirective = /** @class */ (function () {
-        function FsSubmitButtonDirective(_matButton, _form, _elementRef) {
+        function FsSubmitButtonDirective(_matButton, _form, _elementRef, _cdRef) {
             this._matButton = _matButton;
             this._form = _form;
             this._elementRef = _elementRef;
+            this._cdRef = _cdRef;
             this.dirtySubmit = true;
             this.transitionStyle = null;
             this.active = false;
@@ -2229,22 +2224,21 @@
         }
         FsSubmitButtonDirective.prototype.ngOnInit = function () {
             var _this = this;
-            this._form.addSubmitButton(this);
-            rxjs.fromEvent(this.element, 'click')
-                .pipe(operators.takeUntil(this._destroy$))
-                .subscribe(function () {
-                _this.active = true;
-            });
-        };
-        FsSubmitButtonDirective.prototype.setFormRef = function (formRef) {
-            var _this = this;
-            if (formRef) {
-                this.transitionStyle = 'none';
-            }
-            if (formRef && this.dirtySubmit) {
-                if (formRef.dirtySubmitButton) {
-                    this.disable();
+            if (this._form) {
+                this._form.addSubmitButton(this);
+                rxjs.fromEvent(this.element, 'click')
+                    .pipe(operators.takeUntil(this._destroy$))
+                    .subscribe(function () {
+                    _this.active = true;
+                });
+                if (this.dirtySubmit) {
+                    if (this._form.dirtySubmitButton) {
+                        if (!this._form.ngForm.dirty) {
+                            this.disable();
+                        }
+                    }
                 }
+                this.transitionStyle = 'none';
                 setTimeout(function () {
                     _this.transitionStyle = null;
                 }, 500);
@@ -2253,12 +2247,14 @@
         FsSubmitButtonDirective.prototype.disable = function () {
             if (this._matButton) {
                 this._matButton.disabled = true;
+                this._cdRef.markForCheck();
             }
         };
         FsSubmitButtonDirective.prototype.enable = function () {
             if (this._matButton) {
                 this._matButton.disabled = false;
                 this._matButton.disableRipple = true;
+                this._cdRef.markForCheck();
             }
         };
         FsSubmitButtonDirective.prototype.process = function () {
@@ -2323,7 +2319,8 @@
         FsSubmitButtonDirective.ctorParameters = function () { return [
             { type: button.MatButton, decorators: [{ type: core.Optional }, { type: core.Host }] },
             { type: FsFormDirective, decorators: [{ type: core.Optional }] },
-            { type: core.ElementRef }
+            { type: core.ElementRef },
+            { type: core.ChangeDetectorRef }
         ]; };
         __decorate([
             core.Input(),
@@ -2339,13 +2336,14 @@
         ], FsSubmitButtonDirective.prototype, "transitionStyle", void 0);
         FsSubmitButtonDirective = __decorate([
             core.Directive({
-                selector: 'form button[type="submit"],form button:not([type])',
+                selector: 'button[type="submit"]',
             }),
             __param(0, core.Optional()), __param(0, core.Host()),
             __param(1, core.Optional()),
             __metadata("design:paramtypes", [button.MatButton,
                 FsFormDirective,
-                core.ElementRef])
+                core.ElementRef,
+                core.ChangeDetectorRef])
         ], FsSubmitButtonDirective);
         return FsSubmitButtonDirective;
     }());
@@ -2384,8 +2382,9 @@
         function FsFormDialogActionsComponent(_form, _cdRef) {
             this._form = _form;
             this._cdRef = _cdRef;
+            this.save = true;
             this.create = false;
-            this.close = true;
+            this.close = false;
             this.dirty = false;
             this._destroy$ = new rxjs.Subject();
         }
@@ -2412,6 +2411,10 @@
             { type: FsFormDirective, decorators: [{ type: core.Optional }] },
             { type: core.ChangeDetectorRef }
         ]; };
+        __decorate([
+            core.Input(),
+            __metadata("design:type", Object)
+        ], FsFormDialogActionsComponent.prototype, "save", void 0);
         __decorate([
             core.Input(),
             __metadata("design:type", Object)
@@ -2420,11 +2423,16 @@
             core.Input(),
             __metadata("design:type", Object)
         ], FsFormDialogActionsComponent.prototype, "close", void 0);
+        __decorate([
+            core.Input(),
+            __metadata("design:type", String)
+        ], FsFormDialogActionsComponent.prototype, "name", void 0);
         FsFormDialogActionsComponent = __decorate([
             core.Component({
                 selector: 'fs-form-dialog-actions',
-                template: "<button \r\n    mat-button \r\n    type=\"button\"\r\n    color=\"primary\" \r\n    *ngIf=\"close && !dirty && !create\"\r\n    [matDialogClose]=\"null\">\r\n  Close\r\n</button>\r\n<button \r\n    mat-button \r\n    *ngIf=\"dirty || create || !close\"\r\n    type=\"submit\"\r\n    color=\"primary\" \r\n    name=\"save\">\r\n  {{create ? 'Create' : 'Save'}}\r\n</button>\r\n<ng-content></ng-content>\r\n<button \r\n    mat-button \r\n    type=\"button\"\r\n    *ngIf=\"dirty || create || !close\"\r\n    [matDialogClose]=\"null\">\r\n  Cancel\r\n</button>\r\n",
-                changeDetection: core.ChangeDetectionStrategy.OnPush
+                template: "<div class=\"buttons\">\r\n  <ng-container *ngIf=\"save\">\r\n    <button \r\n        mat-button \r\n        type=\"submit\"\r\n        color=\"primary\" \r\n        [name]=\"name\">\r\n      {{create ? 'Create' : 'Save'}}\r\n    </button>\r\n    <button \r\n        mat-button \r\n        type=\"button\"\r\n        [disabled]=\"!dirty && !create\"\r\n        [matDialogClose]=\"null\">\r\n      Cancel\r\n    </button>\r\n  </ng-container>\r\n\r\n  <ng-content></ng-content>\r\n  <div class=\"close\" *ngIf=\"close\">\r\n    <button \r\n        mat-button \r\n        type=\"button\"\r\n        [color]=\"dirty ? 'basic' : 'primary'\"\r\n        [matDialogClose]=\"null\">\r\n      Close\r\n    </button>\r\n  </div>\r\n</div>",
+                changeDetection: core.ChangeDetectionStrategy.OnPush,
+                styles: [".buttons{display:flex;flex-grow:1;align-items:center}.buttons .close{display:flex;flex-grow:1;justify-content:flex-end}:host{display:flex;flex-grow:1}"]
             }),
             __param(0, core.Optional()),
             __metadata("design:paramtypes", [FsFormDirective,