diff --git a/CHANGELOG.md b/CHANGELOG.md index d5c4edfae..5ff147653 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ All notable changes to this project will be documented in this file. - Slideshow: keep playing when losing focus but app is still visible (e.g. split screen) - upgraded Flutter to stable v3.16.7 +### Fixed + +- crash when loading some large DNG in viewer +- searching from drawer on mobile + ## [v1.10.2] - 2023-12-24 ### Changed diff --git a/lib/widgets/navigation/drawer/page_nav_tile.dart b/lib/widgets/navigation/drawer/page_nav_tile.dart index 8636828b8..fedcaffa9 100644 --- a/lib/widgets/navigation/drawer/page_nav_tile.dart +++ b/lib/widgets/navigation/drawer/page_nav_tile.dart @@ -50,7 +50,7 @@ class PageNavTile extends StatelessWidget { : null, onTap: () { Navigator.maybeOf(context)?.pop(); - final route = routeBuilder(context, routeName); + final route = routeBuilder(context, routeName, topLevel); if (topLevel) { Navigator.maybeOf(context)?.pushAndRemoveUntil( route, @@ -65,7 +65,7 @@ class PageNavTile extends StatelessWidget { ); } - static Route routeBuilder(BuildContext context, String routeName) { + static Route routeBuilder(BuildContext context, String routeName, bool topLevel) { switch (routeName) { case SearchPage.routeName: final currentCollection = context.read(); @@ -74,7 +74,7 @@ class PageNavTile extends StatelessWidget { searchFieldLabel: context.l10n.searchCollectionFieldHint, searchFieldStyle: Themes.searchFieldStyle(context), source: context.read(), - parentCollection: currentCollection?.copyWith(), + parentCollection: topLevel ? currentCollection?.copyWith() : currentCollection, ), ); default: diff --git a/lib/widgets/navigation/tv_rail.dart b/lib/widgets/navigation/tv_rail.dart index a54799173..60175254f 100644 --- a/lib/widgets/navigation/tv_rail.dart +++ b/lib/widgets/navigation/tv_rail.dart @@ -253,7 +253,7 @@ class _TvRailState extends State { void _goTo(String routeName) { Navigator.maybeOf(context)?.pushAndRemoveUntil( - PageNavTile.routeBuilder(context, routeName), + PageNavTile.routeBuilder(context, routeName, true), (route) => false, ); }