Simulator #15

Author: SaadArdati

lib/src/codelessly.dart

@@ -15,7 +15,9 @@ import 'utils/codelessly_http_client.dart';
 typedef NavigationListener = void Function(
   BuildContext context,
   String? layoutId,
+  String? canvasId,
 );
+
 typedef BreakpointsListener = void Function(
     BuildContext context, Breakpoint breakpoint);
 
@@ -155,6 +157,10 @@ class Codelessly {
 
   String? get currentNavigatedLayoutId => _currentNavigatedLayoutId;
 
+  String? _currentNavigatedCanvasId;
+
+  String? get currentNavigatedCanvasId => _currentNavigatedCanvasId;
+
   final Map<String, NavigationListener> _navigationListeners = {};
 
   final Map<String, BreakpointsListener> _breakpointsListeners = {};
@@ -763,11 +769,15 @@ class Codelessly {
   /// Calls navigation listeners when navigation happens.
   /// Provided [context] must be of the destination widget. This context
   /// can be used to retrieve new [CodelesslyContext].
-  void notifyNavigationListeners(BuildContext context, String? layoutId) {
+  void notifyNavigationListeners(
+    BuildContext context, {
+    required String? layoutId,
+    required String? canvasId,
+  }) {
     _currentNavigatedLayoutId = layoutId;
-
+    _currentNavigatedCanvasId = canvasId;
     for (final listener in [..._navigationListeners.values]) {
-      listener(context, layoutId);
+      listener(context, layoutId, canvasId);
     }
   }
 

lib/src/functions/functions_repository.dart

@@ -244,6 +244,7 @@ class FunctionsRepository {
 
     final Codelessly codelessly = context.read<Codelessly>();
     final String? myLayoutId = codelessly.currentNavigatedLayoutId;
+    final String? myCanvasId = codelessly.currentNavigatedCanvasId;
 
     if (action.navigationType == NavigationType.pop) {
       await Navigator.maybePop(context, parsedParams);
@@ -295,7 +296,11 @@ class FunctionsRepository {
         // to, because the Navigator.push future has completed and came
         // back to this screen.
         if (context.mounted) {
-          codelessly.notifyNavigationListeners(context, myLayoutId);
+          codelessly.notifyNavigationListeners(
+            context,
+            layoutId: myLayoutId,
+            canvasId: myCanvasId,
+          );
         }
       } else if (action.navigationType == NavigationType.replace) {
         await Navigator.pushReplacement(
@@ -312,7 +317,11 @@ class FunctionsRepository {
         // to, because the Navigator.push future has completed and came
         // back to this screen.
         if (context.mounted) {
-          codelessly.notifyNavigationListeners(context, myLayoutId);
+          codelessly.notifyNavigationListeners(
+            context,
+            layoutId: myLayoutId,
+            canvasId: myCanvasId,
+          );
         }
       }
     }
@@ -329,6 +338,7 @@ class FunctionsRepository {
 
     final Codelessly codelessly = context.read<Codelessly>();
     final String? myLayoutId = codelessly.currentNavigatedLayoutId;
+    final String? myCanvasId = codelessly.currentNavigatedCanvasId;
 
     // Check if a layout exists for the action's [destinationId].
     final String? layoutId = codelessly.dataManager.publishModel?.layouts.values
@@ -369,7 +379,11 @@ class FunctionsRepository {
       ),
     );
     if (context.mounted) {
-      codelessly.notifyNavigationListeners(context, myLayoutId);
+      codelessly.notifyNavigationListeners(
+        context,
+        layoutId: myLayoutId,
+        canvasId: myCanvasId,
+      );
     }
   }
 

lib/src/transformers/node_transformers/passive_canvas_transformer.dart

@@ -402,11 +402,6 @@ class _PassiveCanvasWidgetState extends State<PassiveCanvasWidget> {
       if (!mounted) return;
 
       codelessly = context.read<Codelessly>();
-      final String? myLayoutId = codelessly!
-          .dataManager.publishModel?.layouts.dataMap.entries
-          .firstWhere((entry) {
-        return entry.value.canvasIds.contains(widget.node.id);
-      }).key;
 
       // Set the system UI brightness to the canvas brightness.
       codelessly!.setSystemUIBrightness(widget.node.properties.brightness);
@@ -415,8 +410,8 @@ class _PassiveCanvasWidgetState extends State<PassiveCanvasWidget> {
       // again, such as if this canvas was navigated away from, but then the view
       // pops and goes back to this canvas.
       codelessly!.addNavigationListener('canvas-${widget.node.id}',
-          (event, layoutId) {
-        if (myLayoutId == layoutId) {
+          (event, layoutId, canvasId) {
+        if (canvasId == widget.node.id) {
           codelessly!.setSystemUIBrightness(widget.node.properties.brightness);
         }
       });

lib/src/ui/codelessly_widget.dart

@@ -593,6 +593,7 @@ class _CodelesslyWidgetState extends State<CodelesslyWidget> {
           return _NavigationBuilder(
             key: ValueKey(effectiveLayoutID),
             layoutId: effectiveLayoutID,
+            canvasId: canvasID,
             builder: (context) {
               return _effectiveLayoutBuilder(context, layoutWidget);
             },
@@ -665,11 +666,13 @@ class _CodelesslyWidgetState extends State<CodelesslyWidget> {
 class _NavigationBuilder extends StatefulWidget {
   final WidgetBuilder builder;
   final String? layoutId;
+  final String? canvasId;
 
   const _NavigationBuilder({
     super.key,
     required this.builder,
     required this.layoutId,
+    required this.canvasId,
   });
 
   @override
@@ -684,7 +687,8 @@ class _NavigationBuilderState extends State<_NavigationBuilder> {
       if (!context.mounted) return;
       context.read<Codelessly>().notifyNavigationListeners(
             context,
-            widget.layoutId,
+            layoutId: widget.layoutId,
+            canvasId: widget.canvasId,
           );
     });
   }