From 76433a4b9a7ec9421d406a63ae7ce9db54c4a924 Mon Sep 17 00:00:00 2001
From: Alexandru Branza <branza.alex@gmail.com>
Date: Fri, 4 Feb 2022 16:14:43 +0200
Subject: [PATCH 1/4] Fix Discover Scroll

The scroll of the Discover page would not go to top once a genre or page was changed.
---
 src/routes/Discover/Discover.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index bbccda7a5..394f68ad1 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -67,6 +67,11 @@ const Discover = ({ urlParams, queryParams }) => {
         closeAddonModal();
         setSelectedMetaItemIndex(0);
     }, [discover.selected]);
+    const metaItemsContainerRef = React.useRef();
+    React.useEffect(() => {
+        if (((discover.catalog || {}).content || {}).type === 'Loading')
+            metaItemsContainerRef.current.scrollTo(0,0);
+    }, [discover.catalog]);
     return (
         <MainNavBars className={styles['discover-container']} route={'discover'}>
             <div className={styles['discover-content']}>
@@ -124,7 +129,7 @@ const Discover = ({ urlParams, queryParams }) => {
                                 </div>
                                 :
                                 discover.catalog.content.type === 'Loading' ?
-                                    <div className={styles['meta-items-container']}>
+                                    <div className={styles['meta-items-container']} ref={metaItemsContainerRef}>
                                         {Array(CONSTANTS.CATALOG_PAGE_SIZE).fill(null).map((_, index) => (
                                             <div key={index} className={styles['meta-item-placeholder']}>
                                                 <div className={styles['poster-container']} />

From 16e21b52415149fde801dc9399777b1067406c9d Mon Sep 17 00:00:00 2001
From: Alexandru Branza <branza.alex@gmail.com>
Date: Fri, 4 Feb 2022 16:50:08 +0200
Subject: [PATCH 2/4] Add Missing Space

---
 src/routes/Discover/Discover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 394f68ad1..9b5d0d0e6 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -70,7 +70,7 @@ const Discover = ({ urlParams, queryParams }) => {
     const metaItemsContainerRef = React.useRef();
     React.useEffect(() => {
         if (((discover.catalog || {}).content || {}).type === 'Loading')
-            metaItemsContainerRef.current.scrollTo(0,0);
+            metaItemsContainerRef.current.scrollTo(0, 0);
     }, [discover.catalog]);
     return (
         <MainNavBars className={styles['discover-container']} route={'discover'}>

From b2e2eb1c953feb91de6722f59c2d65c44719d262 Mon Sep 17 00:00:00 2001
From: nklhrstv <me@nikolahristov.com>
Date: Tue, 15 Feb 2022 13:37:47 +0200
Subject: [PATCH 3/4] use optional chaining

---
 src/routes/Discover/Discover.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 9b5d0d0e6..6a357f167 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -69,8 +69,9 @@ const Discover = ({ urlParams, queryParams }) => {
     }, [discover.selected]);
     const metaItemsContainerRef = React.useRef();
     React.useEffect(() => {
-        if (((discover.catalog || {}).content || {}).type === 'Loading')
+        if (discover.catalog?.content.type === 'Loading') {
             metaItemsContainerRef.current.scrollTo(0, 0);
+        }
     }, [discover.catalog]);
     return (
         <MainNavBars className={styles['discover-container']} route={'discover'}>

From fd347ef464a51a5d50489640c4757476aeb226b5 Mon Sep 17 00:00:00 2001
From: nklhrstv <me@nikolahristov.com>
Date: Tue, 15 Feb 2022 13:41:04 +0200
Subject: [PATCH 4/4] metaItemsContainerRef allways reference to the meta item
 container when its mounted

---
 src/routes/Discover/Discover.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 6a357f167..fe9905d32 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -130,7 +130,7 @@ const Discover = ({ urlParams, queryParams }) => {
                                 </div>
                                 :
                                 discover.catalog.content.type === 'Loading' ?
-                                    <div className={styles['meta-items-container']} ref={metaItemsContainerRef}>
+                                    <div ref={metaItemsContainerRef} className={styles['meta-items-container']}>
                                         {Array(CONSTANTS.CATALOG_PAGE_SIZE).fill(null).map((_, index) => (
                                             <div key={index} className={styles['meta-item-placeholder']}>
                                                 <div className={styles['poster-container']} />
@@ -141,7 +141,7 @@ const Discover = ({ urlParams, queryParams }) => {
                                         ))}
                                     </div>
                                     :
-                                    <div className={styles['meta-items-container']} onFocusCapture={metaItemsOnFocusCapture}>
+                                    <div ref={metaItemsContainerRef} className={styles['meta-items-container']} onFocusCapture={metaItemsOnFocusCapture}>
                                         {discover.catalog.content.content.map((metaItem, index) => (
                                             <MetaItem
                                                 key={index}