From 14f7328f9246e3aba4df7acda2f88a76885224fc Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Tue, 20 Jan 2026 09:26:03 +0100
Subject: [PATCH] Add context to group more info (#29077)

* Add area context in more info group

* Use entity name instead of entry

* Remove filter
---
 src/dialogs/more-info/more-info-content.ts | 99 +++++++++++++++++-----
 1 file changed, 77 insertions(+), 22 deletions(-)

diff --git a/src/dialogs/more-info/more-info-content.ts b/src/dialogs/more-info/more-info-content.ts
index c2297a0607..b1a45f1349 100644
--- a/src/dialogs/more-info/more-info-content.ts
+++ b/src/dialogs/more-info/more-info-content.ts
@@ -3,7 +3,10 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
+import { computeEntityName } from "../../common/entity/compute_entity_name";
+import type { EntityNameItem } from "../../common/entity/compute_entity_name_display";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
+import { getEntityContext } from "../../common/entity/context/get_entity_context";
 import "../../components/ha-badge";
 import type { ExtEntityRegistryEntry } from "../../data/entity/entity_registry";
 import { supportsCoverPositionCardFeature } from "../../panels/lovelace/card-features/hui-cover-position-card-feature";
@@ -15,6 +18,12 @@ import "../../panels/lovelace/sections/hui-section";
 import type { HomeAssistant } from "../../types";
 import { stateMoreInfoType } from "./state_more_info_control";
 
+interface EntityInfo {
+  entityId: string;
+  entityName: string | undefined;
+  areaId: string | undefined;
+}
+
 @customElement("more-info-content")
 class MoreInfoContent extends LitElement {
   @property({ attribute: false }) public hass?: HomeAssistant;
@@ -83,32 +92,78 @@ class MoreInfoContent extends LitElement {
   }
 
   private _entitiesSectionConfig = memoizeOne((entityIds: string[]) => {
-    const cards = entityIds
-      .map((entityId) => {
-        const entity = this.hass!.entities[entityId];
-        if (entity?.hidden) {
+    const hass = this.hass!;
+
+    // Get entity names and areas for all visible entities
+    const entityInfos = entityIds
+      .map<EntityInfo | null>((entityId) => {
+        const entry = hass.entities[entityId];
+        if (entry?.hidden) {
           return null;
         }
-        const features: LovelaceCardFeatureConfig[] = [];
-        const context = { entity_id: entityId };
-        if (supportsCoverPositionCardFeature(this.hass!, context)) {
-          features.push({
-            type: "cover-position",
-          });
-        } else if (supportsLightBrightnessCardFeature(this.hass!, context)) {
-          features.push({
-            type: "light-brightness",
-          });
+        const stateObj = hass.states[entityId];
+        if (!stateObj) {
+          return null;
         }
-        return {
-          type: "tile",
-          entity: entityId,
-          features_position: "inline",
-          features,
-          grid_options: { columns: 12 },
-        } as TileCardConfig;
+        const entityName = entry
+          ? computeEntityName(stateObj, hass.entities, hass.devices)
+          : undefined;
+        const { area } = getEntityContext(
+          stateObj,
+          hass.entities,
+          hass.devices,
+          hass.areas,
+          hass.floors
+        );
+        const areaId = area?.area_id;
+        return { entityId, entityName, areaId };
       })
-      .filter(Boolean);
+      .filter(Boolean) as EntityInfo[];
+
+    // Check if all entities have the same entity name
+    const entityNames = new Set(entityInfos.map((info) => info.entityName));
+    const allSameEntityName = entityNames.size === 1;
+
+    // Check if all entities have the same area
+    const areaIds = new Set(entityInfos.map((info) => info.areaId));
+    const allSameArea = areaIds.size === 1;
+
+    // Build name and state content config based on conditions
+    const name: EntityNameItem[] = [{ type: "device" }];
+
+    if (!allSameEntityName) {
+      name.push({ type: "entity" });
+    }
+
+    const stateContent = ["state"];
+    if (!allSameArea) {
+      stateContent.push("area_name");
+    }
+
+    const cards = entityInfos.map(({ entityId }) => {
+      const features: LovelaceCardFeatureConfig[] = [];
+      const context = { entity_id: entityId };
+      if (supportsCoverPositionCardFeature(hass, context)) {
+        features.push({
+          type: "cover-position",
+        });
+      } else if (supportsLightBrightnessCardFeature(hass, context)) {
+        features.push({
+          type: "light-brightness",
+        });
+      }
+
+      return {
+        type: "tile",
+        entity: entityId,
+        name,
+        state_content: stateContent,
+        features_position: "inline",
+        features,
+        grid_options: { columns: 12 },
+      } as TileCardConfig;
+    });
+
     return {
       type: "grid",
       cards,