RouteChangeEvent, ViewPopEvent

Author: FeodorFitsner

sdk/python/flet/__init__.py

@@ -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 KeyboardEvent, Page
+from flet.page import KeyboardEvent, Page, RouteChangeEvent, ViewPopEvent
 from flet.popup_menu_button import PopupMenuButton, PopupMenuItem
 from flet.progress_bar import ProgressBar
 from flet.progress_ring import ProgressRing

sdk/python/flet/event_handler.py

@@ -7,12 +7,13 @@ def handler(self, e):
         for h in self.__handlers.keys():
             if self.__result_converter != None:
                 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)
+                if r != None:
+                    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

@@ -70,16 +70,28 @@ def __init__(self, conn: Connection, session_id):
         self.__on_resize = EventHandler()
         self._add_event_handler("resize", self.__on_resize.handler)
 
-        self.__on_route_change = EventHandler(lambda e: e.data)
+        self.__last_route = None
+
+        def convert_route_change_event(e):
+            if self.__last_route == e.data:
+                return None  # avoid duplicate calls
+            self.__last_route = e.data
+            return RouteChangeEvent(route=e.data)
+
+        self.__on_route_change = EventHandler(convert_route_change_event)
         self._add_event_handler("route_change", self.__on_route_change.handler)
-        self.__on_view_pop = EventHandler(lambda e: self.get_control(e.data))
+
+        def convert_view_pop_event(e):
+            return ViewPopEvent(view=self.get_control(e.data))
+
+        self.__on_view_pop = EventHandler(convert_view_pop_event)
         self._add_event_handler("view_pop", self.__on_view_pop.handler)
 
-        def convert_keyboard_event_data(e):
+        def convert_keyboard_event(e):
             d = json.loads(e.data)
             return KeyboardEvent(**d)
 
-        self.__on_keyboard_event = EventHandler(convert_keyboard_event_data)
+        self.__on_keyboard_event = EventHandler(convert_keyboard_event)
         self._add_event_handler("keyboard_event", self.__on_keyboard_event.handler)
 
         self.__on_window_event = EventHandler()
@@ -267,7 +279,15 @@ def show_signin(self, auth_providers="*", auth_groups=False, allow_dismiss=False
 
     def go(self, route):
         self.route = route
-        self.__on_route_change.handler(Event("page", "route_change", self.route))
+        self.__on_route_change.handler(
+            ControlEvent(
+                target="page",
+                name="route_change",
+                data=self.route,
+                page=self,
+                control=self,
+            )
+        )
         self.update()
 
     def signout(self):
@@ -952,6 +972,16 @@ def dialog(self, value: Optional[Control]):
         self.__dialog = value
 
 
+@dataclass
+class RouteChangeEvent(ControlEvent):
+    route: str
+
+
+@dataclass
+class ViewPopEvent(ControlEvent):
+    view: View
+
+
 @dataclass
 class KeyboardEvent(ControlEvent):
     key: str