Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/components/settings/NavItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ withDefaults(defineProps<{
// settings nav (grandfathered in its baseline there) — NavItem is now the
// single home for this ink. (Marker repeated inline: the guard ratchets
// alpha per raw line.)
const rowClass = 'w-full justify-start gap-2.5 pl-3.5! pr-3! font-[430] tracking-[-0.1px] text-foreground/85 [--btn-ghost-hover:var(--sidebar-hover)]' /* ui-allow-alpha */
const rowClass = 'w-full justify-start gap-2.5 pl-3.5! pr-3! tracking-[-0.1px] text-foreground/85 [--btn-ghost-hover:var(--sidebar-hover)]' /* ui-allow-alpha */
</script>

<template>
<Button
data-settings-nav-item
variant="ghost"
:class="[rowClass, active && 'bg-sidebar-accent text-foreground!']"
:class="[rowClass, active ? 'bg-sidebar-accent font-medium text-foreground!' : 'font-[430]']"
>
<slot />
</Button>
Expand Down
105 changes: 99 additions & 6 deletions src/lib/scroll-hover.ts
Original file line number Diff line number Diff line change
@@ -1,41 +1,132 @@
function isNonHoverPointer(event: PointerEvent): boolean {
return Boolean(event.pointerType) && event.pointerType !== 'mouse' && event.pointerType !== 'pen'
}

export function createScrollHover() {
let pointer: { x: number, y: number } | undefined
let hovered: HTMLElement | undefined
let activeScope: HTMLElement | undefined
let frame: number | undefined
let cleanupListeners: (() => void) | undefined

function detachListeners(): void {
cleanupListeners?.()
cleanupListeners = undefined
}

function clearAll(): void {
pointer = undefined
setHovered(undefined)
}

function attachListeners(scope: HTMLElement): void {
if (cleanupListeners)
return
const doc = scope.ownerDocument
const win = doc.defaultView

const onDocumentPointerMove = (event: PointerEvent) => {
if (isNonHoverPointer(event)) {
clearAll()
return
}
pointer = { x: event.clientX, y: event.clientY }
if (activeScope && !activeScope.contains(event.target as Node | null))
sync(activeScope)
}

const onDocumentPointerDown = (event: PointerEvent) => {
if (isNonHoverPointer(event)) {
clearAll()
return
}
if (activeScope && !activeScope.contains(event.target as Node | null))
setHovered(undefined)
}

const onDocumentFocusIn = (event: FocusEvent) => {
if (activeScope && event.target instanceof Node && !activeScope.contains(event.target))
sync(activeScope)
}

const onVisibilityChange = () => {
if (doc.hidden)
clearAll()
}

doc.addEventListener('pointermove', onDocumentPointerMove, { capture: true, passive: true })
doc.addEventListener('pointerdown', onDocumentPointerDown, { capture: true, passive: true })
doc.addEventListener('focusin', onDocumentFocusIn, { capture: true })
doc.addEventListener('visibilitychange', onVisibilityChange)
win?.addEventListener('blur', clearAll)

const bodyObserver = doc.body && typeof MutationObserver !== 'undefined'
? new MutationObserver(() => {
if (doc.body.style.pointerEvents === 'none') {
setHovered(undefined)
return
}
if (activeScope)
sync(activeScope)
})
: undefined
bodyObserver?.observe(doc.body, { attributes: true, attributeFilter: ['style'] })

cleanupListeners = () => {
doc.removeEventListener('pointermove', onDocumentPointerMove, { capture: true })
doc.removeEventListener('pointerdown', onDocumentPointerDown, { capture: true })
doc.removeEventListener('focusin', onDocumentFocusIn, { capture: true })
doc.removeEventListener('visibilitychange', onVisibilityChange)
win?.removeEventListener('blur', clearAll)
bodyObserver?.disconnect()
}
}

function setHovered(next: HTMLElement | undefined): void {
if (hovered === next)
return
hovered?.removeAttribute('data-pointer-hover')
next?.setAttribute('data-pointer-hover', '')
hovered = next
if (next && activeScope) {
attachListeners(activeScope)
}
else if (!next) {
detachListeners()
}
}

function sync(scope: HTMLElement): void {
if (!pointer)
if (!pointer || scope.ownerDocument.body?.style.pointerEvents === 'none')
return setHovered(undefined)
const hit = scope.ownerDocument.elementFromPoint(pointer.x, pointer.y)
const target = hit?.closest<HTMLElement>('[data-settings-nav-item]')
setHovered(target && scope.contains(target) ? target : undefined)
}

function scheduleSync(scope: HTMLElement): void {
activeScope = scope
if (frame !== undefined)
return
frame = requestAnimationFrame(() => {
frame = undefined
sync(scope)
if (activeScope)
sync(activeScope)
})
}

function pointerMove(event: PointerEvent): void {
if (isNonHoverPointer(event)) {
clearAll()
return
}
activeScope = event.currentTarget as HTMLElement
pointer = { x: event.clientX, y: event.clientY }
sync(event.currentTarget as HTMLElement)
sync(activeScope)
}

function pointerLeave(): void {
pointer = undefined
setHovered(undefined)
clearAll()
}

function scroll(event: Event): void {
Expand All @@ -46,7 +137,9 @@ export function createScrollHover() {
if (frame !== undefined)
cancelAnimationFrame(frame)
frame = undefined
setHovered(undefined)
activeScope = undefined
clearAll()
detachListeners()
}

return { pointerMove, pointerLeave, scroll, dispose }
Expand Down
2 changes: 2 additions & 0 deletions src/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,7 @@
}

:root, [data-color-scheme-preview="memoh"] {
color-scheme: light;
--select-fade-midpoint: rgb(0 0 0 / 0.4); /* Mask alpha, independent of theme. */
/* Nine 34px rows and eight 2px gaps, scaling with the root font. */
--menu-frame-spacing: 0.25rem;
Expand Down Expand Up @@ -1543,6 +1544,7 @@
}

.dark, .dark [data-color-scheme-preview="memoh"] {
color-scheme: dark;
--background: oklch(0.12212 0 0);
--foreground: oklch(0.90 0 0);
--card: oklch(0.21 0 0);
Expand Down
Loading