sascha
/
immich
mirror of https://github.com/immich-app/immich.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(web): justify layout import (#16267) 

* fix(web): justify layout import

* remove dead code
pull/16282/head
Alex 2025-02-22 17:38:08 +07:00 committed by GitHub
parent 4376fd72b7
commit ec58e1065f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
web/src/lib/stores/assets.store.ts
Unescape Escape View File

@ -4,6 +4,7 @@ import { AssetGridTaskManager } from '$lib/utils/asset-store-task-manager';
import { generateId } from '$lib/utils/generate-id';
import type { AssetGridRouteSearchParams } from '$lib/utils/navigation';
import { fromLocalDateTime, splitBucketIntoDateGroups, type DateGroup } from '$lib/utils/timeline-util';
import type { JustifiedLayout, LayoutOptions } from '@immich/justified-layout-wasm';
import { TimeBucketSize, getAssetInfo, getTimeBucket, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
import { throttle } from 'lodash-es';
import { DateTime } from 'luxon';
@ -226,6 +227,7 @@ export class AssetStore {
maxBucketAssets = 0;
listeners: BucketListener[] = [];
getJustifiedLayoutFromAssets: ((assets: AssetResponseDto[], options: LayoutOptions) => JustifiedLayout) | undefined;
constructor(
options: AssetStoreOptions,
@ -387,6 +389,13 @@ export class AssetStore {
);
this.initializedSignal();
this.initialized = true;
// TODO: move to top level import after https://github.com/sveltejs/kit/issues/7805 is fixed
import('$lib/utils/layout-utils')
.then(({ getJustifiedLayoutFromAssets }) => {
this.getJustifiedLayoutFromAssets = getJustifiedLayoutFromAssets;
})
.catch(() => void 0);
}
async updateOptions(options: AssetStoreOptions) {
@ -435,7 +444,7 @@ export class AssetStore {
private async initialLayout(changedWidth: boolean) {
for (const bucket of this.buckets) {
await this.updateGeometry(bucket, changedWidth);
this.updateGeometry(bucket, changedWidth);
}
this.timelineHeight = this.buckets.reduce((accumulator, b) => accumulator + b.bucketHeight, 0);
@ -453,7 +462,7 @@ export class AssetStore {
this.emit(false);
}
private async updateGeometry(bucket: AssetBucket, invalidateHeight: boolean) {
private updateGeometry(bucket: AssetBucket, invalidateHeight: boolean) {
if (invalidateHeight) {
bucket.isBucketHeightActual = false;
bucket.measured = false;
@ -476,8 +485,7 @@ export class AssetStore {
rowHeight: 235,
rowWidth: Math.floor(viewportWidth),
};
// TODO: move this import and make this method sync after https://github.com/sveltejs/kit/issues/7805 is fixed
const { getJustifiedLayoutFromAssets } = await import('$lib/utils/layout-utils');
for (const assetGroup of bucket.dateGroups) {
if (!assetGroup.heightActual) {
const unwrappedWidth = (3 / 2) * assetGroup.assets.length * THUMBNAIL_HEIGHT * (7 / 10);
@ -486,7 +494,9 @@ export class AssetStore {
assetGroup.height = height;
}
assetGroup.geometry = getJustifiedLayoutFromAssets(assetGroup.assets, layoutOptions);
if (this.getJustifiedLayoutFromAssets) {
assetGroup.geometry = this.getJustifiedLayoutFromAssets(assetGroup.assets, layoutOptions);
}
}
}
@ -553,7 +563,7 @@ export class AssetStore {
bucket.assets = assets;
bucket.dateGroups = splitBucketIntoDateGroups(bucket, get(locale));
this.maxBucketAssets = Math.max(this.maxBucketAssets, assets.length);
await this.updateGeometry(bucket, true);
this.updateGeometry(bucket, true);
this.timelineHeight = this.buckets.reduce((accumulator, b) => accumulator + b.bucketHeight, 0);
bucket.loaded();
this.notifyListeners({ type: 'loaded', bucket });
@ -680,7 +690,7 @@ export class AssetStore {
return bDate.diff(aDate).milliseconds;
});
bucket.dateGroups = splitBucketIntoDateGroups(bucket, get(locale));
void this.updateGeometry(bucket, true);
this.updateGeometry(bucket, true);
}
this.emit(true);