From d6e0d577444fc481d0fb913114d9c8a826c76a90 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Mon, 23 Jan 2023 20:09:13 +0100
Subject: [PATCH] Improve HA form default support (#14570)

* use default as placeholder if not required

* Do not force number selector to 0 or min when empty

* use undefined instead of empty string
---
 src/components/ha-form/ha-form.ts                |  1 +
 src/components/ha-selector/ha-selector-number.ts | 10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/ha-form/ha-form.ts b/src/components/ha-form/ha-form.ts
index 4e9c74da46..7f962081c5 100644
--- a/src/components/ha-form/ha-form.ts
+++ b/src/components/ha-form/ha-form.ts
@@ -86,6 +86,7 @@ export class HaForm extends LitElement implements HaFormElement {
                   .value=${getValue(this.data, item)}
                   .label=${this._computeLabel(item, this.data)}
                   .disabled=${item.disabled || this.disabled || false}
+                  .placeholder=${item.required ? "" : item.default}
                   .helper=${this._computeHelper(item)}
                   .required=${item.required || false}
                   .context=${this._generateContext(item)}
diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts
index 4edf7e2eb2..fbc6796a6a 100644
--- a/src/components/ha-selector/ha-selector-number.ts
+++ b/src/components/ha-selector/ha-selector-number.ts
@@ -39,7 +39,7 @@ export class HaNumberSelector extends LitElement {
               <ha-slider
                 .min=${this.selector.number?.min}
                 .max=${this.selector.number?.max}
-                .value=${this._value}
+                .value=${this.value ?? ""}
                 .step=${this.selector.number?.step ?? 1}
                 .disabled=${this.disabled}
                 .required=${this.required}
@@ -81,17 +81,11 @@ export class HaNumberSelector extends LitElement {
     `;
   }
 
-  private get _value() {
-    return this.value ?? (this.selector.number?.min || 0);
-  }
-
   private _handleInputChange(ev) {
     ev.stopPropagation();
     const value =
       ev.target.value === "" || isNaN(ev.target.value)
-        ? this.required
-          ? this.selector.number?.min || 0
-          : undefined
+        ? undefined
         : Number(ev.target.value);
     if (this.value === value) {
       return;