通知グルーピング設定の即時反映対応 (#12485)
* wip * ログ出しの削除 * fix CHANGELOG.md --------- Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
This commit is contained in:
		| @@ -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; | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 おさむのひと
					おさむのひと