refactor: modal manager types (#18150)

This commit is contained in:
Daniel Dietzler 2025-05-08 00:08:19 +02:00 committed by GitHub
parent 5250269fa4
commit 894545aeed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 32 additions and 26 deletions

View file

@ -1,19 +1,20 @@
import ConfirmDialog from '$lib/components/shared-components/dialog/confirm-dialog.svelte';
import { mount, unmount, type Component, type ComponentProps } from 'svelte';
type OnCloseData<T> = T extends { onClose: (data: infer R) => void | Promise<void> } ? R : never;
type OnCloseData<T> = T extends { onClose: (data?: infer R) => void } ? R : never;
type ExtendsEmptyObject<T> = keyof T extends never ? Record<string, never> : T;
class ModalManager {
open<T = { onClose: (data: unknown) => void }, K = OnCloseData<T>>(
Component: Component<{ onClose: T }>,
props?: Record<string, never>,
): Promise<K>;
open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props: Omit<T, 'onClose'>): Promise<K>;
open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props?: Omit<T, 'onClose'>) {
return new Promise<K>((resolve) => {
let modal: object = {};
show<T extends object>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {
return this.open(Component, props).onClose;
}
const onClose = async (data: K) => {
open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {
let modal: object = {};
let onClose: () => Promise<void>;
const deferred = new Promise<K | undefined>((resolve) => {
onClose = async (data?: K) => {
await unmount(modal);
resolve(data);
};
@ -21,15 +22,20 @@ class ModalManager {
modal = mount(Component, {
target: document.body,
props: {
...((props ?? {}) as T),
...(props as T),
onClose,
},
});
});
return {
onClose: deferred,
close: () => onClose(),
};
}
openDialog(options: Omit<ComponentProps<typeof ConfirmDialog>, 'onClose'>) {
return this.open(ConfirmDialog, options);
return this.show(ConfirmDialog, options);
}
}