From e3c5b6179d34e8528ead3a71b87f926faf3a3a11 Mon Sep 17 00:00:00 2001 From: Kenta Kishikawa Date: Sun, 14 Jan 2024 20:44:57 +0900 Subject: [PATCH] fix(Mac): horizontal scrolling when shift key is held --- packages/web/src/datagrid/DataGridCore.svelte | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index 8ab9cf656e..0fa1139797 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -1272,7 +1272,11 @@ function handleGridWheel(event) { if (event.shiftKey) { - scrollHorizontal(event.deltaY, event.deltaX); + // Convert vertical scrolling to horizontal if shift key is held down. + // This is handled at a higher level on MacOS. + const shiftConvert = !isMac(); + const [dx, dy] = shiftConvert ? [event.deltaY, event.deltaX] : [event.deltaX, event.deltaY]; + scrollHorizontal(dx, dy); } else { scrollHorizontal(event.deltaX, event.deltaY); scrollVertical(event.deltaX, event.deltaY);