fix(desktop): reduce sidebar and grid jank

This commit is contained in:
t8y2 committed 2026-07-09 13:21:18 +08:00
1 parent 1cfb39a7b0
commit 36daa214c3
3 files changed
+52 -18

No files matched your search

+33 -11
View File
@@ -2458,13 +2458,17 @@ const gridVerticalScrollbarThumbHeightPercent = ref(100);
const gridHorizontalScrollbarDragging = ref(false);
const gridVerticalScrollbarDragging = ref(false);
let gridHorizontalScrollbarFrame = 0;
let gridHorizontalScrollbarDragFrame = 0;
let gridHorizontalScrollbarPendingClientX = 0;
let gridHorizontalScrollbarResizeObserver: ResizeObserver | null = null;
let dataGridTopbarResizeObserver: ResizeObserver | null = null;
let cellEditResizeObserver: ResizeObserver | null = null;
let resetCellEditTextareaScrollOnResize = false;
let gridHorizontalScrollbarDragState: {
scroller: HTMLElement;
trackRect: DOMRect;
thumbOffsetPx: number;
maxScrollLeft: number;
} | null = null;
let gridVerticalScrollbarDragState: {
trackRect: DOMRect;
@@ -2790,33 +2794,47 @@ function observeDataGridTopbarWidth() {
}
}
function applyGridHorizontalScrollbarDrag(clientX: number) {
const scroller = gridScrollerElement();
function applyPendingGridHorizontalScrollbarDrag() {
gridHorizontalScrollbarDragFrame = 0;
const dragState = gridHorizontalScrollbarDragState;
if (!scroller || !dragState) return;
const maxScrollLeft = Math.max(0, scroller.scrollWidth - scroller.clientWidth);
if (maxScrollLeft <= 1) return;
if (!dragState) return;
const thumbWidthPx = dragState.trackRect.width * (gridHorizontalScrollbarThumbWidthPercent.value / 100);
const maxThumbLeftPx = Math.max(1, dragState.trackRect.width - thumbWidthPx);
const thumbLeftPx = Math.min(maxThumbLeftPx, Math.max(0, clientX - dragState.trackRect.left - dragState.thumbOffsetPx));
scroller.scrollLeft = (thumbLeftPx / maxThumbLeftPx) * maxScrollLeft;
const thumbLeftPx = Math.min(maxThumbLeftPx, Math.max(0, gridHorizontalScrollbarPendingClientX - dragState.trackRect.left - dragState.thumbOffsetPx));
const scroller = dragState.scroller;
const nextScrollLeft = (thumbLeftPx / maxThumbLeftPx) * dragState.maxScrollLeft;
if (Math.abs(scroller.scrollLeft - nextScrollLeft) < 0.5) return;
scroller.scrollLeft = nextScrollLeft;
updateGridHorizontalViewport(scroller);
if (headerRef.value) headerRef.value.scrollLeft = scroller.scrollLeft;
if (useCanvasGridRows.value) {
syncCanvasViewport();
drawCanvasGridNow();
}
}
function scheduleGridHorizontalScrollbarDrag(clientX: number) {
gridHorizontalScrollbarPendingClientX = clientX;
if (gridHorizontalScrollbarDragFrame) return;
// Pointermove can fire faster than paint; keep expensive canvas/layout work to one frame.
gridHorizontalScrollbarDragFrame = requestAnimationFrame(applyPendingGridHorizontalScrollbarDrag);
}
function flushGridHorizontalScrollbarDrag() {
if (!gridHorizontalScrollbarDragFrame) return;
cancelAnimationFrame(gridHorizontalScrollbarDragFrame);
applyPendingGridHorizontalScrollbarDrag();
}
function onGridHorizontalScrollbarPointerMove(event: PointerEvent) {
if (!gridHorizontalScrollbarDragState) return;
event.preventDefault();
applyGridHorizontalScrollbarDrag(event.clientX);
scheduleGridHorizontalScrollbarDrag(event.clientX);
}
function stopGridHorizontalScrollbarDrag() {
if (!gridHorizontalScrollbarDragState) return;
flushGridHorizontalScrollbarDrag();
gridHorizontalScrollbarDragState = null;
gridHorizontalScrollbarDragging.value = false;
window.removeEventListener("pointermove", onGridHorizontalScrollbarPointerMove, true);
@@ -2840,6 +2858,8 @@ function startGridHorizontalScrollbarDrag(event: PointerEvent) {
const track = gridHorizontalScrollbarTrackRef.value;
if (!scroller || !track || !hasGridHorizontalOverflow.value) return;
const maxScrollLeft = Math.max(0, scroller.scrollWidth - scroller.clientWidth);
if (maxScrollLeft <= 1) return;
const trackRect = track.getBoundingClientRect();
const thumbLeftPx = trackRect.width * (gridHorizontalScrollbarThumbLeftPercent.value / 100);
const thumbWidthPx = trackRect.width * (gridHorizontalScrollbarThumbWidthPercent.value / 100);
@@ -2847,8 +2867,10 @@ function startGridHorizontalScrollbarDrag(event: PointerEvent) {
const pointerInsideThumb = pointerX >= thumbLeftPx && pointerX <= thumbLeftPx + thumbWidthPx;
gridHorizontalScrollbarDragState = {
scroller,
trackRect,
thumbOffsetPx: pointerInsideThumb ? pointerX - thumbLeftPx : thumbWidthPx / 2,
maxScrollLeft,
};
gridHorizontalScrollbarDragging.value = true;
document.body.style.userSelect = "none";
@@ -2856,7 +2878,7 @@ function startGridHorizontalScrollbarDrag(event: PointerEvent) {
window.addEventListener("pointerup", stopGridHorizontalScrollbarDrag, true);
window.addEventListener("pointercancel", stopGridHorizontalScrollbarDrag, true);
event.preventDefault();
applyGridHorizontalScrollbarDrag(event.clientX);
scheduleGridHorizontalScrollbarDrag(event.clientX);
}
function applyGridVerticalScrollbarDrag(clientY: number) {