'Widget.remove_children' should remove direct children only.

Relevant feedback comment: #4183 (comment).

Author: rodrigogiraoserrao

src/textual/widget.py

@@ -55,6 +55,8 @@
 from .await_remove import AwaitRemove
 from .box_model import BoxModel
 from .cache import FIFOCache
+from .css.match import match
+from .css.parse import parse_selectors
 from .css.query import NoMatches, WrongType
 from .css.scalar import ScalarOffset
 from .dom import DOMNode, NoScreen
@@ -3294,22 +3296,22 @@ def remove(self) -> AwaitRemove:
         await_remove = self.app._remove_nodes([self], self.parent)
         return await_remove
 
-    def remove_children(
-        self, selector: str | type[QueryType] | None = None
-    ) -> AwaitRemove:
-        """Remove the children of this Widget from the DOM.
+    def remove_children(self, selector: str | type[QueryType] = "*") -> AwaitRemove:
+        """Remove the immediate children of this Widget from the DOM.
 
         Args:
-            selector: A CSS selector to specify which children to remove.
+            selector: A CSS selector to specify which direct children to remove.
 
         Returns:
-            An awaitable object that waits for the children to be removed.
+            An awaitable object that waits for the direct children to be removed.
         """
-        if isinstance(selector, str) or selector is None:
-            children_to_remove = self.query(selector)
-        else:
-            children_to_remove = self.query(selector.__name__)
-        await_remove = self.app._remove_nodes(list(children_to_remove), self)
+        if not isinstance(selector, str):
+            selector = selector.__name__
+        parsed_selectors = parse_selectors(selector)
+        children_to_remove = [
+            child for child in self.children if match(parsed_selectors, child)
+        ]
+        await_remove = self.app._remove_nodes(children_to_remove, self)
         return await_remove
 
     @asynccontextmanager

tests/test_widget_removing.py

@@ -168,10 +168,10 @@ async def test_widget_remove_children_with_string_selector():
 
         await app.screen.remove_children("Label")
 
-        # All labels are gone but the button and the container remain.
+        # Only the Screen > Label widget is gone, everything else remains.
         assert len(app.query(Button)) == 1
         assert len(app.query(Vertical)) == 1
-        assert len(app.query(Label)) == 0
+        assert len(app.query(Label)) == 5
 
 
 async def test_widget_remove_children_with_type_selector():
@@ -198,22 +198,6 @@ async def test_widget_remove_children_with_selector_does_not_leak():
         assert len(container.children) == 0
 
 
-async def test_widget_remove_children_with_compound_selector():
-    app = ExampleApp()
-    async with app.run_test():
-        container = app.query_one(Vertical)
-
-        # 6 labels in total, with 5 of them inside the container.
-        assert len(app.query(Label)) == 6
-        assert len(container.children) == 5
-
-        await app.screen.remove_children("Vertical > Label")
-
-        # The labels inside the container are gone, and the 1 outside remains.
-        assert len(app.query(Label)) == 1
-        assert len(container.children) == 0
-
-
 async def test_widget_remove_children_no_children():
     app = ExampleApp()
     async with app.run_test():