From 14b9a2cef0c22e7c270095e7e2f07caeb972a680 Mon Sep 17 00:00:00 2001
From: Lilian <lilian@blahaj.space>
Date: Sat, 2 Nov 2024 19:20:03 +0100
Subject: [PATCH] [frontend/components] Remove redundant scroller from
 SingleNote view

---
 Iceshrimp.Frontend/Pages/SingleNote.razor     |  8 ++++----
 Iceshrimp.Frontend/Pages/SingleNote.razor.css |  5 -----
 Iceshrimp.Frontend/Pages/SingleNote.razor.js  | 16 ++++++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Iceshrimp.Frontend/Pages/SingleNote.razor b/Iceshrimp.Frontend/Pages/SingleNote.razor
index 3a008d6c..4cf558c4 100644
--- a/Iceshrimp.Frontend/Pages/SingleNote.razor
+++ b/Iceshrimp.Frontend/Pages/SingleNote.razor
@@ -242,7 +242,7 @@
 
             if (state != null)
             {
-                Module.InvokeVoid("SetScrollTop", Scroller, state.ScrollTop);
+                Module.InvokeVoid("SetScrollY", state.ScrollTop);
             }
             else
             {
@@ -255,14 +255,14 @@
     {
         if (NoteId == null || _componentState != State.Loaded) return;
         var scrollTop = (Module ?? throw new Exception("JS Interop used before init"))
-            .Invoke<float>("GetScrollTop", Scroller);
-        var state     = new SingleNoteState { ScrollTop = scrollTop };
+            .Invoke<float>("GetScrollY");
+        var state = new SingleNoteState { ScrollTop = scrollTop };
         StateSvc.SingleNote.SetState(NoteId, state);
     }
 
     public void Dispose()
     {
-        if (_noteChangedHandler != null) _noteChangedHandler.Dispose();
+        _noteChangedHandler?.Dispose();
         SaveState();
         _locationChangingHandlerDisposable?.Dispose();
         MessageService.AnyNoteDeleted -= OnNoteDeleted;
diff --git a/Iceshrimp.Frontend/Pages/SingleNote.razor.css b/Iceshrimp.Frontend/Pages/SingleNote.razor.css
index 69869e74..ba84d661 100644
--- a/Iceshrimp.Frontend/Pages/SingleNote.razor.css
+++ b/Iceshrimp.Frontend/Pages/SingleNote.razor.css
@@ -6,11 +6,6 @@
     border-bottom: solid var(--highlight-color) 0.1rem;
 }
 
-.scroller {
-    overflow-y: auto;
-    overflow-x: clip;
-}
-
 .descendants {
     display: flex;
     flex-direction: column;
diff --git a/Iceshrimp.Frontend/Pages/SingleNote.razor.js b/Iceshrimp.Frontend/Pages/SingleNote.razor.js
index 99e618b9..de24a53e 100644
--- a/Iceshrimp.Frontend/Pages/SingleNote.razor.js
+++ b/Iceshrimp.Frontend/Pages/SingleNote.razor.js
@@ -1,11 +1,11 @@
-export function GetScrollTop(ref) {
-    return ref.scrollTop;
-}
-
-export function SetScrollTop(ref, number) {
-    ref.scrollTop = number;
-}
-
 export function ScrollIntoView(ref) {
     ref.scrollIntoView({ behavior: "instant", block: "center"})
+}
+
+export function GetScrollY(){
+    return window.scrollY;
+}
+
+export function SetScrollY(number){
+    window.scroll(window.scrollX, number);
 }
\ No newline at end of file