From 761d62ae16d75e08a63c4a2616946e065036baf3 Mon Sep 17 00:00:00 2001
From: Monica Dinculescu <noms@google.com>
Date: Wed, 17 Feb 2016 17:14:16 -0800
Subject: [PATCH] fix resetting of paper-input and paper-textarea

---
 iron-form.html  | 12 ++++++++++
 test/basic.html | 61 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/iron-form.html b/iron-form.html
index 26495cf..be6e8f5 100644
--- a/iron-form.html
+++ b/iron-form.html
@@ -452,6 +452,18 @@
             el.checked = this._customElementsInitialValues[i];
           } else {
             el.value = this._customElementsInitialValues[i];
+
+            // In the shady DOM, the native form is all-seeing, and will
+            // reset the nested inputs inside <paper-input> and <paper-textarea>.
+            // In particular, it resets them to what it thinks the default value
+            // is (i.e. "", before the bindings have ran), and since this is
+            // a programmatic update, it also doesn't fire any events.
+            // Which means we need to manually update the native element's value.
+            if (el.inputElement) {
+              el.inputElement.value = el.value;
+            } else if (el.textarea) {
+              el.textarea.value = el.value;
+            }
           }
           el.invalid = false;
         }
diff --git a/test/basic.html b/test/basic.html
index 8be9973..5201f2e 100644
--- a/test/basic.html
+++ b/test/basic.html
@@ -16,6 +16,8 @@
   <script src="../../web-component-tester/browser.js"></script>
 
   <link rel="import" href="../../polymer/polymer.html">
+  <link rel="import" href="../../paper-input/paper-input.html">
+  <link rel="import" href="../../paper-input/paper-textarea.html">
   <link rel="import" href="../iron-form.html">
   <link rel="import" href="simple-element.html">
   <link rel="import" href="element-with-nested-form-element.html">
@@ -120,6 +122,8 @@
     <template>
       <form is="iron-form">
         <simple-element name="zig" value="zag"></simple-element>
+        <paper-input name="zig" value="zug"></paper-input>
+        <paper-textarea name="zig" value="zog"></paper-textarea>
         <input name="foo" value="bar">
         <input type="checkbox" name="foo" value="bar1" checked>
         <input type="checkbox" name="foo" value="bar2">
@@ -343,32 +347,42 @@
   });
 
   suite('resetting', function () {
-    test('form restores the default values', function(done) {
+    test('form restores the default values if changes were made', function(done) {
       var form = fixture('FormForResetting');
 
-      assert.equal(form._customElements.length, 1);
-      assert.equal(form.elements.length, 3);
-
       // Initial values.
       var customElement = form.querySelector('simple-element');
       var input = form.querySelector('input[name="foo"]');
       var checkbox1 = form.querySelectorAll('input[type="checkbox"]')[0];
       var checkbox2 = form.querySelectorAll('input[type="checkbox"]')[1];
+      var paperInput = form.querySelector('paper-input');
+      var paperTextarea = form.querySelector('paper-textarea');
 
       assert.equal(customElement.value, 'zag');
       assert.equal(input.value, 'bar');
       assert.isTrue(checkbox1.checked);
       assert.isFalse(checkbox2.checked);
+      assert.equal(paperInput.value, 'zug');
+      assert.equal(paperInput.inputElement.value, 'zug');
+      assert.equal(paperTextarea.value, 'zog');
+      assert.equal(paperTextarea.inputElement.textarea.value, 'zog');
 
       // Change the values.
       customElement.value = 'not zag';
       input.value = 'not bar';
       checkbox1.checked = false;
       checkbox2.checked = true;
+      paperInput.value = 'not zug';
+      paperTextarea.value = 'not zog';
+
       assert.equal(customElement.value, 'not zag');
       assert.equal(input.value, 'not bar');
       assert.isFalse(checkbox1.checked);
       assert.isTrue(checkbox2.checked);
+      assert.equal(paperInput.value, 'not zug');
+      assert.equal(paperInput.inputElement.value, 'not zug');
+      assert.equal(paperTextarea.value, 'not zog');
+      assert.equal(paperTextarea.inputElement.textarea.value, 'not zog');
 
       form.addEventListener('iron-form-reset', function(event) {
         // Restored initial values.
@@ -376,11 +390,50 @@
         assert.equal(input.value, 'bar');
         assert.isTrue(checkbox1.checked);
         assert.isFalse(checkbox2.checked);
+        assert.equal(paperInput.value, 'zug');
+        assert.equal(paperInput.inputElement.value, 'zug');
+        assert.equal(paperTextarea.value, 'zog');
+        assert.equal(paperTextarea.inputElement.textarea.value, 'zog');
         done();
       });
 
       form.reset();
+    });
+
+    test('form restores the default values if no changes were made', function(done) {
+      var form = fixture('FormForResetting');
+
+      // Initial values.
+      var customElement = form.querySelector('simple-element');
+      var input = form.querySelector('input[name="foo"]');
+      var checkbox1 = form.querySelectorAll('input[type="checkbox"]')[0];
+      var checkbox2 = form.querySelectorAll('input[type="checkbox"]')[1];
+      var paperInput = form.querySelector('paper-input');
+      var paperTextarea = form.querySelector('paper-textarea');
 
+      assert.equal(customElement.value, 'zag');
+      assert.equal(input.value, 'bar');
+      assert.isTrue(checkbox1.checked);
+      assert.isFalse(checkbox2.checked);
+      assert.equal(paperInput.value, 'zug');
+      assert.equal(paperInput.inputElement.value, 'zug');
+      assert.equal(paperTextarea.value, 'zog');
+      assert.equal(paperTextarea.inputElement.textarea.value, 'zog');
+
+      form.addEventListener('iron-form-reset', function(event) {
+        // Restored initial values.
+        assert.equal(customElement.value, 'zag');
+        assert.equal(input.value, 'bar');
+        assert.isTrue(checkbox1.checked);
+        assert.isFalse(checkbox2.checked);
+        assert.equal(paperInput.value, 'zug');
+        assert.equal(paperInput.inputElement.value, 'zug');
+        assert.equal(paperTextarea.value, 'zog');
+        assert.equal(paperTextarea.inputElement.textarea.value, 'zog');
+        done();
+      });
+
+      form.reset();
     });
 
     test('validation messages are cleared', function(done) {