snapshots

Author: willmcgugan

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Footer can now be scrolled horizontally without holding `shift` https://github.com/Textualize/textual/pull/5404
 - The content of an `Input` will now only be automatically selected when the widget is focused by the user, not when the app itself has regained focus (similar to web browsers). https://github.com/Textualize/textual/pull/5379
+- Meta is now discarded in snapshot tests, which should make snapshots less likely to fail without any visible differences
 
 ### Added
 

src/textual/_compositor.py

@@ -1114,7 +1114,9 @@ def render_full_update(self, simplify: bool = False) -> LayoutUpdate:
         crop = screen_region
         chops = self._render_chops(crop, lambda y: True)
         if simplify:
-            render_strips = [Strip.join(chop.values()).simplify() for chop in chops]
+            render_strips = [
+                Strip.join(chop.values()).discard_meta().simplify() for chop in chops
+            ]
         else:
             render_strips = [Strip.join(chop.values()) for chop in chops]
 

src/textual/_styles_cache.py

@@ -7,6 +7,7 @@
 from rich.console import Console
 from rich.segment import Segment
 from rich.style import Style
+from rich.terminal_theme import TerminalTheme
 from rich.text import Text
 
 from textual import log
@@ -144,6 +145,7 @@ def render_widget(self, widget: Widget, crop: Region) -> list[Strip]:
             crop=crop,
             filters=widget.app._filters,
             opacity=widget.opacity,
+            ansi_theme=widget.app.ansi_theme,
         )
         if widget.auto_links:
             hover_style = widget.hover_style
@@ -176,6 +178,7 @@ def render(
         crop: Region | None = None,
         filters: Sequence[LineFilter] | None = None,
         opacity: float = 1.0,
+        ansi_theme: TerminalTheme = DEFAULT_TERMINAL_THEME,
     ) -> list[Strip]:
         """Render a widget content plus CSS styles.
 
@@ -231,6 +234,7 @@ def render(
                     border_title,
                     border_subtitle,
                     opacity,
+                    ansi_theme,
                 )
                 self._cache[y] = strip
             else:
@@ -267,6 +271,7 @@ def render_line(
         border_title: tuple[Text, Color, Color, Style] | None,
         border_subtitle: tuple[Text, Color, Color, Style] | None,
         opacity: float,
+        ansi_theme: TerminalTheme,
     ) -> Strip:
         """Render a styled line.
 
@@ -447,7 +452,9 @@ def post(segments: Iterable[Segment]) -> Iterable[Segment]:
             if inner:
                 line = Segment.apply_style(line, inner)
             if styles.text_opacity != 1.0:
-                line = TextOpacity.process_segments(line, styles.text_opacity)
+                line = TextOpacity.process_segments(
+                    line, styles.text_opacity, ansi_theme
+                )
             line = line_post(line_pad(line, pad_left, pad_right, inner))
 
             if border_left or border_right:

src/textual/content.py

@@ -1024,17 +1024,11 @@ def __init__(
         self.align = align
         self.line_end = line_end
         self.link_style = link_style
-        self.highlight_style: Style | None = None
-        self.highlight_range: tuple[int | None, int | None] | None = None
 
     @property
     def plain(self) -> str:
         return self.content.plain
 
-    def highlight(self, style: Style, start: int | None, end: int | None) -> None:
-        self.highlight_style = style
-        self.highlight_range = (start, end)
-
     def to_strip(self, widget: Widget, style: Style) -> Strip:
         _Segment = Segment
         align = self.align
@@ -1044,10 +1038,6 @@ def to_strip(self, widget: Widget, style: Style) -> Strip:
         x = self.x
         y = self.y
 
-        if self.highlight_style is not None and self.highlight_range is not None:
-            start, end = self.highlight_range
-            content = content.stylize(self.highlight_style, start, end)
-
         if align in ("start", "left") or (align == "justify" and self.line_end):
             pass
 

src/textual/renderables/text_opacity.py

@@ -6,7 +6,12 @@
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.segment import Segment
 from rich.style import Style
+from rich.terminal_theme import TerminalTheme
 
+from textual._ansi_theme import DEFAULT_TERMINAL_THEME
+from textual._context import active_app
+from textual.color import TRANSPARENT
+from textual.filter import ANSIToTruecolor
 from textual.renderables._blend_colors import blend_colors
 
 
@@ -47,13 +52,14 @@ def __init__(self, renderable: RenderableType, opacity: float = 1.0) -> None:
 
     @classmethod
     def process_segments(
-        cls, segments: Iterable[Segment], opacity: float
+        cls, segments: Iterable[Segment], opacity: float, ansi_theme: TerminalTheme
     ) -> Iterable[Segment]:
         """Apply opacity to segments.
 
         Args:
             segments: Incoming segments.
             opacity: Opacity to apply.
+            ansi_theme: Terminal theme.
 
         Returns:
             Segments with applied opacity.
@@ -70,7 +76,8 @@ def process_segments(
                 invisible_style = _from_color(bgcolor=style.bgcolor)
                 yield _Segment(cell_len(text) * " ", invisible_style)
         else:
-            for segment in segments:
+            filter = ANSIToTruecolor(ansi_theme)
+            for segment in filter.apply(list(segments), TRANSPARENT):
                 # use Tuple rather than tuple so Python 3.7 doesn't complain
                 text, style, control = cast(Tuple[str, Style, object], segment)
                 if not style:
@@ -88,5 +95,11 @@ def process_segments(
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
+        try:
+            app = active_app.get()
+        except LookupError:
+            ansi_theme = DEFAULT_TERMINAL_THEME
+        else:
+            ansi_theme = app.ansi_theme
         segments = console.render(self.renderable, options)
-        return self.process_segments(segments, self.opacity)
+        return self.process_segments(segments, self.opacity, ansi_theme)

src/textual/screen.py

@@ -1489,7 +1489,11 @@ def _forward_event(self, event: events.Event) -> None:
                 select_widget, select_offset = self.get_widget_and_offset_at(
                     event.x, event.y
                 )
-                if self._select_end is not None and select_offset is None:
+                if (
+                    self._select_end is not None
+                    and select_offset is None
+                    and event.y > self._select_end[1].y
+                ):
                     end_widget = self._select_end[0]
                     select_offset = end_widget.content_region.bottom_right_inclusive
                     self._select_end = (end_widget, event.offset, select_offset)

src/textual/widget.py

@@ -2290,7 +2290,7 @@ def link_style(self) -> Style:
         )
         style = styles.link_style + Style.from_color(
             link_color.rich_color,
-            link_background.rich_color,
+            link_background.rich_color if styles.link_background.a else None,
         )
         return style
 

tests/renderables/test_text_opacity.py

@@ -29,13 +29,6 @@ def test_text_opacity_value_of_one_noop(text):
     assert render(TextOpacity(text, opacity=1)) == render(text)
 
 
-def test_ansi_colors_noop():
-    ansi_colored_text = Text("Hello, world!", style="red on green", end="")
-    assert render(TextOpacity(ansi_colored_text, opacity=0.5)) == render(
-        ansi_colored_text
-    )
-
-
 def test_text_opacity_no_style_noop():
     text_no_style = Text("Hello, world!", end="")
     assert render(TextOpacity(text_no_style, opacity=0.2)) == render(text_no_style)