From bc94ff78007a320cbedf918c75d42939f71d911d Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 11 Dec 2024 18:09:30 +0200
Subject: [PATCH] Preserve scrollTop on popup reopen

---
 public/scripts/extensions.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/scripts/extensions.js b/public/scripts/extensions.js
index 6dee9a795..2751fa31e 100644
--- a/public/scripts/extensions.js
+++ b/public/scripts/extensions.js
@@ -690,7 +690,12 @@ async function showExtensionsDetails() {
     let popupPromise;
     try {
         // If we are updating an extension, the "old" popup is still active. We should close that.
-        await Popup.util.popups.find(popup => popup.content.querySelector('.extensions_info'))?.completeCancelled();
+        let initialScrollTop = 0;
+        const oldPopup = Popup.util.popups.find(popup => popup.content.querySelector('.extensions_info'));
+        if (oldPopup) {
+            initialScrollTop = oldPopup.content.scrollTop;
+            await oldPopup.completeCancelled();
+        }
         const htmlDefault = $('<div class="marginBot10"><h3 class="textAlignCenter">Built-in Extensions:</h3></div>');
         const htmlExternal = $('<div class="marginBot10"><h3 class="textAlignCenter">Installed Extensions:</h3></div>');
         const htmlLoading = $(`<div class="flex-container alignItemsCenter justifyCenter marginTop10 marginBot5">
@@ -749,6 +754,7 @@ async function showExtensionsDetails() {
             },
         });
         popupPromise = popup.show();
+        popup.content.scrollTop = initialScrollTop;
         checkForUpdatesManual(abortController.signal).finally(() => htmlLoading.remove());
     } catch (error) {
         toastr.error(t`Error loading extensions. See browser console for details.`);