From 59cd2e26291616c43275a2c2561a18c200e30484 Mon Sep 17 00:00:00 2001
From: pplogman <pplogmann@gmail.com>
Date: Thu, 1 Aug 2019 13:11:26 +0200
Subject: [PATCH] add form reset for dynamicaly enabled / disabled elements

---
 iron-form.js    | 44 ++++++++++++++++++++++++++------------------
 test/basic.html | 25 ++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/iron-form.js b/iron-form.js
index cabdd1b..fd82a11 100644
--- a/iron-form.js
+++ b/iron-form.js
@@ -249,7 +249,7 @@ Polymer({
    * @return {void}
    */
   _saveInitialValues: function(overwriteValues) {
-    var nodes = this._getValidatableElements();
+    var nodes = this._getResettableElements();
     for (var i = 0; i < nodes.length; i++) {
       var node = nodes[i];
       if (!this._defaults.has(node) || overwriteValues) {
@@ -374,7 +374,7 @@ Polymer({
     }
 
     // Load the initial values.
-    var nodes = this._getValidatableElements();
+    var nodes = this._getResettableElements();
     for (var i = 0; i < nodes.length; i++) {
       var node = nodes[i];
       if (this._defaults.has(node)) {
@@ -449,14 +449,19 @@ Polymer({
     }
   },
 
+  _getResettableElements: function() {
+	return this._findElements(
+		this._form, true /* ignoreName */, false /* skipSlots */, true /* ignoreDisabled */);
+  },
+
   _getValidatableElements: function() {
     return this._findElements(
-        this._form, true /* ignoreName */, false /* skipSlots */);
+        this._form, true /* ignoreName */, false /* skipSlots */, false /* ignoreDisabled */);
   },
 
   _getSubmittableElements: function() {
     return this._findElements(
-        this._form, false /* ignoreName */, false /* skipSlots */);
+        this._form, false /* ignoreName */, false /* skipSlots */, false /* ignoreDisabled */);
   },
 
   /**
@@ -465,11 +470,12 @@ Polymer({
    * @param  {!Node} parent The parent node
    * @param  {!boolean} ignoreName  Whether the name of the submittable nodes should be disregarded
    * @param  {!boolean} skipSlots  Whether to skip traversing of slot elements
+   * @param  {!boolean} ignoreDisabled  Whether the disabled state of the submittable nodes should be disregarded.
    * @param  {!Array<!Node>=} submittable Reference to the array of submittables
    * @return {!Array<!Node>}
    * @private
    */
-  _findElements: function(parent, ignoreName, skipSlots, submittable) {
+  _findElements: function(parent, ignoreName, skipSlots, ignoreDisabled, submittable) {
     submittable = submittable || [];
     var nodes = dom(parent).querySelectorAll('*');
     for (var i = 0; i < nodes.length; i++) {
@@ -477,9 +483,9 @@ Polymer({
       // name attribute.
       if (!skipSlots &&
           (nodes[i].localName === 'slot' || nodes[i].localName === 'content')) {
-        this._searchSubmittableInSlot(submittable, nodes[i], ignoreName);
+        this._searchSubmittableInSlot(submittable, nodes[i], ignoreName, ignoreDisabled);
       } else {
-        this._searchSubmittable(submittable, nodes[i], ignoreName);
+        this._searchSubmittable(submittable, nodes[i], ignoreName, ignoreDisabled);
       }
     }
     return submittable;
@@ -491,10 +497,11 @@ Polymer({
    * @param  {!Array<!Node>} submittable Reference to the array of submittables
    * @param  {!Node} node The slot or content node
    * @param  {!boolean} ignoreName  Whether the name of the submittable nodes should be disregarded
+   * @param  {!boolean} ignoreDisabled  Whether the disabled state of the submittable nodes should be disregarded.
    * @return {void}
    * @private
    */
-  _searchSubmittableInSlot: function(submittable, node, ignoreName) {
+  _searchSubmittableInSlot: function(submittable, node, ignoreName, ignoreDisabled) {
     var assignedNodes = dom(node).getDistributedNodes();
 
     for (var i = 0; i < assignedNodes.length; i++) {
@@ -504,11 +511,11 @@ Polymer({
 
       // Note: assignedNodes does not contain <slot> or <content> because
       // getDistributedNodes flattens the tree.
-      this._searchSubmittable(submittable, assignedNodes[i], ignoreName);
+      this._searchSubmittable(submittable, assignedNodes[i], ignoreName, ignoreDisabled);
       var nestedAssignedNodes = dom(assignedNodes[i]).querySelectorAll('*');
       for (var j = 0; j < nestedAssignedNodes.length; j++) {
         this._searchSubmittable(
-            submittable, nestedAssignedNodes[j], ignoreName);
+            submittable, nestedAssignedNodes[j], ignoreName), ignoreDisabled;
       }
     }
   },
@@ -519,15 +526,16 @@ Polymer({
    * @param  {!Array<!Node>} submittable Reference to the array of submittables
    * @param  {!Node} node The node to be
    * @param  {!boolean} ignoreName  Whether the name of the submittable nodes should be disregarded
+   * @param  {!boolean} ignoreDisabled  Whether the disabled state of the submittable nodes should be disregarded.
    * @return {void}
    * @private
    */
-  _searchSubmittable: function(submittable, node, ignoreName) {
-    if (this._isSubmittable(node, ignoreName)) {
+  _searchSubmittable: function(submittable, node, ignoreName, ignoreDisabled) {
+    if (this._isSubmittable(node, ignoreName, ignoreDisabled)) {
       submittable.push(node);
     } else if (node.root) {
       this._findElements(
-          node.root, ignoreName, true /* skipSlots */, submittable);
+          node.root, ignoreName, true /* skipSlots */, ignoreDisabled, submittable);
     }
   },
 
@@ -539,14 +547,14 @@ Polymer({
    * we don't search for validatables in its shadowRoot.
    * @param {!Node} node
    * @param {!boolean} ignoreName
+   * @param  {!boolean} ignoreDisabled  Whether the disabled state of the submittable nodes should be disregarded.
    * @return {boolean}
    * @private
    */
-  _isSubmittable: function(node, ignoreName) {
-    return (
-        !node.disabled &&
-        (ignoreName ? node.name || typeof node.validate === 'function' :
-                      node.name));
+  _isSubmittable: function(node, ignoreName, ignoreDisabled) {
+	return  (
+		   (ignoreDisabled || !node.disabled) && 
+		   (ignoreName ? node.name || typeof node.validate === 'function' : node.name));
   },
 
   _serializeElementValues: function(element) {
diff --git a/test/basic.html b/test/basic.html
index 74d3e0c..cba2515 100644
--- a/test/basic.html
+++ b/test/basic.html
@@ -240,6 +240,17 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="reset-disabled">
+	<template>
+		<iron-form>
+		  <form action="/get" method="get">
+			<paper-input name="paper1" id="disabled_element" value="paper1" disabled="true"></paper-input>
+			<input type="reset">
+		  </form>
+		</iron-form>
+	  </template>
+  </test-fixture>
+
   <test-fixture id="content-type">
     <template>
       <div>
@@ -900,7 +911,19 @@
           expect(document.getElementById('paper_0').value).to.be.equal('input');
           done();
         }, 1);
-      });
+	  });
+	  
+	  test('reset a dynamically enabled element', function(done) {
+		var form = fixture('reset-disabled');
+		form.saveResetValues();
+        Base.async(function() {
+			document.getElementById('disabled_element').disabled = false;
+			document.getElementById('disabled_element').value = 'input1++';
+			form.reset();
+			expect(document.getElementById('disabled_element').value).to.be.equal('paper1');
+			done();
+        }, 1);
+	})
 
       test('fires reset and iron-form-reset events', function(done) {
         var form = fixture('resetting');