From a724f147fe720a1272abab275e4c15ddd862eefd Mon Sep 17 00:00:00 2001 From: Yaros Date: Mon, 7 Apr 2025 16:35:27 +0200 Subject: [PATCH] fix(mobile): items not deselecting on back button (#17403) * fix: items not deselecting on back button * chore: add comments --- .../asset_grid/immich_asset_grid_view.dart | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart index 941a2a7ac6..1c0f9a2b56 100644 --- a/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart +++ b/mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart @@ -546,15 +546,16 @@ class ImmichAssetGridViewState extends ConsumerState { if (didPop) { return; } else { - if (widget.preselectedAssets == null) { - Navigator.of(context).canPop() ? Navigator.of(context).pop() : null; - } - if (_selectedAssets.length != widget.preselectedAssets!.length && - !widget.preselectedAssets!.containsAll(_selectedAssets)) { - { - _deselectAll(); - return; - } + /// `preselectedAssets` is only present when opening the asset grid from the + /// "add to album" button. + /// + /// `_selectedAssets` includes `preselectedAssets` on initialization. + if (_selectedAssets.length > + (widget.preselectedAssets?.length ?? 0)) { + /// `_deselectAll` only deselects the selected assets, + /// doesn't affect the preselected ones. + _deselectAll(); + return; } else { Navigator.of(context).canPop() ? Navigator.of(context).pop() : null; }