High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(web): replace per-asset viewport proximity with day-tier active indices (#28597)
Min Idzelis1bd367bd5186
diff --git a/web/src/lib/components/timeline/AssetLayout.svelte b/web/src/lib/components/timeline/AssetLayout.svelteindex 88f03ef46a..59b8499d79 100644--- a/web/src/lib/components/timeline/AssetLayout.svelte+++ b/web/src/lib/components/timeline/AssetLayout.svelte@@ -30,14 +30,11 @@const transitionDuration = $derived(manager.suspendTransitions && !$isUploading ? 0 : 150);const scaleDuration = $derived(transitionDuration === 0 ? 0 : transitionDuration + 100);-- const firstInOrNearViewport = $derived(viewerAssets.findIndex((a) => a.isInOrNearViewport));- const lastInOrNearViewport = $derived(viewerAssets.findLastIndex((a) => a.isInOrNearViewport));</script><!-- Image grid --><div data-image-grid class="relative overflow-clip" style:height={height + 'px'} style:width={width + 'px'}>- {#each viewerAssets.slice(firstInOrNearViewport, lastInOrNearViewport + 1) as viewerAsset (viewerAsset.id)}+ {#each viewerAssets as viewerAsset (viewerAsset.id)}{@const position = viewerAsset.position!}{@const asset = viewerAsset.asset!}diff --git a/web/src/lib/components/timeline/Month.svelte b/web/src/lib/components/timeline/Month.svelteindex 3f4b9b0661..7cbfd67ddf 100644--- a/web/src/lib/components/timeline/Month.svelte+++ b/web/src/lib/components/timeline/Month.svelte@@ -100,7 +100,7 @@<AssetLayout{manager}- viewerAssets={timelineDay.viewerAssets}+ viewerAssets={timelineDay.activeViewerAssets}height={timelineDay.height}width={timelineDay.width}{customThumbnailLayout}diff --git a/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.ts b/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.tsindex bb3ae72c81..3175fd3c3e 100644--- a/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.ts+++ b/web/src/lib/managers/timeline-manager/internal/intersection-support.svelte.ts@@ -53,17 +53,3 @@ export function updateTimelineMonthViewportProximity(timelineManager: TimelineMatimelineManager.clearDeferredLayout(month);}}--export function calculateViewerAssetViewportProximity(- timelineManager: TimelineManager,- positionTop: number,- positionHeight: number,-) {- const headerHeight = timelineManager.headerHeight;- return calculateViewportProximity(- positionTop,- positionTop + positionHeight,- timelineManager.visibleWindow.top - headerHeight,- timelineManager.visibleWindow.bottom + headerHeight,- );-}diff --git a/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-day.svelte.tsindex c3d53be67a..2515acc385 100644--- a/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts+++ b/web/src/lib/managers/timeline-manager/timeline-day.svelte.ts@@ -1,12 +1,31 @@import { AssetOrder, AssetOrderBy } from '@immich/sdk';import { SvelteSet } from 'svelte/reactivity';-import type { CommonLayoutOptions } from '$lib/utils/layout-utils';+import type { CommonLayoutOptions, CommonPosition } from '$lib/utils/layout-utils';import { getJustifiedLayoutFromAssets } from '$lib/utils/layout-utils';import { getOrderingDate, plainDateTimeCompare } from '$lib/utils/timeline-util';+import { TUNABLES } from '$lib/utils/tunables';import type { TimelineMonth } from './timeline-month.svelte';import type { Direction, MoveAsset, TimelineAsset } from './types';import { ViewerAsset } from './viewer-asset.svelte';+const {+ TIMELINE: { INTERSECTION_EXPAND_TOP, INTERSECTION_EXPAND_BOTTOM },+} = TUNABLES;++function lowerBound(assets: ViewerAsset[], target: number, key: (pos: CommonPosition) => number): number {+ let lo = 0;+ let hi = assets.length;+ while (lo < hi) {+ const mid = Math.floor((lo + hi) / 2);+ if (key(assets[mid].position!) < target) {+ lo = mid + 1;+ } else {+ hi = mid;+ }+ }+ return lo;+}+export class TimelineDay {readonly timelineMonth: TimelineMonth;readonly index: number;@@ -18,12 +37,15 @@ export class TimelineDay {height = $state(0);width = $state(0);+ // Assets in or near the viewport; active assets should be added to the DOM.+ activeViewerAssets: ViewerAsset[] = $state([]);+ isInOrNearViewport = $state(false);+#top: number = $state(0);#start: number = $state(0);#row = $state(0);#col = $state(0);#deferredLayout = false;- #lastInOrNearViewport = -1;constructor(timelineMonth: TimelineMonth, index: number, day: number, groupTitle: string, orderBy: AssetOrderBy) {this.index = index;@@ -149,18 +171,32 @@ export class TimelineDay {for (let i = 0; i < this.viewerAssets.length; i++) {this.viewerAssets[i].position = geometry.getPosition(i);}+ this.updateAssetBoundaries();}- get absoluteTimelineDayTop() {- return this.timelineMonth.top + this.#top;- }-- get isInOrNearViewport() {- if (this.#lastInOrNearViewport !== -1 && this.viewerAssets[this.#lastInOrNearViewport].isInOrNearViewport) {- return true;+ updateAssetBoundaries() {+ const manager = this.timelineMonth.timelineManager;+ const visibleWindow = manager.visibleWindow;+ if (this.viewerAssets.length === 0 || !this.viewerAssets[0].position) {+ this.activeViewerAssets = [];+ this.isInOrNearViewport = false;+ return;}- this.#lastInOrNearViewport = this.viewerAssets.findIndex((viewAsset) => viewAsset.isInOrNearViewport);- return this.#lastInOrNearViewport !== -1;+ const dayOffset = this.absoluteTimelineDayTop;+ const headerHeight = manager.headerHeight;+ const expandedTop = visibleWindow.top - headerHeight - INTERSECTION_EXPAND_TOP - dayOffset;+ const expandedBottom = visibleWindow.bottom + headerHeight + INTERSECTION_EXPAND_BOTTOM - dayOffset;++ const first = lowerBound(this.viewerAssets, expandedTop, (p) => p.top + p.height);+ const last = lowerBound(this.viewerAssets, expandedBottom, (p) => p.top) - 1;++ const hasActive = last >= first && first < this.viewerAssets.length;+ this.activeViewerAssets = hasActive ? this.viewerAssets.slice(first, last + 1) : [];+ this.isInOrNearViewport = hasActive;+ }++ get absoluteTimelineDayTop() {+ return this.timelineMonth.top + this.#top;}}diff --git a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.tsindex 32e6d90d1c..5ac2deaa54 100644--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts@@ -214,6 +214,11 @@ export class TimelineManager extends VirtualScrollManager {for (const month of this.months) {updateTimelineMonthViewportProximity(this, month);+ if (month.isInOrNearViewport && month.isLoaded) {+ for (const day of month.timelineDays) {+ day.updateAssetBoundaries();+ }+ }}const month = this.months.find((month) => month.isInViewport);diff --git a/web/src/lib/managers/timeline-manager/timeline-month.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-month.svelte.tsindex b6706e1ea1..54a0edc784 100644--- a/web/src/lib/managers/timeline-manager/timeline-month.svelte.ts+++ b/web/src/lib/managers/timeline-manager/timeline-month.svelte.ts@@ -254,7 +254,7 @@ export class TimelineMonth {addContext.newTimelineDays.add(timelineDay);}- const viewerAsset = new ViewerAsset(timelineDay, timelineAsset);+ const viewerAsset = new ViewerAsset(timelineAsset);timelineDay.viewerAssets.push(viewerAsset);addContext.changedTimelineDays.add(timelineDay);}diff --git a/web/src/lib/managers/timeline-manager/viewer-asset.svelte.ts b/web/src/lib/managers/timeline-manager/viewer-asset.svelte.tsindex 0179dd9e74..3a4ed4545c 100644--- a/web/src/lib/managers/timeline-manager/viewer-asset.svelte.ts+++ b/web/src/lib/managers/timeline-manager/viewer-asset.svelte.ts@@ -1,36 +1,12 @@import type { CommonPosition } from '$lib/utils/layout-utils';-import {- ViewportProximity,- calculateViewerAssetViewportProximity,- isInOrNearViewport,-} from './internal/intersection-support.svelte';-import type { TimelineDay } from './timeline-day.svelte';import type { TimelineAsset } from './types';export class ViewerAsset {- readonly #group: TimelineDay;-- #viewportProximity = $derived.by(() => {- if (!this.position) {- return ViewportProximity.FarFromViewport;- }-- const store = this.#group.timelineMonth.timelineManager;- const positionTop = this.#group.absoluteTimelineDayTop + this.position.top;-- return calculateViewerAssetViewportProximity(store, positionTop, this.position.height);- });-- get isInOrNearViewport() {- return isInOrNearViewport(this.#viewportProximity);- }-position: CommonPosition | undefined = $state.raw();asset: TimelineAsset = $state() as TimelineAsset;id: string = $derived(this.asset.id);- constructor(group: TimelineDay, asset: TimelineAsset) {- this.#group = group;+ constructor(asset: TimelineAsset) {this.asset = asset;}}