refactor: rename to pop_views_until, based on feedback from @ndonkoHenri

Rename pop_until_with_result() to pop_views_until(),
on_view_pop_result to on_views_pop_until,
and ViewPopResultEvent to ViewsPopUntilEvent.

Requested by @FeodorFitsner in the PR review.

Author: brunobrown

…ting_navigation/pop_until_with_result.py …ps/routing_navigation/pop_views_until.pysdk/python/examples/apps/routing_navigation/pop_until_with_result.py renamed to sdk/python/examples/apps/routing_navigation/pop_views_until.py sdk/python/examples/apps/routing_navigation/pop_until_with_result.py renamed to sdk/python/examples/apps/routing_navigation/pop_views_until.py

@@ -81,9 +81,7 @@ def route_change():
                         ft.Button(
                             "Finish and go Home",
                             on_click=lambda _: asyncio.create_task(
-                                page.pop_until_with_result(
-                                    "/", result="Flow completed!"
-                                )
+                                page.pop_views_until("/", result="Flow completed!")
                             ),
                         ),
                     ],
@@ -92,7 +90,7 @@ def route_change():
 
         page.update()
 
-    def on_pop_result(e: ft.ViewPopResultEvent):
+    def on_pop_result(e: ft.ViewsPopUntilEvent):
         result_text.value = f"Result: {e.result}"
         page.show_dialog(ft.SnackBar(ft.Text(f"Result: {e.result}")))
         page.update()
@@ -105,7 +103,7 @@ async def view_pop(e: ft.ViewPopEvent):
 
     page.on_route_change = route_change
     page.on_view_pop = view_pop
-    page.on_view_pop_result = on_pop_result
+    page.on_views_pop_until = on_pop_result
 
     route_change()
 

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

@@ -409,7 +409,7 @@
     PlatformBrightnessChangeEvent,
     RouteChangeEvent,
     ViewPopEvent,
-    ViewPopResultEvent,
+    ViewsPopUntilEvent,
 )
 from flet.controls.painting import (
     Paint,
@@ -1073,7 +1073,7 @@
     "VerticalDivider",
     "View",
     "ViewPopEvent",
-    "ViewPopResultEvent",
+    "ViewsPopUntilEvent",
     "VisualDensity",
     "Wakelock",
     "WebBrowserName",

sdk/python/packages/flet/src/flet/controls/page.py

@@ -215,10 +215,10 @@ class ViewPopEvent(Event["Page"]):
 
 
 @dataclass
-class ViewPopResultEvent(Event["Page"]):
+class ViewsPopUntilEvent(Event["Page"]):
     """
-    Event payload delivered when [`Page.pop_until_with_result`]\
-    [flet.Page.pop_until_with_result] completes navigation.
+    Event payload delivered when [`Page.pop_views_until`]\
+    [flet.Page.pop_views_until] completes navigation.
 
     Carries the result value back to the destination view, analogous to
     Flutter's `Navigator.popUntilWithResult`.
@@ -232,7 +232,7 @@ class ViewPopResultEvent(Event["Page"]):
     result: Any = None
     """
     The result value passed from the caller of
-    [`pop_until_with_result`][flet.Page.pop_until_with_result].
+    [`pop_views_until`][flet.Page.pop_views_until].
     """
 
     view: Optional[View] = None
@@ -533,9 +533,9 @@ class Page(BasePage):
     control.
     """
 
-    on_view_pop_result: Optional[EventHandler[ViewPopResultEvent]] = None
+    on_views_pop_until: Optional[EventHandler[ViewsPopUntilEvent]] = None
     """
-    Called when [`pop_until_with_result`][flet.Page.pop_until_with_result] reaches
+    Called when [`pop_views_until`][flet.Page.pop_views_until] reaches
     the destination view.
 
     The event carries the result value passed by the caller.
@@ -742,7 +742,7 @@ def before_event(self, e: ControlEvent):
             self.__last_route = e.route
             self.query()
 
-        elif isinstance(e, ViewPopEvent | ViewPopResultEvent):
+        elif isinstance(e, ViewPopEvent | ViewsPopUntilEvent):
             for v in unwrap_component(self.views):
                 v = unwrap_component(v)
                 if v.route == e.route:
@@ -932,11 +932,11 @@ async def view_pop(e):
             arguments={"route": new_route},
         )
 
-    async def pop_until_with_result(self, route: str, result: Any = None) -> None:
+    async def pop_views_until(self, route: str, result: Any = None) -> None:
         """
         Pops views from the navigation stack until a view with the given
         `route` is found, then delivers `result` via the
-        [`on_view_pop_result`][flet.Page.on_view_pop_result] event.
+        [`on_views_pop_until`][flet.Page.on_views_pop_until] event.
 
         This is the Flet equivalent of Flutter's `Navigator.popUntilWithResult`.
 
@@ -946,22 +946,22 @@ async def pop_until_with_result(self, route: str, result: Any = None) -> None:
 
 
             def main(page: ft.Page):
-                def on_pop_result(e: ft.ViewPopResultEvent):
+                def on_pop_result(e: ft.ViewsPopUntilEvent):
                     page.show_dialog(ft.SnackBar(ft.Text(f"Result: {e.result}")))
 
-                page.on_view_pop_result = on_pop_result
+                page.on_views_pop_until = on_pop_result
 
                 # ... later, from a deeply nested view:
                 async def go_back(ev):
-                    await page.pop_until_with_result("/", result="Done!")
+                    await page.pop_views_until("/", result="Done!")
             ```
 
         Args:
             route: Target route to navigate back to. Must match the `route`
                 of an existing [`View`][flet.View] in
                 [`page.views`][flet.Page.views].
             result: Optional value delivered to
-                [`on_view_pop_result`][flet.Page.on_view_pop_result] on the
+                [`on_views_pop_until`][flet.Page.on_views_pop_until] on the
                 destination view.
 
         Raises:
@@ -987,17 +987,17 @@ async def go_back(ev):
         # Update browser URL
         await self.push_route(route)
 
-        # Fire on_view_pop_result for the destination view
-        if self.on_view_pop_result:
+        # Fire on_views_pop_until for the destination view
+        if self.on_views_pop_until:
             target_view = unwrap_component(views[target_idx])
-            e = ViewPopResultEvent(
-                name="view_pop_result",
+            e = ViewsPopUntilEvent(
+                name="views_pop_until",
                 control=self,
                 route=route,
                 result=result,
                 view=target_view,
             )
-            await self._trigger_event("view_pop_result", event_data=None, e=e)
+            await self._trigger_event("views_pop_until", event_data=None, e=e)
 
         self.update()
 

…flet/tests/test_pop_until_with_result.py …kages/flet/tests/test_pop_views_until.pysdk/python/packages/flet/tests/test_pop_until_with_result.py renamed to sdk/python/packages/flet/tests/test_pop_views_until.py sdk/python/packages/flet/tests/test_pop_until_with_result.py renamed to sdk/python/packages/flet/tests/test_pop_views_until.py

@@ -5,7 +5,7 @@
 
 import flet as ft
 from flet.controls.control_event import get_event_field_type
-from flet.controls.page import Page, ViewPopResultEvent
+from flet.controls.page import Page, ViewsPopUntilEvent
 from flet.messaging.connection import Connection
 from flet.messaging.session import Session
 from flet.pubsub.pubsub_hub import PubSubHub
@@ -17,64 +17,64 @@ def _make_page() -> Page:
     return Page(sess=Session(conn))
 
 
-def test_view_pop_result_event_creation():
+def test_views_pop_until_event_creation():
     page = _make_page()
-    evt = ViewPopResultEvent(
-        name="view_pop_result",
+    evt = ViewsPopUntilEvent(
+        name="views_pop_until",
         control=page,
         route="/",
         result="test_result",
     )
     assert evt.route == "/"
     assert evt.result == "test_result"
     assert evt.view is None
-    assert evt.name == "view_pop_result"
+    assert evt.name == "views_pop_until"
 
 
-def test_view_pop_result_event_default_result():
+def test_views_pop_until_event_default_result():
     page = _make_page()
-    evt = ViewPopResultEvent(
-        name="view_pop_result",
+    evt = ViewsPopUntilEvent(
+        name="views_pop_until",
         control=page,
         route="/home",
     )
     assert evt.result is None
 
 
-def test_get_event_field_type_on_view_pop_result():
+def test_get_event_field_type_on_views_pop_until():
     page = _make_page()
-    event_type = get_event_field_type(page, "on_view_pop_result")
-    assert event_type == ViewPopResultEvent
+    event_type = get_event_field_type(page, "on_views_pop_until")
+    assert event_type == ViewsPopUntilEvent
 
 
-def test_view_pop_result_event_importable_from_flet():
-    assert hasattr(ft, "ViewPopResultEvent")
-    assert ft.ViewPopResultEvent is ViewPopResultEvent
+def test_views_pop_until_event_importable_from_flet():
+    assert hasattr(ft, "ViewsPopUntilEvent")
+    assert ft.ViewsPopUntilEvent is ViewsPopUntilEvent
 
 
-def test_page_has_on_view_pop_result_attribute():
+def test_page_has_on_views_pop_until_attribute():
     page = _make_page()
-    assert hasattr(page, "on_view_pop_result")
-    assert page.on_view_pop_result is None
+    assert hasattr(page, "on_views_pop_until")
+    assert page.on_views_pop_until is None
 
 
-def test_page_has_pop_until_with_result_method():
+def test_page_has_pop_views_until_method():
     page = _make_page()
-    assert hasattr(page, "pop_until_with_result")
-    assert inspect.iscoroutinefunction(page.pop_until_with_result)
+    assert hasattr(page, "pop_views_until")
+    assert inspect.iscoroutinefunction(page.pop_views_until)
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_raises_on_missing_route():
+async def test_pop_views_until_raises_on_missing_route():
     page = _make_page()
     page.views = [ft.View(route="/")]
 
     with pytest.raises(ValueError, match="No view found with route '/nonexistent'"):
-        await page.pop_until_with_result("/nonexistent")
+        await page.pop_views_until("/nonexistent")
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_removes_views_above_target():
+async def test_pop_views_until_removes_views_above_target():
     page = _make_page()
     page.views = [
         ft.View(route="/"),
@@ -87,14 +87,14 @@ async def test_pop_until_with_result_removes_views_above_target():
         patch.object(page, "_invoke_method", new_callable=AsyncMock),
         patch.object(page, "update"),
     ):
-        await page.pop_until_with_result("/", result="done")
+        await page.pop_views_until("/", result="done")
 
     assert len(page.views) == 1
     assert page.views[0].route == "/"
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_removes_to_middle_view():
+async def test_pop_views_until_removes_to_middle_view():
     page = _make_page()
     page.views = [
         ft.View(route="/"),
@@ -106,15 +106,15 @@ async def test_pop_until_with_result_removes_to_middle_view():
         patch.object(page, "_invoke_method", new_callable=AsyncMock),
         patch.object(page, "update"),
     ):
-        await page.pop_until_with_result("/step1", result="partial")
+        await page.pop_views_until("/step1", result="partial")
 
     assert len(page.views) == 2
     assert page.views[0].route == "/"
     assert page.views[1].route == "/step1"
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_no_op_when_target_is_top():
+async def test_pop_views_until_no_op_when_target_is_top():
     page = _make_page()
     page.views = [
         ft.View(route="/"),
@@ -125,51 +125,51 @@ async def test_pop_until_with_result_no_op_when_target_is_top():
         patch.object(page, "_invoke_method", new_callable=AsyncMock),
         patch.object(page, "update"),
     ):
-        await page.pop_until_with_result("/current", result="same")
+        await page.pop_views_until("/current", result="same")
 
     assert len(page.views) == 2
     assert page.views[-1].route == "/current"
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_fires_only_view_pop_result():
+async def test_pop_views_until_fires_only_views_pop_until():
     page = _make_page()
     page.views = [
         ft.View(route="/"),
         ft.View(route="/step1"),
         ft.View(route="/step2"),
     ]
 
-    page.on_view_pop_result = lambda e: None
+    page.on_views_pop_until = lambda e: None
 
     with (
         patch.object(page, "_invoke_method", new_callable=AsyncMock),
         patch.object(page, "update"),
         patch.object(page, "_trigger_event", new_callable=AsyncMock) as mock_trigger,
     ):
-        await page.pop_until_with_result("/", result="finished")
+        await page.pop_views_until("/", result="finished")
 
     trigger_calls = [call.args[0] for call in mock_trigger.call_args_list]
-    # on_view_pop should NOT be fired — pop_until_with_result handles removal
+    # on_view_pop should NOT be fired — pop_views_until handles removal
     assert "view_pop" not in trigger_calls
-    # on_view_pop_result SHOULD be fired for the destination view
-    assert "view_pop_result" in trigger_calls
+    # on_views_pop_until SHOULD be fired for the destination view
+    assert "views_pop_until" in trigger_calls
 
 
 @pytest.mark.asyncio
-async def test_pop_until_with_result_no_event_when_no_handler():
+async def test_pop_views_until_no_event_when_no_handler():
     page = _make_page()
     page.views = [
         ft.View(route="/"),
         ft.View(route="/step1"),
     ]
 
-    # No on_view_pop_result handler set
+    # No on_views_pop_until handler set
     with (
         patch.object(page, "_invoke_method", new_callable=AsyncMock),
         patch.object(page, "update"),
         patch.object(page, "_trigger_event", new_callable=AsyncMock) as mock_trigger,
     ):
-        await page.pop_until_with_result("/", result="done")
+        await page.pop_views_until("/", result="done")
 
     assert mock_trigger.call_count == 0