Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/web/src/components/ui/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -437,12 +438,15 @@ function SidebarSeparator({ className, ...props }: React.ComponentProps<typeof S
}

function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
const viewport = React.useRef<HTMLDivElement>(null);
useScrollFade(viewport);
return (
<div
ref={viewport}
data-slot="sidebar-content"
data-sidebar="content"
className={cn(
"flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
"scroll-fade flex min-h-0 flex-1 flex-col gap-2 overflow-auto [scrollbar-width:none] group-data-[collapsible=icon]:overflow-hidden [&::-webkit-scrollbar]:hidden",
className,
)}
{...props}
Expand Down
31 changes: 31 additions & 0 deletions apps/web/src/hooks/use-scroll-fade.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { useLayoutEffect, type RefObject } from "react";

export function useScrollFade(viewport: RefObject<HTMLElement | null>) {
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]);
}
30 changes: 5 additions & 25 deletions apps/web/src/settings/layout.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -90,31 +91,10 @@ export function SettingsSidebar() {

export function SettingsLayout() {
const viewport = useRef<HTMLElement>(null);
const content = useRef<HTMLDivElement>(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 (
<main ref={viewport} className="settings-scroll h-full min-h-0 min-w-0 overflow-auto">
<div ref={content}>
<main ref={viewport} className="scroll-fade h-full min-h-0 min-w-0 overflow-auto">
<div>
<Outlet />
</div>
</main>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading