From a122e6d15d1da6eed0e92c3bf0e1cde16122e1d8 Mon Sep 17 00:00:00 2001
From: Tom <mottoes_recap0u@icloud.com>
Date: Mon, 15 May 2023 17:17:36 +0200
Subject: [PATCH] fix retain scroll position in catalog view

---
 src/components/views/Catalog.jsx              | 4 ++--
 src/components/views/SubscriptionsCatalog.jsx | 2 +-
 src/components/views/Thread.jsx               | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 3d888eb6..2ac3b44e 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -471,8 +471,8 @@ const Catalog = () => {
                 const fallbackImgUrl = "assets/filedeleted-res.gif";
                 return (
                   <Link style={{all: "unset", cursor: "pointer"}} key={`link-${index}`} to={`/p/${selectedAddress}/c/${thread.cid}`} 
-                  onClick={() => {setSelectedThread(thread.cid); window.scrollTo(0, 0);}}>
-                    <div key={`thread-${index}`} className="thread">
+                      onClick={() => setSelectedThread(thread.cid)}>
+                  <div key={`thread-${index}`} className="thread">
                         {commentMediaInfo?.url ? (
                           <Fragment key="f-catalog">
                             {commentMediaInfo?.type === "webpage" ? (
diff --git a/src/components/views/SubscriptionsCatalog.jsx b/src/components/views/SubscriptionsCatalog.jsx
index f826ed91..63057a43 100644
--- a/src/components/views/SubscriptionsCatalog.jsx
+++ b/src/components/views/SubscriptionsCatalog.jsx
@@ -214,7 +214,7 @@ const SubscriptionsCatalog = () => {
                 const fallbackImgUrl = "assets/filedeleted-res.gif";
                 return (
                   <Link style={{all: "unset", cursor: "pointer"}} key={`link-${index}`} to={`/p/${thread.subplebbitAddress}/c/${thread.cid}`} 
-                  onClick={() => {setSelectedThread(thread.cid); window.scrollTo(0, 0);}}>
+                  onClick={() => setSelectedThread(thread.cid)}>
                     <div key={`thread-${index}`} className="thread">
                         {commentMediaInfo?.url ? (
                           <Fragment key="f-catalog">
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 046d16a4..d8df9438 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -73,6 +73,12 @@ const Thread = () => {
   const commentMediaInfo = getCommentMediaInfo(comment);
   const fallbackImgUrl = "assets/filedeleted-res.gif";
 
+  
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, []);
+
+
   useEffect(() => {
     if ( comment.state === "failed" && selectedAddress === undefined) {
       navigate('/404');