usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(frontend): better type defs

This commit is contained in:
syuilo 2025-05-22 13:05:28 +09:00
parent 74c857e23d
commit e4db9b64df
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/components/MkNotesTimeline.vue
View File

@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkPagination>
</template>
<script lang="ts" setup>
<script lang="ts" setup generic="T extends PagingCtx<'notes/mentions'>">
import { useTemplateRef } from 'vue';
import type { PagingCtx } from '@/composables/use-pagination.js';
import MkNote from '@/components/MkNote.vue';
@ -41,7 +41,7 @@ import { globalEvents, useGlobalEvent } from '@/events.js';
import { isSeparatorNeeded, getSeparatorInfo } from '@/utility/timeline-date-separate.js';
const props = withDefaults(defineProps<{
pagination: PagingCtx;
pagination: T;
noGap?: boolean;
disableAutoLoad?: boolean;
pullToRefresh?: boolean;

14
packages/frontend/src/components/MkPagination.vue
View File

@ -40,16 +40,19 @@ SPDX-License-Identifier: AGPL-3.0-only
</component>
</template>
<script lang="ts" setup>
<script lang="ts" setup generic="T extends PagingCtx">
import type { PagingCtx } from '@/composables/use-pagination.js';
import type { UnwrapRef } from 'vue';
import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
import { prefer } from '@/preferences.js';
import { usePagination } from '@/composables/use-pagination.js';
import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
type Paginator = ReturnType<typeof usePagination<T['endpoint']>>;
const props = withDefaults(defineProps<{
pagination: PagingCtx;
pagination: T;
disableAutoLoad?: boolean;
displayLimit?: number;
pullToRefresh?: boolean;
@ -58,7 +61,7 @@ const props = withDefaults(defineProps<{
pullToRefresh: true,
});
const paginator = usePagination({
const paginator: Paginator = usePagination({
ctx: props.pagination,
});
@ -70,6 +73,11 @@ function appearFetchMore() {
paginator.fetchOlder();
}
defineSlots<{
empty: () => void;
default: (props: { items: UnwrapRef<Paginator['items']> }) => void;
}>();
defineExpose({
paginator: paginator,
});

2
packages/frontend/src/composables/use-pagination.ts
View File

@ -40,7 +40,7 @@ export type PagingCtx<E extends keyof Misskey.Endpoints = keyof Misskey.Endpoint
canFetchDetection?: 'safe' | 'limit';
};
export function usePagination<Endpoint extends keyof Misskey.Endpoints, T = Misskey.Endpoints[Endpoint]['res'] extends (infer I)[] ? I : never>(props: {
export function usePagination<Endpoint extends keyof Misskey.Endpoints, T extends { id: string; } = (Misskey.Endpoints[Endpoint]['res'] extends (infer I)[] ? I extends { id: string } ? I : { id: string } : { id: string })>(props: {
ctx: PagingCtx<Endpoint>;
autoInit?: boolean;
autoReInit?: boolean;