Preparing v0.22.0 (#2992)

* _set_enum_attr

* fix checked PopupMenuButton

* random_color()

* Cleanup rive.dart

* Accept null in HexColor.fromString

* Fix _set_enum_attr

Author: ndonkoHenri

packages/flet/lib/src/controls/popup_menu_button.dart

@@ -128,7 +128,10 @@ class PopupMenuButtonControl extends StatelessWidget with FletStoreMixin {
                         mouseCursor: parseMouseCursor(
                             cv.control.attrString("mouseCursor")),
                         onTap: () {
-                          backend.triggerControlEvent(cv.control.id, "click");
+                          backend.updateControlState(
+                              cv.control.id, {"checked": "${!checked}"});
+                          backend.triggerControlEvent(
+                              cv.control.id, "click", "${!checked}");
                         },
                         child: child,
                       )

packages/flet/lib/src/utils/colors.dart

@@ -137,7 +137,10 @@ Map<String, MaterialAccentColor> _materialAccentColors = {
 
 // https://stackoverflow.com/questions/50081213/how-do-i-use-hexadecimal-color-strings-in-flutter
 extension HexColor on Color {
-  static Color? fromString(ThemeData? theme, [String colorString = ""]) {
+  static Color? fromString(ThemeData? theme, [String? colorString = ""]) {
+    if (colorString == null || colorString.isEmpty) {
+      return null;
+    }
     var colorParts = colorString.split(",");
 
     var colorValue = colorParts[0];
@@ -245,5 +248,5 @@ MaterialStateProperty<Color?>? parseMaterialStateColor(
 
   final j1 = json.decode(v);
   return getMaterialStateProperty<Color?>(
-      j1, (jv) => HexColor.fromString(theme, jv as String));
+      j1, (jv) => HexColor.fromString(theme, jv as String), null);
 }

packages/flet_rive/lib/src/rive.dart

@@ -45,10 +45,6 @@ class _RiveControlState extends State<RiveControl> with FletStoreMixin {
       placeholder = createControl(widget.control, ctrls.first.id, disabled);
     }
 
-    void _onInit(artboard) {
-      widget.backend.triggerControlEvent(widget.control.id, "init");
-    }
-
     return withPageArgs((context, pageArgs) {
       Widget? rive;
 
@@ -63,7 +59,6 @@ class _RiveControlState extends State<RiveControl> with FletStoreMixin {
           useArtboardSize: useArtBoardSize,
           alignment: alignment,
           placeHolder: placeholder,
-          // onInit: _onInit,
         );
       } else {
         // URL

sdk/python/packages/flet-core/src/flet_core/animated_switcher.py

@@ -225,7 +225,4 @@ def transition(self) -> Optional[AnimatedSwitcherTransition]:
     @transition.setter
     def transition(self, value: Optional[AnimatedSwitcherTransition]):
         self.__transition = value
-        self._set_attr(
-            "transition",
-            value.value if isinstance(value, AnimatedSwitcherTransition) else value,
-        )
+        self._set_enum_attr("transition", value, AnimatedSwitcherTransition)

sdk/python/packages/flet-core/src/flet_core/animation.py

@@ -1,58 +1,13 @@
 import dataclasses
 from dataclasses import field
-from typing import Optional
 from enum import Enum
+from typing import Optional
 
 try:
     from typing import Literal
 except ImportError:
     from typing_extensions import Literal
 
-AnimationCurveString = Literal[
-    "bounceIn",
-    "bounceInOut",
-    "bounceOut",
-    "decelerate",
-    "ease",
-    "easeIn",
-    "easeInBack",
-    "easeInCirc",
-    "easeInCubic",
-    "easeInExpo",
-    "easeInOut",
-    "easeInOutBack",
-    "easeInOutCirc",
-    "easeInOutCubic",
-    "easeInOutCubicEmphasized",
-    "easeInOutExpo",
-    "easeInOutQuad",
-    "easeInOutQuart",
-    "easeInOutQuint",
-    "easeInOutSine",
-    "easeInQuad",
-    "easeInQuart",
-    "easeInQuint",
-    "easeInSine",
-    "easeInToLinear",
-    "easeOut",
-    "easeOutBack",
-    "easeOutCirc",
-    "easeOutCubic",
-    "easeOutExpo",
-    "easeOutQuad",
-    "easeOutQuart",
-    "easeOutQuint",
-    "easeOutSine",
-    "elasticIn",
-    "elasticInOut",
-    "elasticOut",
-    "fastLinearToSlowEaseIn",
-    "fastOutSlowIn",
-    "linear",
-    "linearToEaseOut",
-    "slowMiddle",
-]
-
 
 class AnimationCurve(Enum):
     BOUNCE_IN = "bounceIn"

sdk/python/packages/flet-core/src/flet_core/audio.py

@@ -237,9 +237,7 @@ def release_mode(self):
 
     @release_mode.setter
     def release_mode(self, value: Optional[ReleaseMode]):
-        self._set_attr(
-            "releaseMode", value.value if isinstance(value, ReleaseMode) else value
-        )
+        self._set_enum_attr("releaseMode", value, ReleaseMode)
 
     # on_loaded
     @property

sdk/python/packages/flet-core/src/flet_core/audio_recorder.py

@@ -215,9 +215,7 @@ def audio_encoder(self):
 
     @audio_encoder.setter
     def audio_encoder(self, value: Optional[AudioEncoder]):
-        self._set_attr(
-            "audioEncoder", value.value if isinstance(value, AudioEncoder) else value
-        )
+        self._set_enum_attr("audioEncoder", value, AudioEncoder)
 
     # suppress_noise
     @property

sdk/python/packages/flet-core/src/flet_core/card.py

@@ -275,6 +275,4 @@ def variant(self) -> Optional[CardVariant]:
     @variant.setter
     def variant(self, value: Optional[CardVariant]):
         self.__variant = value
-        self._set_attr(
-            "variant", value.value if isinstance(value, CardVariant) else value
-        )
+        self._set_enum_attr("variant", value, CardVariant)

sdk/python/packages/flet-core/src/flet_core/colors.py

@@ -34,6 +34,7 @@
     }
 }
 """
+import random
 
 
 def with_opacity(opacity: float, color: str):
@@ -377,3 +378,10 @@ def with_opacity(opacity: float, color: str):
 GREY_700 = "grey700"
 GREY_800 = "grey800"
 GREY_900 = "grey900"
+
+colors_list = [v for k, v in vars().items() if k.isupper()]
+
+
+def random_color() -> str:
+    """Return a random color from the colors defined in this module."""
+    return random.choice(colors_list)

sdk/python/packages/flet-core/src/flet_core/control.py

@@ -1,7 +1,8 @@
 import datetime as dt
 import json
 from difflib import SequenceMatcher
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from enum import Enum
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union, Type
 
 from flet_core.embed_json_encoder import EmbedJsonEncoder
 from flet_core.protocol import Command
@@ -105,6 +106,11 @@ def _get_attr(self, name, def_value=None, data_type="string"):
     def _set_attr(self, name, value, dirty=True):
         self._set_attr_internal(name, value, dirty)
 
+    def _set_enum_attr(self, name, value, enum_type: Type[Enum], dirty=True):
+        self._set_attr_internal(
+            name, value.value if isinstance(value, enum_type) else value, dirty
+        )
+
     def _get_value_or_list_attr(self, name, delimiter):
         v = self._get_attr(name)
         if v and delimiter in v: