profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix scroll container find function

Browse source
This commit is contained in:
tamaina 2022-01-29 00:05:38 +09:00
parent 60ad28cbc7
commit 1f4d211ff7
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/client/src/components/ui/pagination.vue
View file

@ -93,14 +93,7 @@ const {
} = defaultStore.reactiveState; } = defaultStore.reactiveState;
const contentEl = $computed(() => props.pagination.pageEl || rootEl); const contentEl = $computed(() => props.pagination.pageEl || rootEl);
const scrollableElement = $computed(() => { const scrollableElement = $computed(() => getScrollContainer(contentEl));
if (contentEl) {
const container = getScrollContainer(contentEl);
return container || contentEl;
}
return null;
});
const init = async (): Promise<void> => { const init = async (): Promise<void> => {
queue.value = []; queue.value = [];

8
packages/client/src/scripts/scroll.ts
View file

@ -2,7 +2,13 @@ type ScrollBehavior = 'auto' | 'smooth' | 'instant';
export function getScrollContainer(el: HTMLElement | null): HTMLElement | null { export function getScrollContainer(el: HTMLElement | null): HTMLElement | null {
if (el == null || el.tagName === 'HTML') return null; if (el == null || el.tagName === 'HTML') return null;
if (el.scrollHeight > el.clientHeight) { const overflow = window.getComputedStyle(el).getPropertyValue('overflow');
if (
// xとyを個別に指定している場合、`hidden scroll`みたいな値になる
overflow.endsWith('scroll') ||
overflow.endsWith('auto') ||
el.scrollHeight > el.clientHeight
) {
return el; return el;
} else { } else {
return getScrollContainer(el.parentElement); return getScrollContainer(el.parentElement);