@ngx-formly/core 5.10.28 → 5.10.32

package/bundles/ngx-formly-core.umd.js

@@ -102,6 +102,20 @@
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
+    /**
+     * @param {?} form
+     * @param {?} callback
+     * @return {?}
+     */
+    function disableTreeValidityCall(form, callback) {
+        /** @type {?} */
+        var _updateTreeValidity = form._updateTreeValidity.bind(form);
+        form._updateTreeValidity = ( /**
+         * @return {?}
+         */function () { });
+        callback();
+        form._updateTreeValidity = _updateTreeValidity;
+    }
     /**
      * @param {?} formId
      * @param {?} field
@@ -113,8 +127,12 @@
             return field.id;
         /** @type {?} */
         var type = field.type;
-        if (!type && field.template)
+        if (!type && field.template) {
             type = 'template';
+        }
+        if (isFunction(type)) {
+            type = (( /** @type {?} */(type))).prototype.constructor.name;
+        }
         return [formId, type, field.key, index].join('_');
     }
     /**
@@ -196,50 +214,12 @@
         }
         model[paths[paths.length - 1]] = clone(value);
     }
-    /**
-     * @param {?} field
-     * @return {?}
-     */
-    function getFieldInitialValue(field) {
-        var e_1, _a;
-        /** @type {?} */
-        var value = field.options['_initialModel'];
-        /** @type {?} */
-        var paths = getKeyPath(field);
-        while (field.parent) {
-            field = field.parent;
-            paths = __spread(getKeyPath(field), paths);
-        }
-        try {
-            for (var paths_1 = __values(paths), paths_1_1 = paths_1.next(); !paths_1_1.done; paths_1_1 = paths_1.next()) {
-                var path = paths_1_1.value;
-                if (!value) {
-                    return undefined;
-                }
-                value = value[path];
-            }
-        }
-        catch (e_1_1) {
-            e_1 = { error: e_1_1 };
-        }
-        finally {
-            try {
-                if (paths_1_1 && !paths_1_1.done && (_a = paths_1.return))
-                    _a.call(paths_1);
-            }
-            finally {
-                if (e_1)
-                    throw e_1.error;
-            }
-        }
-        return value;
-    }
     /**
      * @param {?} field
      * @return {?}
      */
     function getFieldValue(field) {
-        var e_2, _a;
+        var e_1, _a;
         /** @type {?} */
         var model = field.parent.model;
         try {
@@ -251,8 +231,8 @@
                 model = model[path];
             }
         }
-        catch (e_2_1) {
-            e_2 = { error: e_2_1 };
+        catch (e_1_1) {
+            e_1 = { error: e_1_1 };
         }
         finally {
             try {
@@ -260,8 +240,8 @@
                     _a.call(_b);
             }
             finally {
-                if (e_2)
-                    throw e_2.error;
+                if (e_1)
+                    throw e_1.error;
             }
         }
         return model;
@@ -459,27 +439,6 @@
          * @return {?}
          */function () { return fns.splice(fns.indexOf(setFn), 1); });
     }
-    /**
-     * @param {?} form
-     * @param {?} action
-     * @return {?}
-     */
-    function reduceFormUpdateValidityCalls(form, action) {
-        /** @type {?} */
-        var updateValidity = form._updateTreeValidity.bind(form);
-        /** @type {?} */
-        var updateValidityArgs = { called: false, emitEvent: false };
-        form._updateTreeValidity = ( /**
-         * @param {?=} __0
-         * @return {?}
-         */function (_a) {
-            var emitEvent = (_a === void 0 ? { emitEvent: true } : _a).emitEvent;
-            return updateValidityArgs = { called: true, emitEvent: emitEvent || updateValidityArgs.emitEvent };
-        });
-        action();
-        updateValidityArgs.called && updateValidity({ emitEvent: updateValidityArgs.emitEvent });
-        form._updateTreeValidity = updateValidity;
-    }
 
     /**
      * @fileoverview added by tsickle
@@ -863,7 +822,7 @@
                 }
                 /** @type {?} */
                 var field = { fieldGroup: fieldGroup, model: model, formControl: formControl, options: this._setOptions(options) };
-                reduceFormUpdateValidityCalls(formControl, ( /**
+                disableTreeValidityCall(formControl, ( /**
                  * @return {?}
                  */function () { return _this._buildForm(field); }));
                 field.options._checkField(field, true);
@@ -1139,15 +1098,24 @@
     }
     /**
      * @param {?} c
+     * @param {?=} onlySelf
      * @return {?}
      */
-    function updateValidity(c) {
+    function updateValidity(c, onlySelf) {
+        if (onlySelf === void 0) {
+            onlySelf = false;
+        }
         /** @type {?} */
         var status = c.status;
-        c.updateValueAndValidity({ emitEvent: false });
+        /** @type {?} */
+        var value = c.value;
+        c.updateValueAndValidity({ emitEvent: false, onlySelf: onlySelf });
         if (status !== c.status) {
             (( /** @type {?} */(c.statusChanges))).emit(c.status);
         }
+        if (value !== c.value) {
+            (( /** @type {?} */(c.valueChanges))).emit(c.value);
+        }
     }
     /**
      * @param {?} form
@@ -1947,16 +1915,11 @@
      */
     var FormlyAttributes = /** @class */ (function () {
         function FormlyAttributes(renderer, elementRef, _document) {
+            var _this = this;
             this.renderer = renderer;
             this.elementRef = elementRef;
             this.uiAttributesCache = {};
-            this.uiAttributes = __spread(FORMLY_VALIDATORS, [
-                'tabindex',
-                'placeholder',
-                'readonly',
-                'disabled',
-                'step',
-            ]);
+            this.uiAttributes = null;
             /**
              * HostBinding doesn't register listeners conditionally which may produce some perf issues.
              *
@@ -1964,12 +1927,23 @@
              */
             this.uiEvents = {
                 listeners: [],
-                events: [
-                    'click',
-                    'keyup',
-                    'keydown',
-                    'keypress',
-                ],
+                events: ['click', 'keyup', 'keydown', 'keypress', 'focus', 'blur', 'change'],
+                callback: ( /**
+                 * @param {?} eventName
+                 * @param {?} $event
+                 * @return {?}
+                 */function (eventName, $event) {
+                    switch (eventName) {
+                        case 'focus':
+                            return _this.onFocus($event);
+                        case 'blur':
+                            return _this.onBlur($event);
+                        case 'change':
+                            return _this.onChange($event);
+                        default:
+                            return _this.to[eventName](_this.field, $event);
+                    }
+                }),
             };
             this.document = _document;
         }
@@ -2008,11 +1982,11 @@
                      * @param {?} eventName
                      * @return {?}
                      */function (eventName) {
-                        if (_this.to && _this.to[eventName]) {
+                        if ((_this.to && _this.to[eventName]) || ['focus', 'blur', 'change'].indexOf(eventName) !== -1) {
                             _this.uiEvents.listeners.push(_this.renderer.listen(_this.elementRef.nativeElement, eventName, ( /**
                              * @param {?} e
                              * @return {?}
-                             */function (e) { return _this.to[eventName](_this.field, e); })));
+                             */function (e) { return _this.uiEvents.callback(eventName, e); })));
                         }
                     }));
                     if (this.to && this.to.attributes) {
@@ -2084,6 +2058,14 @@
          */
             function () {
                 var _this = this;
+                if (!this.uiAttributes) {
+                    /** @type {?} */
+                    var element_1 = ( /** @type {?} */(this.elementRef.nativeElement));
+                    this.uiAttributes = __spread(FORMLY_VALIDATORS, ['tabindex', 'placeholder', 'readonly', 'disabled', 'step']).filter(( /**
+                     * @param {?} attr
+                     * @return {?}
+                     */function (attr) { return !element_1.hasAttribute || !element_1.hasAttribute(attr); }));
+                }
                 this.uiAttributes.forEach(( /**
                  * @param {?} attr
                  * @return {?}
@@ -2260,11 +2242,6 @@
         FormlyAttributes.decorators = [
             { type: i0.Directive, args: [{
                         selector: '[formlyAttributes]',
-                        host: {
-                            '(focus)': 'onFocus($event)',
-                            '(blur)': 'onBlur($event)',
-                            '(change)': 'onChange($event)',
-                        },
                     },] }
         ];
         /** @nocollapse */
@@ -2570,9 +2547,19 @@
          */
             function () {
                 var _this = this;
-                this.errorMessage$ = this.field.formControl.statusChanges.pipe(operators.startWith(null), operators.switchMap(( /**
-                 * @return {?}
-                 */function () {
+                this.errorMessage$ = rxjs.merge(this.field.formControl.statusChanges, (!this.field.options
+                    ? rxjs.of(null)
+                    : this.field.options.fieldChanges.pipe(operators.filter(( /**
+                     * @param {?} __0
+                     * @return {?}
+                     */function (_a) {
+                        var field = _a.field, type = _a.type, property = _a.property;
+                        return (field === _this.field)
+                            && (type === 'expressionChanges')
+                            && (property.indexOf('validation') !== -1);
+                    }))))).pipe(operators.startWith(null), operators.switchMap(( /**
+             * @return {?}
+             */function () {
                     return rxjs.isObservable(_this.errorMessage)
                         ? _this.errorMessage
                         : rxjs.of(_this.errorMessage);
@@ -2747,9 +2734,7 @@
                  */function (f, ignoreCache) {
                     if (!checkLocked) {
                         checkLocked = true;
-                        reduceFormUpdateValidityCalls(f.formControl, ( /**
-                         * @return {?}
-                         */function () { return _this.checkField(f, ignoreCache); }));
+                        _this.checkField(f, ignoreCache);
                         checkLocked = false;
                     }
                 });
@@ -3527,22 +3512,7 @@
                 if (field.parent) {
                     return;
                 }
-                /** @type {?} */
-                var fieldsToUpdate = this.setValidators(field);
-                if (fieldsToUpdate.length === 0) {
-                    return;
-                }
-                if (fieldsToUpdate.length === 1) {
-                    /** @type {?} */
-                    var control = fieldsToUpdate[0].formControl;
-                    while (control) {
-                        (( /** @type {?} */(control)))._updateTreeValidity({ onlySelf: true });
-                        control = control.parent;
-                    }
-                }
-                else {
-                    (( /** @type {?} */(field.formControl)))._updateTreeValidity();
-                }
+                this.setValidators(field);
             };
         /**
          * @private
@@ -3583,39 +3553,40 @@
         /**
          * @private
          * @param {?} field
+         * @param {?=} disabled
          * @return {?}
          */
         FieldFormExtension.prototype.setValidators = /**
          * @private
          * @param {?} field
+         * @param {?=} disabled
          * @return {?}
          */
-            function (field) {
+            function (field, disabled) {
                 var _this = this;
+                if (disabled === void 0) {
+                    disabled = false;
+                }
                 /** @type {?} */
-                var updateValidity$$1 = false;
+                var markForCheck = false;
+                if (disabled === false && field.key && field.templateOptions && field.templateOptions.disabled) {
+                    disabled = true;
+                }
+                (field.fieldGroup || []).forEach(( /**
+                 * @param {?} f
+                 * @return {?}
+                 */function (f) { return _this.setValidators(f, disabled) && (markForCheck = true); }));
                 if (field.key || !field.parent || (!field.key && !field.fieldGroup)) {
                     var c_1 = field.formControl;
-                    /** @type {?} */
-                    var disabled = field.templateOptions ? field.templateOptions.disabled : false;
-                    if (field.key && c_1) {
+                    field.templateOptions = field.templateOptions || {};
+                    if (field.key && c_1 && c_1 instanceof forms.FormControl) {
                         if (disabled && c_1.enabled) {
                             c_1.disable({ emitEvent: false, onlySelf: true });
-                            if (!c_1.parent) {
-                                updateValidity(c_1);
-                            }
-                            else {
-                                updateValidity$$1 = true;
-                            }
+                            markForCheck = true;
                         }
                         if (!disabled && c_1.disabled) {
                             c_1.enable({ emitEvent: false, onlySelf: true });
-                            if (!c_1.parent) {
-                                updateValidity(c_1);
-                            }
-                            else {
-                                updateValidity$$1 = true;
-                            }
+                            markForCheck = true;
                         }
                     }
                     if (c_1 && (null === c_1.validator || null === c_1.asyncValidator)) {
@@ -3633,27 +3604,13 @@
                             var v = forms.Validators.composeAsync(_this.mergeValidators(field, '_asyncValidators'));
                             return v ? v(c_1) : rxjs.of(null);
                         }));
-                        if (!c_1.parent) {
-                            updateValidity(c_1);
-                        }
-                        else {
-                            updateValidity$$1 = true;
-                        }
+                        markForCheck = true;
                     }
-                }
-                /** @type {?} */
-                var fieldsToUpdate = updateValidity$$1 ? [field] : [];
-                (field.fieldGroup || []).forEach(( /**
-                 * @param {?} f
-                 * @return {?}
-                 */function (f) {
-                    /** @type {?} */
-                    var childrenToUpdate = _this.setValidators(f);
-                    if (!updateValidity$$1) {
-                        fieldsToUpdate.push.apply(fieldsToUpdate, __spread(childrenToUpdate));
+                    if (markForCheck) {
+                        updateValidity(c_1, true);
                     }
-                }));
-                return fieldsToUpdate;
+                }
+                return markForCheck;
             };
         /**
          * @private
@@ -3819,6 +3776,7 @@
                     id: getFieldId("formly_" + this.formId, field, field['index']),
                     hooks: {},
                     modelOptions: {},
+                    validation: { messages: {} },
                     templateOptions: !field.type || !field.key ? {} : {
                         label: '',
                         placeholder: '',
@@ -4063,7 +4021,7 @@
     exports.FormlyModule = FormlyModule;
     exports.ɵdefineHiddenProp = defineHiddenProp;
     exports.ɵreverseDeepMerge = reverseDeepMerge;
-    exports.ɵgetFieldInitialValue = getFieldInitialValue;
+    exports.ɵgetFieldValue = getFieldValue;
     exports.ɵclone = clone;
     exports.ɵwrapProperty = wrapProperty;
     exports.ɵa = defaultFormlyConfig;