fix wait_for_refresh

Author: willmcgugan

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - The :hover pseudo-class no applies to the first widget under the mouse with a hover style set https://github.com/Textualize/textual/pull/6132
 - The footer key hover background is more visible https://github.com/Textualize/textual/pull/6132
 - Made `App.delay_update` public https://github.com/Textualize/textual/pull/6137
+- Pilot.click will return True if the initial mouse down is on the specified target https://github.com/Textualize/textual/pull/6139
 
 ### Added
 

src/textual/message_pump.py

@@ -457,19 +457,24 @@ def call_after_refresh(self, callback: Callback, *args: Any, **kwargs: Any) -> b
         message = messages.InvokeLater(partial(callback, *args, **kwargs))
         return self.post_message(message)
 
-    async def wait_for_refresh(self) -> None:
+    async def wait_for_refresh(self) -> bool:
         """Wait for the next refresh.
 
         This method should only be called from a task other than the one running this widget.
         If called from the same task, it will return immediately to avoid blocking the event loop.
 
+        Returns:
+            `True` if waiting for refresh was successful, or `False` if the call was a null-op
+                due to calling it within the node's own task.
+
         """
 
-        if self._task is None or asyncio.current_task() is not self._task:
-            return
+        if self._task is None or asyncio.current_task() is self._task:
+            return False
         refreshed_event = asyncio.Event()
         self.call_after_refresh(refreshed_event.set)
         await refreshed_event.wait()
+        return True
 
     def call_later(self, callback: Callback, *args: Any, **kwargs: Any) -> bool:
         """Schedule a callback to run after all messages are processed in this object.

src/textual/pilot.py

@@ -444,7 +444,8 @@ async def _post_mouse_events(
                 if mouse_event_cls is Click:
                     kwargs = {**kwargs, "chain": chain}
 
-                widget_at, _ = app.get_widget_at(*offset)
+                if widget_at is None:
+                    widget_at, _ = app.get_widget_at(*offset)
                 event = mouse_event_cls(**kwargs)
                 # Bypass event processing in App.on_event. Because App.on_event
                 # is responsible for updating App.mouse_position, and because

src/textual/widgets/_footer.py

@@ -347,7 +347,7 @@ def _on_mouse_scroll_up(self, event: events.MouseScrollUp) -> None:
                 event.stop()
                 event.prevent_default()
 
-    async def on_mount(self) -> None:
+    def on_mount(self) -> None:
         self.screen.bindings_updated_signal.subscribe(self, self.bindings_changed)
 
     def on_unmount(self) -> None:

tests/test_modal.py

@@ -68,7 +68,7 @@ class ModalApp(App):
 
     def compose(self) -> ComposeResult:
         yield Header()
-        yield Label(TEXT * 8)
+        yield Label(TEXT)
         yield Footer()
 
     def action_request_quit(self) -> None:
@@ -90,15 +90,8 @@ async def test_modal_pop_screen():
     async with app.run_test() as pilot:
         # Pause to ensure the footer is fully composed to avoid flakiness in CI
         await pilot.pause()
-        await app.wait_for_refresh()
-        print(1, app.screen)
-        # Check clicking the footer brings up the quit screen
-        assert await pilot.click(offset=(1, app.size.height - 1))
-        print(2, app.screen)
-        await app.wait_for_refresh()
-        print(3, app.screen)
-        await pilot.pause(1)
-        print(4, app.screen)
+        assert await pilot.click("FooterKey")
+        assert await app.wait_for_refresh()
         assert isinstance(app.screen, QuitScreen)
         # Check activating the quit button exits the app
         await pilot.press("enter")