Merge branch 'main' into feodor/prepare-0-25-2

Author: FeodorFitsner

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

@@ -27,11 +27,8 @@ class CircleAvatarControl extends StatelessWidget with FletStoreMixin {
     bool disabled = control.isDisabled || parentDisabled;
 
     return withPageArgs((context, pageArgs) {
-      // DEPRECATED: foregroundImageUrl and backgroundImageUrl
-      var foregroundImageSrc = control.attrString("foregroundImageSrc") ??
-          control.attrString("foregroundImageUrl");
-      var backgroundImageSrc = control.attrString("backgroundImageSrc") ??
-          control.attrString("backgroundImageUrl");
+      var foregroundImageSrc = control.attrString("foregroundImageSrc");
+      var backgroundImageSrc = control.attrString("backgroundImageSrc");
       var contentCtrls =
           children.where((c) => c.name == "content" && c.isVisible);
 

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

@@ -167,6 +167,7 @@ class _PageControlState extends State<PageControl> with FletStoreMixin {
   bool? _windowTitleBarHidden;
   bool? _windowSkipTaskBar;
   double? _windowProgressBar;
+  bool? _windowIgnoreMouseEvents;
   final _navigatorKey = GlobalKey<NavigatorState>();
   late final RouteState _routeState;
   late final SimpleRouterDelegate _routerDelegate;
@@ -338,6 +339,8 @@ class _PageControlState extends State<PageControl> with FletStoreMixin {
     var windowSkipTaskBar = widget.control.attrBool("windowSkipTaskBar");
     var windowFrameless = widget.control.attrBool("windowFrameless");
     var windowProgressBar = widget.control.attrDouble("windowProgressBar");
+    var windowIgnoreMouseEvents =
+        widget.control.attrBool("windowIgnoreMouseEvents");
 
     updateWindow(PageArgsModel? pageArgs) async {
       try {
@@ -580,6 +583,13 @@ class _PageControlState extends State<PageControl> with FletStoreMixin {
         if (windowWaitUntilReadyToShow == true) {
           await waitUntilReadyToShow();
         }
+
+        // windowIgnoreMouseEvents
+        if (windowIgnoreMouseEvents != null &&
+            windowIgnoreMouseEvents != _windowIgnoreMouseEvents) {
+          await setIgnoreMouseEvents(windowIgnoreMouseEvents);
+          _windowIgnoreMouseEvents = windowIgnoreMouseEvents;
+        }
       } catch (e) {
         debugPrint("ERROR updating window: $e");
       }

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

@@ -76,7 +76,6 @@ class PopupMenuButtonControl extends StatelessWidget with FletStoreMixin {
           },
           onCanceled: () {
             backend.triggerControlEvent(control.id, "cancel");
-            backend.triggerControlEvent(control.id, "cancelled"); // DEPRECATED
           },
           onOpened: () {
             backend.triggerControlEvent(control.id, "open");

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

@@ -283,6 +283,13 @@ Future isFocused() async {
   }
 }
 
+Future setIgnoreMouseEvents(bool ignore) async {
+  if (isDesktopPlatform()) {
+    debugPrint("setIgnoreMouseEvents($ignore)");
+    await windowManager.setIgnoreMouseEvents(ignore);
+  }
+}
+
 Future<WindowMediaData> getWindowMediaData() async {
   var m = WindowMediaData();
   if (isDesktopPlatform()) {

sdk/python/packages/flet-cli/src/flet_cli/utils/project_dependencies.py

@@ -18,8 +18,9 @@ def format_dependency_version(dependency: str, version_value: Any):
         suffix = ""
         if isinstance(version_value, dict):
             version = version_value["version"]
-            if version_value["markers"]:
-                suffix = f";{version_value['markers']}"
+            markers = version_value.get("markers")
+            if markers is not None:
+                suffix = f";{markers}"
         else:
             version = version_value
 

sdk/python/packages/flet/src/flet/__init__.py

@@ -151,7 +151,7 @@
     DismissibleUpdateEvent,
 )
 from flet.core.divider import Divider
-from flet.core.drag_target import DragTarget, DragTargetAcceptEvent
+from flet.core.drag_target import DragTarget, DragTargetEvent
 from flet.core.draggable import Draggable
 from flet.core.dropdown import Dropdown
 from flet.core.elevated_button import ElevatedButton
@@ -239,7 +239,6 @@
     NavigationBar,
     NavigationBarDestination,
     NavigationBarLabelBehavior,
-    NavigationDestination,
 )
 from flet.core.navigation_drawer import (
     NavigationDrawer,
@@ -405,7 +404,6 @@
     Locale,
     LocaleConfiguration,
     MainAxisAlignment,
-    MaterialState,
     MouseCursor,
     NotchShape,
     Number,
@@ -427,7 +425,6 @@
     VisualDensity,
     WebRenderer,
 )
-from flet.core.user_control import UserControl
 from flet.core.vertical_divider import VerticalDivider
 from flet.core.video import (
     PlaylistMode,

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

@@ -127,58 +127,18 @@ def _get_control_name(self):
     def play(self):
         self.invoke_method("play")
 
-    @deprecated(
-        reason="Use play() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def play_async(self):
-        self.play()
-
     def pause(self):
         self.invoke_method("pause")
 
-    @deprecated(
-        reason="Use pause() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def pause_async(self):
-        self.pause()
-
     def resume(self):
         self.invoke_method("resume")
 
-    @deprecated(
-        reason="Use resume() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def resume_async(self):
-        self.resume()
-
     def release(self):
         self.invoke_method("release")
 
-    @deprecated(
-        reason="Use release() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def release_async(self):
-        self.release()
-
     def seek(self, position_milliseconds: int):
         self.invoke_method("seek", {"position": str(position_milliseconds)})
 
-    @deprecated(
-        reason="Use seek() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def seek_async(self, position_milliseconds: int):
-        self.seek(position_milliseconds)
-
     def get_duration(self, wait_timeout: Optional[float] = 5) -> Optional[int]:
         sr = self.invoke_method(
             "get_duration",

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

@@ -95,14 +95,6 @@ def start_recording(
         )
         return started == "true"
 
-    @deprecated(
-        reason="Use start_recording() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def start_recording_async(self, output_path: str) -> bool:
-        return self.start_recording(output_path)
-
     def is_recording(self, wait_timeout: Optional[float] = 5) -> bool:
         recording = self.invoke_method(
             "is_recording",
@@ -145,25 +137,9 @@ def cancel_recording(self, wait_timeout: Optional[float] = 5) -> None:
     def resume_recording(self):
         self.invoke_method("resume_recording")
 
-    @deprecated(
-        reason="Use resume_recording() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def resume_recording_async(self):
-        self.resume_recording()
-
     def pause_recording(self):
         self.invoke_method("pause_recording")
 
-    @deprecated(
-        reason="Use pause_recording() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def pause_recording_async(self):
-        self.pause_recording()
-
     def is_paused(self, wait_timeout: Optional[float] = 5) -> bool:
         paused = self.invoke_method(
             "is_paused",

sdk/python/packages/flet/src/flet/core/canvas/canvas.py

@@ -107,12 +107,6 @@ def clean(self):
         super().clean()
         self.__shapes.clear()
 
-    @deprecated(
-        reason="Use clean() method instead.", version="0.21.0", delete_version="0.26.0"
-    )
-    async def clean_async(self):
-        self.clean()
-
     # shapes
     @property
     def shapes(self) -> List[Shape]:

sdk/python/packages/flet/src/flet/core/circle_avatar.py

@@ -78,8 +78,6 @@ def main(page):
     def __init__(
         self,
         content: Optional[Control] = None,
-        foreground_image_url: Optional[str] = None,
-        background_image_url: Optional[str] = None,
         foreground_image_src: Optional[str] = None,
         background_image_src: Optional[str] = None,
         color: Optional[ColorValue] = None,
@@ -152,8 +150,6 @@ def __init__(
             data=data,
         )
 
-        self.foreground_image_url = foreground_image_url
-        self.background_image_url = background_image_url
         self.foreground_image_src = foreground_image_src
         self.background_image_src = background_image_src
         self.radius = radius
@@ -173,50 +169,6 @@ def _get_children(self):
             return [self.__content]
         return []
 
-    # foreground_image_url
-    @property
-    def foreground_image_url(self) -> Optional[str]:
-        warnings.warn(
-            f"foreground_image_url is deprecated since version 0.22.0 "
-            f"and will be removed in version 0.26.0. Use foreground_image_src instead.",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        return self._get_attr("foregroundImageUrl")
-
-    @foreground_image_url.setter
-    def foreground_image_url(self, value: Optional[str]):
-        self._set_attr("foregroundImageUrl", value)
-        if value is not None:
-            warnings.warn(
-                f"foreground_image_url is deprecated since version 0.22.0 "
-                f"and will be removed in version 0.26.0. Use foreground_image_src instead.",
-                category=DeprecationWarning,
-                stacklevel=2,
-            )
-
-    # background_image_url
-    @property
-    def background_image_url(self) -> Optional[str]:
-        warnings.warn(
-            f"background_image_url is deprecated since version 0.22.0 "
-            f"and will be removed in version 0.26.0. Use background_image_src instead.",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        return self._get_attr("backgroundImageUrl")
-
-    @background_image_url.setter
-    def background_image_url(self, value: Optional[str]):
-        self._set_attr("backgroundImageUrl", value)
-        if value is not None:
-            warnings.warn(
-                f"background_image_url is deprecated since version 0.22.0 "
-                f"and will be removed in version 0.26.0. Use background_image_src instead.",
-                category=DeprecationWarning,
-                stacklevel=2,
-            )
-
     # foreground_image_src
     @property
     def foreground_image_src(self) -> Optional[str]:

sdk/python/packages/flet/src/flet/core/column.py

@@ -167,14 +167,6 @@ def clean(self):
         super().clean()
         self.__controls.clear()
 
-    @deprecated(
-        reason="Use clean() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def clean_async(self):
-        self.clean()
-
     # tight
     @property
     def tight(self) -> bool:

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

@@ -335,12 +335,6 @@ def clean(self) -> None:
         ), f"{self.__class__.__qualname__} Control must be added to the page"
         self.__page._clean(self)
 
-    @deprecated(
-        reason="Use clean() method instead.", version="0.21.0", delete_version="0.26.0"
-    )
-    async def clean_async(self):
-        self.clean()
-
     def invoke_method(
         self,
         method_name: str,

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

@@ -173,23 +173,6 @@ def __init__(
     def _get_control_name(self):
         return "datepicker"
 
-    @deprecated(
-        reason="Use Page.open() method instead.",
-        version="0.23.0",
-        delete_version="0.26.0",
-    )
-    def pick_date(self):
-        self.open = True
-        self.update()
-
-    @deprecated(
-        reason="Use Page.open() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def pick_date_async(self):
-        self.pick_date()
-
     # open
     @property
     def open(self) -> bool:

sdk/python/packages/flet/src/flet/core/dismissible.py

@@ -164,14 +164,6 @@ def before_update(self):
     def confirm_dismiss(self, dismiss: bool):
         self.invoke_method("confirm_dismiss", {"dismiss": str(dismiss).lower()})
 
-    @deprecated(
-        reason="Use confirm_dismiss() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def confirm_dismiss_async(self, dismiss: bool):
-        self.confirm_dismiss(dismiss)
-
     # content
     @property
     def content(self) -> Control:

sdk/python/packages/flet/src/flet/core/drag_target.py

@@ -206,21 +206,6 @@ def on_move(self, handler: OptionalEventCallable["DragTargetEvent"]):
         self.__on_move.handler = handler
 
 
-class DragTargetAcceptEvent(ControlEvent):
-    def __init__(self, e: ControlEvent):
-        super().__init__(e.target, e.name, e.data, e.control, e.page)
-        d = json.loads(e.data)
-        warn(
-            f"{self.__class__.__name__} is deprecated since version 0.22.0 "
-            f"and will be removed in version 0.26.0. Use DragTargetEvent instead.",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        self.src_id: float = d.get("src_id")
-        self.x: float = d.get("x")
-        self.y: float = d.get("y")
-
-
 class DragTargetEvent(ControlEvent):
     def __init__(self, e: ControlEvent):
         super().__init__(e.target, e.name, e.data, e.control, e.page)

sdk/python/packages/flet/src/flet/core/dropdown.py

@@ -408,14 +408,6 @@ def focus(self):
         self._set_attr_json("focus", str(time.time()))
         self.update()
 
-    @deprecated(
-        reason="Use focus() method instead.",
-        version="0.21.0",
-        delete_version="0.26.0",
-    )
-    async def focus_async(self):
-        self.focus()
-
     # options
     @property
     def options(self):