Merge pull request #5973 from Textualize/expand-optimal

added expand rule

Author: willmcgugan

CHANGELOG.md

@@ -14,15 +14,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added `Markdown.get_stream` https://github.com/Textualize/textual/pull/5966
 - Added `textual.highlight` module for syntax highlighting https://github.com/Textualize/textual/pull/5966
 - Added `MessagePump.wait_for_refresh` method https://github.com/Textualize/textual/pull/5966
+- Added `Widget.container_scroll_offset` https://github.com/Textualize/textual/commit/e84600cfb31630f8b5493bf1043a4a1e7c212f7c
+- Added `Markdown.source` attribute to MarkdownBlocks https://github.com/Textualize/textual/commit/e84600cfb31630f8b5493bf1043a4a1e7c212f7c
+- Added extension mechanism to Markdown https://github.com/Textualize/textual/commit/e84600cfb31630f8b5493bf1043a4a1e7c212f7c
+- Added `index` to `ListView.Selected` event https://github.com/Textualize/textual/pull/5973
+- Added `layout` switch to Static.update https://github.com/Textualize/textual/pull/5973
 
 ### Changed
 
 - Improved rendering of Markdown tables (replace Rich table with grid) which allows text selection https://github.com/Textualize/textual/pull/5962
 - Change look of command palette, to drop accented borders https://github.com/Textualize/textual/pull/5966
+- Some style tweaks to Markdown https://github.com/Textualize/textual/commit/e84600cfb31630f8b5493bf1043a4a1e7c212f7c
+
 
 ### Removed
 
 - Breaking change: Removed `Markdown.code_dark_theme`, `Markdown.code_light_theme`, `Markdown.code_indent_guides` which are no longer needed with the new code fence. https://github.com/Textualize/textual/pull/5967
+- Removed focus style from Markdown, as it can be a little expensive https://github.com/Textualize/textual/commit/e84600cfb31630f8b5493bf1043a4a1e7c212f7c
 
 ## [4.0.0] - 2025-07-12
 

src/textual/_arrange.py

@@ -118,10 +118,8 @@ def arrange(
                 )
 
             WidgetPlacement.apply_absolute(layout_placements)
-
             placements.extend(layout_placements)
 
-        widget.log(placements)
     return DockArrangeResult(placements, set(display_widgets), scroll_spacing)
 
 

src/textual/app.py

@@ -1375,7 +1375,7 @@ def _watch_theme(self, theme_name: str) -> None:
         self.set_class(not dark, "-light-mode", update=False)
         self._refresh_truecolor_filter(self.ansi_theme)
         self._invalidate_css()
-        self.call_next(self.refresh_css)
+        self.call_next(partial(self.refresh_css, animate=False))
         self.call_next(self.theme_changed_signal.publish, theme)
 
     def _invalidate_css(self) -> None:

src/textual/content.py

@@ -335,7 +335,9 @@ def styled(
         if not text:
             return Content("")
         span_length = cell_len(text) if cell_length is None else cell_length
-        new_content = cls(text, [Span(0, span_length, style)], span_length)
+        new_content = cls(
+            text, [Span(0, span_length, style)] if style else None, span_length
+        )
         return new_content
 
     @classmethod
@@ -822,6 +824,7 @@ def iter_content() -> Iterable[Content]:
             extend_spans(
                 _Span(offset + start, offset + end, style)
                 for start, end, style in content._spans
+                if style
             )
             offset += len(content._text)
             if total_cell_length is not None:
@@ -1122,7 +1125,7 @@ def render(
         get_style: Callable[[str | Style], Style]
         if parse_style is None:
 
-            def get_style(style: str | Style) -> Style:
+            def _get_style(style: str | Style) -> Style:
                 """The default get_style method."""
                 if isinstance(style, Style):
                     return style
@@ -1132,6 +1135,8 @@ def get_style(style: str | Style) -> Style:
                     visual_style = Style.null()
                 return visual_style
 
+            get_style = _get_style
+
         else:
             get_style = parse_style
 

src/textual/css/_help_text.py

@@ -12,6 +12,7 @@
     VALID_ALIGN_HORIZONTAL,
     VALID_ALIGN_VERTICAL,
     VALID_BORDER,
+    VALID_EXPAND,
     VALID_KEYLINE,
     VALID_LAYOUT,
     VALID_POSITION,
@@ -788,6 +789,23 @@ def position_help_text(property_name: str) -> HelpText:
     )
 
 
+def expand_help_text(property_name: str) -> HelpText:
+    """Help text to show when the user supplies the wrong value for expand.
+
+    Args:
+        property_name: The name of the property.
+
+    Returns:
+        Renderable for displaying the help text for this property.
+    """
+    return HelpText(
+        summary=f"Invalid value for [i]{property_name}[/]",
+        bullets=[
+            Bullet(f"Valid values are {friendly_list(VALID_EXPAND)}"),
+        ],
+    )
+
+
 def style_flags_property_help_text(
     property_name: str, value: str, context: StylingContext
 ) -> HelpText:

src/textual/css/_styles_builder.py

@@ -16,6 +16,7 @@
     border_property_help_text,
     color_property_help_text,
     dock_property_help_text,
+    expand_help_text,
     fractional_property_help_text,
     integer_help_text,
     keyline_help_text,
@@ -44,6 +45,7 @@
     VALID_CONSTRAIN,
     VALID_DISPLAY,
     VALID_EDGE,
+    VALID_EXPAND,
     VALID_HATCH,
     VALID_KEYLINE,
     VALID_OVERFLOW,
@@ -1256,6 +1258,17 @@ def process_hatch(self, name: str, tokens: list[Token]) -> None:
 
         self.styles._rules[name] = (character or " ", color.multiply_alpha(opacity))
 
+    def process_expand(self, name: str, tokens: list[Token]):
+        if not tokens:
+            return
+        if len(tokens) != 1:
+            self.error(name, tokens[0], offset_single_axis_help_text(name))
+        else:
+            token = tokens[0]
+            if token.value not in VALID_EXPAND:
+                self.error(name, tokens[0], expand_help_text(name))
+            self.styles._rules["expand"] = token.value
+
     def _get_suggested_property_name_for_rule(self, rule_name: str) -> str | None:
         """
         Returns a valid CSS property "Python" name, or None if no close matches could be found.

src/textual/css/constants.py

@@ -87,6 +87,7 @@
 VALID_HATCH: Final = {"left", "right", "cross", "vertical", "horizontal"}
 VALID_TEXT_WRAP: Final = {"wrap", "nowrap"}
 VALID_TEXT_OVERFLOW: Final = {"clip", "fold", "ellipsis"}
+VALID_EXPAND: Final = {"greedy", "optimal"}
 
 HATCHES: Final = {
     "left": "╲",

src/textual/css/scalar.py

@@ -283,8 +283,6 @@ def resolve(
 
         if unit == Unit.PERCENT:
             unit = percent_unit
-        # elif unit == Unit.AUTO:
-        #     unit = Unit.FRACTION
         try:
             dimension = RESOLVE_MAP[unit](
                 value, size, viewport, fraction_unit or _FRACTION_ONE

src/textual/css/styles.py

@@ -43,6 +43,7 @@
     VALID_BOX_SIZING,
     VALID_CONSTRAIN,
     VALID_DISPLAY,
+    VALID_EXPAND,
     VALID_OVERFLOW,
     VALID_OVERLAY,
     VALID_POSITION,
@@ -61,6 +62,7 @@
     BoxSizing,
     Constrain,
     Display,
+    Expand,
     Overflow,
     Overlay,
     ScrollbarGutter,
@@ -203,6 +205,7 @@ class RulesMap(TypedDict, total=False):
 
     text_wrap: TextWrap
     text_overflow: TextOverflow
+    expand: Expand
 
     line_pad: int
 
@@ -492,6 +495,7 @@ class StylesBase:
     text_overflow: StringEnumProperty[TextOverflow] = StringEnumProperty(
         VALID_TEXT_OVERFLOW, "fold"
     )
+    expand: StringEnumProperty[Expand] = StringEnumProperty(VALID_EXPAND, "greedy")
     line_pad = IntegerProperty(default=0, layout=True)
     """Padding added to left and right of lines."""
 
@@ -1288,6 +1292,8 @@ def append_declaration(name: str, value: str) -> None:
             append_declaration("text-wrap", self.text_wrap)
         if "text_overflow" in rules:
             append_declaration("text-overflow", self.text_overflow)
+        if "expand" in rules:
+            append_declaration("expand", self.expand)
         if "line_pad" in rules:
             append_declaration("line-pad", str(self.line_pad))
         lines.sort()

src/textual/css/stylesheet.py

@@ -697,7 +697,6 @@ def replace_rules(
 
             for key in modified_rule_keys:
                 setattr(base_styles, key, get_rule(key))
-
         node.notify_style_update()
 
     def update(self, root: DOMNode, animate: bool = False) -> None: