Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-07 18:24:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: required argument in onClose modal function (#19122)

Browse Source
This commit is contained in:
Daniel Dietzler 2025-06-12 00:25:36 +02:00 committed by GitHub
parent 4c5cd14270
commit 5179c5badf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/lib/components/shared-components/search-bar/search-bar.svelte
View File

@ -10,11 +10,11 @@
import { generateId } from '$lib/utils/generate-id'; import { generateId } from '$lib/utils/generate-id';
import { getMetadataSearchQuery } from '$lib/utils/metadata-search'; import { getMetadataSearchQuery } from '$lib/utils/metadata-search';
import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk'; import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk';
import { IconButton } from '@immich/ui';
import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js'; import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js';
import { onDestroy, tick } from 'svelte'; import { onDestroy, tick } from 'svelte';
import { t } from 'svelte-i18n'; import { t } from 'svelte-i18n';
import SearchHistoryBox from './search-history-box.svelte'; import SearchHistoryBox from './search-history-box.svelte';
import { IconButton } from '@immich/ui';
interface Props { interface Props {
value?: string; value?: string;
@ -93,7 +93,7 @@
} }
const result = modalManager.open(SearchFilterModal, { searchQuery }); const result = modalManager.open(SearchFilterModal, { searchQuery });
close = result.close; close = () => result.close(undefined);
closeDropdown(); closeDropdown();
const searchResult = await result.onClose; const searchResult = await result.onClose;

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

@ -1,8 +1,13 @@
import ConfirmModal from '$lib/modals/ConfirmModal.svelte'; import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
import { mount, unmount, type Component, type ComponentProps } from '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 ExtendsEmptyObject<T> = keyof T extends never ? Record<string, never> : T;
type StripValueIfOptional<T> = T extends undefined ? undefined : T;
class ModalManager { class ModalManager {
show<T extends object>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) { 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'>>) { open<T extends object, K = OnCloseData<T>>(Component: Component<T>, props: ExtendsEmptyObject<Omit<T, 'onClose'>>) {
let modal: object = {}; let modal: object = {};
let onClose: () => Promise<void>; let onClose: (...args: [StripValueIfOptional<K>]) => Promise<void>;
const deferred = new Promise<K | undefined>((resolve) => { const deferred = new Promise<StripValueIfOptional<K>>((resolve) => {
onClose = async (data?: K) => { onClose = async (...args: [StripValueIfOptional<K>]) => {
await unmount(modal); await unmount(modal);
resolve(data); resolve(args?.[0]);
}; };
modal = mount(Component, { modal = mount(Component, {
@ -30,7 +35,7 @@ class ModalManager {
return { return {
onClose: deferred, onClose: deferred,
close: () => onClose(), close: (...args: [StripValueIfOptional<K>]) => onClose(args[0]),
}; };
} }

2
web/src/lib/modals/ConfirmModal.svelte
View File

@ -10,7 +10,7 @@
confirmColor?: Color; confirmColor?: Color;
disabled?: boolean; disabled?: boolean;
size?: 'small' | 'medium'; size?: 'small' | 'medium';
onClose: (confirmed?: boolean) => void; onClose: (confirmed: boolean) => void;
promptSnippet?: Snippet; promptSnippet?: Snippet;
} }