summaryrefslogtreecommitdiff
path: root/packages/client/src/scripts/scroll.ts
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2022-11-17 23:35:55 +0900
committertamaina <tamaina@hotmail.co.jp>2022-11-17 23:35:55 +0900
commit764da890b6ad3d53808ec592099a93d9d39d7b08 (patch)
treeb3e9b08bfafa2bbbb5f657af3adb60bcc9510b67 /packages/client/src/scripts/scroll.ts
parentfix (diff)
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-764da890b6ad3d53808ec592099a93d9d39d7b08.tar.gz
sharkey-764da890b6ad3d53808ec592099a93d9d39d7b08.tar.bz2
sharkey-764da890b6ad3d53808ec592099a93d9d39d7b08.zip
Merge branch 'develop' into pizzax-indexeddb
Diffstat (limited to 'packages/client/src/scripts/scroll.ts')
-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);