Add pushToCatalog and popFromCatalog methods to Routes class

PlugFox · Dec 18, 2023 · a1dc601 · a1dc601
1 parent 20083cc
commit a1dc601
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 9 deletions.
diff --git a/example/lib/src/common/router/routes.dart b/example/lib/src/common/router/routes.dart
@@ -67,4 +67,50 @@ enum Routes with OctopusRoute {
           ? CustomUserPage()
           : super.pageBuilder(context, node);
   */
+
+  /// Pushes the [route] to the catalog tab.
+  /// [id] is the product or category id for the [route].
+  static void pushToCatalog(BuildContext context, Routes route, String id) =>
+      Octopus.of(context).setState((state) {
+        final node = state.find((n) => n.name == 'catalog-tab');
+        if (node == null) {
+          return state
+            ..removeByName(Routes.shop.name)
+            ..add(Routes.shop.node(
+              children: <OctopusNode>[
+                OctopusNode.mutable(
+                  'catalog-tab',
+                  children: <OctopusNode>[
+                    Routes.catalog.node(),
+                    route.node(arguments: {'id': id}),
+                  ],
+                ),
+              ],
+            ))
+            ..arguments['shop'] = 'catalog';
+        }
+        node.children.add(route.node(arguments: {'id': id}));
+        return state..arguments['shop'] = 'catalog';
+      });
+
+  /// Pops the last [route] from the catalog tab.
+  static void popFromCatalog(BuildContext context) =>
+      Octopus.of(context).setState((state) {
+        final node = state.find((n) => n.name == 'catalog-tab');
+        if (node == null || node.children.length < 2) {
+          return state
+            ..removeByName(Routes.shop.name)
+            ..add(Routes.shop.node(
+              children: <OctopusNode>[
+                OctopusNode.mutable(
+                  'catalog-tab',
+                  children: <OctopusNode>[Routes.catalog.node()],
+                ),
+              ],
+            ))
+            ..arguments['shop'] = 'catalog';
+        }
+        node.children.removeLast();
+        return state;
+      });
 }
diff --git a/example/lib/src/feature/shop/widget/catalog_screen.dart b/example/lib/src/feature/shop/widget/catalog_screen.dart
@@ -183,10 +183,10 @@ class _CatalogTile extends StatelessWidget {
           textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.bodySmall,
         ),
-        onTap: () => Octopus.push(
+        onTap: () => Routes.pushToCatalog(
           context,
           Routes.category,
-          arguments: <String, String>{'id': category.id},
+          category.id,
         ),
         /* onTap: () => Octopus.of(context).setState(
           (state) => state

diff --git a/lib/src/controller/information_provider.dart b/lib/src/controller/information_provider.dart
@@ -100,12 +100,15 @@ class OctopusInformationProvider extends RouteInformationProvider
       replace = routeInformation.replace;
     } */
 
-    SystemNavigator.selectMultiEntryHistory();
-    SystemNavigator.routeInformationUpdated(
-      uri: routeInformation.uri,
-      state: routeInformation.state,
-      replace: replace,
-    );
+    // If the route is different from the current route, then update the engine.
+    if (routeInformation.uri != _value.uri) {
+      SystemNavigator.selectMultiEntryHistory(); // selectSingleEntryHistory
+      SystemNavigator.routeInformationUpdated(
+        uri: routeInformation.uri,
+        state: routeInformation.state,
+        replace: replace,
+      );
+    }
     _value = _valueInEngine = routeInformation;
   }
 

diff --git a/lib/src/state/state.dart b/lib/src/state/state.dart
@@ -326,6 +326,8 @@ final class OctopusState$Immutable extends OctopusState
   String toString() => _$representation;
 }
 
+// TODO(plugfox): add helper methods for state & nodes
+
 /// Node of the router state tree
 sealed class OctopusNode extends _OctopusTree {
   /// Node of the router state tree

diff --git a/lib/src/widget/navigator.dart b/lib/src/widget/navigator.dart
@@ -292,7 +292,7 @@ class _OctopusNestedNavigatorBuilderState
   void _handleStateChange() {
     if (!mounted) return;
     final newNodes = _getNodesFromContext();
-    if (newNodes.isEmpty && _router.isIdle) {
+    if (newNodes.isEmpty) {
       // If nodes are empty we should check the bucket and add it if necessary.
       _checkBucket();
     }