fix: Navigation stack crashed while there is a modal

Author: Losses

lib/screens/search/utils/backspace_action.dart

@@ -2,10 +2,12 @@ import 'package:rune/utils/router/base_route_entry.dart';
 
 class ModalRouteEntry extends BaseRouteEntry {
   final (bool, dynamic) Function()? canPop;
+  final void Function() pop;
 
   ModalRouteEntry({
     required super.name,
     super.arguments,
     this.canPop,
+    required this.pop,
   });
 }

lib/utils/router/modal_route_entry.dart

@@ -31,6 +31,9 @@ class _ModalRouteWrapperState extends State<ModalRouteWrapper> {
         name: widget.name,
         arguments: widget.arguments,
         canPop: widget.canPop,
+        pop: () {
+          _handleClose(null);
+        },
       ),
     );
   }

lib/utils/router/modal_route_wrapper.dart

@@ -5,6 +5,7 @@ import '../../widgets/router/rune_with_navigation_bar_and_playback_controllor.da
 import '../../providers/router_path.dart';
 
 import 'history.dart';
+import 'modal_route_entry.dart';
 import 'route_entry.dart';
 import 'modal_route_wrapper.dart';
 import 'router_transition_parameter.dart';
@@ -28,35 +29,32 @@ bool $canPop() {
 bool $pop() {
   final navigation = $state();
   if ($canPop()) {
-    final (canPop, result) = $history.pop();
+    final current = $history.current;
+
+    final canPop = $canPop();
     if (!canPop) return false;
 
-    final current = $history.current;
     if (current != null) {
+      if (current is ModalRouteEntry) {
+        current.pop();
+        $history.pop();
+        return true;
+      }
+
       if (current is RouteEntry) {
+        final (success, result) = $history.pop();
         final settings = current.toSettings();
         $router.update(settings.name, settings.arguments);
+        navigation.pop(result);
+        return true;
       }
-      navigation.pop(result);
+
+      return false;
     }
-    return true;
   }
   return false;
 }
 
-Future<bool> $popModal() async {
-  if (!$history.isCurrentModal) {
-    return false;
-  }
-
-  final (canPop, result) = $history.pop();
-  if (canPop) {
-    final navigation = $state();
-    navigation.pop(result);
-  }
-  return true;
-}
-
 Future<T?> $showModal<T extends Object?>(
   BuildContext context,
   Widget Function(BuildContext context, void Function(T? result) close)

lib/utils/router/navigation.dart

@@ -34,14 +34,6 @@ class NavigationHistory {
   (bool, dynamic) pop() {
     if (history.isEmpty) return (false, null);
 
-    final last = history.last;
-    if (last is ModalRouteEntry && last.canPop != null) {
-      final result = last.canPop!();
-      if (!result.$1) return (false, null);
-      history.removeLast();
-      return result;
-    }
-
     history.removeLast();
     return (true, null);
   }