@firestitch/form 12.4.5 → 12.4.7

package/bundles/firestitch-form.umd.js

@@ -1370,46 +1370,50 @@
             }
         };
         FsControlDirective.prototype.getMessageSelector = function () {
+            var _a;
             if (this.messageSelector === false) {
                 return '';
             }
             if (this.messageSelector) {
                 return this.messageSelector;
             }
-            else if (this.formDirective && this.formDirective.messageSelector) {
+            else if ((_a = this.formDirective) === null || _a === void 0 ? void 0 : _a.messageSelector) {
                 return this.formDirective.messageSelector;
             }
         };
         FsControlDirective.prototype.getHintWrapperSelector = function () {
+            var _a;
             if (this.hintSelector === false) {
                 return '';
             }
             if (this.hintSelector) {
                 return this.hintSelector;
             }
-            else if (this.formDirective && this.formDirective.hintSelector) {
+            else if ((_a = this.formDirective) === null || _a === void 0 ? void 0 : _a.hintSelector) {
                 return this.formDirective.hintSelector;
             }
         };
         FsControlDirective.prototype.getWrapperSelector = function () {
+            var _a;
             if (this.wrapperSelector === false) {
                 return '';
             }
             if (this.wrapperSelector) {
                 return this.wrapperSelector;
             }
-            else if (this.formDirective && this.formDirective.wrapperSelector) {
+            else if ((_a = this.formDirective) === null || _a === void 0 ? void 0 : _a.wrapperSelector) {
                 return this.formDirective.wrapperSelector;
             }
         };
         FsControlDirective.prototype.getlabelSelector = function () {
+            var _a;
             if (this.labelSelector === false) {
                 return '';
             }
             if (this.labelSelector) {
                 return this.labelSelector;
             }
-            else if (this.formDirective && this.formDirective.labelSelector) {
+            else if ((_a = this.formDirective) === null || _a === void 0 ? void 0 : _a.labelSelector) {
                 return this.formDirective.labelSelector;
             }
         };
@@ -1430,11 +1434,19 @@
           </mat-form-field>
         */
         FsControlDirective.prototype.render = function () {
-            var _a;
+            var _a, _b;
             if (this.ngControl) {
                 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 || ((_b = (_a = this.formDirective) === null || _a === void 0 ? void 0 : _a.ngForm) === null || _b === void 0 ? void 0 : _b.submitted));
+                if (shouldErrorBeRendered && error) {
+                    wrapper.classList.add('ng-invalid', 'ng-dirty');
+                }
+                else {
+                    wrapper.classList.remove('ng-invalid');
+                }
                 if (!this.getMessageSelector()) {
                     return;
                 }
@@ -1466,13 +1478,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);