Cleanup 0.22.0 (#3002)

* fix typing

* PopupMenuButton: remove onSelected

* PopupMenuButton: fix check selection

* Update ErrorControl message in CupertinoSlidingSegmentedButton and CupertinoSegmentedButton

* DatePicker, TimePicker: fix on_entry_mode_change

* DatePicker, TimePicker: export event handlers

* Export ListTileTitleAlignment

* Checkbox: remove unused imports

* deprecate warning in UserControl

Author: ndonkoHenri

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

@@ -1,12 +1,9 @@
-import 'dart:convert';
-
 import 'package:flutter/material.dart';
 
 import '../flet_control_backend.dart';
 import '../models/control.dart';
 import '../utils/borders.dart';
 import '../utils/colors.dart';
-import '../utils/material_state.dart';
 import '../utils/mouse.dart';
 import '../utils/text.dart';
 import '../utils/theme.dart';

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

@@ -46,8 +46,8 @@ class _CupertinoSegmentedButtonControlState
     int? selectedIndex = widget.control.attrInt("selectedIndex");
 
     if (ctrls.length < 2) {
-      return const ErrorControl("When allow_empty_selection is False, "
-          "the selected property must contain at least one value.");
+      return const ErrorControl(
+          "CupertinoSegmentedButton must have at least two controls.");
     }
     var children = ctrls.asMap().map((i, c) => MapEntry(
         i,

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

@@ -53,8 +53,8 @@ class _CupertinoSlidingSegmentedButtonControlState
             const EdgeInsets.symmetric(vertical: 2, horizontal: 3);
 
     if (ctrls.length < 2) {
-      return const ErrorControl("When allow_empty_selection is False, "
-          "the selected property must contain at least one value.");
+      return const ErrorControl(
+          "CupertinoSlidingSegmentedButton must have at least two controls.");
     }
     Map<int, Widget> children = ctrls.asMap().map((i, c) => MapEntry(
         i,

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

@@ -87,9 +87,6 @@ class PopupMenuButtonControl extends StatelessWidget with FletStoreMixin {
           onOpened: () {
             backend.triggerControlEvent(control.id, "open");
           },
-          onSelected: (itemId) {
-            backend.triggerControlEvent(itemId, "click");
-          },
           position: menuPosition,
           itemBuilder: (BuildContext context) =>
               viewModel.controlViews.map((cv) {
@@ -128,8 +125,6 @@ class PopupMenuButtonControl extends StatelessWidget with FletStoreMixin {
                         mouseCursor: parseMouseCursor(
                             cv.control.attrString("mouseCursor")),
                         onTap: () {
-                          backend.updateControlState(
-                              cv.control.id, {"checked": "${!checked}"});
                           backend.triggerControlEvent(
                               cv.control.id, "click", "${!checked}");
                         },

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

@@ -103,7 +103,7 @@
     DataRow,
     DataTable,
 )
-from flet_core.date_picker import DatePicker, DatePickerEntryMode, DatePickerMode
+from flet_core.date_picker import DatePicker, DatePickerEntryMode, DatePickerMode, DatePickerEntryModeChangeEvent
 from flet_core.dismissible import (
     Dismissible,
     DismissibleDismissEvent,
@@ -154,7 +154,7 @@
 from flet_core.icon import Icon
 from flet_core.icon_button import IconButton
 from flet_core.image import Image
-from flet_core.list_tile import ListTile, ListTileStyle
+from flet_core.list_tile import ListTile, ListTileTitleAlignment, ListTileStyle
 from flet_core.list_view import ListView
 from flet_core.lottie import Lottie
 from flet_core.margin import Margin
@@ -282,7 +282,7 @@
     TimePickerTheme,
     TooltipTheme,
 )
-from flet_core.time_picker import TimePicker, TimePickerEntryMode
+from flet_core.time_picker import TimePicker, TimePickerEntryMode, TimePickerEntryModeChangeEvent
 from flet_core.tooltip import Tooltip
 from flet_core.transform import Offset, Rotate, Scale
 from flet_core.transparent_pointer import TransparentPointer

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

@@ -1,4 +1,3 @@
-import json
 from datetime import date, datetime
 from enum import Enum
 from typing import Any, Optional, Union
@@ -30,8 +29,8 @@ class DatePickerEntryMode(Enum):
 
 
 class DatePickerEntryModeChangeEvent(ControlEvent):
-    def __init__(self, mode) -> None:
-        self.mode: Optional[DatePickerEntryMode] = DatePickerEntryMode(mode)
+    def __init__(self, entry_mode) -> None:
+        self.entry_mode: Optional[DatePickerEntryMode] = DatePickerEntryMode(entry_mode)
 
 
 class DatePicker(Control):
@@ -128,12 +127,7 @@ def __init__(
             data=data,
         )
 
-        def convert_entry_mode_event_data(e):
-            d = json.loads(e.data)
-            self.__result = DatePickerEntryModeChangeEvent(**d)
-            return self.__result
-
-        self.__on_entry_mode_change = EventHandler(convert_entry_mode_event_data)
+        self.__on_entry_mode_change = EventHandler(lambda e: DatePickerEntryModeChangeEvent(e.data))
         self._add_event_handler(
             "entryModeChange", self.__on_entry_mode_change.get_handler()
         )

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

@@ -81,7 +81,7 @@ def _get_control_name(self):
     # height
     @property
     def height(self) -> OptionalNumber:
-        return self._get_attr("height")
+        return self._get_attr("height", data_type="float")
 
     @height.setter
     def height(self, value: OptionalNumber):
@@ -90,7 +90,7 @@ def height(self, value: OptionalNumber):
     # thickness
     @property
     def thickness(self) -> OptionalNumber:
-        return self._get_attr("thickness")
+        return self._get_attr("thickness", data_type="float")
 
     @thickness.setter
     def thickness(self, value: OptionalNumber):
@@ -108,7 +108,7 @@ def color(self, value: Optional[str]):
     # leading_indent
     @property
     def leading_indent(self) -> OptionalNumber:
-        return self._get_attr("leadingIndent")
+        return self._get_attr("leadingIndent", data_type="float")
 
     @leading_indent.setter
     def leading_indent(self, value: OptionalNumber):
@@ -117,7 +117,7 @@ def leading_indent(self, value: OptionalNumber):
     # trailing_indent
     @property
     def trailing_indent(self) -> OptionalNumber:
-        return self._get_attr("trailingIndent")
+        return self._get_attr("trailingIndent", data_type="float")
 
     @trailing_indent.setter
     def trailing_indent(self, value: OptionalNumber):

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

@@ -1,4 +1,3 @@
-import json
 from datetime import time
 from enum import Enum
 from typing import Any, Optional, Union
@@ -19,8 +18,8 @@ class TimePickerEntryMode(Enum):
 
 
 class TimePickerEntryModeChangeEvent(ControlEvent):
-    def __init__(self, mode) -> None:
-        self.mode: Optional[TimePickerEntryMode] = TimePickerEntryMode(mode)
+    def __init__(self, entry_mode) -> None:
+        self.entry_mode: Optional[TimePickerEntryMode] = TimePickerEntryMode(entry_mode)
 
 
 class TimePicker(Control):
@@ -111,12 +110,7 @@ def __init__(
             data=data,
         )
 
-        def convert_entry_mode_event_data(e):
-            d = json.loads(e.data)
-            self.__result = TimePickerEntryModeChangeEvent(**d)
-            return self.__result
-
-        self.__on_entry_mode_change = EventHandler(convert_entry_mode_event_data)
+        self.__on_entry_mode_change = EventHandler(lambda e: TimePickerEntryModeChangeEvent(e.data))
         self._add_event_handler(
             "entryModeChange", self.__on_entry_mode_change.get_handler()
         )

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

@@ -31,7 +31,7 @@ class UrlTarget(Enum):
     SELF = "_self"
     PARENT = "_parent"
     TOP = "_top"
-    UNFENCED_TOP = "_unfencedTop"
+    # UNFENCED_TOP = "_unfencedTop"
 
 
 PaddingValue = Union[None, int, float, Padding]

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

@@ -1,7 +1,16 @@
 from flet_core.stack import Stack
+from flet_core.utils import deprecated
 
 
 class UserControl(Stack):
+    @deprecated(
+        reason="UserControl is deprecated. See https://flet.dev/docs/getting-started/custom-controls.",
+        version="0.21.0",
+        delete_version="1.0",
+    )
+    def __init__(self):
+        super().__init__()
+
     def build(self):
         pass