Ensure widgets in the ViewGroup have retrieve the ScopeManager from V…

…iewGroupScope widget
EnsembleUI · Dec 29, 2023 · 1475e2f · 1475e2f
1 parent 8fbe834
commit 1475e2f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/lib/framework/view/page_group.dart b/lib/framework/view/page_group.dart
@@ -145,10 +145,9 @@ class PageGroupState extends State<PageGroup> with MediaQueryCapability {
           ),
         );
       } else if (widget.menu is SidebarMenu) {
-        return DataScopeWidget(
-          scopeManager: _scopeManager,
-          child: buildSidebarNavigation(context, widget.menu as SidebarMenu),
-        );
+        return PageGroupWidget(
+            scopeManager: _scopeManager,
+            child: buildSidebarNavigation(context, widget.menu as SidebarMenu));
       } else if (widget.menu is BottomNavBarMenu) {
         return BottomNavPageGroup(
           scopeManager: _scopeManager,
@@ -353,21 +352,21 @@ class PageGroupState extends State<PageGroup> with MediaQueryCapability {
 
   /// TODO: can't do this anymore without Conditional widget
   /// get the menu mode depending on user spec + device types / screen resolutions
-  // MenuDisplay _getPreferredMenuDisplay(Menu menu) {
-  //   MenuDisplay? display =
-  //       MenuDisplay.values.from(_scopeManager.dataContext.eval(menu.display));
-  //   // left nav becomes drawer in lower resolution. TODO: take in user settings
-  //   if (screenWidth < 1024) {
-  //     if (display == MenuDisplay.sidebar) {
-  //       display = MenuDisplay.drawer;
-  //     } else if (display == MenuDisplay.endSidebar) {
-  //       display = MenuDisplay.endDrawer;
-  //     }
-  //   }
-  //   display ??= MenuDisplay.bottomNavBar;
-  //
-  //   return display;
-  // }
+// MenuDisplay _getPreferredMenuDisplay(Menu menu) {
+//   MenuDisplay? display =
+//       MenuDisplay.values.from(_scopeManager.dataContext.eval(menu.display));
+//   // left nav becomes drawer in lower resolution. TODO: take in user settings
+//   if (screenWidth < 1024) {
+//     if (display == MenuDisplay.sidebar) {
+//       display = MenuDisplay.drawer;
+//     } else if (display == MenuDisplay.endSidebar) {
+//       display = MenuDisplay.endDrawer;
+//     }
+//   }
+//   display ??= MenuDisplay.bottomNavBar;
+//
+//   return display;
+// }
 }
 
 class ViewGroupNotifier extends ChangeNotifier {

diff --git a/lib/framework/widget/widget.dart b/lib/framework/widget/widget.dart
@@ -4,6 +4,7 @@ import 'package:ensemble/framework/error_handling.dart';
 import 'package:ensemble/framework/scope.dart';
 import 'package:ensemble/framework/studio_debugger.dart';
 import 'package:ensemble/framework/view/data_scope_widget.dart';
+import 'package:ensemble/framework/view/page_group.dart';
 import 'package:ensemble/framework/widget/icon.dart' as ensemble;
 import 'package:ensemble/framework/view/page.dart';
 import 'package:ensemble/page_model.dart';
@@ -97,7 +98,8 @@ abstract class WidgetState<W extends HasController> extends BaseWidgetState<W> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    scopeManager = DataScopeWidget.getScope(context);
+    scopeManager =
+        DataScopeWidget.getScope(context) ?? PageGroupWidget.getScope(context);
   }
 
   @override