From 81cb48316363f2b87e2e6494e19413dd18f4b36d Mon Sep 17 00:00:00 2001
From: ildar170975 <71872483+ildar170975@users.noreply.github.com>
Date: Mon, 15 Dec 2025 11:54:12 +0300
Subject: [PATCH] Generic picker: show a label for area, category, language
 (#28236)

Co-authored-by: Aidan Timson <aidan@timmo.dev>
---
 src/components/ha-area-picker.ts                   | 14 +++++++++++++-
 src/components/ha-combo-box-item.ts                | 11 +++++++++++
 src/components/ha-generic-picker.ts                |  4 ++++
 src/components/ha-language-picker.ts               |  1 +
 src/components/ha-picker-field.ts                  | 10 ++++++++--
 .../dialog-automation-save.ts                      |  2 ++
 src/panels/config/category/ha-category-picker.ts   |  4 ++++
 .../dialog-device-registry-detail.ts               |  1 +
 .../entities/entity-registry-settings-editor.ts    |  2 ++
 9 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/components/ha-area-picker.ts b/src/components/ha-area-picker.ts
index 6a779119b0..c911a93650 100644
--- a/src/components/ha-area-picker.ts
+++ b/src/components/ha-area-picker.ts
@@ -51,6 +51,9 @@ export class HaAreaPicker extends LitElement {
   @property({ type: Boolean, attribute: "no-add" })
   public noAdd = false;
 
+  @property({ type: Boolean, attribute: "show-label" })
+  public showLabel = false;
+
   /**
    * Show only areas with entities from specific domains.
    * @type {Array}
@@ -365,9 +368,17 @@ export class HaAreaPicker extends LitElement {
   protected render(): TemplateResult {
     const placeholder =
       this.placeholder ?? this.hass.localize("ui.components.area-picker.area");
-
     const valueRenderer = this._computeValueRenderer(this.hass.areas);
 
+    let showLabel = this.showLabel;
+    if (this.value) {
+      const area = this.hass.areas[this.value];
+      if (area) {
+        const { floor } = getAreaContext(area, this.hass.floors);
+        showLabel = !floor && this.showLabel;
+      }
+    }
+
     return html`
       <ha-generic-picker
         .hass=${this.hass}
@@ -379,6 +390,7 @@ export class HaAreaPicker extends LitElement {
         .disabled=${this.disabled}
         .required=${this.required}
         .placeholder=${placeholder}
+        .showLabel=${showLabel}
         .value=${this.value}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}
diff --git a/src/components/ha-combo-box-item.ts b/src/components/ha-combo-box-item.ts
index 4104c038ac..f1c9efa934 100644
--- a/src/components/ha-combo-box-item.ts
+++ b/src/components/ha-combo-box-item.ts
@@ -20,6 +20,17 @@ export class HaComboBoxItem extends HaMdListItem {
       [slot="start"] {
         --state-icon-color: var(--secondary-text-color);
       }
+      [slot="overline"] {
+        /* mimicing a floating label of mdc-select */
+        line-height: 1.15rem;
+        font-size: calc(var(--mdc-typography-subtitle1-font-size, 1rem) * 0.75);
+        font-weight: var(--mdc-typography-subtitle1-font-weight, 400);
+        font-family: var(
+          --mdc-typography-subtitle1-font-family,
+          var(--mdc-typography-font-family)
+        );
+        color: var(--mdc-select-label-ink-color, rgba(0, 0, 0, 0.6));
+      }
       [slot="headline"] {
         line-height: var(--ha-line-height-normal);
         font-size: var(--ha-font-size-m);
diff --git a/src/components/ha-generic-picker.ts b/src/components/ha-generic-picker.ts
index 061c5f6834..5872e577d4 100644
--- a/src/components/ha-generic-picker.ts
+++ b/src/components/ha-generic-picker.ts
@@ -48,6 +48,9 @@ export class HaGenericPicker extends LitElement {
   @property({ attribute: "hide-clear-icon", type: Boolean })
   public hideClearIcon = false;
 
+  @property({ attribute: "show-label", type: Boolean })
+  public showLabel = false;
+
   /** To prevent lags, getItems needs to be memoized */
   @property({ attribute: false })
   public getItems!: (
@@ -170,6 +173,7 @@ export class HaGenericPicker extends LitElement {
                   @click=${this.open}
                   @clear=${this._clear}
                   .placeholder=${this.placeholder}
+                  .showLabel=${this.showLabel}
                   .value=${this.value}
                   .required=${this.required}
                   .disabled=${this.disabled}
diff --git a/src/components/ha-language-picker.ts b/src/components/ha-language-picker.ts
index 5b3fdedae9..d7e4d25c9f 100644
--- a/src/components/ha-language-picker.ts
+++ b/src/components/ha-language-picker.ts
@@ -132,6 +132,7 @@ export class HaLanguagePicker extends LitElement {
         .placeholder=${this.label ??
         (this.hass?.localize("ui.components.language-picker.language") ||
           "Language")}
+        show-label
         .value=${value}
         .valueRenderer=${this._valueRenderer}
         .disabled=${this.disabled}
diff --git a/src/components/ha-picker-field.ts b/src/components/ha-picker-field.ts
index 2e93aed84a..f9e9462ef8 100644
--- a/src/components/ha-picker-field.ts
+++ b/src/components/ha-picker-field.ts
@@ -43,6 +43,9 @@ export class HaPickerField extends LitElement {
   @property({ attribute: "hide-clear-icon", type: Boolean })
   public hideClearIcon = false;
 
+  @property({ attribute: "show-label", type: Boolean })
+  public showLabel = false;
+
   @property({ attribute: false })
   public valueRenderer?: PickerValueRenderer;
 
@@ -60,13 +63,16 @@ export class HaPickerField extends LitElement {
   protected render() {
     const showClearIcon =
       !!this.value && !this.required && !this.disabled && !this.hideClearIcon;
+    const placeholder = this.showLabel
+      ? html`<span slot="overline">${this.placeholder}</span>`
+      : nothing;
 
     return html`
       <ha-combo-box-item .disabled=${this.disabled} type="button" compact>
         ${this.value
           ? this.valueRenderer
-            ? this.valueRenderer(this.value)
-            : html`<slot name="headline">${this.value}</slot>`
+            ? html`${placeholder}${this.valueRenderer(this.value)}`
+            : html`${placeholder}<span slot="headline">${this.value}</span>`
           : html`
               <span slot="headline" class="placeholder">
                 ${this.placeholder}
diff --git a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
index 16851ecbf2..cd6137dea3 100644
--- a/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
+++ b/src/panels/config/automation/automation-save-dialog/dialog-automation-save.ts
@@ -177,6 +177,7 @@ class DialogAutomationSave extends LitElement implements HassDialog {
             .hass=${this.hass}
             .scope=${this._params.domain}
             .value=${this._entryUpdates.category}
+            show-label
             @value-changed=${this._registryEntryChanged}
           ></ha-category-picker>`
         : nothing}
@@ -193,6 +194,7 @@ class DialogAutomationSave extends LitElement implements HassDialog {
             id="area"
             .hass=${this.hass}
             .value=${this._entryUpdates.area}
+            show-label
             @value-changed=${this._registryEntryChanged}
           ></ha-area-picker>`
         : nothing}
diff --git a/src/panels/config/category/ha-category-picker.ts b/src/panels/config/category/ha-category-picker.ts
index d52d55173e..27f7732243 100644
--- a/src/panels/config/category/ha-category-picker.ts
+++ b/src/panels/config/category/ha-category-picker.ts
@@ -39,6 +39,9 @@ export class HaCategoryPicker extends SubscribeMixin(LitElement) {
   @property({ type: Boolean, attribute: "no-add" })
   public noAdd = false;
 
+  @property({ type: Boolean, attribute: "show-label" })
+  public showLabel = false;
+
   @property({ type: Boolean }) public disabled = false;
 
   @property({ type: Boolean }) public required = false;
@@ -196,6 +199,7 @@ export class HaCategoryPicker extends SubscribeMixin(LitElement) {
           "ui.components.category-picker.no_categories"
         )}
         .placeholder=${placeholder}
+        .showLabel=${this.showLabel}
         .value=${this.value}
         .getItems=${this._getItems}
         .getAdditionalItems=${this._getAdditionalItems}
diff --git a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
index 4c350f46c0..7b14b44920 100644
--- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
+++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
@@ -80,6 +80,7 @@ class DialogDeviceRegistryDetail extends LitElement {
             <ha-area-picker
               .hass=${this.hass}
               .value=${this._areaId}
+              show-label
               @value-changed=${this._areaPicked}
             ></ha-area-picker>
             <ha-labels-picker
diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts
index 05da9233a6..77ac990020 100644
--- a/src/panels/config/entities/entity-registry-settings-editor.ts
+++ b/src/panels/config/entities/entity-registry-settings-editor.ts
@@ -778,6 +778,7 @@ export class EntityRegistrySettingsEditor extends LitElement {
             .hass=${this.hass}
             .value=${this._areaId}
             .disabled=${this.disabled}
+            show-label
             @value-changed=${this._areaPicked}
           ></ha-area-picker>`
         : ""}
@@ -1012,6 +1013,7 @@ export class EntityRegistrySettingsEditor extends LitElement {
               ? html`<ha-area-picker
                   .hass=${this.hass}
                   .value=${this._areaId}
+                  show-label
                   .disabled=${this.disabled}
                   @value-changed=${this._areaPicked}
                 ></ha-area-picker>`