High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: required argument in onClose modal function (#19122)
Daniel Dietzler5179c5badffc
diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelteindex 262c10adfd..9f36431f19 100644--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte@@ -10,11 +10,11 @@import { generateId } from '$lib/utils/generate-id';import { getMetadataSearchQuery } from '$lib/utils/metadata-search';import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk';+ import { IconButton } from '@immich/ui';import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js';import { onDestroy, tick } from 'svelte';import { t } from 'svelte-i18n';import SearchHistoryBox from './search-history-box.svelte';- import { IconButton } from '@immich/ui';interface Props {value?: string;@@ -93,7 +93,7 @@}const result = modalManager.open(SearchFilterModal, { searchQuery });- close = result.close;+ close = () => result.close(undefined);closeDropdown();const searchResult = await result.onClose;diff --git a/web/src/lib/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.tsindex 7b658d63e5..46363a105b 100644--- a/web/src/lib/managers/modal-manager.svelte.ts+++ b/web/src/lib/managers/modal-manager.svelte.ts@@ -1,8 +1,13 @@import ConfirmModal from '$lib/modals/ConfirmModal.svelte';import { mount, unmount, type Component, type ComponentProps } from 'svelte';-type OnCloseData<T> = T extends { onClose: (data?: infer R) => void } ? R : never;+type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }+ ? R | undefined+ : T extends { onClose: (data: infer R) => void }+ ? R+ : never;type ExtendsEmptyObject<T> = keyof T extends never ? Record<string, never> : T;+type StripValueIfOptional<T> = T extends undefined ? undefined : T;class ModalManager {show<T extends object>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {@@ -11,12 +16,12 @@ class ModalManager {open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {let modal: object = {};- let onClose: () => Promise<void>;+ let onClose: (...args: [StripValueIfOptional<K>]) => Promise<void>;- const deferred = new Promise<K | undefined>((resolve) => {- onClose = async (data?: K) => {+ const deferred = new Promise<StripValueIfOptional<K>>((resolve) => {+ onClose = async (...args: [StripValueIfOptional<K>]) => {await unmount(modal);- resolve(data);+ resolve(args?.[0]);};modal = mount(Component, {@@ -30,7 +35,7 @@ class ModalManager {return {onClose: deferred,- close: () => onClose(),+ close: (...args: [StripValueIfOptional<K>]) => onClose(args[0]),};}diff --git a/web/src/lib/modals/ConfirmModal.svelte b/web/src/lib/modals/ConfirmModal.svelteindex 327d13c355..1a73b58793 100644--- a/web/src/lib/modals/ConfirmModal.svelte+++ b/web/src/lib/modals/ConfirmModal.svelte@@ -10,7 +10,7 @@confirmColor?: Color;disabled?: boolean;size?: 'small' | 'medium';- onClose: (confirmed?: boolean) => void;+ onClose: (confirmed: boolean) => void;promptSnippet?: Snippet;}