@firestitch/form 12.4.12 → 12.4.13

package/bundles/firestitch-form.umd.js

@@ -1359,9 +1359,16 @@
         };
         FsControlDirective.prototype.ngAfterContentInit = function () {
             if (this._control) {
-                this._control.statusChanges
-                    .pipe(operators.takeUntil(this._destroy$))
-                    .subscribe(this.render.bind(this));
+                /*
+                  Ensure that statusChanges has one subscription per control. Multiple can happen
+                  when multiple fsForm validation directives are applied to the same element
+                */
+                if (!this._control.statusChangesSubscribe) {
+                    this._control.statusChanges
+                        .pipe(operators.takeUntil(this._destroy$))
+                        .subscribe(this.render.bind(this));
+                    this._control.statusChangesSubscribe = true;
+                }
             }
         };
         FsControlDirective.prototype.getMessageSelector = function () {
@@ -1430,10 +1437,6 @@
         */
         FsControlDirective.prototype.render = function () {
             var _a, _b;
-            if (this._control.statusChangesSubscribe) {
-                return;
-            }
-            this._control.statusChangesSubscribe = true;
             if (this.ngControl) {
                 var renderer = this.renderer2;
                 var wrapper = this.getWrapperElement();
@@ -1754,7 +1757,7 @@
                 }
             }
             return stream$
-                .pipe(operators.map(function () { return null; }), operators.catchError(function (err) {
+                .pipe(operators.mapTo(null), operators.catchError(function (err) {
                 return rxjs.of({ validationError: err });
             }), operators.take(1));
         };