Merge pull request #6041 from Textualize/prettier-fix

don't ineherit from Static

Author: willmcgugan

CHANGELOG.md

@@ -12,12 +12,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fix type hint for SelectType: only hashable types are allowed. https://github.com/Textualize/textual/pull/6034
 - Fixed `Content.expand_tabs` https://github.com/Textualize/textual/pull/6038
 - Fixed return value for `Pilot.double_click` and `Pilot.triple_click` https://github.com/Textualize/textual/pull/6035
-- Fixed sizing issue with `Pretty` widget https://github.com/Textualize/textual/pull/6040
+- Fixed sizing issue with `Pretty` widget https://github.com/Textualize/textual/pull/6040 https://github.com/Textualize/textual/pull/6041
 
 ### Added
 
 - Added `bar_renderable` to `ProgressBar` widget https://github.com/Textualize/textual/pull/5963
 
+
+### Changed
+
+- Breaking change: The `renderable` property on the `Static` widget has been changed to `content`. https://github.com/Textualize/textual/pull/6041
+
 # [5.3.0] - 2025-08-07
 
 ### Added

src/textual/widgets/_pretty.py

@@ -6,10 +6,11 @@
 
 from rich.pretty import Pretty as PrettyRenderable
 
-from textual.widgets import Static
+from textual.app import RenderResult
+from textual.widget import Widget
 
 
-class Pretty(Static):
+class Pretty(Widget):
     """A pretty-printing widget.
 
     Used to pretty-print any object.
@@ -38,12 +39,18 @@ def __init__(
             classes: The CSS classes of the pretty.
         """
         super().__init__(name=name, id=id, classes=classes)
-        self.update(object)
+        self.shrink = False
+        self._pretty_renderable = PrettyRenderable(object)
 
-    def update(self, object: Any) -> None:
+    def render(self) -> RenderResult:
+        return self._pretty_renderable
+
+    def update(self, object: object) -> None:
         """Update the content of the pretty widget.
 
         Args:
             object: The object to pretty-print.
         """
-        super().update(PrettyRenderable(object))
+        self._pretty_renderable = PrettyRenderable(object)
+        self.clear_cached_dimensions()
+        self.refresh(layout=True)

src/textual/widgets/_static.py

@@ -58,15 +58,15 @@ def visual(self) -> Visual:
         return self._visual
 
     @property
-    def renderable(self) -> VisualType:
-        return self._content or ""
-
-    # TODO: Should probably be renamed to `content`.
-    @renderable.setter
-    def renderable(self, renderable: VisualType) -> None:
-        self._renderable = renderable
-        self._visual = None
+    def content(self) -> VisualType:
+        """The content set in the constructor."""
+        return self._content
+
+    @content.setter
+    def content(self, content: VisualType) -> None:
+        self._visual = visualize(self, content, markup=self._render_markup)
         self.clear_cached_dimensions()
+        self.refresh(layout=True)
 
     def render(self) -> RenderResult:
         """Get a rich renderable for the widget's content.

tests/listview/test_listview_navigation.py

@@ -21,7 +21,7 @@ def _on_list_view_highlighted(self, message: ListView.Highlighted) -> None:
         if message.item is None:
             self.highlighted.append(None)
         else:
-            self.highlighted.append(str(message.item.children[0].renderable))
+            self.highlighted.append(str(message.item.children[0].content))
 
 
 async def test_keyboard_navigation_with_disabled_items() -> None:

tests/listview/test_listview_remove_items.py

@@ -44,7 +44,7 @@ def _on_list_view_highlighted(self, message: ListView.Highlighted) -> None:
         if message.item is None:
             self.highlighted.append(None)
         else:
-            self.highlighted.append(str(message.item.children[0].renderable))
+            self.highlighted.append(str(message.item.children[0].content))
 
 
 async def test_listview_remove_items() -> None:

tests/select/test_prompt.py

@@ -22,11 +22,11 @@ def compose(self):
         select_current_label = select_current.query_one("#label", Static)
         select_overlay = select_widget.query_one(SelectOverlay)
 
-        assert select_current_label.renderable == "Old prompt"
+        assert select_current_label.content == "Old prompt"
         assert select_overlay._options[0].prompt == Text("Old prompt")
 
         select_widget.prompt = "New prompt"
-        assert select_current_label.renderable == "New prompt"
+        assert select_current_label.content == "New prompt"
         assert select_overlay._options[0].prompt == Text("New prompt")
 
 
@@ -46,9 +46,9 @@ def compose(self):
         select_current_label = select_current.query_one("#label", Static)
         select_overlay = select_widget.query_one(SelectOverlay)
 
-        assert select_current_label.renderable == "0"
+        assert select_current_label.content == "0"
         assert select_overlay._options[0].prompt == "0"
 
         select_widget.prompt = "New prompt"
-        assert select_current_label.renderable == "0"
+        assert select_current_label.content == "0"
         assert select_overlay._options[0].prompt == "0"

tests/snapshot_tests/__snapshots__/test_snapshots/test_static_content_property.svg

@@ -4570,3 +4570,21 @@ def compose(self) -> ComposeResult:
                 yield Pretty("hello world")
 
     assert snap_compare(Demo())
+
+
+def test_static_content_property(snap_compare):
+    """Test that the Static.content property.
+
+    You should see the text "FOO BAR"
+
+    """
+
+    class StaticApp(App):
+
+        def compose(self) -> ComposeResult:
+            yield Static("Hello, World")
+
+        def on_mount(self) -> None:
+            self.query_one(Static).content = "FOO BAR"
+
+    assert snap_compare(StaticApp())

tests/snapshot_tests/test_snapshots.py

@@ -82,25 +82,25 @@ async def test_mode_setup(ModesApp: Type[App]):
     app = ModesApp()
     async with app.run_test():
         assert isinstance(app.screen, BaseScreen)
-        assert str(app.screen.query_one(Label).renderable) == "one"
+        assert str(app.screen.query_one(Label).content) == "one"
 
 
 async def test_switch_mode(ModesApp: Type[App]):
     app = ModesApp()
     async with app.run_test() as pilot:
         await pilot.press("2")
-        assert str(app.screen.query_one(Label).renderable) == "two"
+        assert str(app.screen.query_one(Label).content) == "two"
         await pilot.press("1")
-        assert str(app.screen.query_one(Label).renderable) == "one"
+        assert str(app.screen.query_one(Label).content) == "one"
 
 
 async def test_switch_same_mode(ModesApp: Type[App]):
     app = ModesApp()
     async with app.run_test() as pilot:
         await pilot.press("1")
-        assert str(app.screen.query_one(Label).renderable) == "one"
+        assert str(app.screen.query_one(Label).content) == "one"
         await pilot.press("1")
-        assert str(app.screen.query_one(Label).renderable) == "one"
+        assert str(app.screen.query_one(Label).content) == "one"
 
 
 async def test_switch_unknown_mode(ModesApp: Type[App]):
@@ -115,7 +115,7 @@ async def test_remove_mode(ModesApp: Type[App]):
     async with app.run_test() as pilot:
         await app.switch_mode("two")
         await pilot.pause()
-        assert str(app.screen.query_one(Label).renderable) == "two"
+        assert str(app.screen.query_one(Label).content) == "two"
         app.remove_mode("one")
         assert "one" not in app._modes
 
@@ -133,7 +133,7 @@ async def test_add_mode(ModesApp: Type[App]):
         app.add_mode("three", lambda: BaseScreen("three"))
         await app.switch_mode("three")
         await pilot.pause()
-        assert str(app.screen.query_one(Label).renderable) == "three"
+        assert str(app.screen.query_one(Label).content) == "three"
 
 
 async def test_add_mode_duplicated(ModesApp: Type[App]):
@@ -152,7 +152,7 @@ async def test_screen_stack_preserved(ModesApp: Type[App]):
         # Build the stack up.
         for _ in range(N):
             await pilot.press("p")
-            fruits.append(str(app.screen.query_one(Label).renderable))
+            fruits.append(str(app.screen.query_one(Label).content))
 
         assert len(app.screen_stack) == N + 1
 
@@ -164,7 +164,7 @@ async def test_screen_stack_preserved(ModesApp: Type[App]):
         # Check the stack.
         assert len(app.screen_stack) == N + 1
         for _ in range(N):
-            assert str(app.screen.query_one(Label).renderable) == fruits.pop()
+            assert str(app.screen.query_one(Label).content) == fruits.pop()
             await pilot.press("o")