Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/textual/_compositor.py
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,8 @@ def add_widget(
- widget.scrollbar_size_horizontal
)
)
capped_scroll_y = widget.validate_scroll_y(new_scroll_y)
widget.set_reactive(Widget.scroll_y, capped_scroll_y)
widget.set_reactive(Widget.scroll_target_y, capped_scroll_y)
widget.set_reactive(Widget.scroll_y, new_scroll_y)
widget.set_reactive(Widget.scroll_target_y, new_scroll_y)
widget.vertical_scrollbar._reactive_position = new_scroll_y

if visible_only:
Expand Down
15 changes: 7 additions & 8 deletions src/textual/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -4274,9 +4274,7 @@ def remove_children(
]
else:
children_to_remove = selector
await_remove = self.app._prune(
*children_to_remove, parent=cast(DOMNode, self._parent)
)
await_remove = self.app._prune(*children_to_remove, parent=self)
return await_remove

@asynccontextmanager
Expand Down Expand Up @@ -4423,11 +4421,12 @@ def _check_refresh(self) -> None:
self.call_later(self._update_styles)
if self._scroll_required:
self._scroll_required = False
if self.styles.keyline[0] != "none":
# TODO: Feels like a hack
# Perhaps there should be an explicit mechanism for backgrounds to refresh when scrolled?
self._set_dirty()
screen.post_message(messages.UpdateScroll())
if not self._layout_required:
if self.styles.keyline[0] != "none":
# TODO: Feels like a hack
# Perhaps there should be an explicit mechanism for backgrounds to refresh when scrolled?
self._set_dirty()
screen.post_message(messages.UpdateScroll())
if self._repaint_required:
self._repaint_required = False
if self.display:
Expand Down
150 changes: 150 additions & 0 deletions tests/snapshot_tests/__snapshots__/test_snapshots/test_prune_fix.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions tests/snapshot_tests/test_snapshots.py
Original file line number Diff line number Diff line change
Expand Up @@ -4713,3 +4713,29 @@ def compose(self) -> ComposeResult:
yield Static("Hello, World! 293487 " * 200)

assert snap_compare(ScrollbarApp())


def test_prune_fix(snap_compare) -> None:
"""Regression test for https://github.com/Textualize/textual/issues/6205

You should see the text "Hello" and "World" across the first two lines.
The original issue is that a layout operation wasn't done after removing children, leaving
a large gap between "Hello" and "World"

"""

class PruneApp(App):
BINDINGS = [Binding("c", "clear", priority=True)]

def compose(self) -> ComposeResult:
yield Static("Hello")
with VerticalGroup():
for i in range(10):
yield Static(str(i))
yield Static("World")

async def action_clear(self) -> None:
vs = self.query_one(VerticalGroup)
await vs.remove_children()

assert snap_compare(PruneApp(), press=["c"])
Loading