Merge pull request #4285 from davep/tabs-event-isolation

Ensure TabbedContent only handles tab messages intended for it

Author: davep

CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Markdown component classes weren't refreshed when watching for CSS https://github.com/Textualize/textual/issues/3464
 - Rename `Switch.action_toggle` to `action_toggle_switch` to fix clash with `DOMNode.action_toggle` https://github.com/Textualize/textual/issues/4262
 - Fixed `OptionList.OptionHighlighted` leaking out of `Select` https://github.com/Textualize/textual/issues/4224
+- Fixed `Tab` enable/disable messages leaking into `TabbedContent` https://github.com/Textualize/textual/issues/4233
 - Fixed a style leak from `TabbedContent` https://github.com/Textualize/textual/issues/4232
 
 ### Changed

src/textual/widgets/_tabbed_content.py

@@ -610,6 +610,8 @@ def get_pane(self, pane_id: str | ContentTab) -> TabPane:
 
     def _on_tabs_tab_disabled(self, event: Tabs.TabDisabled) -> None:
         """Disable the corresponding tab pane."""
+        if event.tabs.parent is not self:
+            return
         event.stop()
         tab_id = event.tab.id or ""
         try:
@@ -631,6 +633,8 @@ def _on_tab_pane_disabled(self, event: TabPane.Disabled) -> None:
 
     def _on_tabs_tab_enabled(self, event: Tabs.TabEnabled) -> None:
         """Enable the corresponding tab pane."""
+        if event.tabs.parent is not self:
+            return
         event.stop()
         tab_id = event.tab.id or ""
         try:

tests/test_tabbed_content.py

@@ -867,3 +867,26 @@ def compose(self) -> ComposeResult:
 
         assert inner_tabs.active_tab is None
         assert tabbed_content.active == "outer1"
+
+
+async def test_disabling_tab_within_tabbed_content_stays_isolated():
+    """Disabling a tab within a tab pane should not affect the TabbedContent."""
+
+    class TabsNestedInTabbedContent(App):
+        def compose(self) -> ComposeResult:
+            with TabbedContent():
+                with TabPane("TabbedContent", id="duplicate"):
+                    yield Tabs(
+                        Tab("Tab1", id="duplicate"),
+                        Tab("Tab2", id="stay-enabled"),
+                        id="test-tabs",
+                    )
+
+    app = TabsNestedInTabbedContent()
+    async with app.run_test() as pilot:
+        assert app.query_one("Tab#duplicate").disabled is False
+        assert app.query_one("TabPane#duplicate").disabled is False
+        app.query_one("#test-tabs", Tabs).disable("duplicate")
+        await pilot.pause()
+        assert app.query_one("Tab#duplicate").disabled is True
+        assert app.query_one("TabPane#duplicate").disabled is False