diff --git a/packages/app/e2e/regression/tabs.spec.ts b/packages/app/e2e/regression/tabs.spec.ts index df428935c84..fcd31ce8af3 100644 --- a/packages/app/e2e/regression/tabs.spec.ts +++ b/packages/app/e2e/regression/tabs.spec.ts @@ -579,8 +579,19 @@ test("vertical tabs resize, scroll, show shortcut hints, and navigate", async ({ await resize(-380, "260px") const scroll = sidebar.locator('[data-slot="vertical-tabs-scroll"]') + + // The list feathers only the edges with more rows past them. + const feather = () => + scroll.evaluate((element) => { + const style = getComputedStyle(element) + + return [style.getPropertyValue("--vertical-tabs-fade-top"), style.getPropertyValue("--vertical-tabs-fade-bottom")] + }) + + await expect.poll(feather).toEqual(["0px", "16px"]) await scroll.evaluate((element) => element.scrollTo(0, element.scrollHeight)) await expect(tabB).toBeInViewport({ ratio: 1 }) + await expect.poll(feather).toEqual(["16px", "0px"]) await page.locator("html").evaluate((element) => element.setAttribute("dir", "rtl")) const home = sidebar.locator('[data-action="vertical-tabs-home"]') diff --git a/packages/app/src/shell/titlebar/tab-strip.tsx b/packages/app/src/shell/titlebar/tab-strip.tsx index 4c1e4211668..fc7ea3c07b6 100644 --- a/packages/app/src/shell/titlebar/tab-strip.tsx +++ b/packages/app/src/shell/titlebar/tab-strip.tsx @@ -1,4 +1,5 @@ -import { createEffect, createMemo, createResource, For, onCleanup, Show } from "solid-js" +import { createEffect, createMemo, createResource, For, onCleanup, onMount, Show } from "solid-js" +import { createResizeObserver } from "@solid-primitives/resize-observer" import { createStore } from "solid-js/store" import { DragDropProvider, PointerSensor } from "@dnd-kit/solid" import { isSortable, useSortable } from "@dnd-kit/solid/sortable" @@ -392,6 +393,22 @@ export function TitlebarTabStrip(props: { const command = useCommand() const vertical = () => props.orientation === "vertical" let listRef!: HTMLDivElement + let scrollRef!: HTMLDivElement + // Each vertical edge feathers by as much as there is left to scroll past it, so it appears and leaves without a jump. + const [fade, setFade] = createStore({ top: 0, bottom: 0 }) + + const measureFade = () => + setFade({ + top: Math.min(16, Math.round(scrollRef.scrollTop)), + bottom: Math.min( + 16, + Math.max(0, Math.round(scrollRef.scrollHeight - scrollRef.clientHeight - scrollRef.scrollTop)), + ), + }) + + onMount(() => { + if (vertical()) createResizeObserver([scrollRef, listRef], measureFade) + }) const [visibility, setVisibility] = createStore>({}) const [unread, setUnread] = createStore>({}) const visibleTabs = createMemo(() => props.tabs.filter((tab) => tab.type === "draft" || visibility[tabKey(tab)])) @@ -482,12 +499,21 @@ export function TitlebarTabStrip(props: { classList={{ "min-h-0 overflow-hidden": vertical() }} >
{ + if (vertical()) measureFade() + }} > event.target instanceof Element && - !!event.target.closest('[data-slot="tab-close"], [contenteditable="true"], [contenteditable="plaintext-only"]'), + !!event.target.closest( + '[data-slot="tab-close"], [contenteditable="true"], [contenteditable="plaintext-only"]', + ), }), ]} modifiers={[ diff --git a/packages/app/src/shell/titlebar/titlebar.css b/packages/app/src/shell/titlebar/titlebar.css index 2b77904f3b4..a47026a8d1e 100644 --- a/packages/app/src/shell/titlebar/titlebar.css +++ b/packages/app/src/shell/titlebar/titlebar.css @@ -10,11 +10,23 @@ [data-slot="vertical-tabs-sidebar"] [data-slot="vertical-tabs-scroll"] { min-height: 0; - /* Leave enough space to scroll the final tab clear of the fade above Settings. */ padding-block-end: 16px; - scroll-padding-block-end: 16px; - -webkit-mask-image: linear-gradient(to bottom, black calc(100% - 16px), transparent); - mask-image: linear-gradient(to bottom, black calc(100% - 16px), transparent); + /* Keyboard navigation scrolls a tab clear of the feathered edges, which TitlebarTabStrip sizes from the scroll. */ + scroll-padding-block: 16px; + -webkit-mask-image: linear-gradient( + to bottom, + transparent, + black var(--vertical-tabs-fade-top, 0px), + black calc(100% - var(--vertical-tabs-fade-bottom, 0px)), + transparent + ); + mask-image: linear-gradient( + to bottom, + transparent, + black var(--vertical-tabs-fade-top, 0px), + black calc(100% - var(--vertical-tabs-fade-bottom, 0px)), + transparent + ); } [data-slot="mobile-tabs-trigger"][aria-expanded="true"] {