Merge branch 'main' into screenshot-location

Author: davep

poetry.lock

@@ -1,9 +1,12 @@
 [tool.poetry]
 name = "textual-dev"
-version = "1.2.1"
+version = "1.4.0"
 homepage = "https://github.com/Textualize/textual-dev"
 description = "Development tools for working with Textual"
-authors = ["Will McGugan <will@textualize.io>", "Dave Pearson <dave@textualize.io>"]
+authors = [
+    "Will McGugan <will@textualize.io>",
+    "Dave Pearson <dave@textualize.io>",
+]
 license = "MIT"
 readme = "README.md"
 classifiers = [
@@ -20,10 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Typing :: Typed",
 ]
-include = [
-    "src/textual_dev/py.typed",
-    { path = "tests", format = "sdist" },
-]
+include = ["src/textual_dev/py.typed", { path = "tests", format = "sdist" }]
 
 [tool.poetry.dependencies]
 python = "^3.8"

pyproject.toml

@@ -5,7 +5,7 @@
 import shlex
 
 import click
-from importlib_metadata import version
+from importlib.metadata import version
 from textual.constants import DEVTOOLS_HOST, DEVTOOLS_PORT
 
 from .tools.run import exec_command, run_app
@@ -71,7 +71,7 @@ def _pre_run_warnings() -> None:
                 and os.environ.get("TERM_PROGRAM") == "Apple_Terminal"
             ),
             "The default terminal app on macOS is limited to 256 colors. See our FAQ for more details:\n\n"
-            "https://github.com/Textualize/textual/blob/main/FAQ.md#why-doesn't-textual-look-good-on-macos",
+            "https://textual.textualize.io/FAQ/#why-doesnt-textual-look-good-on-macos",
         )
     ]
 

src/textual_dev/cli.py

@@ -3,8 +3,16 @@
 from textual.color import Color
 from textual.containers import Horizontal, Vertical, VerticalScroll
 from textual.design import ColorSystem
+from textual.widget import Widget
 from textual.widgets import Button, Footer, Label, Static, TabbedContent
 
+try:
+    from textual.lazy import Lazy
+except ImportError:
+
+    def Lazy(widget: Widget) -> Widget:  # type: ignore
+        return widget
+
 
 class ThemeColorButtons(VerticalScroll):
     def compose(self) -> ComposeResult:
@@ -79,15 +87,8 @@ class ColorsApp(App[None]):
     def compose(self) -> ComposeResult:
         yield Footer()
         with ColorTabs("Theme Colors", "Named Colors"):
-            yield Content(ThemeColorButtons(), id="theme")
-            yield NamedColorsView()
-
-    def on_mount(self) -> None:
-        self.call_after_refresh(self.update_view)
-
-    async def update_view(self) -> None:
-        content = self.query_one("#theme", Content)
-        await content.mount(ThemeColorsView())
+            yield Content(ThemeColorButtons(), ThemeColorsView(), id="theme")
+            yield Lazy(NamedColorsView())
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         self.query(ColorGroup).remove_class("-active")

src/textual_dev/previews/colors.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Iterable
 
-from importlib_metadata import version
+from importlib.metadata import version
 from rich.align import Align
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.markup import escape

src/textual_dev/renderables.py

@@ -8,7 +8,7 @@
 from functools import singledispatch
 from typing import Any
 
-from importlib_metadata import version
+from importlib.metadata import version
 from rich.console import Console, ConsoleDimensions
 
 
@@ -88,6 +88,8 @@ def _guess_term() -> str:
             term_program = "GNOME Terminal"
         elif "XTERM_VERSION" in os.environ:
             term_program = os.environ.get("XTERM_VERSION") or "XTerm"
+        elif "TERMINATOR_UUID" in os.environ:
+            term_program = "Terminator"
 
     else:
         # See if we can pull out some sort of version information too.

src/textual_dev/tools/diagnose.py

@@ -1,5 +1,5 @@
 from click.testing import CliRunner
-from importlib_metadata import version
+from importlib.metadata import version
 
 from textual_dev.cli import run