mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
fix(ui): overlay scrollbars, resizer hit-test, and Linux mini wheel (#255)
Add OverlayScrollArea with shared thumb metrics and drag handling; size the thumb against the rail track height so panel insets cannot push it past the visible rail. Route scroll uses a stable viewport id; Genres restores scroll and infinite-scroll observation against that viewport (merged with upstream virtualized genres list and lazy routes behind Suspense). Suppress queue resizer activation when the pointer targets the main-route overlay scrollbar; disable the resizer while dragging the thumb and use a grabbing cursor on the body. Apply WebKitGTK smooth wheel to the mini webview as well as main; the mini window reapplies the persisted setting after auth store hydration.
This commit is contained in:
@@ -0,0 +1,141 @@
|
||||
import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
import { computeOverlayScrollbarThumbMeta } from '../utils/overlayScrollbarMetrics';
|
||||
import { bindOverlayScrollbarThumbDrag } from '../utils/overlayScrollbarThumb';
|
||||
|
||||
export type OverlayScrollRailInset = 'none' | 'mini' | 'panel';
|
||||
|
||||
export type OverlayScrollAreaProps = {
|
||||
children: React.ReactNode;
|
||||
/** Optional handler on the outer wrapper (e.g. mini queue DnD hit-testing). */
|
||||
onMouseMove?: React.MouseEventHandler<HTMLDivElement>;
|
||||
/** Classes on the outer wrapper (e.g. queue-list-wrap, mini-queue-wrap). */
|
||||
className?: string;
|
||||
/** Classes on the scrollable viewport (e.g. queue-list, mini-queue). */
|
||||
viewportClassName?: string;
|
||||
/** Serialized internally — triggers remeasure + ResizeObserver refresh. */
|
||||
measureDeps?: ReadonlyArray<unknown>;
|
||||
/** Vertical inset of the hit rail (align with viewport padding). */
|
||||
railInset?: OverlayScrollRailInset;
|
||||
/** e.g. during native DnD — scroll-behavior: auto on the viewport. */
|
||||
viewportScrollBehaviorAuto?: boolean;
|
||||
/** Ref to the scrollable element (querySelector, scrollIntoView, etc.). */
|
||||
viewportRef?: React.Ref<HTMLDivElement>;
|
||||
/** Optional id on the viewport (e.g. main app scroll for route pages). */
|
||||
viewportId?: string;
|
||||
};
|
||||
|
||||
const RAIL_INSET_CLASS: Record<OverlayScrollRailInset, string> = {
|
||||
none: 'overlay-scroll--rail-inset-none',
|
||||
mini: 'overlay-scroll--rail-inset-mini',
|
||||
panel: 'overlay-scroll--rail-inset-panel',
|
||||
};
|
||||
|
||||
function assignRef<T>(ref: React.Ref<T> | undefined, value: T) {
|
||||
if (ref == null) return;
|
||||
if (typeof ref === 'function') ref(value);
|
||||
else (ref as { current: T | null }).current = value;
|
||||
}
|
||||
|
||||
export default function OverlayScrollArea({
|
||||
children,
|
||||
onMouseMove,
|
||||
className = '',
|
||||
viewportClassName = '',
|
||||
measureDeps = [],
|
||||
railInset = 'none',
|
||||
viewportScrollBehaviorAuto = false,
|
||||
viewportRef: viewportRefProp,
|
||||
viewportId,
|
||||
}: OverlayScrollAreaProps) {
|
||||
const wrapRef = useRef<HTMLDivElement>(null);
|
||||
const viewportRef = useRef<HTMLDivElement | null>(null);
|
||||
const [meta, setMeta] = useState({ thumbH: 0, thumbT: 0, visible: false });
|
||||
|
||||
const recompute = useCallback(() => {
|
||||
const vp = viewportRef.current;
|
||||
const wrap = wrapRef.current;
|
||||
const rail = wrap?.querySelector<HTMLElement>('.overlay-scroll__rail');
|
||||
const trackH =
|
||||
rail && rail.clientHeight > 0 ? rail.clientHeight : undefined;
|
||||
setMeta(computeOverlayScrollbarThumbMeta(vp, trackH));
|
||||
}, []);
|
||||
|
||||
const measureKey = JSON.stringify(measureDeps ?? []);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!meta.visible) return;
|
||||
const vp = viewportRef.current;
|
||||
const wrap = wrapRef.current;
|
||||
const rail = wrap?.querySelector<HTMLElement>('.overlay-scroll__rail');
|
||||
const th = rail?.clientHeight;
|
||||
if (!vp || !th || th <= 0) return;
|
||||
setMeta((prev) => {
|
||||
const next = computeOverlayScrollbarThumbMeta(vp, th);
|
||||
if (
|
||||
prev.thumbH === next.thumbH &&
|
||||
prev.thumbT === next.thumbT &&
|
||||
prev.visible === next.visible
|
||||
) {
|
||||
return prev;
|
||||
}
|
||||
return next;
|
||||
});
|
||||
}, [meta.visible]);
|
||||
|
||||
useEffect(() => {
|
||||
recompute();
|
||||
const wrap = wrapRef.current;
|
||||
const onWinResize = () => recompute();
|
||||
window.addEventListener('resize', onWinResize);
|
||||
const ro =
|
||||
typeof ResizeObserver !== 'undefined' && wrap
|
||||
? new ResizeObserver(() => recompute())
|
||||
: null;
|
||||
if (ro && wrap) ro.observe(wrap);
|
||||
return () => {
|
||||
window.removeEventListener('resize', onWinResize);
|
||||
ro?.disconnect();
|
||||
};
|
||||
}, [recompute, measureKey]);
|
||||
|
||||
const setViewportNode = (el: HTMLDivElement | null) => {
|
||||
viewportRef.current = el;
|
||||
assignRef(viewportRefProp, el);
|
||||
};
|
||||
|
||||
const rootClass = [
|
||||
'overlay-scroll',
|
||||
RAIL_INSET_CLASS[railInset],
|
||||
viewportScrollBehaviorAuto ? 'overlay-scroll--viewport-scroll-auto' : '',
|
||||
className,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ');
|
||||
|
||||
const viewportClass = ['overlay-scroll__viewport', viewportClassName].filter(Boolean).join(' ');
|
||||
|
||||
return (
|
||||
<div ref={wrapRef} className={rootClass} onMouseMove={onMouseMove}>
|
||||
<div
|
||||
id={viewportId}
|
||||
ref={setViewportNode}
|
||||
className={viewportClass}
|
||||
onScroll={recompute}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
{meta.visible && (
|
||||
<div className="overlay-scroll__rail" aria-hidden>
|
||||
<div
|
||||
className="overlay-scroll__thumb"
|
||||
style={{
|
||||
height: `${meta.thumbH}px`,
|
||||
transform: `translateY(${meta.thumbT}px)`,
|
||||
}}
|
||||
onPointerDown={(ev) => bindOverlayScrollbarThumbDrag(ev, viewportRef.current)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user