@firestitch/form 12.4.4 → 12.4.6

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

@@ -87,6 +87,7 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     addButton(button: FsButtonDirective): void;
     removeButton(button: FsButtonDirective): void;
     private _listenSubmit;
+    validate(): void;
     private _listenFormStatus;
     private _listenWindowClose;
     private _listenHotKeys;
@@ -110,7 +111,6 @@ export declare class FsFormDirective implements OnInit, OnDestroy, AfterContentI
     private _updateDirtySubmitButtons;
     private _broadcastSubmittingEvents;
     private _broadcasValidatingEvents;
-    private _markControlsAsTouchedAndUpdateValidity;
     private _setupActiveSubmitButton;
     private _disableButtons;
     private _waitUntilStatusPending;

package/bundles/firestitch-form.umd.js

@@ -795,7 +795,7 @@
             }), operators.tap(function () { return _this._confirmed = 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 (data) { return _this._waitUntilStatusPending()
+            }), operators.tap(function () { return _this._broadcasValidatingEvents(); }), operators.tap(function () { return _this.validate(); }), 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$;
@@ -810,6 +810,14 @@
             }), operators.takeUntil(this._destroy$))
                 .subscribe(function () { });
         };
+        FsFormDirective.prototype.validate = function () {
+            Object.values(this.ngForm.controls)
+                .forEach(function (control) {
+                control.markAsDirty();
+                control.markAsTouched();
+                control.updateValueAndValidity();
+            });
+        };
         FsFormDirective.prototype._listenFormStatus = function () {
             var _this = this;
             this._status$
@@ -1153,14 +1161,6 @@
         FsFormDirective.prototype._broadcasValidatingEvents = function () {
             this._status$.next(exports.FormStatus.Validating);
         };
-        FsFormDirective.prototype._markControlsAsTouchedAndUpdateValidity = function () {
-            Object.values(this.ngForm.controls)
-                .forEach(function (control) {
-                control.markAsDirty();
-                control.markAsTouched();
-                control.updateValueAndValidity();
-            });
-        };
         FsFormDirective.prototype._setupActiveSubmitButton = function () {
             this._activeSubmitButton = this._getActiveSubmitButton();
             this._resetButtons();
@@ -1435,6 +1435,14 @@
                 var renderer = this.renderer2;
                 var wrapper = this.getWrapperElement();
                 var error = this.ngControl.dirty ? this.getError(this.ngControl) : null;
+                var shouldErrorBeRendered = this.ngControl.invalid
+                    && (this.ngControl.dirty || ((_a = this.formDirective.ngForm) === null || _a === void 0 ? void 0 : _a.submitted));
+                if (shouldErrorBeRendered && error) {
+                    wrapper.classList.add('ng-invalid', 'ng-dirty');
+                }
+                else {
+                    wrapper.classList.remove('ng-invalid');
+                }
                 if (!this.getMessageSelector()) {
                     return;
                 }
@@ -1466,13 +1474,9 @@
                 if (errorWrapper) {
                     errorWrapper.remove();
                 }
-                wrapper.classList.remove('ng-invalid');
-                var shouldErrorBeRendered = this.ngControl.invalid
-                    && (this.ngControl.dirty || ((_a = this.formDirective.ngForm) === null || _a === void 0 ? void 0 : _a.submitted));
                 if (!shouldErrorBeRendered || !error) {
                     return;
                 }
-                wrapper.classList.add('ng-invalid', 'ng-dirty');
                 errorWrapper = renderer.createElement('div');
                 renderer.addClass(errorWrapper, 'fs-form-error-target');
                 renderer.addClass(errorWrapper, this.appendErrorClass);