From 407f521757328331767837a1c177d7223712d1e2 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 19 Jan 2023 16:31:33 -0800 Subject: [PATCH] Revert "potentially breaking or fixing DM updates" This reverts commit 23badbc7c392eb52b6f74d0e8a83f5e6544acddd. --- .../client/src/components/MkPagination.vue | 40 +++++-------------- packages/client/src/pages/messaging/index.vue | 19 +++++---- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue index c262ee931c..67634b8ec8 100644 --- a/packages/client/src/components/MkPagination.vue +++ b/packages/client/src/components/MkPagination.vue @@ -41,7 +41,6 @@ import * as os from '@/os'; import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll'; import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; -import { ItemHolder } from 'photoswipe'; export type Paging = { endpoint: E; @@ -110,15 +109,9 @@ const init = async (): Promise => { if (!props.pagination.noPaging && (res.length > (props.pagination.limit || 10))) { res.pop(); items.value = props.pagination.reversed ? [...res].reverse() : res; - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = true; } else { items.value = props.pagination.reversed ? [...res].reverse() : res; - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = false; } offset.value = res.length; @@ -132,9 +125,6 @@ const init = async (): Promise => { const reload = (): void => { items.value = []; - if (props.externalItemArray) { - props.externalItemArray.value = []; - } init(); }; @@ -194,15 +184,9 @@ const fetchMore = async (): Promise => { if (res.length > SECOND_FETCH_LIMIT) { res.pop(); items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res); - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = true; } else { items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res); - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = false; } offset.value += res.length; @@ -230,15 +214,9 @@ const fetchMoreAhead = async (): Promise => { if (res.length > SECOND_FETCH_LIMIT) { res.pop(); items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res); - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = true; } else { items.value = props.pagination.reversed ? [...res].reverse().concat(items.value) : items.value.concat(res); - if (props.externalItemArray) { - props.externalItemArray.value = items.value; - } more.value = false; } offset.value += res.length; @@ -266,7 +244,6 @@ const prepend = (item: Item): void => { //items.value = items.value.slice(-props.displayLimit); while (items.value.length >= props.displayLimit) { items.value.shift(); - if (props.externalItemArray) props.externalItemArray.value.shift(); } more.value = true; } @@ -274,13 +251,11 @@ const prepend = (item: Item): void => { } } items.value.push(item); - if (props.externalItemArray) props.externalItemArray.value.push(item); // TODO } else { // 初回表示時はunshiftだけでOK if (!rootEl.value) { items.value.unshift(item); - if (props.externalItemArray) props.externalItemArray.value.unshift(item); return; } @@ -289,7 +264,16 @@ const prepend = (item: Item): void => { if (isTop) { // Prepend the item items.value.unshift(item); - if (props.externalItemArray) props.externalItemArray.value.unshift(item); + + // オーバーフローしたら古いアイテムは捨てる + if (items.value.length >= props.displayLimit) { + // このやり方だとVue 3.2以降アニメーションが動かなくなる + //this.items = items.value.slice(0, props.displayLimit); + while (items.value.length >= props.displayLimit) { + items.value.pop(); + } + more.value = true; + } } else { queue.value.push(item); onScrollTop(rootEl.value, () => { @@ -304,18 +288,15 @@ const prepend = (item: Item): void => { const append = (item: Item): void => { items.value.push(item); - if (props.externalItemArray) props.externalItemArray.value.push(item); }; const removeItem = (finder: (item: Item) => boolean): boolean => { const i = items.value.findIndex(finder); const j = props.externalItemArray?.findIndex(finder); - if (i === -1 && j === -1) { return false; } items.value.splice(i, 1); - if (props.externalItemArray) props.externalItemArray.value.splice(i, 1); return true; }; @@ -327,7 +308,6 @@ const updateItem = (id: Item['id'], replacer: (old: Item) => Item): boolean => { } items.value[i] = replacer(items.value[i]); - if (props.externalItemArray) props.externalItemArray.value[i] = items.value[i]; return true; }; diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index ebe4e6d585..3798ec6f87 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -14,8 +14,8 @@
{{ i18n.ts.startMessaging }} - - + +
@@ -25,8 +25,8 @@ {{ i18n.ts.manageGroups }} {{ i18n.ts.startMessaging }} - - + + @@ -58,13 +58,17 @@ import 'swiper/scss/virtual'; const router = useRouter(); let messages = $ref([]); -let groupMessages = $ref([]); let connection = $ref(null); +const reloadingKey = ref(0); const tabs = ['dms', 'groups']; let tab = $ref(tabs[0]); watch($$(tab), () => (syncSlide(tabs.indexOf(tab)))); +const forceRerender = () => { + reloadingKey.value += 1; +}; + const headerActions = $computed(() => [{ asFullButton: true, icon: 'ph-plus-bold ph-lg', @@ -110,9 +114,10 @@ function onMessage(message): void { messages.unshift(message); } else if (message.groupId) { - groupMessages = groupMessages.filter(m => m.groupId !== message.groupId); - groupMessages.unshift(message); + messages = messages.filter(m => m.groupId !== message.groupId); + messages.unshift(message); } + forceRerender(); } function onRead(ids): void {