fix: restore ancestors album to currentRemoteAlbumProvider when popping

2025-09-21 23:19:12 -05:00
parent 8465d6c493
commit 91d6fedbf2
3 changed files with 13 additions and 7 deletions
@@ -1,4 +1,5 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -226,10 +227,19 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
        if (didPop || !mounted) {
          return;
        }
-        final hasAncestor = context.findAncestorWidgetOfExactType<RemoteAlbumPage>() != null;
+
+        final ancestors = context.router.stack.take(context.router.stack.length - 1);
+        final ancestorPage = ancestors.lastWhereOrNull((route) {
+          return route.name == RemoteAlbumRoute.page.name;
+        });
+
        Navigator.of(context).pop();
-        if (!hasAncestor) {
+
+        if (ancestorPage == null) {
          ref.read(currentRemoteAlbumProvider.notifier).dispose();
+        } else {
+          final album = (ancestorPage.routeData.args as RemoteAlbumRouteArgs).album;
+          ref.read(currentRemoteAlbumProvider.notifier).setAlbum(album);
        }
      },
      child: ProviderScope(