feat: add navigate back to command logic

luisburgos · Aug 6, 2022 · 35fd9a8 · 35fd9a8
1 parent 0b00b15
commit 35fd9a8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/lib/navigation/commands.dart b/lib/navigation/commands.dart
@@ -14,15 +14,15 @@ class NavigationDirections {
 }
 
 class NavigateToCommand extends NavigationCommand {
+  NavigateToCommand({required this.directions});
+
   NavigateToCommand.named(String named)
       : this(
           directions: NavigationDirections(
             routeBuilder: () => named,
           ),
         );
 
-  NavigateToCommand({required this.directions});
-
   final NavigationDirections directions;
 
   @override
@@ -44,4 +44,15 @@ class NavigateBackCommand extends NavigationCommand {
   }
 }
 
-class NavigateBackToCommand extends NavigationCommand {}
+class NavigateBackToCommand extends NavigationCommand {
+  NavigateBackToCommand({required this.directions});
+
+  NavigateBackToCommand.named(String named)
+      : this(
+          directions: NavigationDirections(
+            routeBuilder: () => named,
+          ),
+        );
+
+  final NavigationDirections directions;
+}
diff --git a/lib/navigation/event_handler.dart b/lib/navigation/event_handler.dart
@@ -16,14 +16,23 @@ class NavigationCommandHandler extends TypedEventHandler<NavigationCommand> {
   @override
   //ignore: avoid_renaming_method_parameters
   void handle(NavigationCommand command) {
-    if (command is NavigateBackCommand) {
+    if (command is NavigateBackCommand || command is NavigateBackToCommand) {
       if (_canPop()) {
         navigator.back();
         Buzz.fire(OnNavigatedBackEvent());
         return;
       }
 
-      final fallback = command.preferredBackDefault ?? backDefault;
+      String fallback = backDefault;
+      if (command is NavigateBackCommand) {
+        //TODO: Watch for duplicated logic. Improve method design.
+        fallback = command.preferredBackDefault ?? backDefault;
+      }
+
+      if (command is NavigateBackToCommand) {
+        fallback = command.directions.routeBuilder();
+      }
+
       navigator.offAndToNamed(fallback);
       Buzz.fire(OnNavigatedBackEvent(fallbackPath: fallback));
     }