Merge pull request #906 from EnsembleUI/feat/calendar

Enhance calendar
EnsembleUI · Oct 26, 2023 · c510e91 · c510e91
2 parents f56c33b + 36ea117
commit c510e91
Show file tree

Hide file tree

Showing 8 changed files with 194 additions and 47 deletions.
diff --git a/assets/schema/ensemble_schema.json b/assets/schema/ensemble_schema.json
@@ -5268,6 +5268,9 @@
                   "type": "boolean",
                   "description": "Set visibility of calendar header. Default true."
                 },
+                "header": {
+                  "$ref": "#/$defs/Widget"
+                },
                 "rowSpans": {
                   "type": "array",
                   "items": {
@@ -5288,10 +5291,16 @@
                             "$ref": "#/$defs/Widget"
                           }
                         },
-                        "required": ["start", "end", "widget"]
+                        "required": [
+                          "start",
+                          "end",
+                          "widget"
+                        ]
                       }
                     },
-                    "required": ["span"]
+                    "required": [
+                      "span"
+                    ]
                   }
                 },
                 "headerTextStyle": {

diff --git a/lib/action/invoke_api_action.dart b/lib/action/invoke_api_action.dart
@@ -224,13 +224,15 @@ class InvokeAPIController {
         EnsembleAction.fromYaml(apiDefinition['onError']);
     if (onErrorAction != null) {
       ScreenController().nowExecuteAction(
-          context, localizedContext, onErrorAction, apiMap, scopeManager, event: apiEvent);
+          context, localizedContext, onErrorAction, apiMap, scopeManager,
+          event: apiEvent);
     }
 
     // if our Action has onError, invoke that next
     if (action.onError != null) {
       ScreenController().nowExecuteAction(
-          context, localizedContext, action.onError!, apiMap, scopeManager, event: apiEvent);
+          context, localizedContext, action.onError!, apiMap, scopeManager,
+          event: apiEvent);
     }
 
     // silently fail if error handle is not defined? or should we alert user?

diff --git a/lib/framework/data_context.dart b/lib/framework/data_context.dart
@@ -565,7 +565,7 @@ class Formatter with Invokable {
       'prettyCurrency': (input) => InvokablePrimitive.prettyCurrency(input),
       'prettyDuration': (input) =>
           InvokablePrimitive.prettyDuration(input, locale: locale),
-      'pluralize': pluralize
+      'pluralize': pluralize,
     };
   }
 

diff --git a/lib/framework/ensemble_widget.dart b/lib/framework/ensemble_widget.dart
@@ -1,16 +1,15 @@
 import 'package:ensemble_ts_interpreter/invokables/invokable.dart';
 import 'package:flutter/cupertino.dart';
 
-abstract class EnsembleWidget<C extends EnsembleController> extends StatefulWidget {
+abstract class EnsembleWidget<C extends EnsembleController>
+    extends StatefulWidget {
   const EnsembleWidget(this.controller, {super.key});
   final C controller;
 }
 
 abstract class EnsembleWidgetState<W extends EnsembleWidget> extends State<W> {
   void _update() {
-    setState(() {
-
-    });
+    setState(() {});
   }
 
   @override
@@ -32,4 +31,3 @@ abstract class EnsembleWidgetState<W extends EnsembleWidget> extends State<W> {
     super.dispose();
   }
 }
-
diff --git a/lib/framework/scope.dart b/lib/framework/scope.dart
@@ -254,7 +254,8 @@ mixin ViewBuilder on IsScopeManager {
             if (model.inputs![param] != null) {
               // set the Custom Widget's inputs from parent scope
               evalPropertyAndRegisterBinding(
-                  scopeManager._parent!, // widget inputs are set in the parent's scope
+                  scopeManager
+                      ._parent!, // widget inputs are set in the parent's scope
                   payload.widget as Invokable,
                   param,
                   model.inputs![param]);
@@ -276,7 +277,8 @@ mixin ViewBuilder on IsScopeManager {
         // set props and styles on the widget. At this stage the widget
         // has not been attached, so no worries about ValueNotifier
         for (String key in model.props.keys) {
-          if (InvokableController.getSettableProperties(invokable).contains(key)) {
+          if (InvokableController.getSettableProperties(invokable)
+              .contains(key)) {
             if (_isPassthroughProperty(key, invokable)) {
               InvokableController.setProperty(invokable, key, model.props[key]);
             } else {
@@ -286,9 +288,11 @@ mixin ViewBuilder on IsScopeManager {
           }
         }
         for (String key in model.styles.keys) {
-          if (InvokableController.getSettableProperties(invokable).contains(key)) {
+          if (InvokableController.getSettableProperties(invokable)
+              .contains(key)) {
             if (_isPassthroughProperty(key, invokable)) {
-              InvokableController.setProperty(invokable, key, model.styles[key]);
+              InvokableController.setProperty(
+                  invokable, key, model.styles[key]);
             } else {
               evalPropertyAndRegisterBinding(
                   scopeManager, invokable, key, model.styles[key]);

diff --git a/lib/framework/widget/view_util.dart b/lib/framework/widget/view_util.dart
@@ -219,8 +219,7 @@ class ViewUtil {
       EnsembleController? previousController;
       String? id = model.props['id']?.toString();
       if (id != null) {
-        dynamic controller =
-            scopeNode.scope.dataContext.getContextById(id);
+        dynamic controller = scopeNode.scope.dataContext.getContextById(id);
         if (controller is EnsembleController) {
           previousController = controller;
         }