From 899288ae439792100efcb4d7edc47c58cd291432 Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 27 Mar 2025 11:10:23 +0100
Subject: [PATCH] Revert "Restore scroll position when using back navigation in
 dashboard" (#24795)

Revert "Restore scroll position when using back navigation in dashboard (#24777)"

This reverts commit 9cfcd21a93dd50d61fb64039ce7bec973c721806.
---
 src/panels/lovelace/hui-root.ts | 39 ++++++---------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index d20b865b86..5b39a0f8e8 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -76,9 +76,9 @@ import { getLovelaceStrategy } from "./strategies/get-strategy";
 import { isLegacyStrategyConfig } from "./strategies/legacy-strategy";
 import type { Lovelace } from "./types";
 import "./views/hui-view";
+import "./views/hui-view-container";
 import type { HUIView } from "./views/hui-view";
 import "./views/hui-view-background";
-import "./views/hui-view-container";
 
 @customElement("hui-root")
 class HUIRoot extends LitElement {
@@ -99,8 +99,6 @@ class HUIRoot extends LitElement {
 
   private _viewCache?: Record<string, HUIView>;
 
-  private _viewScrollPositions: Record<string, number> = {};
-
   private _debouncedConfigChanged: () => void;
 
   private _conversation = memoizeOne((_components) =>
@@ -112,7 +110,7 @@ class HUIRoot extends LitElement {
     // The view can trigger a re-render when it knows that certain
     // web components have been loaded.
     this._debouncedConfigChanged = debounce(
-      () => this._selectView(this._curView, true, false),
+      () => this._selectView(this._curView, true),
       100,
       false
     );
@@ -527,22 +525,13 @@ class HUIRoot extends LitElement {
     window.addEventListener("scroll", this._handleWindowScroll, {
       passive: true,
     });
-    window.addEventListener("popstate", this._handlePopState);
   }
 
   public disconnectedCallback(): void {
     super.disconnectedCallback();
     window.removeEventListener("scroll", this._handleWindowScroll);
-    window.removeEventListener("popstate", this._handlePopState);
   }
 
-  private _restoreScroll = false;
-
-  private _handlePopState = () => {
-    // If we navigated back, we want to restore the scroll position.
-    this._restoreScroll = true;
-  };
-
   protected updated(changedProperties: PropertyValues): void {
     super.updated(changedProperties);
 
@@ -583,6 +572,9 @@ class HUIRoot extends LitElement {
         }
         newSelectView = index;
       }
+
+      // Will allow to override history scroll restoration when using back button
+      setTimeout(() => scrollTo({ behavior: "auto", top: 0 }), 1);
     }
 
     if (changedProperties.has("lovelace")) {
@@ -621,10 +613,7 @@ class HUIRoot extends LitElement {
         newSelectView = this._curView;
       }
       // Will allow for ripples to start rendering
-      afterNextRender(() => {
-        this._selectView(newSelectView, force, this._restoreScroll);
-        this._restoreScroll = false;
-      });
+      afterNextRender(() => this._selectView(newSelectView, force));
     }
   }
 
@@ -932,26 +921,17 @@ class HUIRoot extends LitElement {
     }
   }
 
-  private _selectView(
-    viewIndex: HUIRoot["_curView"],
-    force: boolean,
-    restoreScroll: boolean
-  ): void {
+  private _selectView(viewIndex: HUIRoot["_curView"], force: boolean): void {
     if (!force && this._curView === viewIndex) {
       return;
     }
 
-    if (this._curView != null) {
-      this._viewScrollPositions[this._curView] = window.scrollY;
-    }
-
     viewIndex = viewIndex === undefined ? 0 : viewIndex;
 
     this._curView = viewIndex;
 
     if (force) {
       this._viewCache = {};
-      this._viewScrollPositions = {};
     }
 
     // Recreate a new element to clear the applied themes.
@@ -983,15 +963,10 @@ class HUIRoot extends LitElement {
 
     if (!force && this._viewCache![viewIndex]) {
       view = this._viewCache![viewIndex];
-      const position = restoreScroll
-        ? this._viewScrollPositions[viewIndex] || 0
-        : 0;
-      setTimeout(() => scrollTo({ behavior: "auto", top: position }), 0);
     } else {
       view = document.createElement("hui-view");
       view.index = viewIndex;
       this._viewCache![viewIndex] = view;
-      setTimeout(() => scrollTo({ behavior: "auto", top: 0 }), 0);
     }
 
     view.lovelace = this.lovelace;