clickable style

Author: willmcgugan

src/textual/_line_cache.py

@@ -5,9 +5,11 @@
 
 from typing import Iterable
 
+from rich.cells import cell_len
 from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
 from rich.control import Control
 from rich.segment import Segment
+from rich.style import Style
 
 from ._loop import loop_last
 
@@ -57,3 +59,15 @@ def render(self, x: int, y: int, width: int, height: int) -> Iterable[Segment]:
                 if not last:
                     yield new_line
         self._dirty[:] = [False] * len(self.lines)
+
+    def get_style_at(self, x: int, y: int) -> Style:
+        try:
+            line = self.lines[y]
+        except IndexError:
+            return Style.null()
+        end = 0
+        for segment in line:
+            end += cell_len(segment.text)
+            if x < end:
+                return segment.style or Style.null()
+        return Style.null()

src/textual/app.py

@@ -276,6 +276,9 @@ async def action_quit(self) -> None:
     async def action_bang(self) -> None:
         1 / 0
 
+    async def action_bell(self) -> None:
+        self.console.bell()
+
 
 if __name__ == "__main__":
     import asyncio

src/textual/events.py

@@ -1,15 +1,11 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
-import re
-from enum import auto, Enum
-from time import monotonic
-from typing import ClassVar, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from rich.repr import rich_repr, RichReprResult
 
 from .message import Message
-from ._types import Callback, MessageTarget
+from ._types import MessageTarget
 from .keys import Keys
 
 
@@ -137,15 +133,31 @@ def __rich_repr__(self) -> RichReprResult:
         yield "meta", self.meta, False
         yield "ctrl", self.ctrl, False
 
+    def offset(self, x: int, y: int):
+        return self.__class__(
+            self.sender,
+            x=self.x + x,
+            y=self.y + y,
+            button=self.button,
+            shift=self.shift,
+            meta=self.meta,
+            ctrl=self.ctrl,
+            screen_x=self.screen_x,
+            screen_y=self.screen_y,
+        )
 
+
+@rich_repr
 class MouseMove(MouseEvent):
     pass
 
 
+@rich_repr
 class MouseDown(MouseEvent):
     pass
 
 
+@rich_repr
 class MouseUp(MouseEvent):
     pass
 
@@ -199,14 +211,14 @@ class Leave(Event):
     pass
 
 
-class Focus(Event, type=EventType.FOCUS):
+class Focus(Event):
     pass
 
 
-class Blur(Event, type=EventType.BLUR):
+class Blur(Event):
     pass
 
 
-class Update(Event, type=EventType.UPDATE):
+class Update(Event):
     def can_batch(self, event: Message) -> bool:
         return isinstance(event, Update) and event.sender == self.sender

src/textual/geometry.py

@@ -51,7 +51,7 @@ def contains_point(self, point: tuple[int, int]) -> bool:
 
     def translate(self, x: int, y: int) -> Region:
         _x, _y, width, height = self
-        return Region(self.x + _x, self.y + _y, width, height)
+        return Region(_x + x, _y + y, width, height)
 
     def __contains__(self, other: Any) -> bool:
         try:

src/textual/view.py

@@ -93,7 +93,7 @@ def render(self) -> RenderableType:
     #     yield from segments
 
     def get_widget_at(
-        self, x: int, y: int, offset_x: int = 0, offset_y: int = 0, deep: bool = False
+        self, x: int, y: int, deep: bool = False
     ) -> Tuple[Widget, Region]:
 
         for layout, (layout_region, render) in self.layout.map.items():
@@ -102,14 +102,13 @@ def get_widget_at(
                 widget = layout.renderable
                 if deep and isinstance(layout.renderable, View):
 
-                    if isinstance(layout.renderable, View):
-                        view = layout.renderable
-                        translate_x = region.x
-                        translate_y = region.y
-                        widget, region = view.get_widget_at(
-                            x - region.x, y - region.y, deep=True
-                        )
-                        region = region.translate(translate_x, translate_y)
+                    view = layout.renderable
+                    translate_x = region.x
+                    translate_y = region.y
+                    widget, region = view.get_widget_at(
+                        x - region.x, y - region.y, deep=True
+                    )
+                    region = region.translate(translate_x, translate_y)
 
                 if isinstance(widget, WidgetBase):
                     return widget, region
@@ -182,6 +181,7 @@ async def on_resize(self, event: events.Resize) -> None:
     async def _on_mouse_move(self, event: events.MouseMove) -> None:
         try:
             widget, region = self.get_widget_at(event.x, event.y, deep=True)
+            log.debug("MOVE =%r %r", widget, region)
             log.debug("mouse over %r %r", widget, region)
         except NoWidget:
             await self.app.set_mouse_over(None)
@@ -206,24 +206,20 @@ async def forward_event(self, event: events.Event) -> None:
         if isinstance(event, (events.Enter, events.Leave)):
             await self.post_message(event)
 
-        elif isinstance(event, (events.MouseDown)):
-            try:
-                widget, _region = self.get_widget_at(event.x, event.y, deep=True)
-            except NoWidget:
-                await self.app.set_focus(None)
-            else:
-                await self.app.set_focus(widget)
-
         elif isinstance(event, events.MouseMove):
             await self._on_mouse_move(event)
 
         elif isinstance(event, events.MouseEvent):
+            log.debug("MOUSE %r", event)
             try:
-                widget, region = self.get_widget_at(event.x, event.y)
+                widget, region = self.get_widget_at(event.x, event.y, deep=True)
             except NoWidget:
-                pass
+                if isinstance(event, events.MouseDown):
+                    await self.app.set_focus(None)
             else:
-                await widget.forward_event(event)
+                if isinstance(event, events.MouseDown):
+                    await self.app.set_focus(widget)
+                await widget.forward_event(event.offset(-region.x, -region.y))
 
         elif isinstance(event, (events.MouseScrollDown, events.MouseScrollUp)):
             widget, _region = self.get_widget_at(event.x, event.y)

src/textual/widget.py

@@ -18,6 +18,7 @@
 from rich.panel import Panel
 import rich.repr
 from rich.segment import Segment
+from rich.style import Style
 
 from . import events
 from ._context import active_app
@@ -227,6 +228,9 @@ def line_cache(self) -> LineCache:
     # def __rich__(self) -> LineCache:
     #     return self.line_cache
 
+    def get_style_at(self, x: int, y: int) -> Style:
+        return self.line_cache.get_style_at(x, y)
+
     def render(self) -> RenderableType:
         raise NotImplementedError
         # return self.line_cache
@@ -251,6 +255,16 @@ def render_update(self, x: int, y: int) -> Iterable[Segment]:
         width, height = self.size
         yield from self.line_cache.render(x, y, width, height)
 
+    async def on_mouse_move(self, event: events.MouseMove) -> None:
+        log.debug("%r", self.get_style_at(event.x, event.y))
+
+    async def on_mouse_up(self, event: events.MouseUp) -> None:
+        log.debug("CLICKED %r", event)
+        style = self.get_style_at(event.x, event.y)
+        log.debug(style.meta)
+        if "@click" in style.meta:
+            await self.app.action(style.meta["@click"])
+
 
 class StaticWidget(Widget):
     def __init__(self, renderable: RenderableType, name: str | None = None) -> None:

src/textual/widgets/scroll_view.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 from rich.layout import Layout
+from rich.text import Text
 
 from .. import events
 from ..scrollbar import ScrollBar
+
 from ..page import Page
 from ..view import LayoutView
 from ..widget import StaticWidget
@@ -23,8 +25,9 @@ def __init__(self, name: str | None = None) -> None:
         super().__init__(layout=layout, name=name)
 
     async def on_mount(self, event: events.Mount) -> None:
+        text = Text.from_markup("Hello, [@click='bell']World[/]!")
         await self.mount_all(
-            content=StaticWidget("Hello"),
+            content=StaticWidget(text),
             vertical_scrollbar=StaticWidget(self._vertical_scrollbar),
             horizontal_scrollbar=StaticWidget(self._horizontal_Scrollbar),
         )