Merge branch 'main' into fix-camera-dispose

Author: sharjeelyunus

CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2025-03-03
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`ensemble` - `v1.1.30`](#ensemble---v1130)
+ - [`ensemble_chat` - `v0.0.1+1`](#ensemble_chat---v0011)
+ - [`ensemble_auth` - `v1.0.1`](#ensemble_auth---v101)
+ - [`ensemble_camera` - `v0.0.1+1`](#ensemble_camera---v0011)
+ - [`ensemble_location` - `v0.0.1+1`](#ensemble_location---v0011)
+ - [`ensemble_file_manager` - `v0.0.1+1`](#ensemble_file_manager---v0011)
+ - [`ensemble_bluetooth` - `v0.0.1+1`](#ensemble_bluetooth---v0011)
+ - [`ensemble_connect` - `v0.0.1+1`](#ensemble_connect---v0011)
+ - [`ensemble_deeplink` - `v0.0.1+1`](#ensemble_deeplink---v0011)
+ - [`ensemble_network_info` - `v0.0.1+1`](#ensemble_network_info---v0011)
+ - [`ensemble_contacts` - `v0.0.1+1`](#ensemble_contacts---v0011)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `ensemble_chat` - `v0.0.1+1`
+ - `ensemble_auth` - `v1.0.1`
+ - `ensemble_camera` - `v0.0.1+1`
+ - `ensemble_location` - `v0.0.1+1`
+ - `ensemble_file_manager` - `v0.0.1+1`
+ - `ensemble_bluetooth` - `v0.0.1+1`
+ - `ensemble_connect` - `v0.0.1+1`
+ - `ensemble_deeplink` - `v0.0.1+1`
+ - `ensemble_network_info` - `v0.0.1+1`
+ - `ensemble_contacts` - `v0.0.1+1`
+
+---
+
+#### `ensemble` - `v1.1.30`
+
+
 ## 2025-03-03
 
 ### Changes

modules/auth/pubspec.yaml

@@ -28,7 +28,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   ensemble_ts_interpreter:

modules/bracket/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
 dev_dependencies:

modules/camera/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:

modules/chat/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   ensemble_ts_interpreter:

modules/connect/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   plaid_flutter: ^3.1.2

modules/contacts/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   flutter_contacts: ^1.1.7+1

modules/deeplink/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   flutter_branch_sdk: ^7.0.1

modules/ensemble/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.1.30
+
 ## 1.1.29
 
  - **FIX**(notification_manager): initialize message handling on startup. ([9ca35acb](https://github.com/ensembleUI/ensemble/commit/9ca35acbd9b868198acb29fa618841b362ac8d19))

modules/ensemble/lib/framework/view/page.dart

@@ -404,8 +404,8 @@ class PageState extends State<Page>
         curve: curve,
         duration: duration,
         backgroundWidget: backgroundWidget,
-        expandedBarHeight: flexibleMaxHeight,
-        collapsedBarHeight: flexibleMinHeight,
+        expandedBarHeight: flexibleMaxHeight?? titleBarHeight,
+        collapsedBarHeight: flexibleMinHeight?? titleBarHeight,
         floating: scrollMode == ScrollMode.floating,
         pinned: scrollMode == ScrollMode.pinned,
 
@@ -919,9 +919,10 @@ class _AnimatedAppBarState extends State<AnimatedAppBar> {
   }
 
   void _updateCollapseState() {
-    bool newState = widget.scrollController.hasClients &&
-        widget.scrollController.offset >
-            (widget.expandedBarHeight - widget.collapsedBarHeight);
+    bool newState = widget.scrollController != null &&
+        widget.scrollController.hasClients &&
+            widget.scrollController.offset >
+                (widget.expandedBarHeight - widget.collapsedBarHeight);
 
     if (newState != isCollapsed) {
       setState(() {
@@ -980,8 +981,8 @@ class _AnimatedAppBarState extends State<AnimatedAppBar> {
 }
 
 enum ScrollMode {
-  floating,
   pinned,
+  floating,
 }
 class ActionResponse {
   Map<String, dynamic>? _resultData;

modules/ensemble/lib/layout/data_grid.dart

@@ -82,6 +82,11 @@ class DataGrid extends StatefulWidget
           controller.dataRowHeight = Utils.optionalDouble(val),
       'headingRowHeight': (val) =>
           controller.headingRowHeight = Utils.optionalDouble(val),
+      'scrollbarBehaviour': (val) =>
+          controller.scrollbarBehaviour =
+              Utils.getEnum<ScrollbarBehaviour>(val, ScrollbarBehaviour.values),
+      'thumbThickness': (val) =>
+          controller.thumbThickness = Utils.optionalDouble(val),
       'columnSpacing': (val) =>
           controller.columnSpacing = Utils.optionalDouble(val),
       'dividerThickness': (val) =>
@@ -184,7 +189,9 @@ class DataGridController extends BoxController {
   GenericTextController? headingTextController;
   double? dataRowHeight;
   double? headingRowHeight;
+  ScrollbarBehaviour? scrollbarBehaviour;
   double? columnSpacing;
+  double? thumbThickness;
   GenericTextController? dataTextController;
   double? dividerThickness;
   TableBorder border = const TableBorder();
@@ -268,6 +275,7 @@ class DataGridState extends EWidgetState<DataGrid>
   @override
   Widget buildWidget(BuildContext context) {
     ScopeManager? scopeManager = DataScopeWidget.getScope(context);
+    final ScrollController _scrollController = ScrollController();
     if (scopeManager == null) {
       throw Exception(
           'scopeManager is null in the DataGrid.buildWidget method. This is unexpected. DataGrid.id=${widget.id}');
@@ -311,13 +319,17 @@ class DataGridState extends EWidgetState<DataGrid>
     );
     return SingleChildScrollView(
       scrollDirection: Axis.vertical,
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
 
-        // DataTable requires all children to report their intrinsic height.
-        // Some widgets don't like that so we expose this so the widgets
-        // can react accordingly
-        child: RequiresChildWithIntrinsicDimension(child: grid),
+      child: RawScrollbar(
+        thickness: widget.controller.thumbThickness,
+        controller: _scrollController,
+        thumbVisibility: widget.controller.scrollbarBehaviour == ScrollbarBehaviour.static,
+        trackVisibility: widget.controller.scrollbarBehaviour == ScrollbarBehaviour.static,
+        child: SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          controller: _scrollController,
+          child: RequiresChildWithIntrinsicDimension(child: grid),
+        ),
       ),
     );
   }
@@ -407,7 +419,7 @@ class DataGridState extends EWidgetState<DataGrid>
         if (kDebugMode) {
           print(
               'Number of DataGrid columns must be equal to the number of cells in each row. Number of DataGrid columns is ${_columns.length} '
-              'while number of cells in the row is ${cells.length}. We will try to match them to be the same');
+                 'while number of cells in the row is ${cells.length}. We will try to match them to be the same');
         }
         if (_columns.length > cells.length) {
           int diff = _columns.length - cells.length;
@@ -503,3 +515,7 @@ class DataGridState extends EWidgetState<DataGrid>
     }
   }
 }
+enum ScrollbarBehaviour{
+  static,
+  fade
+}

modules/ensemble/lib/widget/helpers/input_wrapper.dart

@@ -77,7 +77,14 @@ class InputWrapper extends StatelessWidget {
                   Theme.of(context).inputDecorationTheme.labelStyle,
             ),
           ),
-        widget,
+        // semantics for whatever text input comes through
+        MergeSemantics(
+          child: Semantics(
+              label: controller.label,
+              child: widget,
+            ),
+        ),
+
         if (shouldShowLabel && controller.description != null)
           Container(
             margin: const EdgeInsets.only(top: 12.0),

modules/ensemble/pubspec.yaml

@@ -15,7 +15,7 @@ description: Ensemble Runtime
 # This version is used _only_ for the Runner app, which is used if you just do
 # a `flutter run` or a `flutter make-host-app-editable`. It has no impact
 # on any other native host app that you embed your Flutter project into.
-version: 1.1.29
+version: 1.1.30
 
 environment:
   sdk: ">=3.5.0"

modules/ensemble_bluetooth/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:

modules/ensemble_network_info/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   network_info_plus: ^5.0.3

modules/file_manager/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:

modules/firebase_analytics/pubspec.yaml

@@ -40,7 +40,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
 dev_dependencies:

modules/location/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   ensemble_ts_interpreter:

modules/moengage/pubspec.yaml

@@ -37,7 +37,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble
 
   moengage_flutter: ^8.0.0

starter/pubspec.yaml

@@ -36,7 +36,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.29
+      ref: ensemble-v1.1.30
       path: modules/ensemble