From 1ca0b58aca115925f9ec1f506522880f5b183815 Mon Sep 17 00:00:00 2001
From: karwosts <32912880+karwosts@users.noreply.github.com>
Date: Thu, 1 Aug 2024 01:43:08 -0700
Subject: [PATCH] Picture elements editor minor adjustments (#21512)

* Picture elements editor minor adjustments

* image selector for image element

* revert change to expanded
---
 src/components/ha-selector/ha-selector-image.ts          | 9 ++++++++-
 .../config-elements/elements/hui-image-element-editor.ts | 2 +-
 .../config-elements/hui-picture-elements-card-editor.ts  | 4 ++--
 src/translations/en.json                                 | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/ha-selector/ha-selector-image.ts b/src/components/ha-selector/ha-selector-image.ts
index cde24f883c..ff337e8810 100644
--- a/src/components/ha-selector/ha-selector-image.ts
+++ b/src/components/ha-selector/ha-selector-image.ts
@@ -45,7 +45,14 @@ export class HaImageSelector extends LitElement {
     return html`
       <div>
         <label>
-          ${this.hass.localize("ui.components.selectors.image.select_image")}
+          ${this.hass.localize(
+            "ui.components.selectors.image.select_image_with_label",
+            {
+              label:
+                this.label ||
+                this.hass.localize("ui.components.selectors.image.image"),
+            }
+          )}
           <ha-formfield
             .label=${this.hass.localize("ui.components.selectors.image.upload")}
           >
diff --git a/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts b/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
index 06c9ee68d6..24e761be8a 100644
--- a/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/elements/hui-image-element-editor.ts
@@ -41,7 +41,7 @@ const SCHEMA = [
       ui_action: {},
     },
   },
-  { name: "image", selector: { text: {} } },
+  { name: "image", selector: { image: {} } },
   { name: "camera_image", selector: { entity: { domain: "camera" } } },
   {
     name: "camera_view",
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
index 329a19ab8e..a2d16716ff 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-elements-card-editor.ts
@@ -74,8 +74,8 @@ export class HuiPictureElementsCardEditor
           ),
           schema: [
             { name: "title", selector: { text: {} } },
-            { name: "image", selector: { text: {} } },
-            { name: "dark_mode_image", selector: { text: {} } },
+            { name: "image", selector: { image: {} } },
+            { name: "dark_mode_image", selector: { image: {} } },
             {
               name: "camera_image",
               selector: { entity: { domain: "camera" } },
diff --git a/src/translations/en.json b/src/translations/en.json
index 8510a8045f..135f06cfea 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -379,7 +379,8 @@
           "unknown_file": "Unknown file"
         },
         "image": {
-          "select_image": "Select image",
+          "image": "image",
+          "select_image_with_label": "Select {label}",
           "upload": "Upload picture",
           "url": "Local path or web URL"
         },