From 52d8e98cdb6e287b566da15bd6933ce952454eac Mon Sep 17 00:00:00 2001
From: Yosi Levy <37745463+yosilevy@users.noreply.github.com>
Date: Wed, 15 Jan 2025 09:52:20 +0200
Subject: [PATCH] Overflow fix (#23652)

---
 src/panels/history/ha-panel-history.ts |  6 ++++
 src/panels/logbook/ha-panel-logbook.ts | 46 +++++++++++++++-----------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts
index 92161db368..bc8ce0edd9 100644
--- a/src/panels/history/ha-panel-history.ts
+++ b/src/panels/history/ha-panel-history.ts
@@ -615,6 +615,12 @@ class HaPanelHistory extends LitElement {
     return [
       haStyle,
       css`
+        ha-top-app-bar-fixed {
+          height: 100vh;
+          overflow-x: hidden;
+          overflow-y: visible;
+        }
+
         .content {
           padding: 0 16px 16px;
           padding-bottom: max(env(safe-area-inset-bottom), 16px);
diff --git a/src/panels/logbook/ha-panel-logbook.ts b/src/panels/logbook/ha-panel-logbook.ts
index cfca725600..7aef49959f 100644
--- a/src/panels/logbook/ha-panel-logbook.ts
+++ b/src/panels/logbook/ha-panel-logbook.ts
@@ -87,29 +87,31 @@ export class HaPanelLogbook extends LitElement {
           .label=${this.hass!.localize("ui.common.refresh")}
         ></ha-icon-button>
 
-        <div class="filters">
-          <ha-date-range-picker
-            .hass=${this.hass}
-            .startDate=${this._time.range[0]}
-            .endDate=${this._time.range[1]}
-            @change=${this._dateRangeChanged}
-          ></ha-date-range-picker>
+        <div class="content">
+          <div class="filters">
+            <ha-date-range-picker
+              .hass=${this.hass}
+              .startDate=${this._time.range[0]}
+              .endDate=${this._time.range[1]}
+              @change=${this._dateRangeChanged}
+            ></ha-date-range-picker>
 
-          <ha-target-picker
+            <ha-target-picker
+              .hass=${this.hass}
+              .entityFilter=${filterLogbookCompatibleEntities}
+              .value=${this._targetPickerValue}
+              add-on-top
+              @value-changed=${this._targetsChanged}
+            ></ha-target-picker>
+          </div>
+
+          <ha-logbook
             .hass=${this.hass}
-            .entityFilter=${filterLogbookCompatibleEntities}
-            .value=${this._targetPickerValue}
-            add-on-top
-            @value-changed=${this._targetsChanged}
-          ></ha-target-picker>
+            .time=${this._time}
+            .entityIds=${this._getEntityIds()}
+            virtualize
+          ></ha-logbook>
         </div>
-
-        <ha-logbook
-          .hass=${this.hass}
-          .time=${this._time}
-          .entityIds=${this._getEntityIds()}
-          virtualize
-        ></ha-logbook>
       </ha-top-app-bar-fixed>
     `;
   }
@@ -319,6 +321,10 @@ export class HaPanelLogbook extends LitElement {
           margin-bottom: 8px;
         }
 
+        .content {
+          overflow: hidden;
+        }
+
         .filters {
           display: flex;
           padding: 16px 16px 0;