mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-13 19:46:16 +03:00
feat(app): experiment with a gliding sidebar hover (#57659)
This commit is contained in:
committed by
GitHub
Unverified
parent
d200c55048
commit
1ccf1f3294
@@ -0,0 +1,195 @@
|
||||
import { frameLoop, prefersReducedMotion, Spring } from "@opencode/ui/motion"
|
||||
import { motionTuning } from "@opencode/ui/motion-tuning"
|
||||
import { makeEventListener } from "@solid-primitives/event-listener"
|
||||
import { createSignal, onCleanup, onMount, Show } from "solid-js"
|
||||
|
||||
const choice = motionTuning.choice("sidebar.hover", {
|
||||
label: "Sidebar hover",
|
||||
group: "Experiments",
|
||||
value: "today",
|
||||
labels: { today: "Today", glide: "Glide" },
|
||||
})
|
||||
|
||||
const tuning = motionTuning.spring("sidebar.hover.glide", {
|
||||
label: "Sidebar hover glide",
|
||||
group: "Experiments",
|
||||
presets: {
|
||||
snappy: { duration: 0.14, bounce: 0 },
|
||||
smooth: { duration: 0.2, bounce: 0 },
|
||||
calm: { duration: 0.28, bounce: 0 },
|
||||
},
|
||||
})
|
||||
|
||||
const [mode, setMode] = createSignal(choice())
|
||||
|
||||
motionTuning.subscribe(() => setMode(choice()))
|
||||
|
||||
const rows = "[data-titlebar-tab], [data-titlebar-tab-action]"
|
||||
|
||||
// The pill's corner radius, matching the rows'.
|
||||
const radius = 6
|
||||
|
||||
const grid = (value: number) => Math.round(value * 64) / 64
|
||||
|
||||
const edges = ["top", "bottom", "left", "right"] as const
|
||||
|
||||
/**
|
||||
* Experiment: one hover pill glides behind the sidebar's rows, instead of each row lighting its own background. It
|
||||
* targets the row nearest the pointer, so crossing a gap between rows holds it rather than dropping it.
|
||||
*/
|
||||
export function SidebarHover() {
|
||||
return (
|
||||
<Show when={mode() === "glide"}>
|
||||
<Pill />
|
||||
</Show>
|
||||
)
|
||||
}
|
||||
|
||||
function Pill() {
|
||||
let pill!: HTMLDivElement
|
||||
let top!: HTMLDivElement
|
||||
let fill!: HTMLDivElement
|
||||
let bottom!: HTMLDivElement
|
||||
let pointer: { x: number; y: number } | undefined
|
||||
// The hovered row's edges relative to the sidebar, from the last frame's read phase.
|
||||
let hit: { top: number; bottom: number; left: number; right: number } | undefined
|
||||
let frame: (() => void) | undefined
|
||||
|
||||
const motion = {
|
||||
top: Spring.fromDuration(0, tuning()),
|
||||
bottom: Spring.fromDuration(0, tuning()),
|
||||
left: Spring.fromDuration(0, tuning()),
|
||||
right: Spring.fromDuration(0, tuning()),
|
||||
opacity: Spring.fromDuration(0, { duration: 0.15, bounce: 0 }),
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
// SAFETY: the pill renders inside the sidebar's portal root.
|
||||
const root = pill.parentElement!
|
||||
root.dataset.sidebarHover = "glide"
|
||||
onCleanup(() => delete root.dataset.sidebarHover)
|
||||
|
||||
const read = () => {
|
||||
hit = pointer && !root.querySelector('[data-dragging="true"]') ? nearest(root, pointer) : undefined
|
||||
}
|
||||
|
||||
const write = (dt: number) => {
|
||||
const spring = tuning()
|
||||
const reduced = prefersReducedMotion()
|
||||
|
||||
const target = hit
|
||||
|
||||
edges.forEach((edge) => {
|
||||
motion[edge].omega = (2 * Math.PI) / spring.duration
|
||||
motion[edge].zeta = 1 - spring.bounce
|
||||
|
||||
if (!target) return
|
||||
|
||||
// Appearing from hidden starts on the row rather than sweeping in from where it left.
|
||||
if (motion.opacity.value === 0 || reduced) motion[edge].snap(target[edge])
|
||||
motion[edge].set(target[edge])
|
||||
})
|
||||
|
||||
motion.opacity.set(target ? 1 : 0)
|
||||
|
||||
const y0 = grid(motion.top.step(dt))
|
||||
const y1 = grid(motion.bottom.step(dt))
|
||||
top.style.transform = `translateY(${y0}px)`
|
||||
bottom.style.transform = `translateY(${y1 - radius * 2}px)`
|
||||
fill.style.transform = `translateY(${y0 + radius}px) scaleY(${Math.max(0, y1 - y0 - radius * 2)})`
|
||||
|
||||
const x0 = grid(motion.left.step(dt))
|
||||
const width = `${grid(motion.right.step(dt)) - x0}px`
|
||||
pill.style.transform = `translateX(${x0}px)`
|
||||
|
||||
// Only Home beside the sidebar toggle is narrower, so width changes only on the way to or from it.
|
||||
if (pill.style.width !== width) pill.style.width = width
|
||||
pill.style.opacity = String(motion.opacity.step(dt))
|
||||
|
||||
if (Object.values(motion).some((item) => !item.resting)) return true
|
||||
frame = undefined
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
const wake = () => {
|
||||
frame ??= frameLoop.addMeasured(read, write)
|
||||
}
|
||||
|
||||
// While the pointer rests inside, rows that open, close, resize or finish a drag move the pill to the row now under it.
|
||||
const resize = new ResizeObserver(wake)
|
||||
const mutation = new MutationObserver(wake)
|
||||
|
||||
makeEventListener(root, "pointermove", (event) => {
|
||||
if (event.pointerType === "touch") return
|
||||
|
||||
if (!pointer)
|
||||
root.querySelectorAll("[data-titlebar-tab-list]").forEach((list) => {
|
||||
resize.observe(list)
|
||||
mutation.observe(list, { childList: true, subtree: true, attributeFilter: ["data-dragging"] })
|
||||
})
|
||||
|
||||
pointer = { x: event.clientX, y: event.clientY }
|
||||
wake()
|
||||
})
|
||||
makeEventListener(root, "pointerleave", () => {
|
||||
pointer = undefined
|
||||
resize.disconnect()
|
||||
mutation.disconnect()
|
||||
wake()
|
||||
})
|
||||
makeEventListener(root, "pointerup", wake)
|
||||
// Rows that scroll under a resting pointer move the pill with them.
|
||||
makeEventListener(root, "scroll", wake, { capture: true, passive: true })
|
||||
onCleanup(() => {
|
||||
frame?.()
|
||||
resize.disconnect()
|
||||
mutation.disconnect()
|
||||
})
|
||||
})
|
||||
|
||||
// Opaque slices, so the caps can overlap the middle without darkening it; the group fades as one.
|
||||
return (
|
||||
<div
|
||||
ref={pill}
|
||||
data-slot="sidebar-hover-pill"
|
||||
aria-hidden="true"
|
||||
class="pointer-events-none absolute left-0 top-0 -z-10 opacity-0"
|
||||
>
|
||||
<div ref={top} class="absolute inset-x-0 top-0 h-3 rounded-[6px]" />
|
||||
<div ref={fill} class="absolute inset-x-0 top-0 h-px origin-top" />
|
||||
<div ref={bottom} class="absolute inset-x-0 top-0 h-3 rounded-[6px]" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// The row nearest the pointer, clipped to the scrolling list, or none once the pointer leaves the rows' span.
|
||||
function nearest(root: HTMLElement, pointer: { x: number; y: number }) {
|
||||
const box = root.getBoundingClientRect()
|
||||
const scroll = root.querySelector('[data-slot="vertical-tabs-scroll"]')
|
||||
const view = scroll?.getBoundingClientRect()
|
||||
|
||||
const boxes = [...root.querySelectorAll(rows)].flatMap((element) => {
|
||||
const rect = element.getBoundingClientRect()
|
||||
const clip = view && scroll?.contains(element)
|
||||
const top = clip ? Math.max(rect.top, view.top) : rect.top
|
||||
const bottom = clip ? Math.min(rect.bottom, view.bottom) : rect.bottom
|
||||
|
||||
return bottom - top > 0 ? [{ top, bottom, left: rect.left, right: rect.right }] : []
|
||||
})
|
||||
|
||||
const first = boxes[0]
|
||||
|
||||
const last = boxes.at(-1)
|
||||
|
||||
if (!first || !last || pointer.y < first.top || pointer.y > last.bottom) return
|
||||
|
||||
const distance = (row: { top: number; bottom: number }) => Math.max(row.top - pointer.y, pointer.y - row.bottom, 0)
|
||||
// A tie in a gap goes to the lower row, as clicks do.
|
||||
const row = boxes.reduce((best, item) => (distance(item) <= distance(best) ? item : best))
|
||||
|
||||
// Beside the row, such as on the sidebar toggle next to Home, is off the rows.
|
||||
if (pointer.x < row.left || pointer.x > row.right) return
|
||||
|
||||
return { top: row.top - box.top, bottom: row.bottom - box.top, left: row.left - box.left, right: row.right - box.left }
|
||||
}
|
||||
@@ -144,6 +144,34 @@
|
||||
background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
|
||||
}
|
||||
|
||||
/* The sidebar hover experiment: one pill glides behind the rows, which keep only their own pressed and focus states. */
|
||||
[data-sidebar-hover="glide"] {
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
}
|
||||
|
||||
[data-slot="sidebar-hover-pill"] > * {
|
||||
background:
|
||||
linear-gradient(var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)),
|
||||
var(--v2-background-bg-deep);
|
||||
}
|
||||
|
||||
[data-sidebar-hover="glide"]
|
||||
:is(
|
||||
[data-titlebar-tab]:not(:has(> [data-slot="tab-link"]:focus-visible)),
|
||||
[data-titlebar-tab-action]:not(:focus-visible)
|
||||
):not(:active, [data-state="pressed"], [data-dragging="true"], [data-editing="true"]),
|
||||
[data-sidebar-hover="glide"]
|
||||
[data-titlebar-tab]:not(:has(> [data-slot="tab-link"]:focus-visible)):not(
|
||||
:active,
|
||||
[data-state="pressed"],
|
||||
[data-dragging="true"],
|
||||
[data-editing="true"]
|
||||
)
|
||||
[data-slot="tab-close"] {
|
||||
background: none;
|
||||
}
|
||||
|
||||
[data-titlebar-tab][data-editing="true"] [data-slot="tab-close"] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ import { sessionTabTitle } from "./tab-title"
|
||||
import { SessionTabAvatar } from "@/shell/layout/session-tab-avatar"
|
||||
import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2"
|
||||
import { RecentlyClosedTabsMenu } from "./recently-closed-tabs-menu"
|
||||
import { SidebarHover } from "./sidebar-hover"
|
||||
import { useSettingsDialog } from "@/settings/command"
|
||||
import { rootSession } from "@/shell/routes/session"
|
||||
import { TitlebarItems, useTitlebarItems } from "@/runtime/extension/titlebar-items"
|
||||
@@ -786,6 +787,7 @@ export function Titlebar(props: { verticalTabs?: { mount?: HTMLElement } }) {
|
||||
mount={mount}
|
||||
ref={(element) => (element.className = "flex size-full min-h-0 flex-col")}
|
||||
>
|
||||
<SidebarHover />
|
||||
<Show when={!windows()}>
|
||||
{/* Shares the session header's 48px center line. Without traffic lights, Home fills the
|
||||
start so the row doesn't leave an empty band. */}
|
||||
|
||||
Reference in New Issue
Block a user