From f7030d4a422c1b1e274a9b32a2e1ec6bc46e1e2f Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 2 Apr 2022 15:12:01 +0900
Subject: [PATCH] =?UTF-8?q?enhance:=20=E3=82=BF=E3=83=83=E3=83=81=E3=83=91?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=83=BB=E3=82=BF=E3=83=83=E3=83=81=E3=82=B9?=
 =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3=E3=81=A7=E3=81=AE=E3=83=87?=
 =?UTF-8?q?=E3=83=83=E3=82=AD=E3=81=AE=E6=93=8D=E4=BD=9C=E6=80=A7=E3=82=92?=
 =?UTF-8?q?=E5=90=91=E4=B8=8A=20(#8450)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance experience of deck with touchpad

* test: 単純にdeltaYを加算してみる

* clean up

* ios bug fix?

* :v:

* use overflow-y

* Safari does not supports clip
---
 packages/client/src/ui/deck.vue        | 4 ++--
 packages/client/src/ui/deck/column.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index 7e845feef4..1e0d9a1652 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -128,8 +128,8 @@ if (deckStore.state.navWindow) {
 document.documentElement.style.overflowY = 'hidden';
 document.documentElement.style.scrollBehavior = 'auto';
 window.addEventListener('wheel', (ev) => {
-	if (getScrollContainer(ev.target as HTMLElement) == null) {
-		document.documentElement.scrollLeft += ev.deltaY > 0 ? 96 : -96;
+	if (getScrollContainer(ev.target as HTMLElement) == null && ev.deltaX === 0) {
+		document.documentElement.scrollLeft += ev.deltaY;
 	}
 });
 loadDeck();
diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue
index 4f427b7624..5f8da8cf8f 100644
--- a/packages/client/src/ui/deck/column.vue
+++ b/packages/client/src/ui/deck/column.vue
@@ -372,9 +372,9 @@ function onDrop(e) {
 
 	> div {
 		height: calc(100% - var(--deckColumnHeaderHeight));
-		overflow: auto;
-		overflow-x: hidden;
-		overscroll-behavior: contain;
+		overflow-y: auto;
+		overflow-x: hidden; // Safari does not supports clip
+		overflow-x: clip;
 		-webkit-overflow-scrolling: touch;
 		box-sizing: border-box;
 	}