Merge pull request #5 from vlaci/extend-textual-colors

Extend textual colors

Author: willmcgugan

poetry.lock

@@ -2,13 +2,13 @@ Label {
     width: 100%;
 }
 
-ColorButtons {
+ThemeColorButtons {
     dock: left;
     overflow-y: auto;
     width: 30;
 }
 
-ColorButtons > Button {
+ThemeColorButtons > Button {
     width: 100%;
 }
 
@@ -61,6 +61,10 @@ ColorGroup.-active {
     color: $text;
 }
 
+.text-left {
+    content-align: left middle;
+}
+
 .muted {
     color: $text-muted;
 }

src/textual_dev/previews/colors.css

@@ -1,14 +1,14 @@
 from textual.app import App, ComposeResult
+from textual.color import COLOR_NAME_TO_RGB, Color
 from textual.containers import Horizontal, Vertical, VerticalScroll
 from textual.design import ColorSystem
-from textual.widgets import Button, Footer, Label, Static
+from textual.widgets import Button, Footer, Label, Static, TabbedContent
 
 
-class ColorButtons(VerticalScroll):
+class ThemeColorButtons(VerticalScroll):
     def compose(self) -> ComposeResult:
-        for border in ColorSystem.COLOR_NAMES:
-            if border:
-                yield Button(border, id=border)
+        for color_name in ColorSystem.COLOR_NAMES:
+            yield Button(color_name, id=color_name)
 
 
 class ColorBar(Static):
@@ -28,6 +28,26 @@ class Content(Vertical):
 
 
 class ColorsView(VerticalScroll):
+    pass
+
+
+class ColorTabs(TabbedContent, inherit_css=False):
+    pass
+
+
+class NamedColorsView(ColorsView):
+    def compose(self) -> ComposeResult:
+        with ColorGroup(id=f"group-named"):
+            for name, rgb in COLOR_NAME_TO_RGB.items():
+                color = Color(*rgb)
+                with ColorItem() as ci:
+                    ci.styles.background = name
+                    yield ColorBar(name, classes="text")
+                    yield ColorBar(f"{color.hex6}", classes="text")
+                    yield ColorBar(f"{color.rgb}", classes="text text-left")
+
+
+class ThemeColorsView(ColorsView):
     def compose(self) -> ComposeResult:
         LEVELS = [
             "darken-3",
@@ -56,15 +76,17 @@ class ColorsApp(App[None]):
     BINDINGS = [("d", "toggle_dark", "Toggle dark mode")]
 
     def compose(self) -> ComposeResult:
-        yield Content(ColorButtons())
         yield Footer()
+        with ColorTabs("Theme Colors", "Named Colors"):
+            yield Content(ThemeColorButtons())
+            yield Vertical(NamedColorsView())
 
     def on_mount(self) -> None:
         self.call_after_refresh(self.update_view)
 
     def update_view(self) -> None:
         content = self.query_one("Content", Content)
-        content.mount(ColorsView())
+        content.mount(ThemeColorsView())
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         self.query(ColorGroup).remove_class("-active")

src/textual_dev/previews/colors.py

@@ -1,8 +1,8 @@
 import pytest
 
-from textual.devtools.client import DevtoolsClient
-from textual.devtools.server import _make_devtools_aiohttp_app
-from textual.devtools.service import DevtoolsService
+from textual_dev.client import DevtoolsClient
+from textual_dev.server import _make_devtools_aiohttp_app
+from textual_dev.service import DevtoolsService
 
 
 @pytest.fixture

tests/devtools/conftest.py

@@ -7,7 +7,7 @@
 from rich.console import Console
 from rich.segment import Segment
 
-from textual.devtools.renderables import DevConsoleLog, DevConsoleNotice
+from textual_dev.renderables import DevConsoleLog, DevConsoleNotice
 
 from utilities.wait_for_predicate import wait_for_predicate
 

tests/devtools/test_devtools.py

@@ -10,8 +10,8 @@
 from rich.panel import Panel
 
 from textual.constants import DEVTOOLS_PORT
-from textual.devtools.client import DevtoolsClient
-from textual.devtools.redirect_output import DevtoolsLog
+from textual_dev.client import DevtoolsClient
+from textual_dev.redirect_output import DevtoolsLog
 
 from utilities.wait_for_predicate import wait_for_predicate
 

tests/devtools/test_devtools_client.py

@@ -4,7 +4,7 @@
 import msgpack
 import time_machine
 
-from textual.devtools.redirect_output import StdoutRedirector
+from textual_dev.redirect_output import StdoutRedirector
 
 TIMESTAMP = 1649166819
 

tests/devtools/test_redirect_output.py

@@ -1,7 +1,7 @@
 from click.testing import CliRunner
 from importlib_metadata import version
 
-from textual.cli.cli import run
+from textual_dev.cli import run
 
 
 def test_cli_version():