chore(web): migration svelte 5 syntax (#13883)

This commit is contained in:
Alex
2024-11-14 08:43:25 -06:00
committed by GitHub
parent 9203a61709
commit 0b3742cf13
310 changed files with 6435 additions and 4176 deletions

View File

@@ -15,35 +15,38 @@
import { generateId } from '$lib/utils/generate-id';
import { tick } from 'svelte';
export let value = '';
export let grayTheme: boolean;
export let searchQuery: MetadataSearchDto | SmartSearchDto = {};
interface Props {
value?: string;
grayTheme: boolean;
searchQuery?: MetadataSearchDto | SmartSearchDto;
onSearch?: () => void;
}
$: showClearIcon = value.length > 0;
let { value = $bindable(''), grayTheme, searchQuery = {}, onSearch }: Props = $props();
let input: HTMLInputElement;
let showClearIcon = $derived(value.length > 0);
let showSuggestions = false;
let showFilter = false;
let isSearchSuggestions = false;
let selectedId: string | undefined;
let moveSelection: (direction: 1 | -1) => void;
let clearSelection: () => void;
let selectActiveOption: () => void;
let input = $state<HTMLInputElement>();
let searchHistoryBox = $state<ReturnType<typeof SearchHistoryBox>>();
let showSuggestions = $state(false);
let showFilter = $state(false);
let isSearchSuggestions = $state(false);
let selectedId: string | undefined = $state();
const listboxId = generateId();
const onSearch = async (payload: SmartSearchDto | MetadataSearchDto) => {
const handleSearch = async (payload: SmartSearchDto | MetadataSearchDto) => {
const params = getMetadataSearchQuery(payload);
closeDropdown();
showFilter = false;
$isSearchEnabled = false;
await goto(`${AppRoute.SEARCH}?${params}`);
onSearch?.();
};
const clearSearchTerm = (searchTerm: string) => {
input.focus();
input?.focus();
$savedSearchTerms = $savedSearchTerms.filter((item) => item !== searchTerm);
};
@@ -57,7 +60,7 @@
};
const clearAllSearchTerms = () => {
input.focus();
input?.focus();
$savedSearchTerms = [];
};
@@ -82,7 +85,7 @@
const onHistoryTermClick = async (searchTerm: string) => {
value = searchTerm;
const searchPayload = { query: searchTerm };
await onSearch(searchPayload);
await handleSearch(searchPayload);
};
const onFilterClick = () => {
@@ -95,13 +98,13 @@
};
const onSubmit = () => {
handlePromiseError(onSearch({ query: value }));
handlePromiseError(handleSearch({ query: value }));
saveSearchTerm(value);
};
const onClear = () => {
value = '';
input.focus();
input?.focus();
};
const onEscape = () => {
@@ -112,19 +115,19 @@
const onArrow = async (direction: 1 | -1) => {
openDropdown();
await tick();
moveSelection(direction);
searchHistoryBox?.moveSelection(direction);
};
const onEnter = (event: KeyboardEvent) => {
if (selectedId) {
event.preventDefault();
selectActiveOption();
searchHistoryBox?.selectActiveOption();
}
};
const onInput = () => {
openDropdown();
clearSelection();
searchHistoryBox?.clearSelection();
};
const openDropdown = () => {
@@ -133,14 +136,19 @@
const closeDropdown = () => {
showSuggestions = false;
clearSelection();
searchHistoryBox?.clearSelection();
};
const onsubmit = (event: Event) => {
event.preventDefault();
onSubmit();
};
</script>
<svelte:window
use:shortcuts={[
{ shortcut: { key: 'Escape' }, onShortcut: onEscape },
{ shortcut: { ctrl: true, key: 'k' }, onShortcut: () => input.select() },
{ shortcut: { ctrl: true, key: 'k' }, onShortcut: () => input?.select() },
{ shortcut: { ctrl: true, shift: true, key: 'k' }, onShortcut: onFilterClick },
]}
/>
@@ -151,9 +159,9 @@
autocomplete="off"
class="select-text text-sm"
action={AppRoute.SEARCH}
on:reset={() => (value = '')}
on:submit|preventDefault={onSubmit}
on:focusin={onFocusIn}
onreset={() => (value = '')}
{onsubmit}
onfocusin={onFocusIn}
role="search"
>
<div use:focusOutside={{ onFocusOut: closeDropdown }} tabindex="-1">
@@ -171,8 +179,8 @@
pattern="^(?!m:$).*$"
bind:value
bind:this={input}
on:focus={openDropdown}
on:input={onInput}
onfocus={openDropdown}
oninput={onInput}
disabled={showFilter}
role="combobox"
aria-controls={listboxId}
@@ -191,13 +199,11 @@
<!-- SEARCH HISTORY BOX -->
<SearchHistoryBox
bind:this={searchHistoryBox}
bind:isSearchSuggestions
id={listboxId}
searchQuery={value}
isOpen={showSuggestions}
bind:isSearchSuggestions
bind:moveSelection
bind:clearSelection
bind:selectActiveOption
onClearAllSearchTerms={clearAllSearchTerms}
onClearSearchTerm={(searchTerm) => clearSearchTerm(searchTerm)}
onSelectSearchTerm={(searchTerm) => handlePromiseError(onHistoryTermClick(searchTerm))}
@@ -206,19 +212,30 @@
</div>
<div class="absolute inset-y-0 {showClearIcon ? 'right-14' : 'right-2'} flex items-center pl-6 transition-all">
<CircleIconButton title={$t('show_search_options')} icon={mdiTune} on:click={onFilterClick} size="20" />
<CircleIconButton title={$t('show_search_options')} icon={mdiTune} onclick={onFilterClick} size="20" />
</div>
{#if showClearIcon}
<div class="absolute inset-y-0 right-0 flex items-center pr-2">
<CircleIconButton on:click={onClear} icon={mdiClose} title={$t('clear')} size="20" />
<CircleIconButton onclick={onClear} icon={mdiClose} title={$t('clear')} size="20" />
</div>
{/if}
<div class="absolute inset-y-0 left-0 flex items-center pl-2">
<CircleIconButton type="submit" disabled={showFilter} title={$t('search')} icon={mdiMagnify} size="20" />
<CircleIconButton
type="submit"
disabled={showFilter}
title={$t('search')}
icon={mdiMagnify}
size="20"
onclick={() => {}}
/>
</div>
</form>
{#if showFilter}
<SearchFilterModal {searchQuery} onSearch={(payload) => onSearch(payload)} onClose={() => (showFilter = false)} />
<SearchFilterModal
{searchQuery}
onSearch={(payload) => handleSearch(payload)}
onClose={() => (showFilter = false)}
/>
{/if}
</div>

View File

@@ -1,4 +1,4 @@
<script lang="ts" context="module">
<script lang="ts" module>
export interface SearchCameraFilter {
make?: string;
model?: string;
@@ -6,20 +6,21 @@
</script>
<script lang="ts">
import { run } from 'svelte/legacy';
import Combobox, { asComboboxOptions, asSelectedOption } from '$lib/components/shared-components/combobox.svelte';
import { handlePromiseError } from '$lib/utils';
import { SearchSuggestionType, getSearchSuggestions } from '@immich/sdk';
import { t } from 'svelte-i18n';
export let filters: SearchCameraFilter;
interface Props {
filters: SearchCameraFilter;
}
let makes: string[] = [];
let models: string[] = [];
let { filters = $bindable() }: Props = $props();
$: makeFilter = filters.make;
$: modelFilter = filters.model;
$: handlePromiseError(updateMakes());
$: handlePromiseError(updateModels(makeFilter));
let makes: string[] = $state([]);
let models: string[] = $state([]);
async function updateMakes() {
const results: Array<string | null> = await getSearchSuggestions({
@@ -47,6 +48,14 @@
filters.model = undefined;
}
}
let makeFilter = $derived(filters.make);
let modelFilter = $derived(filters.model);
run(() => {
handlePromiseError(updateMakes());
});
run(() => {
handlePromiseError(updateModels(makeFilter));
});
</script>
<div id="camera-selection">

View File

@@ -1,4 +1,4 @@
<script lang="ts" context="module">
<script lang="ts" module>
export interface SearchDateFilter {
takenBefore?: string;
takenAfter?: string;
@@ -9,7 +9,11 @@
import DateInput from '$lib/components/elements/date-input.svelte';
import { t } from 'svelte-i18n';
export let filters: SearchDateFilter;
interface Props {
filters: SearchDateFilter;
}
let { filters = $bindable() }: Props = $props();
</script>
<div id="date-range-selection" class="grid grid-auto-fit-40 gap-5">

View File

@@ -1,4 +1,4 @@
<script lang="ts" context="module">
<script lang="ts" module>
export interface SearchDisplayFilters {
isNotInAlbum?: boolean;
isArchive?: boolean;
@@ -10,7 +10,11 @@
import Checkbox from '$lib/components/elements/checkbox.svelte';
import { t } from 'svelte-i18n';
export let filters: SearchDisplayFilters;
interface Props {
filters: SearchDisplayFilters;
}
let { filters = $bindable() }: Props = $props();
</script>
<div id="display-options-selection">

View File

@@ -1,4 +1,4 @@
<script lang="ts" context="module">
<script lang="ts" module>
import type { SearchLocationFilter } from './search-location-section.svelte';
import type { SearchDisplayFilters } from './search-display-section.svelte';
import type { SearchDateFilter } from './search-date-section.svelte';
@@ -36,10 +36,15 @@
import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
import { mdiTune } from '@mdi/js';
import { generateId } from '$lib/utils/generate-id';
import { SvelteSet } from 'svelte/reactivity';
export let searchQuery: MetadataSearchDto | SmartSearchDto;
export let onClose: () => void;
export let onSearch: (search: SmartSearchDto | MetadataSearchDto) => void;
interface Props {
searchQuery: MetadataSearchDto | SmartSearchDto;
onClose: () => void;
onSearch: (search: SmartSearchDto | MetadataSearchDto) => void;
}
let { searchQuery, onClose, onSearch }: Props = $props();
const parseOptionalDate = (dateString?: string) => (dateString ? parseUtcDate(dateString) : undefined);
const toStartOfDayDate = (dateString: string) => parseUtcDate(dateString)?.startOf('day').toISODate() || undefined;
@@ -50,10 +55,10 @@
return value === null ? undefined : value;
}
let filter: SearchFilter = {
let filter: SearchFilter = $state({
query: 'query' in searchQuery ? searchQuery.query : searchQuery.originalFileName || '',
queryType: 'query' in searchQuery ? 'smart' : 'metadata',
personIds: new Set('personIds' in searchQuery ? searchQuery.personIds : []),
personIds: new SvelteSet('personIds' in searchQuery ? searchQuery.personIds : []),
location: {
country: withNullAsUndefined(searchQuery.country),
state: withNullAsUndefined(searchQuery.state),
@@ -78,7 +83,7 @@
: searchQuery.type === AssetTypeEnum.Video
? MediaType.Video
: MediaType.All,
};
});
const resetForm = () => {
filter = {
@@ -122,10 +127,20 @@
onSearch(payload);
};
const onreset = (event: Event) => {
event.preventDefault();
resetForm();
};
const onsubmit = (event: Event) => {
event.preventDefault();
search();
};
</script>
<FullScreenModal icon={mdiTune} width="extra-wide" title={$t('search_options')} {onClose}>
<form id={formId} autocomplete="off" on:submit|preventDefault={search} on:reset|preventDefault={resetForm}>
<form id={formId} autocomplete="off" {onsubmit} {onreset}>
<div class="space-y-10 pb-10" tabindex="-1">
<!-- PEOPLE -->
<SearchPeopleSection bind:selectedPeople={filter.personIds} />
@@ -152,8 +167,8 @@
</div>
</form>
<svelte:fragment slot="sticky-bottom">
{#snippet stickyBottom()}
<Button type="reset" color="gray" fullwidth form={formId}>{$t('clear_all')}</Button>
<Button type="submit" fullwidth form={formId}>{$t('search')}</Button>
</svelte:fragment>
{/snippet}
</FullScreenModal>

View File

@@ -6,22 +6,41 @@
import { t } from 'svelte-i18n';
import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte';
export let id: string;
export let searchQuery: string = '';
export let isSearchSuggestions: boolean = false;
export let isOpen: boolean = false;
export let onSelectSearchTerm: (searchTerm: string) => void;
export let onClearSearchTerm: (searchTerm: string) => void;
export let onClearAllSearchTerms: () => void;
export let onActiveSelectionChange: (selectedId: string | undefined) => void;
interface Props {
id: string;
searchQuery?: string;
isSearchSuggestions?: boolean;
isOpen?: boolean;
onSelectSearchTerm: (searchTerm: string) => void;
onClearSearchTerm: (searchTerm: string) => void;
onClearAllSearchTerms: () => void;
onActiveSelectionChange: (selectedId: string | undefined) => void;
}
$: filteredSearchTerms = $savedSearchTerms.filter((term) => term.toLowerCase().includes(searchQuery.toLowerCase()));
$: isSearchSuggestions = filteredSearchTerms.length > 0;
$: showClearAll = searchQuery === '';
$: suggestionCount = showClearAll ? filteredSearchTerms.length + 1 : filteredSearchTerms.length;
let {
id,
searchQuery = '',
isSearchSuggestions = $bindable(false),
isOpen = false,
onSelectSearchTerm,
onClearSearchTerm,
onClearAllSearchTerms,
onActiveSelectionChange,
}: Props = $props();
let selectedIndex: number | undefined = undefined;
let element: HTMLDivElement;
let filteredSearchTerms = $derived(
$savedSearchTerms.filter((term) => term.toLowerCase().includes(searchQuery.toLowerCase())),
);
$effect(() => {
isSearchSuggestions = filteredSearchTerms.length > 0;
});
let showClearAll = $derived(searchQuery === '');
let suggestionCount = $derived(showClearAll ? filteredSearchTerms.length + 1 : filteredSearchTerms.length);
let selectedIndex: number | undefined = $state(undefined);
let element = $state<HTMLDivElement>();
export function moveSelection(increment: 1 | -1) {
if (!isSearchSuggestions) {
@@ -45,7 +64,7 @@
if (selectedIndex === undefined) {
return;
}
const selectedElement = element.querySelector(`#${getId(selectedIndex)}`) as HTMLElement;
const selectedElement = element?.querySelector(`#${getId(selectedIndex)}`) as HTMLElement;
selectedElement?.click();
}
@@ -86,7 +105,7 @@
type="button"
class="rounded-lg p-2 font-semibold text-immich-primary aria-selected:bg-immich-primary/25 hover:bg-immich-primary/25 dark:text-immich-dark-primary"
role="option"
on:click={() => handleClearAll()}
onclick={() => handleClearAll()}
tabindex="-1"
aria-selected={selectedIndex === 0}
aria-label={$t('clear_all_recent_searches')}
@@ -100,11 +119,11 @@
{@const index = showClearAll ? i + 1 : i}
<div class="flex w-full items-center justify-between text-sm text-black dark:text-gray-300">
<div class="relative w-full items-center">
<!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y_click_events_have_key_events -->
<div
id={getId(index)}
class="relative flex w-full cursor-pointer gap-3 py-3 pl-5 hover:bg-gray-100 aria-selected:bg-gray-100 dark:aria-selected:bg-gray-500/30 dark:hover:bg-gray-500/30"
on:click={() => handleSelect(savedSearchTerm)}
onclick={() => handleSelect(savedSearchTerm)}
role="option"
tabindex="-1"
aria-selected={selectedIndex === index}
@@ -120,7 +139,7 @@
size="18"
padding="1"
tabindex={-1}
on:click={() => handleClearSingle(savedSearchTerm)}
onclick={() => handleClearSingle(savedSearchTerm)}
/>
</div>
</div>

View File

@@ -1,4 +1,4 @@
<script lang="ts" context="module">
<script lang="ts" module>
export interface SearchLocationFilter {
country?: string;
state?: string;
@@ -7,22 +7,22 @@
</script>
<script lang="ts">
import { run } from 'svelte/legacy';
import Combobox, { asComboboxOptions, asSelectedOption } from '$lib/components/shared-components/combobox.svelte';
import { handlePromiseError } from '$lib/utils';
import { getSearchSuggestions, SearchSuggestionType } from '@immich/sdk';
import { t } from 'svelte-i18n';
export let filters: SearchLocationFilter;
interface Props {
filters: SearchLocationFilter;
}
let countries: string[] = [];
let states: string[] = [];
let cities: string[] = [];
let { filters = $bindable() }: Props = $props();
$: countryFilter = filters.country;
$: stateFilter = filters.state;
$: handlePromiseError(updateCountries());
$: handlePromiseError(updateStates(countryFilter));
$: handlePromiseError(updateCities(countryFilter, stateFilter));
let countries: string[] = $state([]);
let states: string[] = $state([]);
let cities: string[] = $state([]);
async function updateCountries() {
const results: Array<string | null> = await getSearchSuggestions({
@@ -64,6 +64,17 @@
filters.city = undefined;
}
}
let countryFilter = $derived(filters.country);
let stateFilter = $derived(filters.state);
run(() => {
handlePromiseError(updateCountries());
});
run(() => {
handlePromiseError(updateStates(countryFilter));
});
run(() => {
handlePromiseError(updateCities(countryFilter, stateFilter));
});
</script>
<div id="location-selection">

View File

@@ -3,7 +3,11 @@
import { MediaType } from './search-filter-modal.svelte';
import { t } from 'svelte-i18n';
export let filteredMedia: MediaType;
interface Props {
filteredMedia: MediaType;
}
let { filteredMedia = $bindable() }: Props = $props();
</script>
<div id="media-type-selection">

View File

@@ -10,12 +10,16 @@
import { t } from 'svelte-i18n';
import SingleGridRow from '$lib/components/shared-components/single-grid-row.svelte';
export let selectedPeople: Set<string>;
interface Props {
selectedPeople: Set<string>;
}
let { selectedPeople = $bindable() }: Props = $props();
let peoplePromise = getPeople();
let showAllPeople = false;
let name = '';
let numberOfPeople = 1;
let showAllPeople = $state(false);
let name = $state('');
let numberOfPeople = $state(1);
function orderBySelectedPeopleFirst(people: PersonResponseDto[]) {
return [
@@ -72,7 +76,7 @@
)
? 'dark:border-slate-500 border-slate-400 bg-slate-200 dark:bg-slate-800 dark:text-white'
: 'border-transparent'}"
on:click={() => togglePersonSelection(person.id)}
onclick={() => togglePersonSelection(person.id)}
>
<ImageThumbnail circle shadow url={getPeopleThumbnailUrl(person)} altText={person.name} widthStyle="100%" />
<p class="mt-2 line-clamp-2 text-sm font-medium dark:text-white">{person.name}</p>
@@ -86,7 +90,7 @@
shadow={false}
color="text-primary"
class="flex gap-2 place-items-center"
on:click={() => (showAllPeople = !showAllPeople)}
onclick={() => (showAllPeople = !showAllPeople)}
>
{#if showAllPeople}
<span><Icon path={mdiClose} ariaHidden /></span>

View File

@@ -2,8 +2,12 @@
import RadioButton from '$lib/components/elements/radio-button.svelte';
import { t } from 'svelte-i18n';
export let query: string | undefined;
export let queryType: 'smart' | 'metadata' = 'smart';
interface Props {
query: string | undefined;
queryType?: 'smart' | 'metadata';
}
let { query = $bindable(), queryType = $bindable('smart') }: Props = $props();
</script>
<fieldset>