From 35f24c989607169246c37900d92a98b3069c6f14 Mon Sep 17 00:00:00 2001
From: Rob Dodson <robdodson@google.com>
Date: Thu, 22 Jun 2017 16:30:14 -0700
Subject: [PATCH 1/4] Pipe label through to aria-labels

---
 paper-input-behavior.html | 18 ------------------
 paper-input.html          |  6 +++---
 paper-textarea.html       | 13 ++-----------
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/paper-input-behavior.html b/paper-input-behavior.html
index b7c912ee..c6f8e86c 100644
--- a/paper-input-behavior.html
+++ b/paper-input-behavior.html
@@ -397,8 +397,6 @@
     },
 
     attached: function() {
-      this._updateAriaLabelledBy();
-
       // In the 2.0 version of the element, this is handled in `onIronInputReady`,
       // i.e. after the native input has finished distributing. In the 1.0 version,
       // the input is in the shadow tree, so it's already available.
@@ -498,22 +496,6 @@
       return placeholder || alwaysFloatLabel;
     },
 
-    _updateAriaLabelledBy: function() {
-      var label = Polymer.dom(this.root).querySelector('label');
-      if (!label) {
-        this._ariaLabelledBy = '';
-        return;
-      }
-      var labelledBy;
-      if (label.id) {
-        labelledBy = label.id;
-      } else {
-        labelledBy = 'paper-input-label-' + Polymer.PaperInputHelper.NextLabelID++;
-        label.id = labelledBy;
-      }
-      this._ariaLabelledBy = labelledBy;
-    },
-
     _onChange:function(event) {
       // In the Shadow DOM, the `change` event is not leaked into the
       // ancestor tree, so we must do this manually.
diff --git a/paper-input.html b/paper-input.html
index 535cfa96..eaff2a16 100644
--- a/paper-input.html
+++ b/paper-input.html
@@ -145,7 +145,7 @@
 
       <slot name="prefix" slot="prefix"></slot>
 
-      <label hidden$="[[!label]]" aria-hidden="true" for="input" slot="label">[[label]]</label>
+      <label hidden$="[[!label]]" aria-hidden="true" slot="label">[[label]]</label>
 
       <span id="template-placeholder"></span>
 
@@ -168,7 +168,7 @@
    -->
   <template id="v0">
     <input is="iron-input" id="input" slot="input"
-        aria-labelledby$="[[_ariaLabelledBy]]"
+        aria-label$="[[label]]"
         aria-describedby$="[[_ariaDescribedBy]]"
         disabled$="[[disabled]]"
         title$="[[title]]"
@@ -211,7 +211,7 @@
         invalid="{{invalid}}"
         validator="[[validator]]">
       <input id="nativeInput"
-        aria-labelledby$="[[_ariaLabelledBy]]"
+        aria-label$="[[label]]"
         aria-describedby$="[[_ariaDescribedBy]]"
         disabled$="[[disabled]]"
         title$="[[title]]"
diff --git a/paper-textarea.html b/paper-textarea.html
index 9f769c26..0e180306 100644
--- a/paper-textarea.html
+++ b/paper-textarea.html
@@ -55,10 +55,10 @@
         disabled$="[[disabled]]"
         invalid="[[invalid]]">
 
-      <label hidden$="[[!label]]" aria-hidden="true" for="input" slot="label">[[label]]</label>
+      <label hidden$="[[!label]]" aria-hidden="true" slot="label">[[label]]</label>
 
       <iron-autogrow-textarea id="input" class="paper-input-input" slot="input"
-        aria-labelledby$="[[_ariaLabelledBy]]"
+        label="[[label]]"
         aria-describedby$="[[_ariaDescribedBy]]"
         bind-value="{{value}}"
         invalid="{{invalid}}"
@@ -100,11 +100,6 @@
     ],
 
     properties: {
-      _ariaLabelledBy: {
-        observer: '_ariaLabelledByChanged',
-        type: String
-      },
-
       _ariaDescribedBy: {
         observer: '_ariaDescribedByChanged',
         type: String
@@ -136,10 +131,6 @@
       }
     },
 
-    _ariaLabelledByChanged: function(ariaLabelledBy) {
-      this.$.input.textarea.setAttribute('aria-labelledby', ariaLabelledBy);
-    },
-
     _ariaDescribedByChanged: function(ariaDescribedBy) {
       this.$.input.textarea.setAttribute('aria-describedby', ariaDescribedBy);
     },

From bceac9065f224bbcd1ecaa6be7d7c71bb31a07b2 Mon Sep 17 00:00:00 2001
From: Rob Dodson <robdodson@google.com>
Date: Thu, 22 Jun 2017 17:19:49 -0700
Subject: [PATCH 2/4] Backout changes to paper-input

---
 paper-input-behavior.html | 18 ++++++++++++++++++
 paper-input.html          |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/paper-input-behavior.html b/paper-input-behavior.html
index c6f8e86c..b7c912ee 100644
--- a/paper-input-behavior.html
+++ b/paper-input-behavior.html
@@ -397,6 +397,8 @@
     },
 
     attached: function() {
+      this._updateAriaLabelledBy();
+
       // In the 2.0 version of the element, this is handled in `onIronInputReady`,
       // i.e. after the native input has finished distributing. In the 1.0 version,
       // the input is in the shadow tree, so it's already available.
@@ -496,6 +498,22 @@
       return placeholder || alwaysFloatLabel;
     },
 
+    _updateAriaLabelledBy: function() {
+      var label = Polymer.dom(this.root).querySelector('label');
+      if (!label) {
+        this._ariaLabelledBy = '';
+        return;
+      }
+      var labelledBy;
+      if (label.id) {
+        labelledBy = label.id;
+      } else {
+        labelledBy = 'paper-input-label-' + Polymer.PaperInputHelper.NextLabelID++;
+        label.id = labelledBy;
+      }
+      this._ariaLabelledBy = labelledBy;
+    },
+
     _onChange:function(event) {
       // In the Shadow DOM, the `change` event is not leaked into the
       // ancestor tree, so we must do this manually.
diff --git a/paper-input.html b/paper-input.html
index eaff2a16..535cfa96 100644
--- a/paper-input.html
+++ b/paper-input.html
@@ -145,7 +145,7 @@
 
       <slot name="prefix" slot="prefix"></slot>
 
-      <label hidden$="[[!label]]" aria-hidden="true" slot="label">[[label]]</label>
+      <label hidden$="[[!label]]" aria-hidden="true" for="input" slot="label">[[label]]</label>
 
       <span id="template-placeholder"></span>
 
@@ -168,7 +168,7 @@
    -->
   <template id="v0">
     <input is="iron-input" id="input" slot="input"
-        aria-label$="[[label]]"
+        aria-labelledby$="[[_ariaLabelledBy]]"
         aria-describedby$="[[_ariaDescribedBy]]"
         disabled$="[[disabled]]"
         title$="[[title]]"
@@ -211,7 +211,7 @@
         invalid="{{invalid}}"
         validator="[[validator]]">
       <input id="nativeInput"
-        aria-label$="[[label]]"
+        aria-labelledby$="[[_ariaLabelledBy]]"
         aria-describedby$="[[_ariaDescribedBy]]"
         disabled$="[[disabled]]"
         title$="[[title]]"

From c56acf5d0640f7fb2de7d8389009526e1edfd10c Mon Sep 17 00:00:00 2001
From: Rob Dodson <robdodson@google.com>
Date: Tue, 26 Sep 2017 15:48:14 -0700
Subject: [PATCH 3/4] Update test to check aria-label is properly set on
 iron-autogrow-textarea

---
 test/paper-textarea.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/paper-textarea.html b/test/paper-textarea.html
index 4561bcaa..7deff1f5 100644
--- a/test/paper-textarea.html
+++ b/test/paper-textarea.html
@@ -209,8 +209,8 @@
 
       test('has aria-labelledby', function() {
         var input = fixture('label');
-        assert.isTrue(input.inputElement.textarea.hasAttribute('aria-labelledby'))
-        assert.equal(input.inputElement.textarea.getAttribute('aria-labelledby'), Polymer.dom(input.root).querySelector('label').id, 'aria-labelledby points to the label');
+        assert.isTrue(input.inputElement.textarea.hasAttribute('aria-label'))
+        assert.equal(input.inputElement.textarea.getAttribute('aria-label'), input.label, 'paper-textarea passes through label to aria-label');
       });
 
       test('has aria-describedby for error message', function(done) {

From 72c896b113a03dbbc4e4383ec2185deae920ca73 Mon Sep 17 00:00:00 2001
From: Rob Dodson <robdodson@google.com>
Date: Tue, 26 Sep 2017 15:56:17 -0700
Subject: [PATCH 4/4] rename test

---
 test/paper-textarea.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/paper-textarea.html b/test/paper-textarea.html
index 7deff1f5..0a78095a 100644
--- a/test/paper-textarea.html
+++ b/test/paper-textarea.html
@@ -207,7 +207,7 @@
 
     suite('a11y', function() {
 
-      test('has aria-labelledby', function() {
+      test('has aria-label', function() {
         var input = fixture('label');
         assert.isTrue(input.inputElement.textarea.hasAttribute('aria-label'))
         assert.equal(input.inputElement.textarea.getAttribute('aria-label'), input.label, 'paper-textarea passes through label to aria-label');