From e1cf13cf3d4e221de9cbf7b72a5a7d9cbd12d0fd Mon Sep 17 00:00:00 2001
From: Pas <74743263+Pasithea0@users.noreply.github.com>
Date: Sat, 3 May 2025 18:18:35 -0600
Subject: [PATCH] fix some carousel stuff

---
 src/assets/css/index.css                    | 52 ++++++++++-----------
 src/pages/parts/settings/AppearancePart.tsx | 46 +++++++++---------
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 2bcf2fbf..4548b003 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -295,42 +295,42 @@ input[type=range].styled-slider.slider-progress::-ms-fill-lower {
   position: relative;
   -webkit-mask-image: linear-gradient(
     to bottom,
-    rgba(0, 0, 0, 0),
-    rgba(0, 0, 0, 1) var(--mask-fade-distance),
-    rgba(0, 0, 0, 1) calc(100% - var(--mask-fade-distance)),
-    rgba(0, 0, 0, 0) 100%
+    transparent,
+    black var(--mask-fade-distance),
+    black calc(100% - var(--mask-fade-distance)),
+    transparent
   );
   mask-image: var(-webkit-mask-image);
   z-index: 1;
 }
 
-.vertical-carousel-container.mask-none {
+.vertical-carousel-container.hide-top-gradient {
+  -webkit-mask-image: linear-gradient(
+    to bottom,
+    black,
+    black calc(100% - var(--mask-fade-distance)),
+    transparent
+  );
+  mask-image: var(-webkit-mask-image);
+}
+
+.vertical-carousel-container.hide-bottom-gradient {
+  -webkit-mask-image: linear-gradient(
+    to bottom,
+    transparent,
+    black var(--mask-fade-distance),
+    black
+  );
+  mask-image: var(-webkit-mask-image);
+}
+
+.vertical-carousel-container.hide-top-gradient.hide-bottom-gradient {
   -webkit-mask-image: none;
   mask-image: none;
 }
 
-.vertical-carousel-container.mask-image-bottom-only {
-  -webkit-mask-image: linear-gradient(
-    to bottom,
-    rgba(0, 0, 0, 1),
-    rgba(0, 0, 0, 1) calc(100% - var(--mask-fade-distance)),
-    rgba(0, 0, 0, 0) 100%
-  );
-  mask-image: var(-webkit-mask-image);
-}
-
-.vertical-carousel-container.mask-image-top-only {
-  -webkit-mask-image: linear-gradient(
-    to bottom,
-    rgba(0, 0, 0, 0),
-    rgba(0, 0, 0, 1) var(--mask-fade-distance),
-    rgba(0, 0, 0, 1)
-  );
-  mask-image: var(-webkit-mask-image);
-}
-
 @media (max-width: 768px) {
   .vertical-carousel-container {
     --mask-fade-distance: 20px;
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/parts/settings/AppearancePart.tsx b/src/pages/parts/settings/AppearancePart.tsx
index b5474c38..2d091639 100644
--- a/src/pages/parts/settings/AppearancePart.tsx
+++ b/src/pages/parts/settings/AppearancePart.tsx
@@ -169,28 +169,27 @@ export function AppearancePart(props: {
   const activeThemeRef = useRef<HTMLDivElement>(null);
   const [isAtTop, setIsAtTop] = useState(true);
   const [isAtBottom, setIsAtBottom] = useState(false);
-  const topSentinelRef = useRef<HTMLDivElement>(null);
-  const bottomSentinelRef = useRef<HTMLDivElement>(null);
+
+  const checkScrollPosition = () => {
+    const container = carouselRef.current;
+    if (!container) return;
+
+    setIsAtTop(container.scrollTop <= 0);
+    setIsAtBottom(
+      Math.abs(
+        container.scrollHeight - container.scrollTop - container.clientHeight,
+      ) < 2,
+    );
+  };
 
   useEffect(() => {
-    const observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          if (entry.target === topSentinelRef.current) {
-            setIsAtTop(entry.isIntersecting);
-          }
-          if (entry.target === bottomSentinelRef.current) {
-            setIsAtBottom(entry.isIntersecting);
-          }
-        });
-      },
-      { root: carouselRef.current, threshold: 1 },
-    );
+    const container = carouselRef.current;
+    if (!container) return;
 
-    if (topSentinelRef.current) observer.observe(topSentinelRef.current);
-    if (bottomSentinelRef.current) observer.observe(bottomSentinelRef.current);
+    container.addEventListener("scroll", checkScrollPosition);
+    checkScrollPosition(); // Check initial position
 
-    return () => observer.disconnect();
+    return () => container.removeEventListener("scroll", checkScrollPosition);
   }, []);
 
   useEffect(() => {
@@ -207,6 +206,8 @@ export function AppearancePart(props: {
         container.scrollTop -
         containerRect.top -
         (containerRect.height - elementRect.height) / 2;
+
+      checkScrollPosition(); // Update masks after scrolling
     }
   }, [props.active]);
 
@@ -263,16 +264,14 @@ export function AppearancePart(props: {
           <div
             ref={carouselRef}
             className={classNames(
-              "grid grid-cols-2 gap-4 max-w-[600px] max-h-[28rem] overflow-y-auto",
+              "grid grid-cols-2 gap-4 max-w-[600px] max-h-[36rem] overflow-y-auto",
               "vertical-carousel-container",
               {
-                "mask-none": isAtTop && isAtBottom,
-                "mask-image-bottom-only": isAtTop && !isAtBottom,
-                "mask-image-top-only": !isAtTop && isAtBottom,
+                "hide-top-gradient": isAtTop,
+                "hide-bottom-gradient": isAtBottom,
               },
             )}
           >
-            <div ref={topSentinelRef} className="absolute top-0 h-px" />
             {availableThemes.map((v) => (
               <div
                 key={v.id}
@@ -287,7 +286,6 @@ export function AppearancePart(props: {
                 />
               </div>
             ))}
-            <div ref={bottomSentinelRef} className="absolute bottom-0 h-px" />
           </div>
         </div>
       </div>