Merge pull request #641 from dickp/master

fix(formly-form): validateOnModelChange now copes when field.formControl is an array #523

Author: Caleb Kniffen

src/directives/formly-field.test.js

@@ -1934,6 +1934,31 @@ describe('formly-field', function() {
         expect($validateSpy).to.have.been.calledOnce
       })
 
+      it(`should cope when field.formControl has been upgraded to an array`, () => {
+        scope.model = {
+          multiNgModel: {
+            start: 'start',
+            stop: 'stop',
+          },
+        }
+        const field = getNewField({
+          key: 'multiNgModel',
+          template: multiNgModelField,
+          extras: {
+            validateOnModelChange: true,
+          },
+        })
+        scope.fields = [field]
+        compileAndDigest()
+        const $validateSpy0 = sinon.spy(field.formControl[0], '$validate')
+        const $validateSpy1 = sinon.spy(field.formControl[1], '$validate')
+        scope.model.foo = 'bar'
+        scope.$digest()
+        $timeout.flush()
+        expect($validateSpy0).to.have.been.calledOnce
+        expect($validateSpy1).to.have.been.calledOnce
+      })
+
       it.skip(`should run field expressions when form is initialised`, () => {
         scope.model = {email: ''}
         scope.fields = [getNewField({

src/directives/formly-form.js

@@ -126,6 +126,15 @@ function formlyForm(formlyUsability, formlyWarn, $parse, formlyConfig, $interpol
       angular.forEach($scope.fields, runFieldExpressionProperties)
     }
 
+    function validateFormControl(formControl, promise) {
+      const validate = formControl.$validate
+      if (promise) {
+        promise.then(validate)
+      } else {
+        validate()
+      }
+    }
+
     function runFieldExpressionProperties(field, index) {
       const model = field.model || $scope.model
       const promise = field.runExpressions && field.runExpressions()
@@ -134,11 +143,12 @@ function formlyForm(formlyUsability, formlyWarn, $parse, formlyConfig, $interpol
         field.hide = evalCloseToFormlyExpression(field.hideExpression, val, field, index)
       }
       if (field.extras && field.extras.validateOnModelChange && field.formControl) {
-        const validate = field.formControl.$validate
-        if (promise) {
-          promise.then(validate)
+        if (angular.isArray(field.formControl)) {
+          angular.forEach(field.formControl, function(formControl) {
+            validateFormControl(formControl, promise)
+          })
         } else {
-          validate()
+          validateFormControl(field.formControl, promise)
         }
       }
     }