From d6c3f34eea974aa1c0aac04d38d2d223d6e512bf Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 25 Jul 2023 04:01:26 +0000
Subject: [PATCH] :v:

---
 .../frontend/src/components/MkPagination.vue  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 38cdf96fc..27cd9ebda 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -248,19 +248,10 @@ function preventDefault(ev: Event) {
 
 /**
  * アイテムを上に追加した場合に追加分だけスクロールを下にずらす
+ * Safariでは使わない方がいいかも？
  * @param fn DOM操作(unshiftItemsなど)
  */
 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();
 	const oldHeight = scrollableElement ? scrollableElement.scrollHeight : getBodyScrollHeight();
 	const oldScroll = scrollableElement ? scrollableElement.scrollTop : window.scrollY;
@@ -550,13 +541,21 @@ async function executeQueue() {
 	if (isPausingUpdateByExecutingQueue.value) return;
 	const queueArr = Array.from(queue.value.entries());
 	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;
-	await adjustScroll(() => {
-		unshiftItems(
-			queueArr.slice(0, props.pagination.limit).map(v => v[1]).reverse(),
-			Infinity,
-		);
-	});
+
+	if (isWebKit) {
+		// Safariでは描画が微妙になるので一定程度スクロールするだけ
+		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));
 	await nextTick();
 	isPausingUpdateByExecutingQueue.value = false;