feat: expose events (on_double_tap, on_pan_start) in WindowDragArea (#5043)

* improve events typing in gesture_detector.py

* window.start_dragging

* delete window_drag_area.dart

* rework WindowDragArea inheriting from GestureDetector

* export more utils

Author: ndonkoHenri

packages/flet/lib/src/controls/window_drag_area.dart_

@@ -235,6 +235,12 @@ Future windowToFront() async {
   }
 }
 
+Future windowStartDragging() async {
+  if (isDesktopPlatform()) {
+    await windowManager.startDragging();
+  }
+}
+
 Future blurWindow() async {
   if (isDesktopPlatform() &&
       (defaultTargetPlatform == TargetPlatform.windows ||

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

@@ -10,19 +10,10 @@
 from typing import Optional, cast
 
 import flet.version
-import flet_cli.utils.processes as processes
 import yaml
 from flet.utils import cleanup_path, copy_tree, is_windows, slugify
 from flet.utils.platform_utils import get_bool_env_var
 from flet.version import update_version
-from flet_cli.commands.base import BaseCommand
-from flet_cli.utils.hash_stamp import HashStamp
-from flet_cli.utils.merge import merge_dict
-from flet_cli.utils.project_dependencies import (
-    get_poetry_dependencies,
-    get_project_dependencies,
-)
-from flet_cli.utils.pyproject_toml import load_pyproject_toml
 from packaging import version
 from packaging.requirements import Requirement
 from rich.console import Console, Group
@@ -33,6 +24,16 @@
 from rich.table import Column, Table
 from rich.theme import Theme
 
+import flet_cli.utils.processes as processes
+from flet_cli.commands.base import BaseCommand
+from flet_cli.utils.hash_stamp import HashStamp
+from flet_cli.utils.merge import merge_dict
+from flet_cli.utils.project_dependencies import (
+    get_poetry_dependencies,
+    get_project_dependencies,
+)
+from flet_cli.utils.pyproject_toml import load_pyproject_toml
+
 PYODIDE_ROOT_URL = "https://cdn.jsdelivr.net/pyodide/v0.27.2/full"
 DEFAULT_TEMPLATE_URL = "gh:flet-dev/flet-build-template"
 
@@ -75,7 +76,6 @@ def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.python_module_name = None
         self.get_pyproject = None
         self.python_app_path = None
-        self.no_rich_output = None
         self.emojis = {}
         self.dart_exe = None
         self.verbose = False
@@ -1145,7 +1145,9 @@ def setup_template_data(self):
                 "target_arch": (
                     target_arch
                     if isinstance(target_arch, list)
-                    else [target_arch] if isinstance(target_arch, str) else []
+                    else [target_arch]
+                    if isinstance(target_arch, str)
+                    else []
                 ),
                 "info_plist": info_plist,
                 "macos_entitlements": macos_entitlements,

sdk/python/packages/flet-cli/src/flet_cli/commands/build.py

@@ -94,37 +94,39 @@ def __init__(
         exclude_from_semantics: Optional[bool] = None,
         trackpad_scroll_causes_scale: Optional[bool] = None,
         allowed_devices: Optional[Set[PointerDeviceType]] = None,
-        on_tap=None,
-        on_tap_down=None,
-        on_tap_up=None,
-        on_multi_tap=None,
-        multi_tap_touches=None,
-        on_multi_long_press=None,
-        on_secondary_tap=None,
-        on_secondary_tap_down=None,
-        on_secondary_tap_up=None,
-        on_long_press_start=None,
-        on_long_press_end=None,
-        on_secondary_long_press_start=None,
-        on_secondary_long_press_end=None,
-        on_double_tap=None,
-        on_double_tap_down=None,
-        on_horizontal_drag_start=None,
-        on_horizontal_drag_update=None,
-        on_horizontal_drag_end=None,
-        on_vertical_drag_start=None,
-        on_vertical_drag_update=None,
-        on_vertical_drag_end=None,
-        on_pan_start=None,
-        on_pan_update=None,
-        on_pan_end=None,
-        on_scale_start=None,
-        on_scale_update=None,
-        on_scale_end=None,
-        on_hover=None,
-        on_enter=None,
-        on_exit=None,
-        on_scroll=None,
+        on_tap: OptionalEventCallable["TapEvent"] = None,
+        on_tap_down: OptionalEventCallable["TapEvent"] = None,
+        on_tap_up: OptionalEventCallable["TapEvent"] = None,
+        on_multi_tap: OptionalEventCallable["TapEvent"] = None,
+        multi_tap_touches: Optional[int] = None,
+        on_multi_long_press: OptionalEventCallable["LongPressEndEvent"] = None,
+        on_secondary_tap: OptionalEventCallable["TapEvent"] = None,
+        on_secondary_tap_down: OptionalEventCallable["TapEvent"] = None,
+        on_secondary_tap_up: OptionalEventCallable["TapEvent"] = None,
+        on_long_press_start: OptionalEventCallable["LongPressEndEvent"] = None,
+        on_long_press_end: OptionalEventCallable["LongPressEndEvent"] = None,
+        on_secondary_long_press_start: OptionalEventCallable[
+            "LongPressEndEvent"
+        ] = None,
+        on_secondary_long_press_end: OptionalEventCallable["LongPressEndEvent"] = None,
+        on_double_tap: OptionalEventCallable["TapEvent"] = None,
+        on_double_tap_down: OptionalEventCallable["TapEvent"] = None,
+        on_horizontal_drag_start: OptionalEventCallable["DragStartEvent"] = None,
+        on_horizontal_drag_update: OptionalEventCallable["DragUpdateEvent"] = None,
+        on_horizontal_drag_end: OptionalEventCallable["DragEndEvent"] = None,
+        on_vertical_drag_start: OptionalEventCallable["DragStartEvent"] = None,
+        on_vertical_drag_update: OptionalEventCallable["DragUpdateEvent"] = None,
+        on_vertical_drag_end: OptionalEventCallable["DragEndEvent"] = None,
+        on_pan_start: OptionalEventCallable["DragStartEvent"] = None,
+        on_pan_update: OptionalEventCallable["DragUpdateEvent"] = None,
+        on_pan_end: OptionalEventCallable["DragEndEvent"] = None,
+        on_scale_start: OptionalEventCallable["ScaleStartEvent"] = None,
+        on_scale_update: OptionalEventCallable["ScaleUpdateEvent"] = None,
+        on_scale_end: OptionalEventCallable["ScaleEndEvent"] = None,
+        on_hover: OptionalEventCallable["HoverEvent"] = None,
+        on_enter: OptionalEventCallable["HoverEvent"] = None,
+        on_exit: OptionalEventCallable["HoverEvent"] = None,
+        on_scroll: OptionalEventCallable["ScrollEvent"] = None,
         #
         # ConstrainedControl
         #
@@ -344,6 +346,7 @@ def _get_control_name(self):
         return "gesturedetector"
 
     def before_update(self):
+        super().before_update()
         self._set_attr_json("allowedDevices", self.__allowed_devices)
 
     def _get_children(self):

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

@@ -1,11 +1,11 @@
-from flet.core.constrained_control import ConstrainedControl
-from flet.core.control import Control, control
+from typing import Any
 
-__all__ = ["WindowDragArea"]
+from flet.core.control import Control
+from flet.core.gesture_detector import DragStartEvent, GestureDetector, TapEvent
+from flet.core.types import OptionalEventCallable
 
 
-@control("WindowDragArea")
-class WindowDragArea(ConstrainedControl):
+class WindowDragArea(GestureDetector):
     """
     A control for drag to move, maximize and restore application window.
 
@@ -36,9 +36,42 @@ def main(page: ft.Page):
     Online docs: https://flet.dev/docs/controls/windowdragarea
     """
 
-    content: Control
-    maximizable: bool = True
+    def __init__(
+        self,
+        content: Control,
+        maximizable: bool = True,
+        on_double_tap: OptionalEventCallable["TapEvent"] = None,
+        on_pan_start: OptionalEventCallable["DragStartEvent"] = None,
+        **kwargs: Any,
+    ):
+        GestureDetector.__init__(
+            self,
+            content=content,
+            on_double_tap=self.handle_double_tap,
+            on_pan_start=self.handle_pan_start,
+            **kwargs,
+        )
+
+        self.maximizable = maximizable
+        self.on_double_tap = on_double_tap
+        self.on_pan_start = on_pan_start
 
     def before_update(self):
         super().before_update()
         assert self.content.visible, "content must be visible"
+
+    def handle_double_tap(self, e: TapEvent):
+        if self.maximizable and self.page.window.maximizable:
+            if not self.page.window.maximized:
+                self.page.window.maximized = True
+            else:
+                self.page.window.maximized = False
+            self.page.update()
+
+        if self.on_double_tap is not None and self.page.window.maximized:
+            self.on_double_tap(e)
+
+    def handle_pan_start(self, e: DragStartEvent):
+        self.page.window.start_dragging()
+        if self.on_pan_start is not None:
+            self.on_pan_start(e)