graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 12:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

✌️

Browse source
This commit is contained in:
tamaina 2023-07-25 04:01:26 +00:00
parent c265569008
commit d6c3f34eea
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/frontend/src/components/MkPagination.vue
View file

@ -248,19 +248,10 @@ function preventDefault(ev: Event) {
/** /**
* アイテムを上に追加した場合に追加分だけスクロールを下にずらす * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
* Safariでは使わない方がいいかも？
* @param fn DOM操作(unshiftItemsなど) * @param fn DOM操作(unshiftItemsなど)
*/ */
async function adjustScroll(fn: () => void): Promise<void> { async function adjustScroll(fn: () => void): Promise<void> {
if (isWebKit) {
// Safariでは描画が微妙になるので一定程度スクロールするだけ
scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
// backedを強制的にtrueにする
backed = true;
await nextTick();
fn();
return await nextTick();
}
await nextTick(); await nextTick();
const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight(); const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY; const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
@ -550,13 +541,21 @@ async function executeQueue() {
if (isPausingUpdateByExecutingQueue.value) return; if (isPausingUpdateByExecutingQueue.value) return;
const queueArr = Array.from(queue.value.entries()); const queueArr = Array.from(queue.value.entries());
queue.value = new Map(queueArr.slice(props.pagination.limit)); queue.value = new Map(queueArr.slice(props.pagination.limit));
const newItems = Array.from({ length: Math.min(queueArr.length, props.pagination.limit) }, (_, i) => queueArr[i][1]).reverse();
isPausingUpdateByExecutingQueue.value = true; isPausingUpdateByExecutingQueue.value = true;
await adjustScroll(() => {
unshiftItems( if (isWebKit) {
queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(), // Safariでは描画が微妙になるので一定程度スクロールするだけ
Infinity, scrollBy(scrollableElement, { top: TOLERANCE + 4, behavior: 'instant' });
); backed = true;
}); await nextTick();
unshiftItems(newItems, Infinity);
await nextTick();
} else {
await adjustScroll(() => unshiftItems(newItems, Infinity));
backed = true;
}
items.value = new Map([...items.value].slice(0, displayLimit.value)); items.value = new Map([...items.value].slice(0, displayLimit.value));
await nextTick(); await nextTick();
isPausingUpdateByExecutingQueue.value = false; isPausingUpdateByExecutingQueue.value = false;