feat(grid): support Alt key to scroll horizontally with mouse wheel
This commit is contained in:
1 parent
88755811ba
commit
ca1ef942fa
6 files changed
+32
-4
No files matched your search
@@ -120,7 +120,7 @@ function syncHorizontalScrollbar() {
|
|||||||
function scrollTableHorizontally(event: WheelEvent) {
|
function scrollTableHorizontally(event: WheelEvent) {
|
||||||
const scroller = tableScroller.value;
|
const scroller = tableScroller.value;
|
||||||
if (!scroller) return;
|
if (!scroller) return;
|
||||||
const delta = event.shiftKey ? event.deltaY : Math.abs(event.deltaX) > Math.abs(event.deltaY) ? event.deltaX : 0;
|
const delta = event.shiftKey || event.altKey ? event.deltaY : Math.abs(event.deltaX) > Math.abs(event.deltaY) ? event.deltaX : 0;
|
||||||
if (!delta) return;
|
if (!delta) return;
|
||||||
const previousScrollLeft = scroller.scrollLeft;
|
const previousScrollLeft = scroller.scrollLeft;
|
||||||
scroller.scrollLeft += delta;
|
scroller.scrollLeft += delta;
|
||||||
|
|||||||
@@ -7521,7 +7521,7 @@ function shouldAccelerateCanvasWheel(event: WheelEvent): boolean {
|
|||||||
if (event.ctrlKey || event.metaKey) return false;
|
if (event.ctrlKey || event.metaKey) return false;
|
||||||
if (event.deltaX !== 0) return true;
|
if (event.deltaX !== 0) return true;
|
||||||
if (event.deltaMode !== WheelEvent.DOM_DELTA_PIXEL) return true;
|
if (event.deltaMode !== WheelEvent.DOM_DELTA_PIXEL) return true;
|
||||||
return event.shiftKey && Math.abs(event.deltaY) > Math.abs(event.deltaX) && Math.abs(event.deltaY) >= CANVAS_TRACKPAD_DELTA_THRESHOLD;
|
return (event.shiftKey || event.altKey) && Math.abs(event.deltaY) > Math.abs(event.deltaX) && Math.abs(event.deltaY) >= CANVAS_TRACKPAD_DELTA_THRESHOLD;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onCanvasWheel(event: WheelEvent) {
|
function onCanvasWheel(event: WheelEvent) {
|
||||||
@@ -7534,6 +7534,7 @@ function onCanvasWheel(event: WheelEvent) {
|
|||||||
deltaY: event.deltaY,
|
deltaY: event.deltaY,
|
||||||
deltaMode: event.deltaMode,
|
deltaMode: event.deltaMode,
|
||||||
shiftKey: event.shiftKey,
|
shiftKey: event.shiftKey,
|
||||||
|
altKey: event.altKey,
|
||||||
ctrlKey: event.ctrlKey,
|
ctrlKey: event.ctrlKey,
|
||||||
metaKey: event.metaKey,
|
metaKey: event.metaKey,
|
||||||
lineSize: CANVAS_DATA_GRID_ROW_HEIGHT,
|
lineSize: CANVAS_DATA_GRID_ROW_HEIGHT,
|
||||||
@@ -7557,6 +7558,7 @@ function onDomGridWheel(event: WheelEvent) {
|
|||||||
deltaY: event.deltaY,
|
deltaY: event.deltaY,
|
||||||
deltaMode: event.deltaMode,
|
deltaMode: event.deltaMode,
|
||||||
shiftKey: event.shiftKey,
|
shiftKey: event.shiftKey,
|
||||||
|
altKey: event.altKey,
|
||||||
ctrlKey: event.ctrlKey,
|
ctrlKey: event.ctrlKey,
|
||||||
metaKey: event.metaKey,
|
metaKey: event.metaKey,
|
||||||
lineSize: CANVAS_DATA_GRID_ROW_HEIGHT,
|
lineSize: CANVAS_DATA_GRID_ROW_HEIGHT,
|
||||||
|
|||||||
@@ -66,6 +66,16 @@ describe("data grid wheel scrolling", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("turns Alt plus deltaY into horizontal-only movement", () => {
|
||||||
|
expect(resolveWheel({ deltaY: 40, altKey: true, accelerationFactor: 1.5 })).toMatchObject({
|
||||||
|
scrollDeltaX: 60,
|
||||||
|
scrollDeltaY: 0,
|
||||||
|
nextScrollTop: 100,
|
||||||
|
nextScrollLeft: 260,
|
||||||
|
moved: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it("keeps plain deltaY vertical", () => {
|
it("keeps plain deltaY vertical", () => {
|
||||||
expect(resolveWheel({ deltaY: 40 })).toMatchObject({
|
expect(resolveWheel({ deltaY: 40 })).toMatchObject({
|
||||||
scrollDeltaX: 0,
|
scrollDeltaX: 0,
|
||||||
|
|||||||
@@ -57,6 +57,21 @@ describe("constrainSqlHoverLayout", () => {
|
|||||||
expect(wheelEvent.defaultPrevented).toBe(true);
|
expect(wheelEvent.defaultPrevented).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("translates Alt plus deltaY into horizontal scrolling", () => {
|
||||||
|
const root = document.createElement("div");
|
||||||
|
const content = document.createElement("div");
|
||||||
|
Object.defineProperty(content, "clientWidth", { configurable: true, value: 600 });
|
||||||
|
Object.defineProperty(content, "scrollWidth", { configurable: true, value: 1200 });
|
||||||
|
constrainSqlHoverLayout(root, content);
|
||||||
|
|
||||||
|
const wheelEvent = new WheelEvent("wheel", { cancelable: true, deltaY: 120 });
|
||||||
|
Object.defineProperty(wheelEvent, "altKey", { value: true });
|
||||||
|
content.dispatchEvent(wheelEvent);
|
||||||
|
|
||||||
|
expect(content.scrollLeft).toBe(120);
|
||||||
|
expect(wheelEvent.defaultPrevented).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
it("starts the scrollbar on mount and stops responding after destroy", () => {
|
it("starts the scrollbar on mount and stops responding after destroy", () => {
|
||||||
const root = document.createElement("div");
|
const root = document.createElement("div");
|
||||||
const content = document.createElement("div");
|
const content = document.createElement("div");
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ export interface DataGridWheelInput {
|
|||||||
deltaY: number;
|
deltaY: number;
|
||||||
deltaMode: number;
|
deltaMode: number;
|
||||||
shiftKey?: boolean;
|
shiftKey?: boolean;
|
||||||
|
altKey?: boolean;
|
||||||
ctrlKey?: boolean;
|
ctrlKey?: boolean;
|
||||||
metaKey?: boolean;
|
metaKey?: boolean;
|
||||||
lineSize: number;
|
lineSize: number;
|
||||||
@@ -52,7 +53,7 @@ export function resolveDataGridWheelScroll(input: DataGridWheelInput): DataGridW
|
|||||||
const accelerationFactor = input.accelerationFactor ?? 1;
|
const accelerationFactor = input.accelerationFactor ?? 1;
|
||||||
const normalizedDeltaX = wheelDeltaToPixels(input.deltaX, input.deltaMode, input.lineSize, metrics.clientWidth);
|
const normalizedDeltaX = wheelDeltaToPixels(input.deltaX, input.deltaMode, input.lineSize, metrics.clientWidth);
|
||||||
const normalizedDeltaY = wheelDeltaToPixels(input.deltaY, input.deltaMode, input.lineSize, metrics.clientHeight);
|
const normalizedDeltaY = wheelDeltaToPixels(input.deltaY, input.deltaMode, input.lineSize, metrics.clientHeight);
|
||||||
const shiftedDeltaY = input.shiftKey && Math.abs(normalizedDeltaY) > Math.abs(normalizedDeltaX) ? normalizedDeltaY : 0;
|
const shiftedDeltaY = (input.shiftKey || input.altKey) && Math.abs(normalizedDeltaY) > Math.abs(normalizedDeltaX) ? normalizedDeltaY : 0;
|
||||||
// Native pixel deltas are already expressed in CSS pixels. When a device reports deltaX,
|
// Native pixel deltas are already expressed in CSS pixels. When a device reports deltaX,
|
||||||
// preserve both axes at 1:1 so diagonal trackpad input is not distorted by Canvas acceleration.
|
// preserve both axes at 1:1 so diagonal trackpad input is not distorted by Canvas acceleration.
|
||||||
const hasNativePixelDeltaX = input.deltaMode === DOM_DELTA_PIXEL && input.deltaX !== 0;
|
const hasNativePixelDeltaX = input.deltaMode === DOM_DELTA_PIXEL && input.deltaX !== 0;
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ function appendSqlHoverHorizontalScrollbar(root: HTMLElement, sqlContent: HTMLEl
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleWheel = (event: WheelEvent) => {
|
const handleWheel = (event: WheelEvent) => {
|
||||||
const horizontalDelta = event.deltaX || (event.shiftKey ? event.deltaY : 0);
|
const horizontalDelta = event.deltaX || (event.shiftKey || event.altKey ? event.deltaY : 0);
|
||||||
if (!horizontalDelta) return;
|
if (!horizontalDelta) return;
|
||||||
const maxScroll = Math.max(0, sqlContent.scrollWidth - sqlContent.clientWidth);
|
const maxScroll = Math.max(0, sqlContent.scrollWidth - sqlContent.clientWidth);
|
||||||
const nextScrollLeft = Math.min(Math.max(sqlContent.scrollLeft + horizontalDelta, 0), maxScroll);
|
const nextScrollLeft = Math.min(Math.max(sqlContent.scrollLeft + horizontalDelta, 0), maxScroll);
|
||||||
|
|||||||
Reference in new issue
Block a user