Merge pull request #6023 from Textualize/content-simplify

content simplify

Author: willmcgugan

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# Unreleased
+
+### Added
+
+- Added `Content.simplify` https://github.com/Textualize/textual/pull/6023
+- Added `textual.reactive.Initialize` https://github.com/Textualize/textual/pull/6023
+
 ## [5.2.0] - 2025-08-01
 
 ### Added

src/textual/_callback.py

@@ -30,7 +30,10 @@ def count_parameters(func: Callable) -> int:
         param_count = _count_parameters(func) - 1
     else:
         param_count = _count_parameters(func)
-    func._param_count = param_count
+    try:
+        func._param_count = param_count
+    except TypeError:
+        pass
     return param_count
 
 

src/textual/_compositor.py

@@ -614,6 +614,7 @@ def add_widget(
                             )
                         )
                         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:

src/textual/_slug.py

@@ -114,3 +114,27 @@ def slug(self, text: str) -> str:
         if used:
             slugged = f"{slugged}-{used}"
         return slugged
+
+
+VALID_ID_CHARACTERS = frozenset("abcdefghijklmnopqrstuvwxyz0123456789-")
+
+
+def slug_for_tcss_id(text: str) -> str:
+    """Produce a slug usable as a TCSS id from the given text.
+
+    Args:
+        text: Text.
+
+    Returns:
+        A slugified version of text suitable for use as a TCSS id.
+    """
+    is_valid = VALID_ID_CHARACTERS.__contains__
+    slug = "".join(
+        (character if is_valid(character) else "{:x}".format(ord(character)))
+        for character in text.casefold().replace(" ", "-")
+    )
+    if not slug:
+        return "_"
+    if slug[0].isdecimal():
+        return f"_{slug}"
+    return slug

src/textual/content.py

@@ -395,6 +395,36 @@ def assemble(
             text_append(end)
         return cls("".join(text), spans)
 
+    def simplify(self) -> Content:
+        """Simplify spans by joining contiguous spans together.
+
+        This can produce faster renders but typically only worth it if you have appended a
+        large number of Content instances together.
+
+        Note that this this modifies the Content instance in-place, which might appear
+        to violate the immutability constraints, but it will not change the rendered output,
+        nor its hash.
+
+        Returns:
+            Self.
+        """
+        spans = self.spans
+        if not spans:
+            return self
+        last_span = Span(0, 0, Style())
+        new_spans: list[Span] = []
+        changed: bool = False
+        for span in self._spans:
+            if span.start == last_span.end and span.style == last_span.style:
+                last_span = new_spans[-1] = Span(last_span.start, span.end, span.style)
+                changed = True
+            else:
+                new_spans.append(span)
+                last_span = span
+        if changed:
+            self._spans[:] = new_spans
+        return self
+
     def __eq__(self, other: object) -> bool:
         """Compares text only, so that markup doesn't effect sorting."""
         if isinstance(other, str):
@@ -528,7 +558,6 @@ def get_span(y: int) -> tuple[int, int] | None:
                 return None
 
         for y, line in enumerate(self.split(allow_blank=True)):
-
             if post_style is not None:
                 line = line.stylize(post_style)
 
@@ -1201,6 +1230,12 @@ def render_segments(
         ]
         return segments
 
+    def __rich__(self):
+        """Allow Content to be rendered with rich.print."""
+        from rich.segment import Segments
+
+        return Segments(self.render_segments(Style(), "\n"))
+
     def _divide_spans(self, offsets: tuple[int, ...]) -> list[tuple[Span, int, int]]:
         """Divide content from a list of offset to cut.
 
@@ -1568,7 +1603,6 @@ def to_strip(self, style: Style) -> tuple[list[Segment], int]:
     def _apply_link_style(
         self, link_style: RichStyle, segments: list[Segment]
     ) -> list[Segment]:
-
         _Segment = Segment
         segments = [
             _Segment(

src/textual/getters.py

@@ -54,23 +54,17 @@ def __init__(self, selector: str) -> None:
         Args:
             selector: A TCSS selector, e.g. "#mywidget"
         """
-        self.selector = selector
-        self.expect_type = Widget
 
     @overload
-    def __init__(self, selector: type[QueryType]) -> None:
-        self.selector = selector.__name__
-        self.expect_type = selector
+    def __init__(self, selector: type[QueryType]) -> None: ...
 
     @overload
-    def __init__(self, selector: str, expect_type: type[QueryType]) -> None:
-        self.selector = selector
-        self.expect_type = expect_type
+    def __init__(self, selector: str, expect_type: type[QueryType]) -> None: ...
 
     @overload
-    def __init__(self, selector: type[QueryType], expect_type: type[QueryType]) -> None:
-        self.selector = selector.__name__
-        self.expect_type = expect_type
+    def __init__(
+        self, selector: type[QueryType], expect_type: type[QueryType]
+    ) -> None: ...
 
     def __init__(
         self,
@@ -140,14 +134,10 @@ def on_mount(self) -> None:
     expect_type: type[Widget]
 
     @overload
-    def __init__(self, child_id: str) -> None:
-        self.child_id = child_id
-        self.expect_type = Widget
+    def __init__(self, child_id: str) -> None: ...
 
     @overload
-    def __init__(self, child_id: str, expect_type: type[QueryType]) -> None:
-        self.child_id = child_id
-        self.expect_type = expect_type
+    def __init__(self, child_id: str, expect_type: type[QueryType]) -> None: ...
 
     def __init__(
         self,

src/textual/reactive.py

@@ -56,6 +56,29 @@ class TooManyComputesError(ReactiveError):
     """Raised when an attribute has public and private compute methods."""
 
 
+class Initialize(Generic[ReactiveType]):
+    """Initialize a reactive by calling a method parent object.
+
+    Example:
+        ```python
+            class InitializeApp(App):
+
+                def get_names(self) -> list[str]:
+                    return ["foo", "bar", "baz"]
+
+                # The `names` property will call `get_names` to get its default when first referenced.
+                names = reactive(Initialize(get_names))
+        ```
+
+    """
+
+    def __init__(self, callback: Callable[[ReactableType], ReactiveType]) -> None:
+        self.callback = callback
+
+    def __call__(self, obj: ReactableType) -> ReactiveType:
+        return self.callback(obj)
+
+
 async def await_watcher(obj: Reactable, awaitable: Awaitable[object]) -> None:
     """Coroutine to await an awaitable returned from a watcher"""
     _rich_traceback_omit = True
@@ -118,7 +141,7 @@ class Reactive(Generic[ReactiveType]):
 
     def __init__(
         self,
-        default: ReactiveType | Callable[[], ReactiveType],
+        default: ReactiveType | Callable[[], ReactiveType] | Initialize[ReactiveType],
         *,
         layout: bool = False,
         repaint: bool = True,
@@ -190,7 +213,11 @@ def _initialize_reactive(self, obj: Reactable, name: str) -> None:
         else:
             default_or_callable = self._default
             default = (
-                default_or_callable()
+                (
+                    default_or_callable(obj)
+                    if isinstance(default_or_callable, Initialize)
+                    else default_or_callable()
+                )
                 if callable(default_or_callable)
                 else default_or_callable
             )
@@ -421,7 +448,7 @@ class reactive(Reactive[ReactiveType]):
 
     def __init__(
         self,
-        default: ReactiveType | Callable[[], ReactiveType],
+        default: ReactiveType | Callable[[], ReactiveType] | Initialize[ReactiveType],
         *,
         layout: bool = False,
         repaint: bool = True,
@@ -456,7 +483,7 @@ class var(Reactive[ReactiveType]):
 
     def __init__(
         self,
-        default: ReactiveType | Callable[[], ReactiveType],
+        default: ReactiveType | Callable[[], ReactiveType] | Initialize[ReactiveType],
         init: bool = True,
         always_update: bool = False,
         bindings: bool = False,

src/textual/visual.py

@@ -196,6 +196,7 @@ def to_strips(
         height: int | None,
         style: Style,
         *,
+        apply_selection: bool = True,
         pad: bool = False,
         post_style: Style | None = None,
     ) -> list[Strip]:
@@ -207,6 +208,7 @@ def to_strips(
             width: Desired width (in cells).
             height: Desired height (in lines) or `None` for no limit.
             style: A (Visual) Style instance.
+            apply_selection: Automatically apply selection styles?
             pad: Pad to desired width?
             post_style: Optional Style to apply to strips after rendering.
 
@@ -229,7 +231,7 @@ def to_strips(
             RenderOptions(
                 widget._get_style,
                 widget.styles,
-                selection,
+                selection if apply_selection else None,
                 selection_style,
             ),
         )

src/textual/widgets/_markdown.py

@@ -13,7 +13,7 @@
 from rich.text import Text
 from typing_extensions import TypeAlias
 
-from textual._slug import TrackedSlugs, slug
+from textual._slug import TrackedSlugs, slug_for_tcss_id
 from textual.app import ComposeResult
 from textual.await_complete import AwaitComplete
 from textual.containers import Horizontal, Vertical, VerticalScroll
@@ -1267,7 +1267,9 @@ def _parse_markdown(self, tokens: Iterable[Token]) -> Iterable[MarkdownBlock]:
             elif token_type.endswith("_close"):
                 block = stack.pop()
                 if token.type == "heading_close":
-                    block.id = f"heading-{slug(block._content.plain)}-{id(block)}"
+                    block.id = (
+                        f"heading-{slug_for_tcss_id(block._content.plain)}-{id(block)}"
+                    )
                 if stack:
                     stack[-1]._blocks.append(block)
                 else:

tests/test_content.py

@@ -286,3 +286,11 @@ def test_split_and_tabs():
     content = Content("--- hello.py\t2024-01-15 10:30:00.000000000 -0800", spans=spans)
     widget = Widget()
     content.render_strips(0, None, Style(), RenderOptions(widget._get_style, {}))
+
+
+def test_simplify():
+    """Test simplify joins spans."""
+    content = Content.from_markup("[bold]Foo[/][bold]Bar[/]")
+    assert content.spans == [Span(0, 3, "bold"), Span(3, 6, "bold")]
+    content.simplify()
+    assert content.spans == [Span(0, 6, "bold")]