refactor(web): expose scaled image dimensions from AdaptiveImage

Change-Id: Iae105fb749525739ba8df5b944a73ea66a6a6964

mise.lock

@@ -1,30 +1,30 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
 
 [[tools."aqua:flutter/flutter"]]
-version = "3.44.1"
+version = "3.44.0"
 backend = "aqua:flutter/flutter"
 
 [tools."aqua:flutter/flutter"."platforms.linux-arm64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.1-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-arm64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.1-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.1-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-x64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.1-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.macos-arm64"]
-checksum = "blake3:15069c982a30ca0189a83edb5627b69d91485ad94fb74d2de8585b43364e9e8e"
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.1-stable.zip"
+checksum = "blake3:fb03aa5d9790205c948922ec3f0751c16e4575b09d6ae9dd4fbeb664a69f0e00"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.0-stable.zip"
 
 [tools."aqua:flutter/flutter"."platforms.macos-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.1-stable.zip"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.0-stable.zip"
 
 [tools."aqua:flutter/flutter"."platforms.windows-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.1-stable.zip"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.0-stable.zip"
 
 [[tools.flutter]]
 version = "3.41.9-stable"

mise.toml

@@ -16,7 +16,7 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-"aqua:flutter/flutter" = "3.44.1"
+"aqua:flutter/flutter" = "3.44.0"
 pnpm = "10.33.4"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"

mobile/lib/domain/models/settings_key.dart

@@ -1,15 +1,16 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/models/value_codec.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
 enum SettingsKey<T extends Object> {
   // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   themeDynamic<bool>(),
   themeColorfulInterface<bool>(),
 
@@ -27,11 +28,11 @@ enum SettingsKey<T extends Object> {
   networkAutoEndpointSwitching<bool>(),
   networkPreferredWifiName<String>(),
   networkLocalEndpoint<String>(),
-  networkExternalEndpointList<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: MapCodec(PrimitiveCodec.string, PrimitiveCodec.string)),
+  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
 
   // Album
-  albumSortMode<AlbumSortMode>(codec: EnumCodec(AlbumSortMode.values)),
+  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
   albumIsReverse<bool>(),
   albumIsGrid<bool>(),
 
@@ -45,23 +46,23 @@ enum SettingsKey<T extends Object> {
 
   // Timeline
   timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: EnumCodec(GroupAssetsBy.values)),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
   mapRelativeDate<int>(),
   mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   mapWithPartners<bool>(),
 
   // Cleanup
   cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
+  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
   cleanupCutoffDaysAgo<int>(),
   cleanupDefaultsInitialized<bool>(),
 
@@ -69,16 +70,148 @@ enum SettingsKey<T extends Object> {
   slideshowTransition<bool>(),
   slideshowRepeat<bool>(),
   slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: EnumCodec(SlideshowDirection.values));
+  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
 
-  final ValueCodec<T>? _codecOverride;
+  final _SettingsCodec<T>? _codecOverride;
 
-  const SettingsKey({ValueCodec<T>? codec}) : _codecOverride = codec;
+  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
 
-  ValueCodec<T> get _codec => _codecOverride ?? ValueCodec.forType(T);
+  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
+
+sealed class _SettingsCodec<T extends Object> {
+  const _SettingsCodec();
+
+  String encode(T value);
+  T decode(String raw);
+
+  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+    int: _PrimitiveCodec.integer,
+    double: _PrimitiveCodec.real,
+    bool: _PrimitiveCodec.boolean,
+    String: _PrimitiveCodec.string,
+    DateTime: _DateTimeCodec(),
+  };
+
+  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
+    if (codec == null) {
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+    }
+    return codec as _SettingsCodec<T>;
+  }
+}
+
+final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+  final List<T> values;
+
+  const _EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+}
+
+final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+  const _DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime decode(String raw) => DateTime.parse(raw);
+}
+
+final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
+  final _SettingsCodec<K> _keyCodec;
+  final _SettingsCodec<V> _valueCodec;
+
+  const _MapCodec(this._keyCodec, this._valueCodec);
+
+  @override
+  String encode(Map<K, V> value) {
+    final entries = <String, String>{};
+    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
+    return jsonEncode(entries);
+  }
+
+  @override
+  Map<K, V> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) {
+        return {};
+      }
+      final result = <K, V>{};
+      for (final entry in decoded.entries) {
+        final rawKey = entry.key;
+        final rawValue = entry.value;
+        if (rawKey is! String || rawValue is! String) {
+          return {};
+        }
+        final k = _keyCodec.decode(rawKey);
+        final v = _valueCodec.decode(rawValue);
+        result[k] = v;
+      }
+      return result;
+    } on FormatException {
+      return {};
+    }
+  }
+}
+
+final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
+  final _SettingsCodec<T> _elementCodec;
+
+  const _ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) {
+        return [];
+      }
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) {
+          return [];
+        }
+        final element = _elementCodec.decode(item);
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return [];
+    }
+  }
+}
+
+final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+  final T Function(String) _parse;
+
+  const _PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  T decode(String raw) => _parse(raw);
+
+  static const integer = _PrimitiveCodec<int>._(int.parse);
+  static const real = _PrimitiveCodec<double>._(double.parse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
+  static const string = _PrimitiveCodec<String>._(_identity);
+
+  static String _identity(String s) => s;
+}

mobile/lib/domain/models/value_codec.dart

@@ -1,133 +0,0 @@
-import 'dart:convert';
-
-sealed class ValueCodec<T extends Object> {
-  const ValueCodec();
-
-  String encode(T value);
-  T decode(String raw);
-
-  static const Map<Type, ValueCodec<Object>> _primitives = {
-    int: PrimitiveCodec.integer,
-    double: PrimitiveCodec.real,
-    bool: PrimitiveCodec.boolean,
-    String: PrimitiveCodec.string,
-    DateTime: DateTimeCodec(),
-  };
-
-  static ValueCodec<T> forType<T extends Object>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
-    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the key.');
-    }
-    return codec as ValueCodec<T>;
-  }
-}
-
-final class EnumCodec<T extends Enum> extends ValueCodec<T> {
-  final List<T> values;
-
-  const EnumCodec(this.values);
-
-  @override
-  String encode(T value) => value.name;
-
-  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
-}
-
-final class DateTimeCodec extends ValueCodec<DateTime> {
-  const DateTimeCodec();
-
-  @override
-  String encode(DateTime value) => value.toIso8601String();
-
-  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
-}
-
-final class MapCodec<K extends Object, V extends Object> extends ValueCodec<Map<K, V>> {
-  final ValueCodec<K> _keyCodec;
-  final ValueCodec<V> _valueCodec;
-
-  const MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return {};
-      }
-      final result = <K, V>{};
-      for (final entry in decoded.entries) {
-        final rawKey = entry.key;
-        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) {
-          return {};
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return {};
-    }
-  }
-}
-
-final class ListCodec<T extends Object> extends ValueCodec<List<T>> {
-  final ValueCodec<T> _elementCodec;
-
-  const ListCodec(this._elementCodec);
-
-  @override
-  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
-
-  @override
-  List<T> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! List) {
-        return [];
-      }
-      final result = <T>[];
-      for (final item in decoded) {
-        if (item is! String) {
-          return [];
-        }
-        final element = _elementCodec.decode(item);
-        result.add(element);
-      }
-      return result;
-    } on FormatException {
-      return [];
-    }
-  }
-}
-
-final class PrimitiveCodec<T extends Object> extends ValueCodec<T> {
-  final T Function(String) _parse;
-
-  const PrimitiveCodec._(this._parse);
-
-  @override
-  String encode(T value) => value.toString();
-
-  @override
-  T decode(String raw) => _parse(raw);
-
-  static const integer = PrimitiveCodec<int>._(int.parse);
-  static const real = PrimitiveCodec<double>._(double.parse);
-  static const boolean = PrimitiveCodec<bool>._(bool.parse);
-  static const string = PrimitiveCodec<String>._(_identity);
-
-  static String _identity(String s) => s;
-}

mobile/lib/infrastructure/repositories/cached_key_value_repository.dart

@@ -1,37 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-// ignore: depend_on_referenced_packages
-import 'package:meta/meta.dart';
-
-abstract class CachedKeyValueRepository<K extends Enum, S> {
-  CachedKeyValueRepository(this._snapshot);
-
-  S _snapshot;
-  S get snapshot => _snapshot;
-  @protected
-  set snapshot(S value) => _snapshot = value;
-
-  List<K> get keys;
-
-  Object decodeValue(K key, String raw);
-
-  S buildSnapshot(Map<K, Object> overrides);
-
-  Selectable<({String key, String value})> selectable();
-
-  Future<void> refresh() async => _snapshot = _build(await selectable().get());
-
-  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));
-
-  S _build(List<({String key, String value})> rows) {
-    final overrides = <K, Object>{};
-    for (final row in rows) {
-      final key = keys.firstWhereOrNull((k) => k.name == row.key);
-      if (key == null) {
-        continue;
-      }
-      overrides[key] = decodeValue(key, row.value);
-    }
-    return buildSnapshot(overrides);
-  }
-}

mobile/lib/infrastructure/repositories/settings.repository.dart

@@ -1,14 +1,14 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig> {
+class SettingsRepository extends DriftDatabaseRepository {
   final Drift _db;
 
-  SettingsRepository._(this._db) : super(const .new());
+  SettingsRepository._(this._db) : super(_db);
 
   static SettingsRepository? _instance;
 
@@ -20,6 +20,9 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return instance;
   }
 
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
   static Future<SettingsRepository> ensureInitialized(Drift db) async {
     if (_instance == null) {
       final instance = SettingsRepository._(db);
@@ -29,20 +32,7 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return _instance!;
   }
 
-  @override
-  List<SettingsKey> get keys => SettingsKey.values;
-
-  @override
-  Object decodeValue(SettingsKey key, String raw) => key.decode(raw);
-
-  @override
-  AppConfig buildSnapshot(Map<SettingsKey, Object> overrides) => AppConfig.fromEntries(overrides);
-
-  @override
-  Selectable<({String key, String value})> selectable() =>
-      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));
-
-  AppConfig get appConfig => snapshot;
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
 
   Future<void> clear(Iterable<SettingsKey> keys) async {
     if (keys.isEmpty) {
@@ -52,15 +42,13 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     final names = keys.map((key) => key.name).toList();
     await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
 
-    var config = snapshot;
     for (final key in keys) {
-      config = config.write(key, defaultConfig.read(key));
+      _appConfig = _appConfig.write(key, defaultConfig.read(key));
     }
-    snapshot = config;
   }
 
   Future<void> write<T extends Object, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == snapshot.read(key)) {
+    if (value == _appConfig.read(key)) {
       return;
     }
 
@@ -73,8 +61,24 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
         .insertOnConflictUpdate(
           SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
         );
-    snapshot = snapshot.write(key, value);
+    _appConfig = _appConfig.write(key, value);
   }
 
-  Stream<AppConfig> watchConfig() => watchSnapshot();
+  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<SettingsEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        return {...overrides, metadataKey: metadataKey.decode(row.value)};
+      }),
+    );
+  }
 }

mobile/lib/utils/openapi_patching.dart

@@ -19,7 +19,6 @@ dynamic upgradeDto(dynamic value, String targetType) {
       if (value is Map) {
         addDefault(value, 'mapLightStyleUrl', 'https://tiles.immich.cloud/v1/style/light.json');
         addDefault(value, 'mapDarkStyleUrl', 'https://tiles.immich.cloud/v1/style/dark.json');
-        addDefault(value, 'minFaces', 3);
       }
     case 'UserResponseDto':
       if (value is Map) {
@@ -55,7 +54,6 @@ dynamic upgradeDto(dynamic value, String targetType) {
     case 'ServerFeaturesDto':
       if (value is Map) {
         addDefault(value, 'ocr', false);
-        addDefault(value, 'realtimeTranscoding', false);
       }
       break;
     case 'MemoriesResponse':

mobile/pubspec.lock

@@ -1997,4 +1997,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.12.0 <4.0.0"
-  flutter: "3.44.1"
+  flutter: "3.44.0"

mobile/pubspec.yaml

@@ -6,7 +6,7 @@ version: 3.0.0+3047
 
 environment:
   sdk: '>=3.12.0 <4.0.0'
-  flutter: 3.44.1
+  flutter: 3.44.0
 
 dependencies:
   async: ^2.13.1

web/src/lib/components/AdaptiveImage.svelte

@@ -74,6 +74,8 @@
     onError?: () => void;
     ref?: HTMLDivElement;
     imgRef?: HTMLImageElement;
+    imgNaturalSize?: Size;
+    imgScaledSize?: Size;
     backdrop?: Snippet;
     overlays?: Snippet;
   };
@@ -82,6 +84,10 @@
     ref = $bindable(),
     // eslint-disable-next-line no-useless-assignment
     imgRef = $bindable(),
+    // eslint-disable-next-line no-useless-assignment
+    imgNaturalSize = $bindable(),
+    // eslint-disable-next-line no-useless-assignment
+    imgScaledSize = $bindable(),
     asset,
     sharedLink,
     objectFit = 'contain',
@@ -149,10 +155,22 @@
     return { width: 1, height: 1 };
   });
 
+  $effect(() => {
+    imgNaturalSize = imageDimensions;
+  });
+
+  const scaledDimensions = $derived.by(() => {
+    const scaleFn = objectFit === 'cover' ? scaleToCover : scaleToFit;
+    return scaleFn(imageDimensions, container);
+  });
+
+  $effect(() => {
+    imgScaledSize = scaledDimensions;
+  });
+
   const { insetInlineStart, top, displayWidth, displayHeight, rasterWidth, rasterHeight, rasterScale } = $derived.by(
     () => {
-      const scaleFn = objectFit === 'cover' ? scaleToCover : scaleToFit;
-      const { width, height } = scaleFn(imageDimensions, container);
+      const { width, height } = scaledDimensions;
       if (maxRasterPixels === 0) {
         return {
           insetInlineStart: (container.width - width) / 2 + 'px',

web/src/lib/components/asset-viewer/PhotoViewer.svelte

@@ -13,7 +13,7 @@
   import { SlideshowLook, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
   import { handlePromiseError } from '$lib/utils';
   import { canCopyImageToClipboard, copyImageToClipboard } from '$lib/utils/asset-utils';
-  import { getNaturalSize, scaleToFit, type Size } from '$lib/utils/container-utils';
+  import type { Size } from '$lib/utils/container-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { getOcrBoundingBoxes } from '$lib/utils/ocr-utils';
   import { getBoundingBox, type BoundingBox } from '$lib/utils/people-utils';
@@ -67,13 +67,9 @@
     height: containerHeight,
   });
 
-  const overlaySize = $derived.by((): Size => {
-    if (!assetViewerManager.imgRef || !visibleImageReady) {
-      return { width: 0, height: 0 };
-    }
+  let scaledDimensions = $state<Size>({ width: 0, height: 0 });
 
-    return scaleToFit(getNaturalSize(assetViewerManager.imgRef), { width: containerWidth, height: containerHeight });
-  });
+  const overlaySize = $derived(visibleImageReady ? scaledDimensions : { width: 0, height: 0 });
 
   const highlightedBoxes = $derived(getBoundingBox(assetViewerManager.highlightedFaces, overlaySize));
   const isHighlighting = $derived(highlightedBoxes.length > 0);
@@ -235,6 +231,7 @@
       onReady?.();
     }}
     bind:imgRef={assetViewerManager.imgRef}
+    bind:imgScaledSize={scaledDimensions}
     bind:ref={adaptiveImage}
   >
     {#snippet backdrop()}