Merge branch 'main' into refactor-label-rename-renderable-to-content

Author: TomJGooding

CHANGELOG.md

@@ -17,7 +17,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Added `bar_renderable` to `ProgressBar` widget https://github.com/Textualize/textual/pull/5963
-
+- Added `OptionList.set_options` https://github.com/Textualize/textual/pull/6048
+- Added `TextArea.suggestion` https://github.com/Textualize/textual/pull/6048
+- Added `TextArea.placeholder` https://github.com/Textualize/textual/pull/6048
 
 ### Changed
 

src/textual/_queue.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+import asyncio
+from asyncio import Event
+from collections import deque
+from typing import Generic, TypeVar
+
+QueueType = TypeVar("QueueType")
+
+
+class Queue(Generic[QueueType]):
+    """A cut-down version of asyncio.Queue
+
+    This has just enough functionality to run the message pumps.
+
+    """
+
+    def __init__(self) -> None:
+        self.values: deque[QueueType] = deque()
+        self.ready_event = Event()
+
+    def put_nowait(self, value: QueueType) -> None:
+        self.values.append(value)
+        self.ready_event.set()
+
+    def qsize(self) -> int:
+        return len(self.values)
+
+    def empty(self) -> bool:
+        return not self.values
+
+    def task_done(self) -> None:
+        pass
+
+    async def get(self) -> QueueType:
+        if not self.ready_event.is_set():
+            await self.ready_event.wait()
+        value = self.values.popleft()
+        if not self.values:
+            self.ready_event.clear()
+        return value
+
+    def get_nowait(self) -> QueueType:
+        if not self.values:
+            raise asyncio.QueueEmpty()
+        value = self.values.popleft()
+        if not self.values:
+            self.ready_event.clear()
+        return value

src/textual/app.py

@@ -2768,6 +2768,7 @@ def push_screen(
 
         next_screen._push_result_callback(message_pump, callback, future)
         self._load_screen_css(next_screen)
+        next_screen._update_auto_focus()
         self._screen_stack.append(next_screen)
         next_screen.post_message(events.ScreenResume())
         self.log.system(f"{self.screen} is current (PUSHED)")

src/textual/dom.py

@@ -1729,7 +1729,7 @@ def _update_styles(self) -> None:
 
         Should be called whenever CSS classes / pseudo classes change.
         """
-        if not self.is_attached:
+        if not self.is_attached or not self.screen.is_mounted:
             return
         try:
             self.app.update_styles(self)

src/textual/highlight.py

@@ -19,6 +19,8 @@ class HighlightTheme:
     STYLES: dict[TokenType, str] = {
         Token.Comment: "$text 60%",
         Token.Error: "$text-error on $error-muted",
+        Token.Generic.Strong: "bold",
+        Token.Generic.Emph: "italic",
         Token.Generic.Error: "$text-error on $error-muted",
         Token.Generic.Heading: "$text-primary underline",
         Token.Generic.Subheading: "$text-primary",
@@ -27,6 +29,7 @@ class HighlightTheme:
         Token.Keyword.Namespace: "$text-error",
         Token.Keyword.Type: "bold",
         Token.Literal.Number: "$text-warning",
+        Token.Literal.String.Backtick: "$text 60%",
         Token.Literal.String: "$text-success 90%",
         Token.Literal.String.Doc: "$text-success 80% italic",
         Token.Literal.String.Double: "$text-success 90%",

src/textual/message_pump.py

@@ -36,6 +36,7 @@
 from textual._context import message_hook as message_hook_context_var
 from textual._context import prevent_message_types_stack
 from textual._on import OnNoWidget
+from textual._queue import Queue
 from textual._time import time
 from textual.constants import SLOW_THRESHOLD
 from textual.css.match import match
@@ -143,8 +144,8 @@ def __init__(self, parent: MessagePump | None = None) -> None:
         """
 
     @cached_property
-    def _message_queue(self) -> asyncio.Queue[Message | None]:
-        return asyncio.Queue()
+    def _message_queue(self) -> Queue[Message | None]:
+        return Queue()
 
     @cached_property
     def _mounted_event(self) -> asyncio.Event:

src/textual/screen.py

@@ -1346,23 +1346,31 @@ def _on_screen_resume(self) -> None:
         self.app._refresh_notifications()
         size = self.app.size
 
-        # Only auto-focus when the app has focus (textual-web only)
+        self._update_auto_focus()
+
+        if self.is_attached:
+            self._compositor_refresh()
+            self.app.stylesheet.update(self)
+            self._refresh_layout(size)
+            self.refresh()
+
+    async def _compose(self) -> None:
+        await super()._compose()
+        self._update_auto_focus()
+
+    def _update_auto_focus(self) -> None:
+        """Update auto focus."""
         if self.app.app_focus:
             auto_focus = (
                 self.app.AUTO_FOCUS if self.AUTO_FOCUS is None else self.AUTO_FOCUS
             )
             if auto_focus and self.focused is None:
                 for widget in self.query(auto_focus):
                     if widget.focusable:
+                        widget.has_focus = True
                         self.set_focus(widget)
                         break
 
-        if self.is_attached:
-            self._compositor_refresh()
-            self.app.stylesheet.update(self)
-            self._refresh_layout(size)
-            self.refresh()
-
     def _on_screen_suspend(self) -> None:
         """Screen has suspended."""
         if self.app.SUSPENDED_SCREEN_CLASS:

src/textual/widget.py

@@ -3904,12 +3904,12 @@ def post_render(
 
         return renderable
 
-    def watch_mouse_hover(self, value: bool) -> None:
+    def watch_mouse_hover(self, _mouse_over: bool) -> None:
         """Update from CSS if mouse over state changes."""
         if self._has_hover_style:
             self._update_styles()
 
-    def watch_has_focus(self, value: bool) -> None:
+    def watch_has_focus(self, _has_focus: bool) -> None:
         """Update from CSS if has focus state changes."""
         self._update_styles()
 

src/textual/widgets/_option_list.py

@@ -324,15 +324,37 @@ def clear_options(self) -> Self:
         self._option_to_index.clear()
         self.highlighted = None
         self.refresh()
-        self.scroll_to(0, 0, animate=False)
+        self.scroll_y = 0
         self._update_lines()
         return self
 
+    def set_options(self, options: Iterable[OptionListContent]) -> Self:
+        """Set options, potentially clearing existing options.
+
+        Args:
+            options: Options to set.
+
+        Returns:
+            The `OptionList` instance.
+        """
+        self._options.clear()
+        self._line_cache.clear()
+        self._option_render_cache.clear()
+        self._id_to_option.clear()
+        self._option_to_index.clear()
+        self.highlighted = None
+        self.scroll_y = 0
+        self.add_options(options)
+        return self
+
     def add_options(self, new_options: Iterable[OptionListContent]) -> Self:
         """Add new options.
 
         Args:
             new_options: Content of new options.
+
+        Returns:
+            The `OptionList` instance.
         """
 
         new_options = list(new_options)

src/textual/widgets/_static.py

@@ -29,8 +29,6 @@ class Static(Widget, inherit_bindings=False):
     }
     """
 
-    _renderable: VisualType
-
     def __init__(
         self,
         content: VisualType = "",
@@ -48,23 +46,31 @@ def __init__(
         )
         self.expand = expand
         self.shrink = shrink
-        self._content = content
-        self._visual: Visual | None = None
+        self.__content = content
+        self.__visual: Visual | None = None
 
     @property
     def visual(self) -> Visual:
-        if self._visual is None:
-            self._visual = visualize(self, self._content, markup=self._render_markup)
-        return self._visual
+        """The visual to be displayed.
+
+        Note that the visual is what is ultimately rendered in the widget, but may not be the
+        same object set with the `update` method  or `content` property. For instance, if you
+        update with a string, then the visual will be a [Content][textual.content.Content] instance.
+
+        """
+        if self.__visual is None:
+            self.__visual = visualize(self, self.__content, markup=self._render_markup)
+        return self.__visual
 
     @property
     def content(self) -> VisualType:
-        """The content set in the constructor."""
-        return self._content
+        """The original content set in the constructor."""
+        return self.__content
 
     @content.setter
     def content(self, content: VisualType) -> None:
-        self._visual = visualize(self, content, markup=self._render_markup)
+        self.__content = content
+        self.__visual = visualize(self, content, markup=self._render_markup)
         self.clear_cached_dimensions()
         self.refresh(layout=True)
 
@@ -77,13 +83,13 @@ def render(self) -> RenderResult:
         return self.visual
 
     def update(self, content: VisualType = "", *, layout: bool = True) -> None:
-        """Update the widget's content area with new text or Rich renderable.
+        """Update the widget's content area with a string, a Visual (such as [Content][textual.content.Content]), or a [Rich renderable](https://rich.readthedocs.io/en/latest/protocol.html).
 
         Args:
             content: New content.
-            layout: Also perform a layout operation (set to `False` if you are certain the size won't change.)
+            layout: Also perform a layout operation (set to `False` if you are certain the size won't change).
         """
 
-        self._content = content
-        self._visual = visualize(self, content, markup=self._render_markup)
+        self.__content = content
+        self.__visual = visualize(self, content, markup=self._render_markup)
         self.refresh(layout=layout)