Skip to content

Commit 02b8ea9

Browse files
committed
Merge remote-tracking branch 'origin/main' into refactor/asset_grid
2 parents d9f25a6 + 798debf commit 02b8ea9

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

web/src/lib/components/photos-page/asset-grid-actions.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
} from '$lib/components/photos-page/actions/focus-actions';
88
import ChangeDate from '$lib/components/shared-components/change-date.svelte';
99
import { AppRoute } from '$lib/constants';
10-
import { modalManager } from '$lib/managers/modal-manager.svelte';
10+
import { modalManager } from '@immich/ui';
1111
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
1212
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
1313
import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';

web/src/lib/components/photos-page/asset-grid.svelte

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
import Skeleton from '$lib/components/photos-page/skeleton.svelte';
99
import Scrubber from '$lib/components/shared-components/scrubber/scrubber.svelte';
1010
import { AssetAction } from '$lib/constants';
11+
import { authManager } from '$lib/managers/auth-manager.svelte';
12+
import { modalManager } from '@immich/ui';
1113
import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
1214
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
1315
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
1416
import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
1517
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
1618
import { mobileDevice } from '$lib/stores/mobile-device.svelte';
1719
import { navigate } from '$lib/utils/navigation';
18-
import { type ScrubberListener, type TimelinePlainYearMonth } from '$lib/utils/timeline-util';
20+
import { getTimes, type ScrubberListener, type TimelinePlainYearMonth } from '$lib/utils/timeline-util';
1921
import { AssetVisibility, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
2022
import { DateTime } from 'luxon';
2123
import { onMount, type Snippet } from 'svelte';
@@ -69,7 +71,7 @@
6971
empty,
7072
}: Props = $props();
7173
72-
let { isViewing: showAssetViewer, gridScrollTarget, mutex, viewingAsset} = assetViewingStore;
74+
let { isViewing: showAssetViewer, gridScrollTarget, mutex, asset: viewingAsset} = assetViewingStore;
7375
7476
let element: HTMLElement | undefined = $state();
7577
@@ -500,6 +502,21 @@
500502
</section>
501503
</section>
502504

505+
<Portal target="body">
506+
{#if $showAssetViewer}
507+
<AssetViewerAndActions
508+
bind:showSkeleton
509+
{timelineManager}
510+
{removeAction}
511+
{withStacked}
512+
{isShared}
513+
{album}
514+
{person}
515+
{isShowDeleteConfirmation}
516+
></AssetViewerAndActions>
517+
{/if}
518+
</Portal>
519+
503520
<style>
504521
#asset-grid {
505522
contain: strict;

0 commit comments

Comments
 (0)