Merge branch 'main' into fix-1372

tests/test_overflow_change.py

@@ -0,0 +1,37 @@
+"""Regression test for #1616 https://github.com/Textualize/textual/issues/1616"""
+import pytest
+
+
+from textual.app import App
+from textual.containers import Vertical
+
+
+async def test_overflow_change_updates_virtual_size_appropriately():
+    class MyApp(App):
+        def compose(self):
+            yield Vertical()
+
+    app = MyApp()
+
+    async with app.run_test() as pilot:
+        vertical = app.query_one(Vertical)
+
+        height = vertical.virtual_size.height
+
+        vertical.styles.overflow_x = "scroll"
+        await pilot.pause()  # Let changes propagate.
+        assert vertical.virtual_size.height < height
+
+        vertical.styles.overflow_x = "hidden"
+        await pilot.pause()
+        assert vertical.virtual_size.height == height
+
+        width = vertical.virtual_size.width
+
+        vertical.styles.overflow_y = "scroll"
+        await pilot.pause()
+        assert vertical.virtual_size.width < width
+
+        vertical.styles.overflow_y = "hidden"
+        await pilot.pause()
+        assert vertical.virtual_size.width == width

tests/tree/test_tree_node_children.py

@@ -1,5 +1,6 @@
 import pytest
-from textual.widgets import Tree, TreeNode
+from textual.widgets import Tree
+from textual.widgets.tree import TreeNode
 
 
 def label_of(node: TreeNode[None]):

tests/tree/test_tree_node_label.py

@@ -1,4 +1,5 @@
-from textual.widgets import Tree, TreeNode
+from textual.widgets import Tree
+from textual.widgets.tree import TreeNode
 from rich.text import Text
 
 

tests/tree/test_tree_node_parent.py

@@ -1,4 +1,4 @@
-from textual.widgets import TreeNode, Tree
+from textual.widgets import Tree
 
 
 def test_tree_node_parent() -> None: