cache visual styles, speedup OptionList

Author: willmcgugan

src/textual/content.py

@@ -313,7 +313,9 @@ def assemble(
                 part_text, part_style = part
                 text_append(part_text)
                 if part_style:
-                    spans.append(_Span(position, position + len(part_text), part_style))
+                    spans.append(
+                        _Span(position, position + len(part_text), part_style),
+                    )
                 position += len(part_text)
             elif isinstance(part, Content):
                 text_append(part.plain)

src/textual/widget.py

@@ -450,6 +450,7 @@ def __init__(
 
         self._styles_cache = StylesCache()
         self._rich_style_cache: dict[tuple[str, ...], tuple[Style, Style]] = {}
+        self._visual_style_cache: dict[tuple[str, ...], VisualStyle] = {}
 
         self._tooltip: RenderableType | None = None
         """The tooltip content."""
@@ -1043,7 +1044,7 @@ def get_component_rich_style(self, *names: str, partial: bool = False) -> Style:
 
         return partial_style if partial else style
 
-    def get_visual_style(self, component_classes: Iterable[str]) -> VisualStyle:
+    def get_visual_style(self, *component_classes: str) -> VisualStyle:
         """Get the visual style for the widget, including any component styles.
 
         Args:
@@ -1053,46 +1054,51 @@ def get_visual_style(self, component_classes: Iterable[str]) -> VisualStyle:
             A Visual style instance.
 
         """
-        background = Color(0, 0, 0, 0)
-        color = Color(255, 255, 255, 0)
-
-        style = Style()
-        opacity = 1.0
-
-        def iter_styles() -> Iterable[StylesBase]:
-            """Iterate over the styles from the DOM and additional components styles."""
-            for node in reversed(self.ancestors_with_self):
-                yield node.styles
-            for name in component_classes:
-                yield node.get_component_styles(name)
-
-        for styles in iter_styles():
-            has_rule = styles.has_rule
-            opacity *= styles.opacity
-            if has_rule("background"):
-                text_background = background + styles.background.tint(
-                    styles.background_tint
-                )
-                background += (
-                    styles.background.tint(styles.background_tint)
-                ).multiply_alpha(opacity)
-            else:
-                text_background = background
-            if has_rule("color"):
-                color = styles.color
-            style += styles.text_style
-            if has_rule("auto_color") and styles.auto_color:
-                color = text_background.get_contrast_text(color.a)
-
-        visual_style = VisualStyle(
-            background,
-            color,
-            bold=style.bold,
-            dim=style.dim,
-            italic=style.italic,
-            underline=style.underline,
-            strike=style.strike,
-        )
+        if (
+            visual_style := self._visual_style_cache.get(component_classes, None)
+        ) is None:
+            # TODO: cache this?
+            background = Color(0, 0, 0, 0)
+            color = Color(255, 255, 255, 0)
+
+            style = Style()
+            opacity = 1.0
+
+            def iter_styles() -> Iterable[StylesBase]:
+                """Iterate over the styles from the DOM and additional components styles."""
+                for node in reversed(self.ancestors_with_self):
+                    yield node.styles
+                for name in component_classes:
+                    yield node.get_component_styles(name)
+
+            for styles in iter_styles():
+                has_rule = styles.has_rule
+                opacity *= styles.opacity
+                if has_rule("background"):
+                    text_background = background + styles.background.tint(
+                        styles.background_tint
+                    )
+                    background += (
+                        styles.background.tint(styles.background_tint)
+                    ).multiply_alpha(opacity)
+                else:
+                    text_background = background
+                if has_rule("color"):
+                    color = styles.color
+                style += styles.text_style
+                if has_rule("auto_color") and styles.auto_color:
+                    color = text_background.get_contrast_text(color.a)
+
+            visual_style = VisualStyle(
+                background,
+                color,
+                bold=style.bold,
+                dim=style.dim,
+                italic=style.italic,
+                underline=style.underline,
+                strike=style.strike,
+            )
+            self._visual_style_cache[component_classes] = visual_style
 
         return visual_style
 
@@ -4270,6 +4276,8 @@ async def broker_event(self, event_name: str, event: events.Event) -> bool:
 
     def notify_style_update(self) -> None:
         self._rich_style_cache.clear()
+        self._visual_style_cache.clear()
+        super().notify_style_update()
 
     async def _on_mouse_down(self, event: events.MouseDown) -> None:
         await self.broker_event("mouse.down", event)

src/textual/widgets/_data_table.py

@@ -1107,6 +1107,7 @@ def get_row_height(self, row_key: RowKey) -> int:
         return self.rows[row_key].height
 
     def notify_style_update(self) -> None:
+        super().notify_style_update()
         self._row_render_cache.clear()
         self._cell_render_cache.clear()
         self._line_cache.clear()

src/textual/widgets/_log.py

@@ -94,6 +94,7 @@ def lines(self) -> Sequence[str]:
 
     def notify_style_update(self) -> None:
         """Called by Textual when styles update."""
+        super().notify_style_update()
         self._render_line_cache.clear()
 
     def _update_maximum_width(self, updates: int, size: int) -> None:

src/textual/widgets/_option_list.py

@@ -341,6 +341,7 @@ def _refresh_lines(self) -> None:
 
     def notify_style_update(self) -> None:
         self._content_render_cache.clear()
+        super().notify_style_update()
 
     def _on_resize(self):
         self._refresh_lines()
@@ -486,7 +487,7 @@ def _render_option_content(
         if component_class:
             component_class_list.append(component_class)
 
-        visual_style = self.get_visual_style(component_class_list)
+        visual_style = self.get_visual_style(*component_class_list)
 
         strips = Visual.to_strips(self, visual, width, None, visual_style, pad=True)
         style_meta = Style.from_meta({"option": option_index})

src/textual/widgets/_rich_log.py

@@ -126,6 +126,7 @@ def __init__(
         indicating we can proceed with rendering deferred writes."""
 
     def notify_style_update(self) -> None:
+        super().notify_style_update()
         self._line_cache.clear()
 
     def on_resize(self, event: Resize) -> None:

src/textual/widgets/_tree.py

@@ -1462,6 +1462,7 @@ async def _on_click(self, event: events.Click) -> None:
                     await self.run_action("select_cursor")
 
     def notify_style_update(self) -> None:
+        super().notify_style_update()
         self._invalidate()
 
     def action_cursor_up(self) -> None: