diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx index 82423cb7..aa9a9140 100644 --- a/apps/web/src/components/ui/sidebar.tsx +++ b/apps/web/src/components/ui/sidebar.tsx @@ -7,6 +7,7 @@ import { PanelLeftIcon } from "lucide-react"; import { Slot } from "radix-ui"; import { useIsMobile } from "@/hooks/use-mobile"; +import { useScrollFade } from "@/hooks/use-scroll-fade"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Separator } from "@/components/ui/separator"; @@ -437,12 +438,15 @@ function SidebarSeparator({ className, ...props }: React.ComponentProps) { + const viewport = React.useRef(null); + useScrollFade(viewport); return (
) { + useLayoutEffect(() => { + const element = viewport.current; + if (element === null) return; + const update = () => { + element.style.setProperty("--scroll-top", element.scrollTop > 1 ? "transparent" : "black"); + element.style.setProperty( + "--scroll-bottom", + element.scrollTop + element.clientHeight < element.scrollHeight - 1 ? "transparent" : "black", + ); + }; + const resize = new ResizeObserver(update); + const observe = () => { + resize.disconnect(); + resize.observe(element); + for (const child of element.children) resize.observe(child); + update(); + }; + const mutations = new MutationObserver(observe); + mutations.observe(element, { childList: true, subtree: true, characterData: true }); + element.addEventListener("scroll", update, { passive: true }); + observe(); + return () => { + resize.disconnect(); + mutations.disconnect(); + element.removeEventListener("scroll", update); + }; + }, [viewport]); +} diff --git a/apps/web/src/settings/layout.tsx b/apps/web/src/settings/layout.tsx index 318d7979..4302d4ee 100644 --- a/apps/web/src/settings/layout.tsx +++ b/apps/web/src/settings/layout.tsx @@ -1,6 +1,7 @@ import { Link, Outlet, useMatchRoute, useNavigate } from "@tanstack/react-router"; import { Search } from "lucide-react"; -import { useEffect, useRef, useState } from "react"; +import { useRef, useState } from "react"; +import { useScrollFade } from "@/hooks/use-scroll-fade"; import { Sidebar, @@ -90,31 +91,10 @@ export function SettingsSidebar() { export function SettingsLayout() { const viewport = useRef(null); - const content = useRef(null); - useEffect(() => { - const element = viewport.current; - const body = content.current; - if (element === null || body === null) return; - const update = () => { - element.style.setProperty("--scroll-top", element.scrollTop > 1 ? "transparent" : "black"); - element.style.setProperty( - "--scroll-bottom", - element.scrollTop + element.clientHeight < element.scrollHeight - 1 ? "transparent" : "black", - ); - }; - const observer = new ResizeObserver(update); - observer.observe(element); - observer.observe(body); - element.addEventListener("scroll", update, { passive: true }); - update(); - return () => { - observer.disconnect(); - element.removeEventListener("scroll", update); - }; - }, []); + useScrollFade(viewport); return ( -
-
+
+
diff --git a/apps/web/src/style.css b/apps/web/src/style.css index 02a73893..722ceea8 100644 --- a/apps/web/src/style.css +++ b/apps/web/src/style.css @@ -552,8 +552,8 @@ color: color-mix(in srgb, var(--cw-ink) 80%, transparent); } -/* Only soften edges that have more settings content beyond them. */ -.settings-scroll { +/* Only soften edges that have more scrollable content beyond them. */ +.scroll-fade { mask-image: linear-gradient( to bottom, var(--scroll-top, black),