immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-17 17:23:20 +03:00
Code Issues Packages Projects Releases 16 Wiki Activity

chore: more flexible modal manager types (#19123)

Browse Source 
* fix: required argument in onClose modal function

* chore: more flexible modal manager types
This commit is contained in:
Daniel Dietzler
2025-06-12 00:32:49 +02:00
committed by GitHub
parent 5179c5badf
commit 22eef5f3c5
11 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/src/lib/managers/modal-manager.svelte.ts
View File

@@ -6,15 +6,21 @@ type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }
: T extends { onClose: (data: infer R) => void }
? R
: never;
type ExtendsEmptyObject<T> = keyof T extends never ? Record<string, never> : T;
type ExtendsEmptyObject<T> = keyof T extends never ? never : T;
type StripValueIfOptional<T> = T extends undefined ? undefined : T;
// if the modal does not expect any props, makes the props param optional but also allows passing `{}` and `undefined`
type OptionalParamIfEmpty<T> = ExtendsEmptyObject<T> extends never ? [] | [Record<string, never> | undefined] : [T];
class ModalManager {
show<T extends object>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {
return this.open(Component, props).onClose;
show<T extends object>(Component: Component<T>, ...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>) {
return this.open(Component, ...props).onClose;
}
open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {
open<T extends object, K = OnCloseData<T>>(
Component: Component<T>,
...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>
) {
let modal: object = {};
let onClose: (...args: [StripValueIfOptional<K>]) => Promise<void>;
@@ -27,7 +33,7 @@ class ModalManager {
modal = mount(Component, {
target: document.body,
props: {
...(props as T),
...((props?.[0] ?? {}) as T),
onClose,
},
});