trigger onValidityChange when global touched changes

miguelcobain · Mar 6, 2017 · 7cb32b0 · 7cb32b0
1 parent 78b6efb
commit 7cb32b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/addon/components/paper-form.js b/addon/components/paper-form.js
@@ -39,9 +39,10 @@ export default Component.extend(ParentMixin, {
 
   actions: {
     onValidityChange() {
-      if (this.get('lastIsValid') !== this.get('isValid')) {
+      if (this.get('lastIsValid') !== this.get('isValid') || this.get('lastIsTouched') !== this.get('isTouched')) {
         this.sendAction('onValidityChange', this.get('isValid'), this.get('isTouched'), this.get('isInvalidAndTouched'));
         this.set('lastIsValid', this.get('isValid'));
+        this.set('lastIsTouched', this.get('isTouched'));
       }
     },
     onSubmit() {

diff --git a/tests/integration/components/paper-form-test.js b/tests/integration/components/paper-form-test.js
@@ -64,7 +64,7 @@ test('form `onSubmit` action is invoked', function(assert) {
 test('form `onValidityChange` action is invoked', function(assert) {
   // paper-input triggers `onValidityChange` on render
   // so we expect two runs: one on render and another on validity change
-  assert.expect(6);
+  assert.expect(9);
 
   this.set('onValidityChange', (isValid, isTouched, isInvalidAndTouched) => {
     assert.ok(isValid);
@@ -80,13 +80,19 @@ test('form `onValidityChange` action is invoked', function(assert) {
   `);
 
   this.set('onValidityChange', (isValid, isTouched, isInvalidAndTouched) => {
-    assert.notOk(isValid);
+    assert.ok(isValid);
     assert.ok(isTouched);
-    assert.ok(isInvalidAndTouched);
+    assert.notOk(isInvalidAndTouched);
   });
 
   this.$('input:first').trigger('blur');
 
+  this.set('onValidityChange', (isValid, isTouched, isInvalidAndTouched) => {
+    assert.notOk(isValid);
+    assert.ok(isTouched);
+    assert.ok(isInvalidAndTouched);
+  });
+
   this.set('errors', [{
     message: 'foo should be a number.',
     attribute: 'foo'