Fix container click event data object (#198)

Author: FeodorFitsner

sdk/python/flet/__init__.py

@@ -8,7 +8,7 @@
 from flet.checkbox import Checkbox
 from flet.circle_avatar import CircleAvatar
 from flet.column import Column
-from flet.container import Container, ContainerTapEventData
+from flet.container import Container, ContainerTapEvent
 from flet.control import Control
 from flet.divider import Divider
 from flet.drag_target import DragTarget
@@ -29,7 +29,7 @@
 from flet.markdown import Markdown
 from flet.navigation_rail import NavigationRail, NavigationRailDestination
 from flet.outlined_button import OutlinedButton
-from flet.page import KeyboardEventData, Page
+from flet.page import KeyboardEvent, Page
 from flet.popup_menu_button import PopupMenuButton, PopupMenuItem
 from flet.progress_bar import ProgressBar
 from flet.progress_ring import ProgressRing

sdk/python/flet/container.py

@@ -7,6 +7,7 @@
 from flet.border import Border
 from flet.constrained_control import ConstrainedControl
 from flet.control import BlendMode, Control, OptionalNumber
+from flet.control_event import ControlEvent
 from flet.event_handler import EventHandler
 from flet.gradients import Gradient
 from flet.image import ImageFit, ImageRepeat
@@ -102,8 +103,10 @@ def __init__(
         )
 
         def convert_container_tap_event_data(e):
+            if self.ink:
+                return e
             d = json.loads(e.data)
-            return ContainerTapEventData(**d)
+            return ContainerTapEvent(**d)
 
         self.__on_click = EventHandler(convert_container_tap_event_data)
         self._add_event_handler("click", self.__on_click.handler)
@@ -345,7 +348,7 @@ def on_hover(self, handler):
             self._set_attr("onHover", None)
 
 
-class ContainerTapEventData:
+class ContainerTapEvent(ControlEvent):
     def __init__(self, lx, ly, gx, gy) -> None:
         self.local_x: float = lx
         self.local_y: float = ly

sdk/python/flet/control_event.py

@@ -0,0 +1,9 @@
+from flet.event import Event
+
+
+class ControlEvent(Event):
+    def __init__(self, target: str, name: str, data: str, control, page):
+        Event.__init__(self, target=target, name=name, data=data)
+
+        self.control = control
+        self.page = page

sdk/python/flet/event.py

@@ -1,6 +1,3 @@
-from flet.control import Control
-
-
 class Event:
     def __init__(self, target: str, name: str, data: str):
         self.target: str = target

sdk/python/flet/event_handler.py

@@ -6,7 +6,13 @@ def __init__(self, result_converter=None) -> None:
     def handler(self, e):
         for h in self.__handlers.keys():
             if self.__result_converter != None:
-                h(self.__result_converter(e))
+                r = self.__result_converter(e)
+                r.target = e.target
+                r.name = e.name
+                r.data = e.data
+                r.control = e.control
+                r.page = e.page
+                h(r)
             else:
                 h(e)
 

sdk/python/flet/page.py

@@ -19,6 +19,7 @@
     OptionalNumber,
     ScrollMode,
 )
+from flet.control_event import ControlEvent
 from flet.event import Event
 from flet.event_handler import EventHandler
 from flet.floating_action_button import FloatingActionButton
@@ -76,7 +77,7 @@ def __init__(self, conn: Connection, session_id):
 
         def convert_keyboard_event_data(e):
             d = json.loads(e.data)
-            return KeyboardEventData(**d)
+            return KeyboardEvent(**d)
 
         self.__on_keyboard_event = EventHandler(convert_keyboard_event_data)
         self._add_event_handler("keyboard_event", self.__on_keyboard_event.handler)
@@ -951,16 +952,8 @@ def dialog(self, value: Optional[Control]):
         self.__dialog = value
 
 
-class ControlEvent(Event):
-    def __init__(self, target: str, name: str, data: str, control: Control, page: Page):
-        Event.__init__(self, target=target, name=name, data=data)
-
-        self.control: Control = control
-        self.page: Page = page
-
-
 @dataclass
-class KeyboardEventData:
+class KeyboardEvent(ControlEvent):
     key: str
     shift: bool
     ctrl: bool