From 67b970fcaa1e7a4918e31290433885993680f3bf Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 3 Feb 2025 15:12:28 +0100 Subject: [PATCH] Improve chart height and narrow option in grid section (#24046) * Fix chart size in grid * Set minimal height to 2 for history chart * Update history chart --- src/panels/lovelace/cards/hui-history-graph-card.ts | 9 ++++----- src/panels/lovelace/cards/hui-statistics-graph-card.ts | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts index f03488ce536e..c28f45643ebf 100644 --- a/src/panels/lovelace/cards/hui-history-graph-card.ts +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -65,7 +65,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { return { columns: 12, min_columns: 6, - min_rows: this._config?.entities?.length || 1, + min_rows: 2, }; } @@ -244,7 +244,8 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { })}`; const columns = this._config.grid_options?.columns ?? 12; - const narrow = Number.isNaN(columns) || Number(columns) <= 12; + const narrow = typeof columns === "number" && columns <= 12; + const hasFixedHeight = typeof this._config.grid_options?.rows === "number"; return html` @@ -284,9 +285,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { .minYAxis=${this._config.min_y_axis} .maxYAxis=${this._config.max_y_axis} .fitYData=${this._config.fit_y_data || false} - .height=${this._config.grid_options?.rows - ? "100%" - : undefined} + .height=${hasFixedHeight ? "100%" : undefined} .narrow=${narrow} > `} diff --git a/src/panels/lovelace/cards/hui-statistics-graph-card.ts b/src/panels/lovelace/cards/hui-statistics-graph-card.ts index f94e9700739e..6cc5b73a706c 100644 --- a/src/panels/lovelace/cards/hui-statistics-graph-card.ts +++ b/src/panels/lovelace/cards/hui-statistics-graph-card.ts @@ -258,6 +258,8 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard { return nothing; } + const hasFixedHeight = typeof this._config.grid_options?.rows === "number"; + return html`