Merge pull request #553 from bjspencer/master

fix(formly-field): Issue #510 Fixes formly-field to handle multiple inputs in a single form control

Author: Kent C. Dodds

src/directives/formly-field.js

@@ -374,16 +374,20 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo
       function addShowMessagesWatcher() {
         stopWatchingShowError = scope.$watch(function watchShowValidationChange() {
           const customExpression = formlyConfig.extras.errorExistsAndShouldBeVisibleExpression
-          const {options, fc} = scope
-          if (!fc.$invalid) {
+          const options = scope.options
+          const formControls = arrayify(scope.fc)
+          if (!formControls.some(fc => fc.$invalid)) {
             return false
           } else if (typeof options.validation.show === 'boolean') {
             return options.validation.show
           } else if (customExpression) {
-            return formlyUtil.formlyEval(scope, customExpression, fc.$modelValue, fc.$viewValue)
+            return formControls.some(fc =>
+              formlyUtil.formlyEval(scope, customExpression, fc.$modelValue, fc.$viewValue))
           } else {
-            const noTouchedButDirty = (angular.isUndefined(fc.$touched) && fc.$dirty)
-            return (scope.fc.$touched || noTouchedButDirty)
+            return formControls.some(fc => {
+              const noTouchedButDirty = (angular.isUndefined(fc.$touched) && fc.$dirty)
+              return (fc.$touched || noTouchedButDirty)
+            })
           }
         }, function onShowValidationChange(show) {
           scope.options.validation.errorExistsAndShouldBeVisible = show

src/directives/formly-field.test.js

@@ -1366,7 +1366,7 @@ describe('formly-field', function() {
   })
 
   describe(`options.validation.errorExistsAndShouldBeVisible`, () => {
-    describe.skip(`multiple ng-model elements`, () => {
+    describe(`multiple ng-model elements`, () => {
       beforeEach(() => {
         scope.fields = [
           {
@@ -1396,7 +1396,7 @@ describe('formly-field', function() {
         compileAndDigest()
 
         invalidateAndTouchFields()
-        expect(spy).to.have.been.calledWith(sinon.match.array, sinon.match.array)
+        expect(spy).to.have.been.calledTwice // once for each form control.
       })
 
       function invalidateAndTouchFields() {