From ab1b778439e6f774a192fd34f4b72b9c03cd9460 Mon Sep 17 00:00:00 2001
From: Steve Repsher <steverep@users.noreply.github.com>
Date: Tue, 25 Oct 2022 06:29:05 -0400
Subject: [PATCH] Pass helper to ha-form subtypes (#14165)

---
 src/components/ha-form/ha-form-float.ts   | 6 +++++-
 src/components/ha-form/ha-form-integer.ts | 4 ++++
 src/components/ha-form/ha-form-select.ts  | 5 ++++-
 src/components/ha-form/ha-form.ts         | 1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/ha-form/ha-form-float.ts b/src/components/ha-form/ha-form-float.ts
index 5f0ea6d17a..2ed59db428 100644
--- a/src/components/ha-form/ha-form-float.ts
+++ b/src/components/ha-form/ha-form-float.ts
@@ -11,7 +11,9 @@ export class HaFormFloat extends LitElement implements HaFormElement {
 
   @property({ attribute: false }) public data!: HaFormFloatData;
 
-  @property() public label!: string;
+  @property() public label?: string;
+
+  @property() public helper?: string;
 
   @property({ type: Boolean }) public disabled = false;
 
@@ -29,6 +31,8 @@ export class HaFormFloat extends LitElement implements HaFormElement {
         type="numeric"
         inputMode="decimal"
         .label=${this.label}
+        .helper=${this.helper}
+        helperPersistent
         .value=${this.data !== undefined ? this.data : ""}
         .disabled=${this.disabled}
         .required=${this.schema.required}
diff --git a/src/components/ha-form/ha-form-integer.ts b/src/components/ha-form/ha-form-integer.ts
index 3fe7389ab6..f09821e3d7 100644
--- a/src/components/ha-form/ha-form-integer.ts
+++ b/src/components/ha-form/ha-form-integer.ts
@@ -21,6 +21,8 @@ export class HaFormInteger extends LitElement implements HaFormElement {
 
   @property() public label?: string;
 
+  @property() public helper?: string;
+
   @property({ type: Boolean }) public disabled = false;
 
   @query("ha-textfield ha-slider") private _input?:
@@ -74,6 +76,8 @@ export class HaFormInteger extends LitElement implements HaFormElement {
         type="number"
         inputMode="numeric"
         .label=${this.label}
+        .helper=${this.helper}
+        helperPersistent
         .value=${this.data !== undefined ? this.data : ""}
         .disabled=${this.disabled}
         .required=${this.schema.required}
diff --git a/src/components/ha-form/ha-form-select.ts b/src/components/ha-form/ha-form-select.ts
index 73dc74b95c..86a5db98a6 100644
--- a/src/components/ha-form/ha-form-select.ts
+++ b/src/components/ha-form/ha-form-select.ts
@@ -19,7 +19,9 @@ export class HaFormSelect extends LitElement implements HaFormElement {
 
   @property() public data!: HaFormSelectData;
 
-  @property() public label!: string;
+  @property() public label?: string;
+
+  @property() public helper?: string;
 
   @property({ type: Boolean }) public disabled = false;
 
@@ -41,6 +43,7 @@ export class HaFormSelect extends LitElement implements HaFormElement {
         .schema=${this.schema}
         .value=${this.data}
         .label=${this.label}
+        .helper=${this.helper}
         .disabled=${this.disabled}
         .required=${this.schema.required}
         .selector=${this._selectSchema(this.schema.options)}
diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index dd1a5e294b..a16bd3799e 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -92,6 +92,7 @@ export class HaForm extends LitElement implements HaFormElement {
                   schema: item,
                   data: getValue(this.data, item),
                   label: this._computeLabel(item, this.data),
+                  helper: this._computeHelper(item),
                   disabled: this.disabled,
                   hass: this.hass,
                   computeLabel: this.computeLabel,