select mechanics

Author: willmcgugan

CHANGELOG.md

@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added `Select.type_to_search` which allows you to type to move the cursor to a matching option https://github.com/Textualize/textual/pull/5403
 - Updated `TextArea` and `Input` behavior when there is a selection and the user presses left or right https://github.com/Textualize/textual/pull/5400
 - Added `from_app_focus` to `Focus` event to indicate if a widget is being focused because the app itself has regained focus or not https://github.com/Textualize/textual/pull/5379
+- Added `Offset.transpose`
+- Added `screen--selection` component class to define style for selection
+- Added `Widget.scrollable_container` property
+- Added `Widget.select_all`
 
 ### Fixed
 

src/textual/_ansi_theme.py

@@ -1,52 +1,69 @@
 from rich.terminal_theme import TerminalTheme
 
+
+def rgb(red: int, green: int, blue: int) -> tuple[int, int, int]:
+    """Define an RGB color.
+
+    This exists mainly so that a VSCode extension can render the colors inline.
+
+    Args:
+        red: Red component.
+        green: Green component.
+        blue: Blue component.
+
+    Returns:
+        Color triplet.
+    """
+    return red, green, blue
+
+
 MONOKAI = TerminalTheme(
-    (12, 12, 12),
-    (217, 217, 217),
+    rgb(12, 12, 12),
+    rgb(217, 217, 217),
     [
-        (26, 26, 26),
-        (244, 0, 95),
-        (152, 224, 36),
-        (253, 151, 31),
-        (157, 101, 255),
-        (244, 0, 95),
-        (88, 209, 235),
-        (196, 197, 181),
-        (98, 94, 76),
+        rgb(26, 26, 26),
+        rgb(244, 0, 95),
+        rgb(152, 224, 36),
+        rgb(253, 151, 31),
+        rgb(157, 101, 255),
+        rgb(244, 0, 95),
+        rgb(88, 209, 235),
+        rgb(196, 197, 181),
+        rgb(98, 94, 76),
     ],
     [
-        (244, 0, 95),
-        (152, 224, 36),
-        (224, 213, 97),
-        (157, 101, 255),
-        (244, 0, 95),
-        (88, 209, 235),
-        (246, 246, 239),
+        rgb(244, 0, 95),
+        rgb(152, 224, 36),
+        rgb(224, 213, 97),
+        rgb(157, 101, 255),
+        rgb(244, 0, 95),
+        rgb(88, 209, 235),
+        rgb(246, 246, 239),
     ],
 )
 
 ALABASTER = TerminalTheme(
-    (247, 247, 247),
-    (0, 0, 0),
+    rgb(247, 247, 247),
+    rgb(0, 0, 0),
     [
-        (0, 0, 0),
-        (170, 55, 49),
-        (68, 140, 39),
-        (203, 144, 0),
-        (50, 92, 192),
-        (122, 62, 157),
-        (0, 131, 178),
-        (247, 247, 247),
-        (119, 119, 119),
+        rgb(0, 0, 0),
+        rgb(170, 55, 49),
+        rgb(68, 140, 39),
+        rgb(203, 144, 0),
+        rgb(50, 92, 192),
+        rgb(122, 62, 157),
+        rgb(0, 131, 178),
+        rgb(247, 247, 247),
+        rgb(119, 119, 119),
     ],
     [
-        (240, 80, 80),
-        (96, 203, 0),
-        (255, 188, 93),
-        (0, 122, 204),
-        (230, 76, 230),
-        (0, 170, 203),
-        (247, 247, 247),
+        rgb(240, 80, 80),
+        rgb(96, 203, 0),
+        rgb(255, 188, 93),
+        rgb(0, 122, 204),
+        rgb(230, 76, 230),
+        rgb(0, 170, 203),
+        rgb(247, 247, 247),
     ],
 )
 

src/textual/_compositor.py

@@ -884,7 +884,7 @@ def get_widget_and_offset_at(
             y: Y position within the Layout.
 
         Returns:
-            A tuple of the Style at the cell (x, y) and the offset within the widget.
+            A tuple of the widget at (x, y) and the offset within the widget.
         """
         try:
             widget, region = self.get_widget_at(x, y)
@@ -893,9 +893,10 @@ def get_widget_and_offset_at(
         if widget not in self.visible_widgets:
             return None, None
 
-        if y >= widget.content_region.bottom:
-            # If y is below the content region, default to the offset on the next line
-            return widget, Offset(x - region.x, widget.content_region.bottom)
+        # if y >= widget.content_region.bottom:
+        #     # If y is below the content region, default to the offset on the next line
+        #     # y = widget.content_region.bottom
+        #     return widget, Offset(x - region.x, widget.content_region.bottom)
 
         x -= region.x
         y -= region.y
@@ -907,19 +908,43 @@ def get_widget_and_offset_at(
             return widget, None
         end = 0
         start = 0
+
+        offset_y: int | None = None
+        offset_x = 0
+        offset_x2 = 0
+
         for segment in lines[0]:
             end += segment.cell_length
-            if x <= end:
-                style = segment.style
-                if style and style._meta is not None:
-                    meta = style.meta
-                    if "offset" in meta:
-                        offset_x, offset_y = style.meta["offset"]
-                        offset = Offset(offset_x + (x - start), offset_y)
-                        return widget, offset
-
-                return widget, None
+            style = segment.style
+            if style is not None and style._meta is not None:
+                meta = style.meta
+                if "offset" in meta:
+                    offset_x, offset_y = style.meta["offset"]
+                    offset_x2 = offset_x + segment.cell_length
+
+                    if x <= end:
+                        return widget, (
+                            None
+                            if offset_y is None
+                            else Offset(offset_x + (x - start), offset_y)
+                        )
             start = end
+
+        return widget, (None if offset_y is None else Offset(offset_x2, offset_y))
+
+        # for segment in lines[0]:
+        #     end += segment.cell_length
+        #     if x <= end:
+        #         style = segment.style
+        #         if style and style._meta is not None:
+        #             meta = style.meta
+        #             if "offset" in meta:
+        #                 offset_x, offset_y = style.meta["offset"]
+        #                 offset = Offset(offset_x + (x - start), offset_y)
+        #                 return widget, offset
+
+        #         return widget, None
+        #     start = end
         return widget, None
 
     def find_widget(self, widget: Widget) -> MapGeometry:
@@ -1106,9 +1131,11 @@ 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]
+            render_strips = [Strip.join(chop.values()).discard_meta() for chop in chops]
 
         return LayoutUpdate(render_strips, screen_region)
 

src/textual/color.py

@@ -177,6 +177,7 @@ def automatic(cls, alpha_percentage: float = 100.0) -> Color:
         return cls(0, 0, 0, alpha_percentage / 100.0, auto=True)
 
     @classmethod
+    @lru_cache(maxsize=1024)
     def from_rich_color(
         cls, rich_color: RichColor | None, theme: TerminalTheme | None = None
     ) -> Color:
@@ -192,7 +193,9 @@ def from_rich_color(
         if rich_color is None:
             return TRANSPARENT
         r, g, b = rich_color.get_truecolor(theme)
-        return cls(r, g, b)
+        return cls(
+            r, g, b, ansi=rich_color.number if rich_color.is_system_defined else None
+        )
 
     @classmethod
     def from_hsl(cls, h: float, s: float, l: float) -> Color:
@@ -400,7 +403,7 @@ def blend(
         """
         if destination.auto:
             destination = self.get_contrast_text(destination.a)
-        if destination.ansi is not None:
+        if destination.ansi is not None or self.ansi:
             return destination
         if factor <= 0:
             return self

src/textual/content.py

@@ -11,6 +11,7 @@
 from __future__ import annotations
 
 import re
+from functools import lru_cache
 from operator import itemgetter
 from typing import TYPE_CHECKING, Callable, Iterable, NamedTuple, Sequence
 
@@ -132,6 +133,7 @@ def from_rich_text(
         """
         if isinstance(text, str):
             text = Text.from_markup(text)
+
         if text._spans:
             ansi_theme: TerminalTheme | None
             try:
@@ -153,13 +155,20 @@ def from_rich_text(
         else:
             spans = []
 
-        return cls(
+        content = cls(
             text.plain,
             spans,
             align=align,
             no_wrap=no_wrap,
             ellipsis=ellipsis,
         )
+        if text.style:
+            content = content.stylize_before(
+                text.style
+                if isinstance(text.style, str)
+                else Style.from_rich_style(text.style, ansi_theme)
+            )
+        return content
 
     @classmethod
     def styled(
@@ -284,10 +293,6 @@ def render_strips(
         if height is not None:
             lines = lines[:height]
 
-        # strip_lines = [
-        #     Strip(line.content.render_segments(style), line.content.cell_length)
-        #     for line in lines
-        # ]
         strip_lines = [line.to_strip(style) for line in lines]
         return strip_lines
 
@@ -716,12 +721,12 @@ def render(
             app = active_app.get()
             # TODO: Update when we add Content.from_markup
 
+            @lru_cache(maxsize=1024)
             def get_style(style: str, /) -> Style:
-                return (
-                    Style.from_rich_style(app.console.get_style(style), app.ansi_theme)
-                    if isinstance(style, str)
-                    else style
+                visual_style = Style.from_rich_style(
+                    app.console.get_style(style), app.ansi_theme
                 )
+                return visual_style
 
         else:
             get_style = parse_style

src/textual/screen.py

@@ -1456,14 +1456,15 @@ def _forward_event(self, event: events.Event) -> None:
             select_widget, select_offset = self.get_widget_and_offset_at(
                 event.screen_x, event.screen_y
             )
-            if select_widget is not None and select_widget.ALLOW_SELECT:
+            if select_widget is not None and select_widget.allow_select:
                 self._selecting = True
                 if select_widget is not None and select_offset is not None:
                     self._select_start = (
                         select_widget,
                         event.screen_offset,
                         select_offset,
                     )
+
             else:
                 self._selection = False
 
@@ -1484,7 +1485,11 @@ def _forward_event(self, event: events.Event) -> None:
                 select_widget, select_offset = self.get_widget_and_offset_at(
                     event.x, event.y
                 )
-                if select_widget is not None and select_offset is not None:
+                if (
+                    select_widget is not None
+                    and select_widget.allow_select
+                    and select_offset is not None
+                ):
                     self._select_end = (select_widget, event.offset, select_offset)
 
         if isinstance(event, events.MouseEvent):

src/textual/strip.py

@@ -394,6 +394,24 @@ def simplify(self) -> Strip:
         )
         return line
 
+    def discard_meta(self) -> Strip:
+        """Remove all meta from segments.
+
+        Returns:
+            New strip.
+        """
+
+        def remove_meta_from_segment(segment: Segment) -> Segment:
+            if segment.style is None:
+                return segment
+            text, style, control = segment
+            style = style.copy()
+            style._meta = None
+
+            return Segment(text, style, control)
+
+        return Strip([segment for segment in self._segments], self._cell_length)
+
     def apply_filter(self, filter: LineFilter, background: Color) -> Strip:
         """Apply a filter to all segments in the strip.
 

src/textual/visual.py

@@ -86,8 +86,10 @@ def visualize(widget: Widget, obj: object) -> Visual:
             if isinstance(obj, str):
                 obj = widget.render_str(obj)
 
-            if isinstance(obj, Text) and widget.ALLOW_SELECT:
-                return Content.from_rich_text(obj, align=widget.styles.text_align)
+            if isinstance(obj, Text) and widget.allow_select:
+                return Content.from_rich_text(
+                    obj, align=obj.align or widget.styles.text_align
+                )
 
             # If its is a Rich renderable, wrap it with a RichVisual
             return RichVisual(widget, rich_cast(obj))
@@ -173,6 +175,7 @@ def from_rich_style(
             underline=rich_style.underline,
             reverse=rich_style.reverse,
             strike=rich_style.strike,
+            _meta=rich_style._meta,
         )
 
     @classmethod