From f8d950f3f6e5f016f66c2ab7c397a4ef0cb6df6d Mon Sep 17 00:00:00 2001
From: Elizabeth Mitchell <lizmitchell@google.com>
Date: Thu, 4 Aug 2022 09:11:21 -0700
Subject: [PATCH] chore(field): remove field ID property

PiperOrigin-RevId: 465328988
---
 textfield/filled-text-field.ts            |  1 -
 textfield/lib/filled-text-field_test.ts   |  1 -
 textfield/lib/outlined-text-field_test.ts |  1 -
 textfield/lib/text-field.ts               | 13 ++++++-------
 textfield/lib/text-field_test.ts          |  1 -
 textfield/outlined-text-field.ts          |  1 -
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/textfield/filled-text-field.ts b/textfield/filled-text-field.ts
index e50f291fe2..d471fef227 100644
--- a/textfield/filled-text-field.ts
+++ b/textfield/filled-text-field.ts
@@ -37,7 +37,6 @@ export class MdFilledTextField extends FilledTextField {
     return html`
       <md-filled-field
         class="md3-text-field__field"
-        id=${this.fieldId}
         ?disabled=${this.disabled}
         ?error=${this.error}
         ?hasEnd=${this.hasTrailingIcon}
diff --git a/textfield/lib/filled-text-field_test.ts b/textfield/lib/filled-text-field_test.ts
index e7fdb9ede6..ca05ad813d 100644
--- a/textfield/lib/filled-text-field_test.ts
+++ b/textfield/lib/filled-text-field_test.ts
@@ -27,7 +27,6 @@ class TestTextField extends FilledTextField {
     return html`
       <md-filled-field
         class="md3-text-field__field"
-        id=${this.fieldId}
         ?disabled=${this.disabled}
         .error=${this.error}
         .label=${this.label}
diff --git a/textfield/lib/outlined-text-field_test.ts b/textfield/lib/outlined-text-field_test.ts
index c473ef3f54..9cbb53b9e3 100644
--- a/textfield/lib/outlined-text-field_test.ts
+++ b/textfield/lib/outlined-text-field_test.ts
@@ -27,7 +27,6 @@ class TestTextField extends OutlinedTextField {
     return html`
        <md-outlined-field
          class="md3-text-field__field"
-         id=${this.fieldId}
          ?disabled=${this.disabled}
          .error=${this.error}
          .label=${this.label}
diff --git a/textfield/lib/text-field.ts b/textfield/lib/text-field.ts
index 7e6c0d00fa..9ccd2a760a 100644
--- a/textfield/lib/text-field.ts
+++ b/textfield/lib/text-field.ts
@@ -65,10 +65,6 @@ export class TextField extends LitElement {
    * An optional suffix to display after the input value.
    */
   @property({type: String}) suffixText = '';
-  /**
-   * The ID on the field element, used for SSR.
-   */
-  @property({type: String}) fieldId = 'field';
   /**
    * Whether or not the text field has a leading icon. Used for SSR.
    */
@@ -202,14 +198,17 @@ export class TextField extends LitElement {
     // TODO(b/237281840): replace ternary operators with double pipes
     // TODO(b/237283903): remove when custom isTruthy directive is supported
     const placeholderValue = this.placeholder ? this.placeholder : undefined;
+    const ariaLabelValue = this.ariaLabel ? this.ariaLabel :
+        this.label                        ? this.label :
+                                            undefined;
     const ariaLabelledByValue =
-        this.ariaLabelledBy ? this.ariaLabelledBy : this.fieldId;
+        this.ariaLabelledBy ? this.ariaLabelledBy : undefined;
 
     return html`<input
       class="md3-text-field__input"
       aria-invalid=${this.error}
-      aria-label=${ifDefined(this.ariaLabel)}
-      aria-labelledby=${ariaLabelledByValue}
+      aria-label=${ifDefined(ariaLabelValue)}
+      aria-labelledby=${ifDefined(ariaLabelledByValue)}
       ?disabled=${this.disabled}
       placeholder=${ifDefined(placeholderValue)}
       ?readonly=${this.readonly}
diff --git a/textfield/lib/text-field_test.ts b/textfield/lib/text-field_test.ts
index 1245fbe44e..49ebb67a0a 100644
--- a/textfield/lib/text-field_test.ts
+++ b/textfield/lib/text-field_test.ts
@@ -31,7 +31,6 @@ class TestTextField extends TextField {
     return html`
       <md-filled-field
         class="md3-text-field__field"
-        id=${this.fieldId}
         ?disabled=${this.disabled}
         .error=${this.error}
         .label=${this.label}
diff --git a/textfield/outlined-text-field.ts b/textfield/outlined-text-field.ts
index 2c6fed850d..7a6d920aae 100644
--- a/textfield/outlined-text-field.ts
+++ b/textfield/outlined-text-field.ts
@@ -37,7 +37,6 @@ export class MdOutlinedTextField extends OutlinedTextField {
     return html`
       <md-outlined-field
         class="md3-text-field__field"
-        id=${this.fieldId}
         ?disabled=${this.disabled}
         ?error=${this.error}
         ?hasEnd=${this.hasTrailingIcon}