diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index 985b9a4973..52a2c3af37 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -102,10 +102,6 @@ const props = withDefaults(defineProps<{ }>(), { }); -const emit = defineEmits<{ - (ev: 'queue', count: number): void; -}>(); - let rootEl = $shallowRef(); /** @@ -128,6 +124,7 @@ const items = ref(new Map()); * 最新が最後(パフォーマンス上の理由でitemsと逆にした) */ const queue = ref(new Map()); +const queueSize = computed(() => queue.value.size); const offset = ref(0); @@ -231,11 +228,6 @@ watch([$$(weakBacked), $$(contentEl)], () => { }); //#endregion -watch(queue, (a, b) => { - if (a.size === 0 && b.size === 0) return; - emit('queue', queue.value.size); -}, { deep: true }); - /** * 初期化 * scrollAfterInitなどの後処理もあるので、reload関数を使うべき @@ -283,7 +275,12 @@ function scrollAfterInit() { if (props.pagination.reversed) { nextTick(() => { setTimeout(() => { - if (contentEl) scrollToBottom(contentEl); + if (contentEl) { + scrollToBottom(contentEl); + // scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある + weakBacked = false; + backed = false; + } }, 200); // scrollToBottomでmoreFetchingボタンが画面外まで出るまで @@ -295,7 +292,11 @@ function scrollAfterInit() { } else { nextTick(() => { setTimeout(() => { - if (contentEl) scrollToTop(contentEl); + scrollToTop(scrollableElement); + // scrollToしてもbacked周りがうまく動かないので手動で戻す必要がある + weakBacked = false; + backed = false; + moreFetching.value = false; }, 200); }); @@ -471,6 +472,7 @@ const prepend = (item: MisskeyEntity): void => { } if ( + queueSize.value === 0 && // キューに残っている場合はキューに追加する !backed && // 先頭に表示されていない時はキューに追加する !isPausingUpdate && // タブがバックグラウンドの時はキューに追加する active.value // keepAliveで隠されている間はキューに追加する @@ -566,6 +568,7 @@ defineExpose({ queue, more, inited, + queueSize, reload, prepend, append: appendItem, diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index 13d5b9f88d..bc15ebfcaf 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -1,5 +1,5 @@ diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue index b2bc889cfb..693259a0e5 100644 --- a/packages/frontend/src/pages/antenna-timeline.vue +++ b/packages/frontend/src/pages/antenna-timeline.vue @@ -3,14 +3,13 @@
-
+
@@ -34,17 +33,12 @@ const props = defineProps<{ }>(); let antenna = $ref(null); -let queue = $ref(0); let rootEl = $shallowRef(); let tlEl = $shallowRef>(); const keymap = $computed(() => ({ 't': focus, })); -function queueUpdated(q) { - queue = q; -} - function top() { tlEl?.reload(); } diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue index 20b35c9a25..f045d53a69 100644 --- a/packages/frontend/src/pages/timeline.vue +++ b/packages/frontend/src/pages/timeline.vue @@ -6,14 +6,13 @@ -
+
@@ -26,7 +25,6 @@ import { defineAsyncComponent, computed, watch, provide } from 'vue'; import type { Tab } from '@/components/global/MkPageHeader.tabs.vue'; import MkTimeline from '@/components/MkTimeline.vue'; import MkPostForm from '@/components/MkPostForm.vue'; -import { scroll } from '@/scripts/scroll'; import * as os from '@/os'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; @@ -47,16 +45,11 @@ const keymap = { const tlComponent = $shallowRef>(); const rootEl = $shallowRef(); -let queue = $ref(0); let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global'); const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) }); watch ($$(src), () => queue = 0); -function queueUpdated(q: number): void { - queue = q; -} - function top(): void { tlComponent?.reload(); } diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue index 67a576ce83..e297e1747e 100644 --- a/packages/frontend/src/pages/user-list-timeline.vue +++ b/packages/frontend/src/pages/user-list-timeline.vue @@ -3,14 +3,13 @@
-
+
@@ -21,7 +20,6 @@