summaryrefslogtreecommitdiff
path: root/packages/client/src/scripts
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-07-06 19:02:39 +0200
committerJohann150 <johann.galle@protonmail.com>2022-07-06 19:02:39 +0200
commit7775eb964159c0bf808462c405779029e28dc6f5 (patch)
tree3b91c9d517e936e4080a671f5c86a3f5ee53541b /packages/client/src/scripts
parentrefactor: use autofocus parameter (diff)
downloadsharkey-7775eb964159c0bf808462c405779029e28dc6f5.tar.gz
sharkey-7775eb964159c0bf808462c405779029e28dc6f5.tar.bz2
sharkey-7775eb964159c0bf808462c405779029e28dc6f5.zip
refactor: use overflow-y to determine scroll container
By using `overflow-y` instead of `overflow` using `endsWith` can be avoided and represents the data we are actually interested in here more accurately.
Diffstat (limited to 'packages/client/src/scripts')
-rw-r--r--packages/client/src/scripts/scroll.ts8
1 files changed, 2 insertions, 6 deletions
diff --git a/packages/client/src/scripts/scroll.ts b/packages/client/src/scripts/scroll.ts
index 0643bad2fb..f5bc6bf9ce 100644
--- a/packages/client/src/scripts/scroll.ts
+++ b/packages/client/src/scripts/scroll.ts
@@ -2,12 +2,8 @@ type ScrollBehavior = 'auto' | 'smooth' | 'instant';
export function getScrollContainer(el: HTMLElement | null): HTMLElement | null {
if (el == null || el.tagName === 'HTML') return null;
- const overflow = window.getComputedStyle(el).getPropertyValue('overflow');
- if (
- // xとyを個別に指定している場合、`hidden scroll`みたいな値になる
- overflow.endsWith('scroll') ||
- overflow.endsWith('auto')
- ) {
+ const overflow = window.getComputedStyle(el).getPropertyValue('overflow-y');
+ if (overflow === 'scroll' || overflow === 'auto') {
return el;
} else {
return getScrollContainer(el.parentElement);