Create Timeline facade component to unify timeline usage
• Create timeline/timeline.svelte as main entry point for timeline functionality • Combine BaseTimeline, TimelineKeyboardActions, and TimelineAssetViewer • Update all route imports from base-timeline to use Timeline component • Move scrubber.svelte to timeline/base-components/ • Fix timeline-keyboard-actions date handling from result.dateTime to result.date • Clean up unused imports and props
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
import AlbumMap from '$lib/components/album-page/album-map.svelte';
|
import AlbumMap from '$lib/components/album-page/album-map.svelte';
|
||||||
import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte';
|
import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte';
|
||||||
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
||||||
<AssetGrid enableRouting={true} {album} {timelineManager} {assetInteraction}>
|
<Timeline enableRouting={true} {album} {timelineManager} {assetInteraction}>
|
||||||
<section class="pt-8 md:pt-24 px-2 md:px-0">
|
<section class="pt-8 md:pt-24 px-2 md:px-0">
|
||||||
<!-- ALBUM TITLE -->
|
<!-- ALBUM TITLE -->
|
||||||
<h1
|
<h1
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
</p>
|
</p>
|
||||||
{/if}
|
{/if}
|
||||||
</section>
|
</section>
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<header>
|
<header>
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
notificationController,
|
notificationController,
|
||||||
} from '$lib/components/shared-components/notification/notification';
|
} from '$lib/components/shared-components/notification/notification';
|
||||||
import Portal from '$lib/components/shared-components/portal/portal.svelte';
|
import Portal from '$lib/components/shared-components/portal/portal.svelte';
|
||||||
|
|
||||||
import DeleteAssetDialog from '$lib/components/timeline/actions/delete-asset-dialog.svelte';
|
import DeleteAssetDialog from '$lib/components/timeline/actions/delete-asset-dialog.svelte';
|
||||||
import { AssetAction } from '$lib/constants';
|
import { AssetAction } from '$lib/constants';
|
||||||
import { showDeleteModal } from '$lib/stores/preferences.store';
|
import { showDeleteModal } from '$lib/stores/preferences.store';
|
||||||
|
|||||||
@@ -212,7 +212,9 @@
|
|||||||
onConfirm={async (result: AbsoluteResult | RelativeResult) => {
|
onConfirm={async (result: AbsoluteResult | RelativeResult) => {
|
||||||
isShowSelectDate = false;
|
isShowSelectDate = false;
|
||||||
if (result.mode === 'absolute') {
|
if (result.mode === 'absolute') {
|
||||||
const asset = await timelineManager.getClosestAssetToDate(result.dateTime.toObject());
|
const asset = await timelineManager.getClosestAssetToDate(
|
||||||
|
(DateTime.fromISO(result.date) as DateTime<true>).toObject(),
|
||||||
|
);
|
||||||
if (asset) {
|
if (asset) {
|
||||||
setFocusAsset(asset);
|
setFocusAsset(asset);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,8 @@
|
|||||||
import { afterNavigate, beforeNavigate } from '$app/navigation';
|
import { afterNavigate, beforeNavigate } from '$app/navigation';
|
||||||
import { page } from '$app/stores';
|
import { page } from '$app/stores';
|
||||||
import { resizeObserver, type OnResizeCallback } from '$lib/actions/resize-observer';
|
import { resizeObserver, type OnResizeCallback } from '$lib/actions/resize-observer';
|
||||||
import AssetGridActions from '$lib/components/timeline/actions/timeline-keyboard-actions.svelte';
|
|
||||||
import Skeleton from '$lib/components/timeline/base-components/skeleton.svelte';
|
import Skeleton from '$lib/components/timeline/base-components/skeleton.svelte';
|
||||||
import SelectableTimelineDay from '$lib/components/timeline/internal-components/selectable-timeline-day.svelte';
|
import SelectableTimelineDay from '$lib/components/timeline/internal-components/selectable-timeline-day.svelte';
|
||||||
import TimelineAssetViewer from '$lib/components/timeline/internal-components/timeline-asset-viewer.svelte';
|
|
||||||
import { AssetAction } from '$lib/constants';
|
|
||||||
import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
|
import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
|
||||||
import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
|
import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
@@ -15,10 +12,8 @@
|
|||||||
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
||||||
import { mobileDevice } from '$lib/stores/mobile-device.svelte';
|
import { mobileDevice } from '$lib/stores/mobile-device.svelte';
|
||||||
import { navigate } from '$lib/utils/navigation';
|
import { navigate } from '$lib/utils/navigation';
|
||||||
import { type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
|
|
||||||
import { onMount, type Snippet } from 'svelte';
|
import { onMount, type Snippet } from 'svelte';
|
||||||
import type { UpdatePayload } from 'vite';
|
import type { UpdatePayload } from 'vite';
|
||||||
import Portal from '../../shared-components/portal/portal.svelte';
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
||||||
@@ -31,21 +26,12 @@
|
|||||||
enableRouting: boolean;
|
enableRouting: boolean;
|
||||||
timelineManager: TimelineManager;
|
timelineManager: TimelineManager;
|
||||||
assetInteraction: AssetInteraction;
|
assetInteraction: AssetInteraction;
|
||||||
removeAction?:
|
|
||||||
| AssetAction.UNARCHIVE
|
|
||||||
| AssetAction.ARCHIVE
|
|
||||||
| AssetAction.FAVORITE
|
|
||||||
| AssetAction.UNFAVORITE
|
|
||||||
| AssetAction.SET_VISIBILITY_TIMELINE;
|
|
||||||
withStacked?: boolean;
|
withStacked?: boolean;
|
||||||
showArchiveIcon?: boolean;
|
showArchiveIcon?: boolean;
|
||||||
isShared?: boolean;
|
showSkeleton?: boolean;
|
||||||
album?: AlbumResponseDto | null;
|
|
||||||
person?: PersonResponseDto | null;
|
|
||||||
isShowDeleteConfirmation?: boolean;
|
isShowDeleteConfirmation?: boolean;
|
||||||
onAssetOpen?: (dayGroup: DayGroup, asset: TimelineAsset, defaultAssetOpen: () => void) => void;
|
onAssetOpen?: (dayGroup: DayGroup, asset: TimelineAsset, defaultAssetOpen: () => void) => void;
|
||||||
onSelect?: (asset: TimelineAsset) => void;
|
onSelect?: (asset: TimelineAsset) => void;
|
||||||
onEscape?: () => void;
|
|
||||||
header?: Snippet<[handleScrollTop: (top: number) => void]>;
|
header?: Snippet<[handleScrollTop: (top: number) => void]>;
|
||||||
children?: Snippet;
|
children?: Snippet;
|
||||||
empty?: Snippet;
|
empty?: Snippet;
|
||||||
@@ -60,30 +46,23 @@
|
|||||||
enableRouting,
|
enableRouting,
|
||||||
timelineManager = $bindable(),
|
timelineManager = $bindable(),
|
||||||
assetInteraction,
|
assetInteraction,
|
||||||
removeAction,
|
|
||||||
withStacked = false,
|
withStacked = false,
|
||||||
|
showSkeleton = $bindable(true),
|
||||||
showArchiveIcon = false,
|
showArchiveIcon = false,
|
||||||
isShared = false,
|
|
||||||
album = null,
|
|
||||||
person = null,
|
|
||||||
isShowDeleteConfirmation = $bindable(false),
|
isShowDeleteConfirmation = $bindable(false),
|
||||||
|
|
||||||
onAssetOpen,
|
onAssetOpen,
|
||||||
onSelect,
|
onSelect,
|
||||||
onEscape,
|
|
||||||
children,
|
children,
|
||||||
empty,
|
empty,
|
||||||
header,
|
header,
|
||||||
handleTimelineScroll = () => {},
|
handleTimelineScroll = () => {},
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
let { isViewing: showAssetViewer, gridScrollTarget } = assetViewingStore;
|
let { gridScrollTarget } = assetViewingStore;
|
||||||
|
|
||||||
let element: HTMLElement | undefined = $state();
|
let element: HTMLElement | undefined = $state();
|
||||||
|
|
||||||
let timelineElement: HTMLElement | undefined = $state();
|
let timelineElement: HTMLElement | undefined = $state();
|
||||||
let showSkeleton = $state(true);
|
|
||||||
|
|
||||||
let scrubberWidth = $state(0);
|
let scrubberWidth = $state(0);
|
||||||
|
|
||||||
const maxMd = $derived(mobileDevice.maxMd);
|
const maxMd = $derived(mobileDevice.maxMd);
|
||||||
@@ -161,7 +140,7 @@
|
|||||||
return true;
|
return true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const scrollToAsset = (asset: TimelineAsset) => {
|
export const scrollToAsset = (asset: TimelineAsset) => {
|
||||||
const monthGroup = timelineManager.getMonthGroupByAssetId(asset.id);
|
const monthGroup = timelineManager.getMonthGroupByAssetId(asset.id);
|
||||||
if (!monthGroup) {
|
if (!monthGroup) {
|
||||||
return false;
|
return false;
|
||||||
@@ -264,9 +243,6 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<AssetGridActions {scrollToAsset} {timelineManager} {assetInteraction} bind:isShowDeleteConfirmation {onEscape}
|
|
||||||
></AssetGridActions>
|
|
||||||
|
|
||||||
{@render header?.(scrollTop)}
|
{@render header?.(scrollTop)}
|
||||||
|
|
||||||
<!-- Right margin MUST be equal to the width of scrubber -->
|
<!-- Right margin MUST be equal to the width of scrubber -->
|
||||||
@@ -352,12 +328,6 @@
|
|||||||
</section>
|
</section>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<Portal target="body">
|
|
||||||
{#if $showAssetViewer}
|
|
||||||
<TimelineAssetViewer bind:showSkeleton {timelineManager} {removeAction} {withStacked} {isShared} {album} {person} />
|
|
||||||
{/if}
|
|
||||||
</Portal>
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
#asset-grid {
|
#asset-grid {
|
||||||
contain: strict;
|
contain: strict;
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import TimelineViewer from '$lib/components/timeline/base-components/base-timeline-viewer.svelte';
|
import BaseTimelineViewer from '$lib/components/timeline/base-components/base-timeline-viewer.svelte';
|
||||||
import { AssetAction } from '$lib/constants';
|
|
||||||
import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
|
import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
|
||||||
import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
|
import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
|
||||||
import type { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import type { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||||
import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
import type { ScrubberListener, TimelineYearMonth } from '$lib/utils/timeline-util';
|
import type { ScrubberListener, TimelineYearMonth } from '$lib/utils/timeline-util';
|
||||||
import type { AlbumResponseDto, PersonResponseDto } from '@immich/sdk';
|
|
||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
import Scrubber from '../../shared-components/scrubber/scrubber.svelte';
|
import Scrubber from './scrubber.svelte';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
||||||
@@ -22,20 +20,12 @@
|
|||||||
enableRouting: boolean;
|
enableRouting: boolean;
|
||||||
timelineManager: TimelineManager;
|
timelineManager: TimelineManager;
|
||||||
assetInteraction: AssetInteraction;
|
assetInteraction: AssetInteraction;
|
||||||
removeAction?:
|
|
||||||
| AssetAction.UNARCHIVE
|
|
||||||
| AssetAction.ARCHIVE
|
|
||||||
| AssetAction.FAVORITE
|
|
||||||
| AssetAction.UNFAVORITE
|
|
||||||
| AssetAction.SET_VISIBILITY_TIMELINE;
|
|
||||||
withStacked?: boolean;
|
withStacked?: boolean;
|
||||||
showArchiveIcon?: boolean;
|
showArchiveIcon?: boolean;
|
||||||
isShared?: boolean;
|
showSkeleton?: boolean;
|
||||||
album?: AlbumResponseDto | null;
|
|
||||||
person?: PersonResponseDto | null;
|
|
||||||
isShowDeleteConfirmation?: boolean;
|
|
||||||
|
|
||||||
onAssetOpen?: (dayGroup: DayGroup, asset: TimelineAsset, defaultAssetOpen: () => void) => void;
|
isShowDeleteConfirmation?: boolean;
|
||||||
onSelect?: (asset: TimelineAsset) => void;
|
onSelect?: (asset: TimelineAsset) => void;
|
||||||
onEscape?: () => void;
|
onEscape?: () => void;
|
||||||
|
|
||||||
@@ -50,16 +40,13 @@
|
|||||||
enableRouting,
|
enableRouting,
|
||||||
timelineManager = $bindable(),
|
timelineManager = $bindable(),
|
||||||
assetInteraction,
|
assetInteraction,
|
||||||
removeAction,
|
|
||||||
withStacked = false,
|
withStacked = false,
|
||||||
showArchiveIcon = false,
|
showArchiveIcon = false,
|
||||||
isShared = false,
|
showSkeleton = $bindable(true),
|
||||||
album = null,
|
|
||||||
person = null,
|
|
||||||
isShowDeleteConfirmation = $bindable(false),
|
isShowDeleteConfirmation = $bindable(false),
|
||||||
onAssetOpen,
|
onAssetOpen,
|
||||||
onSelect = () => {},
|
onSelect = () => {},
|
||||||
onEscape = () => {},
|
|
||||||
children,
|
children,
|
||||||
empty,
|
empty,
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
@@ -176,25 +163,22 @@
|
|||||||
|
|
||||||
handleScrollTop?.(scrollToTop);
|
handleScrollTop?.(scrollToTop);
|
||||||
};
|
};
|
||||||
|
let baseTimelineViewer: BaseTimelineViewer | undefined = $state();
|
||||||
|
export const scrollToAsset = (asset: TimelineAsset) => baseTimelineViewer?.scrollToAsset(asset) ?? false;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<TimelineViewer
|
<TimelineViewer
|
||||||
{customThumbnailLayout}
|
|
||||||
{isSelectionMode}
|
{isSelectionMode}
|
||||||
{singleSelect}
|
{singleSelect}
|
||||||
{enableRouting}
|
{enableRouting}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
{assetInteraction}
|
{assetInteraction}
|
||||||
{removeAction}
|
|
||||||
{withStacked}
|
{withStacked}
|
||||||
{showArchiveIcon}
|
{showArchiveIcon}
|
||||||
{isShared}
|
{showSkeleton}
|
||||||
{album}
|
|
||||||
{person}
|
|
||||||
{isShowDeleteConfirmation}
|
{isShowDeleteConfirmation}
|
||||||
{onAssetOpen}
|
{onAssetOpen}
|
||||||
{onSelect}
|
{onSelect}
|
||||||
{onEscape}
|
|
||||||
{children}
|
{children}
|
||||||
{empty}
|
{empty}
|
||||||
{handleTimelineScroll}
|
{handleTimelineScroll}
|
||||||
@@ -215,4 +199,4 @@
|
|||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</TimelineViewer>
|
</BaseTimelineViewer>
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
customThumbnailLayout?: Snippet<[TimelineAsset]>;
|
||||||
isSelectionMode: boolean;
|
|
||||||
singleSelect: boolean;
|
singleSelect: boolean;
|
||||||
withStacked: boolean;
|
withStacked: boolean;
|
||||||
showArchiveIcon: boolean;
|
showArchiveIcon: boolean;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
import { isSelectingAllAssets } from '$lib/stores/assets-store.svelte';
|
import { isSelectingAllAssets } from '$lib/stores/assets-store.svelte';
|
||||||
import { uploadAssetsStore } from '$lib/stores/upload';
|
|
||||||
import { navigate } from '$lib/utils/navigation';
|
import { navigate } from '$lib/utils/navigation';
|
||||||
|
|
||||||
import TimelineDay from '$lib/components/timeline/base-components/timeline-day.svelte';
|
import TimelineDay from '$lib/components/timeline/base-components/timeline-day.svelte';
|
||||||
@@ -13,8 +12,6 @@
|
|||||||
import { searchStore } from '$lib/stores/search.svelte';
|
import { searchStore } from '$lib/stores/search.svelte';
|
||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
|
|
||||||
let { isUploading } = uploadAssetsStore;
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
isSelectionMode: boolean;
|
isSelectionMode: boolean;
|
||||||
singleSelect: boolean;
|
singleSelect: boolean;
|
||||||
@@ -264,7 +261,6 @@
|
|||||||
|
|
||||||
<TimelineDay
|
<TimelineDay
|
||||||
{customThumbnailLayout}
|
{customThumbnailLayout}
|
||||||
{isSelectionMode}
|
|
||||||
{singleSelect}
|
{singleSelect}
|
||||||
{withStacked}
|
{withStacked}
|
||||||
{showArchiveIcon}
|
{showArchiveIcon}
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import Portal from '$lib/components/shared-components/portal/portal.svelte';
|
||||||
|
import TimelineKeyboardActions from '$lib/components/timeline/actions/timeline-keyboard-actions.svelte';
|
||||||
|
import BaseTimeline from '$lib/components/timeline/base-components/base-timeline.svelte';
|
||||||
|
import TimelineAssetViewer from '$lib/components/timeline/internal-components/timeline-asset-viewer.svelte';
|
||||||
|
import type { AssetAction } from '$lib/constants';
|
||||||
|
import type { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
|
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||||
|
import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
||||||
|
import type { AlbumResponseDto, PersonResponseDto } from '@immich/sdk';
|
||||||
|
import type { Snippet } from 'svelte';
|
||||||
|
|
||||||
|
let { isViewing: showAssetViewer } = assetViewingStore;
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
isSelectionMode?: boolean;
|
||||||
|
singleSelect?: boolean;
|
||||||
|
/** `true` if this asset grid is responds to navigation events; if `true`, then look at the
|
||||||
|
`AssetViewingStore.gridScrollTarget` and load and scroll to the asset specified, and
|
||||||
|
additionally, update the page location/url with the asset as the asset-grid is scrolled */
|
||||||
|
enableRouting: boolean;
|
||||||
|
timelineManager: TimelineManager;
|
||||||
|
assetInteraction: AssetInteraction;
|
||||||
|
removeAction?:
|
||||||
|
| AssetAction.UNARCHIVE
|
||||||
|
| AssetAction.ARCHIVE
|
||||||
|
| AssetAction.FAVORITE
|
||||||
|
| AssetAction.UNFAVORITE
|
||||||
|
| AssetAction.SET_VISIBILITY_TIMELINE;
|
||||||
|
withStacked?: boolean;
|
||||||
|
showArchiveIcon?: boolean;
|
||||||
|
isShared?: boolean;
|
||||||
|
album?: AlbumResponseDto | null;
|
||||||
|
person?: PersonResponseDto | null;
|
||||||
|
isShowDeleteConfirmation?: boolean;
|
||||||
|
onSelect?: (asset: TimelineAsset) => void;
|
||||||
|
onEscape?: () => void;
|
||||||
|
children?: Snippet;
|
||||||
|
empty?: Snippet;
|
||||||
|
}
|
||||||
|
|
||||||
|
let {
|
||||||
|
isSelectionMode = false,
|
||||||
|
singleSelect = false,
|
||||||
|
enableRouting,
|
||||||
|
timelineManager = $bindable(),
|
||||||
|
assetInteraction,
|
||||||
|
removeAction,
|
||||||
|
withStacked = false,
|
||||||
|
showArchiveIcon = false,
|
||||||
|
isShared = false,
|
||||||
|
album = null,
|
||||||
|
person = null,
|
||||||
|
isShowDeleteConfirmation = $bindable(false),
|
||||||
|
onSelect = () => {},
|
||||||
|
onEscape = () => {},
|
||||||
|
children,
|
||||||
|
empty,
|
||||||
|
}: Props = $props();
|
||||||
|
|
||||||
|
let viewer: BaseTimeline | undefined = $state();
|
||||||
|
let showSkeleton: boolean = $state(true);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<BaseTimeline
|
||||||
|
bind:this={viewer}
|
||||||
|
{isSelectionMode}
|
||||||
|
{singleSelect}
|
||||||
|
{enableRouting}
|
||||||
|
{timelineManager}
|
||||||
|
{assetInteraction}
|
||||||
|
{withStacked}
|
||||||
|
{showArchiveIcon}
|
||||||
|
{isShowDeleteConfirmation}
|
||||||
|
{showSkeleton}
|
||||||
|
{onSelect}
|
||||||
|
{children}
|
||||||
|
{empty}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<TimelineKeyboardActions
|
||||||
|
scrollToAsset={(asset) => viewer?.scrollToAsset(asset) ?? false}
|
||||||
|
{timelineManager}
|
||||||
|
{assetInteraction}
|
||||||
|
bind:isShowDeleteConfirmation
|
||||||
|
{onEscape}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Portal target="body">
|
||||||
|
{#if $showAssetViewer}
|
||||||
|
<TimelineAssetViewer bind:showSkeleton {timelineManager} {removeAction} {withStacked} {isShared} {album} {person} />
|
||||||
|
{/if}
|
||||||
|
</Portal>
|
||||||
+3
-3
@@ -31,7 +31,7 @@
|
|||||||
notificationController,
|
notificationController,
|
||||||
} from '$lib/components/shared-components/notification/notification';
|
} from '$lib/components/shared-components/notification/notification';
|
||||||
import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
|
import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AlbumPageViewMode, AppRoute } from '$lib/constants';
|
import { AlbumPageViewMode, AppRoute } from '$lib/constants';
|
||||||
import { activityManager } from '$lib/managers/activity-manager.svelte';
|
import { activityManager } from '$lib/managers/activity-manager.svelte';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
@@ -443,7 +443,7 @@
|
|||||||
<div class="flex overflow-hidden" use:scrollMemoryClearer={{ routeStartsWith: AppRoute.ALBUMS }}>
|
<div class="flex overflow-hidden" use:scrollMemoryClearer={{ routeStartsWith: AppRoute.ALBUMS }}>
|
||||||
<div class="relative w-full shrink">
|
<div class="relative w-full shrink">
|
||||||
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={viewMode === AlbumPageViewMode.SELECT_ASSETS ? false : true}
|
enableRouting={viewMode === AlbumPageViewMode.SELECT_ASSETS ? false : true}
|
||||||
{album}
|
{album}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
@@ -544,7 +544,7 @@
|
|||||||
</section>
|
</section>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
|
|
||||||
{#if showActivityStatus && !activityManager.isLoading}
|
{#if showActivityStatus && !activityManager.isLoading}
|
||||||
<div class="absolute z-2 bottom-0 end-0 mb-6 me-6 justify-self-end">
|
<div class="absolute z-2 bottom-0 end-0 mb-6 me-6 justify-self-end">
|
||||||
|
|||||||
@@ -10,10 +10,10 @@
|
|||||||
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
||||||
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
||||||
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
|
||||||
import { AssetAction } from '$lib/constants';
|
import { AssetAction } from '$lib/constants';
|
||||||
|
|
||||||
import SetVisibilityAction from '$lib/components/photos-page/actions/set-visibility-action.svelte';
|
import SetVisibilityAction from '$lib/components/photos-page/actions/set-visibility-action.svelte';
|
||||||
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
import { AssetVisibility } from '@immich/sdk';
|
import { AssetVisibility } from '@immich/sdk';
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<UserPageLayout hideNavbar={assetInteraction.selectionActive} title={data.meta.title} scrollbar={false}>
|
<UserPageLayout hideNavbar={assetInteraction.selectionActive} title={data.meta.title} scrollbar={false}>
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={true}
|
enableRouting={true}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
{assetInteraction}
|
{assetInteraction}
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<EmptyPlaceholder text={$t('no_archived_assets_message')} />
|
<EmptyPlaceholder text={$t('no_archived_assets_message')} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</UserPageLayout>
|
</UserPageLayout>
|
||||||
|
|
||||||
{#if assetInteraction.selectionActive}
|
{#if assetInteraction.selectionActive}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
||||||
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
||||||
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AssetAction } from '$lib/constants';
|
import { AssetAction } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<UserPageLayout hideNavbar={assetInteraction.selectionActive} title={data.meta.title} scrollbar={false}>
|
<UserPageLayout hideNavbar={assetInteraction.selectionActive} title={data.meta.title} scrollbar={false}>
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={true}
|
enableRouting={true}
|
||||||
withStacked={true}
|
withStacked={true}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<EmptyPlaceholder text={$t('no_favorites_message')} />
|
<EmptyPlaceholder text={$t('no_favorites_message')} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</UserPageLayout>
|
</UserPageLayout>
|
||||||
|
|
||||||
<!-- Multiselection mode app bar -->
|
<!-- Multiselection mode app bar -->
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
||||||
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
||||||
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AppRoute, AssetAction } from '$lib/constants';
|
import { AppRoute, AssetAction } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
</Button>
|
</Button>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={true}
|
enableRouting={true}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
{assetInteraction}
|
{assetInteraction}
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<EmptyPlaceholder text={$t('no_locked_photos_message')} title={$t('nothing_here_yet')} />
|
<EmptyPlaceholder text={$t('no_locked_photos_message')} title={$t('nothing_here_yet')} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</UserPageLayout>
|
</UserPageLayout>
|
||||||
|
|
||||||
<!-- Multi-selection mode app bar -->
|
<!-- Multi-selection mode app bar -->
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@
|
|||||||
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';
|
||||||
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
||||||
import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
|
import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AppRoute } from '$lib/constants';
|
import { AppRoute } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
<main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
|
||||||
<AssetGrid enableRouting={true} {timelineManager} {assetInteraction} onEscape={handleEscape} />
|
<Timeline enableRouting={true} {timelineManager} {assetInteraction} onEscape={handleEscape} />
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
{#if assetInteraction.selectionActive}
|
{#if assetInteraction.selectionActive}
|
||||||
|
|||||||
+3
-3
@@ -29,7 +29,7 @@
|
|||||||
NotificationType,
|
NotificationType,
|
||||||
notificationController,
|
notificationController,
|
||||||
} from '$lib/components/shared-components/notification/notification';
|
} from '$lib/components/shared-components/notification/notification';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AppRoute, PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
|
import { AppRoute, PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||||
@@ -386,7 +386,7 @@
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{#key person.id}
|
{#key person.id}
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={true}
|
enableRouting={true}
|
||||||
{person}
|
{person}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
@@ -498,7 +498,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
{/key}
|
{/key}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
import MemoryLane from '$lib/components/photos-page/memory-lane.svelte';
|
import MemoryLane from '$lib/components/photos-page/memory-lane.svelte';
|
||||||
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
|
||||||
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AssetAction } from '$lib/constants';
|
import { AssetAction } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<UserPageLayout hideNavbar={assetInteraction.selectionActive} showUploadButton scrollbar={false}>
|
<UserPageLayout hideNavbar={assetInteraction.selectionActive} showUploadButton scrollbar={false}>
|
||||||
<AssetGrid
|
<Timeline
|
||||||
enableRouting={true}
|
enableRouting={true}
|
||||||
{timelineManager}
|
{timelineManager}
|
||||||
{assetInteraction}
|
{assetInteraction}
|
||||||
@@ -103,7 +103,7 @@
|
|||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<EmptyPlaceholder text={$t('no_assets_message')} onClick={() => openFileUploadDialog()} />
|
<EmptyPlaceholder text={$t('no_assets_message')} onClick={() => openFileUploadDialog()} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</UserPageLayout>
|
</UserPageLayout>
|
||||||
|
|
||||||
{#if assetInteraction.selectionActive}
|
{#if assetInteraction.selectionActive}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import TreeItemThumbnails from '$lib/components/shared-components/tree/tree-item-thumbnails.svelte';
|
import TreeItemThumbnails from '$lib/components/shared-components/tree/tree-item-thumbnails.svelte';
|
||||||
import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';
|
import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';
|
||||||
import Sidebar from '$lib/components/sidebar/sidebar.svelte';
|
import Sidebar from '$lib/components/sidebar/sidebar.svelte';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';
|
import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import TagCreateModal from '$lib/modals/TagCreateModal.svelte';
|
import TagCreateModal from '$lib/modals/TagCreateModal.svelte';
|
||||||
@@ -117,11 +117,11 @@
|
|||||||
|
|
||||||
<section class="mt-2 h-[calc(100%-(--spacing(20)))] overflow-auto immich-scrollbar">
|
<section class="mt-2 h-[calc(100%-(--spacing(20)))] overflow-auto immich-scrollbar">
|
||||||
{#if tag.hasAssets}
|
{#if tag.hasAssets}
|
||||||
<AssetGrid enableRouting={true} {timelineManager} {assetInteraction} removeAction={AssetAction.UNARCHIVE}>
|
<Timeline enableRouting={true} {timelineManager} {assetInteraction} removeAction={AssetAction.UNARCHIVE}>
|
||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<TreeItemThumbnails items={tag.children} icon={mdiTag} onClick={handleNavigation} />
|
<TreeItemThumbnails items={tag.children} icon={mdiTag} onClick={handleNavigation} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
{:else}
|
{:else}
|
||||||
<TreeItemThumbnails items={tag.children} icon={mdiTag} onClick={handleNavigation} />
|
<TreeItemThumbnails items={tag.children} icon={mdiTag} onClick={handleNavigation} />
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
notificationController,
|
notificationController,
|
||||||
NotificationType,
|
NotificationType,
|
||||||
} from '$lib/components/shared-components/notification/notification';
|
} from '$lib/components/shared-components/notification/notification';
|
||||||
import AssetGrid from '$lib/components/timeline/base-components/base-timeline.svelte';
|
import Timeline from '$lib/components/timeline/timeline.svelte';
|
||||||
import { AppRoute } from '$lib/constants';
|
import { AppRoute } from '$lib/constants';
|
||||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||||
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
|
||||||
@@ -116,14 +116,14 @@
|
|||||||
</HStack>
|
</HStack>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
<AssetGrid enableRouting={true} {timelineManager} {assetInteraction} onEscape={handleEscape}>
|
<Timeline enableRouting={true} {timelineManager} {assetInteraction} onEscape={handleEscape}>
|
||||||
<p class="font-medium text-gray-500/60 dark:text-gray-300/60 p-4">
|
<p class="font-medium text-gray-500/60 dark:text-gray-300/60 p-4">
|
||||||
{$t('trashed_items_will_be_permanently_deleted_after', { values: { days: $serverConfig.trashDays } })}
|
{$t('trashed_items_will_be_permanently_deleted_after', { values: { days: $serverConfig.trashDays } })}
|
||||||
</p>
|
</p>
|
||||||
{#snippet empty()}
|
{#snippet empty()}
|
||||||
<EmptyPlaceholder text={$t('trash_no_results_message')} src={empty3Url} />
|
<EmptyPlaceholder text={$t('trash_no_results_message')} src={empty3Url} />
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</AssetGrid>
|
</Timeline>
|
||||||
</UserPageLayout>
|
</UserPageLayout>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user