Simulator #14

Author: SaadArdati

lib/src/functions/functions_repository.dart

@@ -243,7 +243,7 @@ class FunctionsRepository {
     _log('Performing navigation action with params: $parsedParams');
 
     final Codelessly codelessly = context.read<Codelessly>();
-    final String myLayoutId = codelessly.currentNavigatedLayoutId!;
+    final String? myLayoutId = codelessly.currentNavigatedLayoutId;
 
     if (action.navigationType == NavigationType.pop) {
       await Navigator.maybePop(context, parsedParams);
@@ -328,7 +328,7 @@ class FunctionsRepository {
     _log('Performing show dialog action with params: $parsedParams');
 
     final Codelessly codelessly = context.read<Codelessly>();
-    final myLayoutId = codelessly.currentNavigatedLayoutId!;
+    final String? myLayoutId = codelessly.currentNavigatedLayoutId;
 
     // Check if a layout exists for the action's [destinationId].
     final String? layoutId = codelessly.dataManager.publishModel?.layouts.values

lib/src/ui/codelessly_widget.dart

@@ -590,7 +590,13 @@ class _CodelesslyWidgetState extends State<CodelesslyWidget> {
                 _label, 'Layout loaded in ${millis}ms or ${millis / 1000}s');
           }
 
-          return _effectiveLayoutBuilder(context, layoutWidget);
+          return _NavigationBuilder(
+            key: ValueKey(effectiveLayoutID),
+            layoutId: effectiveLayoutID,
+            builder: (context) {
+              return _effectiveLayoutBuilder(context, layoutWidget);
+            },
+          );
         } catch (e, str) {
           print(e);
           print(str);
@@ -621,43 +627,37 @@ class _CodelesslyWidgetState extends State<CodelesslyWidget> {
           value: codelessly,
         ),
       ],
-      child: _NavigationBuilder(
-          key: ValueKey(_effectiveController.layoutID),
-          // TODO(Saad): Ensure this is not null on first load in non-simulated cases.
-          layoutId: _effectiveController.layoutID,
-          builder: (context) {
-            return StreamBuilder<CStatus>(
-              stream: codelessly.statusStream,
-              initialData: codelessly.status,
-              builder: (context, snapshot) {
-                Widget loading() =>
-                    _effectiveLoadingBuilder?.call(context) ??
-                    const CodelesslyLoadingScreen();
-                Widget error(Object? exception) {
-                  final error = exception ?? snapshot.error;
-                  return _effectiveErrorBuilder?.call(context, error) ??
-                      CodelesslyErrorScreen(
-                        exception: error,
-                        publishSource: _effectiveController.publishSource,
-                      );
-                }
-
-                if (snapshot.hasError) return error(snapshot.error);
-                if (!snapshot.hasData) return loading();
-
-                final CStatus status = snapshot.data!;
-                return switch (status) {
-                  CEmpty() || CConfigured() => loading(),
-                  CError() => error(status.exception),
-                  CLoading(state: CLoadingState state) =>
-                    state.hasPassed(CLoadingState.createdManagers)
-                        ? buildStreamedLayout()
-                        : loading(),
-                  CLoaded() => buildStreamedLayout(),
-                };
-              },
-            );
-          }),
+      child: StreamBuilder<CStatus>(
+        stream: codelessly.statusStream,
+        initialData: codelessly.status,
+        builder: (context, snapshot) {
+          Widget loading() =>
+              _effectiveLoadingBuilder?.call(context) ??
+              const CodelesslyLoadingScreen();
+          Widget error(Object? exception) {
+            final error = exception ?? snapshot.error;
+            return _effectiveErrorBuilder?.call(context, error) ??
+                CodelesslyErrorScreen(
+                  exception: error,
+                  publishSource: _effectiveController.publishSource,
+                );
+          }
+
+          if (snapshot.hasError) return error(snapshot.error);
+          if (!snapshot.hasData) return loading();
+
+          final CStatus status = snapshot.data!;
+          return switch (status) {
+            CEmpty() || CConfigured() => loading(),
+            CError() => error(status.exception),
+            CLoading(state: CLoadingState state) =>
+              state.hasPassed(CLoadingState.createdManagers)
+                  ? buildStreamedLayout()
+                  : loading(),
+            CLoaded() => buildStreamedLayout(),
+          };
+        },
+      ),
     );
   }
 }