Merge branch 'main' into fix-get-event-loop-call

Author: graingert

CHANGELOG.md

@@ -16,6 +16,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed triggering a deprecation warning in py >= 3.10 https://github.com/Textualize/textual/pull/5799
 - Fixed `Input` invalid cursor position after updating the value https://github.com/Textualize/textual/issues/5811
 
+### Added
+
+- Exposed `CollapsibleTitle` https://github.com/Textualize/textual/pull/5810
+
+### Added
+
+- Added `Color.hsv` property and `Color.from_hsv` class method https://github.com/Textualize/textual/pull/5803
+
 ## [3.2.0] - 2025-05-02
 
 ### Fixed

questions/why-no-ansi-themes.question.md

@@ -7,7 +7,7 @@ alt_titles:
 
 Textual will not generate escape sequences for the 16 themeable *ANSI* colors.
 
-This is an intentional design decision we took for for the following reasons:
+This is an intentional design decision we took for the following reasons:
 
 - Not everyone has a carefully chosen ANSI color theme. Color combinations which may look fine on your system, may be unreadable on another machine. There is very little an app author or Textual can do to resolve this. Asking users to simply pick a better theme is not a good solution, since not all users will know how.
 - ANSI colors can't be manipulated in the way Textual can do with other colors. Textual can blend colors and produce light and dark shades from an original color, which is used to create more readable text and user interfaces. Color blending will also be used to power future accessibility features.

src/textual/color.py

@@ -31,7 +31,7 @@
 from __future__ import annotations
 
 import re
-from colorsys import hls_to_rgb, rgb_to_hls
+from colorsys import hls_to_rgb, hsv_to_rgb, rgb_to_hls, rgb_to_hsv
 from functools import lru_cache
 from operator import itemgetter
 from typing import Callable, NamedTuple
@@ -82,7 +82,7 @@ class HSV(NamedTuple):
     s: float
     """Saturation in range 0 to 1."""
     v: float
-    """Value un range 0 to 1."""
+    """Value in range 0 to 1."""
 
 
 class Lab(NamedTuple):
@@ -212,6 +212,21 @@ def from_hsl(cls, h: float, s: float, l: float) -> Color:
         r, g, b = hls_to_rgb(h, l, s)
         return cls(int(r * 255 + 0.5), int(g * 255 + 0.5), int(b * 255 + 0.5))
 
+    @classmethod
+    def from_hsv(cls, h: float, s: float, v: float) -> Color:
+        """Create a color from HSV components.
+
+        Args:
+            h: Hue.
+            s: Saturation.
+            v: Value.
+
+        Returns:
+            A new color.
+        """
+        r, g, b = hsv_to_rgb(h, s, v)
+        return cls(int(r * 255 + 0.5), int(g * 255 + 0.5), int(b * 255 + 0.5))
+
     @property
     def inverse(self) -> Color:
         """The inverse of this color.
@@ -286,6 +301,19 @@ def hsl(self) -> HSL:
         h, l, s = rgb_to_hls(r, g, b)
         return HSL(h, s, l)
 
+    @property
+    def hsv(self) -> HSV:
+        """This color in HSV format.
+
+        HSV color is an alternative way of representing a color, which can be used in certain color calculations.
+
+        Returns:
+            Color encoded in HSV format.
+        """
+        r, g, b = self.normalized
+        h, s, v = rgb_to_hsv(r, g, b)
+        return HSV(h, s, v)
+
     @property
     def brightness(self) -> float:
         """The human perceptual brightness.
@@ -301,7 +329,7 @@ def brightness(self) -> float:
     def hex(self) -> str:
         """The color in CSS hex form, with 6 digits for RGB, and 8 digits for RGBA.
 
-        For example, `"#46b3de"` for an RGB color, or `"#3342457f"` for a color with alpha.
+        For example, `"#46B3DE"` for an RGB color, or `"#3342457F"` for a color with alpha.
         """
         r, g, b, a, ansi, _ = self.clamped
         if ansi is not None:
@@ -316,7 +344,7 @@ def hex(self) -> str:
     def hex6(self) -> str:
         """The color in CSS hex form, with 6 digits for RGB. Alpha is ignored.
 
-        For example, `"#46b3de"`.
+        For example, `"#46B3DE"`.
         """
         r, g, b, _a, _, _ = self.clamped
         return f"#{r:02X}{g:02X}{b:02X}"

src/textual/widgets/__init__.py

@@ -12,7 +12,7 @@
     from textual.widget import Widget
     from textual.widgets._button import Button
     from textual.widgets._checkbox import Checkbox
-    from textual.widgets._collapsible import Collapsible
+    from textual.widgets._collapsible import Collapsible, CollapsibleTitle
     from textual.widgets._content_switcher import ContentSwitcher
     from textual.widgets._data_table import DataTable
     from textual.widgets._digits import Digits
@@ -54,6 +54,7 @@
     "Button",
     "Checkbox",
     "Collapsible",
+    "CollapsibleTitle",
     "ContentSwitcher",
     "DataTable",
     "Digits",

src/textual/widgets/__init__.pyi

@@ -2,6 +2,7 @@
 from ._button import Button as Button
 from ._checkbox import Checkbox as Checkbox
 from ._collapsible import Collapsible as Collapsible
+from ._collapsible import CollapsibleTitle as CollapsibleTitle
 from ._content_switcher import ContentSwitcher as ContentSwitcher
 from ._data_table import DataTable as DataTable
 from ._digits import Digits as Digits

src/textual/widgets/collapsible.py

@@ -0,0 +1,3 @@
+from textual.widgets._collapsible import CollapsibleTitle
+
+__all__ = ["CollapsibleTitle"]

tests/test_color.py

@@ -52,6 +52,17 @@ def test_hsl():
     assert red.hsl.css == "hsl(356,81.8%,43.1%)"
 
 
+def test_hsv():
+    red = Color(200, 20, 32)
+    print(red.hsv)
+    assert red.hsv == pytest.approx(
+        (0.9888888888888889, 0.8999999999999999, 0.7843137254901961)
+    )
+    assert Color.from_hsv(
+        0.9888888888888889, 0.8999999999999999, 0.7843137254901961
+    ).normalized == pytest.approx(red.normalized, rel=1e-5)
+
+
 def test_color_brightness():
     assert Color(255, 255, 255).brightness == 1
     assert Color(0, 0, 0).brightness == 0