From 767d785d041558d94a521fdfb5f14cbdf3e278d3 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 17 Jul 2025 09:59:29 +0200
Subject: [PATCH] Increase area card default height when using camera and
 features (#26205)

---
 src/panels/lovelace/cards/hui-area-card.ts               | 9 +++++++--
 .../strategies/areas/areas-overview-view-strategy.ts     | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts
index 68dce2164e..fc1fb9d502 100644
--- a/src/panels/lovelace/cards/hui-area-card.ts
+++ b/src/panels/lovelace/cards/hui-area-card.ts
@@ -115,7 +115,7 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
   }
 
   public getGridOptions(): LovelaceGridOptions {
-    const columns = 6;
+    let columns = 6;
     let min_columns = 6;
     let rows = 1;
     const featurePosition = this._config
@@ -125,6 +125,7 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
     if (featuresCount) {
       if (featurePosition === "inline") {
         min_columns = 12;
+        columns = 12;
       } else {
         rows += featuresCount;
       }
@@ -133,7 +134,11 @@ export class HuiAreaCard extends LitElement implements LovelaceCard {
     const displayType = this._config?.display_type || "picture";
 
     if (displayType !== "compact") {
-      rows += 2;
+      if (featurePosition === "inline" && featuresCount > 0) {
+        rows += 3;
+      } else {
+        rows += 2;
+      }
     }
 
     return {
diff --git a/src/panels/lovelace/strategies/areas/areas-overview-view-strategy.ts b/src/panels/lovelace/strategies/areas/areas-overview-view-strategy.ts
index 264432248c..91d9f332b5 100644
--- a/src/panels/lovelace/strategies/areas/areas-overview-view-strategy.ts
+++ b/src/panels/lovelace/strategies/areas/areas-overview-view-strategy.ts
@@ -98,11 +98,11 @@ export class AreasOverviewViewStrategy extends ReactiveElement {
             sensorClasses.push("humidity");
           }
 
+          const isLarge = areaOptions.card_size === "large";
           return {
             type: "area",
             area: area.area_id,
-            display_type:
-              areaOptions.card_size === "large" ? "camera" : "compact",
+            display_type: isLarge ? "camera" : "compact",
             sensor_classes: sensorClasses,
             exclude_entities: hiddenEntities,
             features: filteredControls.length
@@ -114,7 +114,7 @@ export class AreasOverviewViewStrategy extends ReactiveElement {
                 ]
               : [],
             grid_options: {
-              rows: 1,
+              rows: isLarge ? 4 : 1,
               columns: 12,
             },
             features_position: "inline",