diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2023-11-28 20:43:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 20:43:25 +0900 |
| commit | ec04c76ee536df548b6b55e314f1b3eb1e12dde4 (patch) | |
| tree | b5b4e1c2b32677883bebccaa30bf8e2d1c59350d /packages/frontend | |
| parent | fix(docs): "docs(changelog): GHSA-3f39-6537-3cgc について追記 (#12482)"... (diff) | |
| download | misskey-ec04c76ee536df548b6b55e314f1b3eb1e12dde4.tar.gz misskey-ec04c76ee536df548b6b55e314f1b3eb1e12dde4.tar.bz2 misskey-ec04c76ee536df548b6b55e314f1b3eb1e12dde4.zip | |
通知グルーピング設定の即時反映対応 (#12485)
* wip
* ログ出しの削除
* fix CHANGELOG.md
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Diffstat (limited to 'packages/frontend')
| -rw-r--r-- | packages/frontend/src/components/MkNotifications.vue | 6 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkPagination.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 7b072fa492..2a0082204a 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated } from 'vue'; +import { onUnmounted, onDeactivated, onMounted, computed, shallowRef, onActivated, watch } from 'vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import XNotification from '@/components/MkNotification.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; @@ -43,7 +43,7 @@ const props = defineProps<{ const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>(); -const pagination: Paging = defaultStore.state.useGroupedNotifications ? { +let pagination = $computed(() => defaultStore.reactiveState.useGroupedNotifications.value ? { endpoint: 'i/notifications-grouped' as const, limit: 20, params: computed(() => ({ @@ -55,7 +55,7 @@ const pagination: Paging = defaultStore.state.useGroupedNotifications ? { params: computed(() => ({ excludeTypes: props.excludeTypes ?? undefined, })), -}; +}); function onNotification(notification) { const isMuted = props.excludeTypes ? props.excludeTypes.includes(notification.type) : false; diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index e7796dfcb5..2c59e6d4e8 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -186,7 +186,7 @@ watch([$$(backed), $$(contentEl)], () => { }); // パラメータに何らかの変更があった際、再読込したい(チャンネル等のIDが変わったなど) -watch(() => props.pagination.params, init, { deep: true }); +watch(() => [props.pagination.endpoint, props.pagination.params], init, { deep: true }); watch(queue, (a, b) => { if (a.size === 0 && b.size === 0) return; |