Merge branch 'main' into fix-option-list-fix-size-when-options-removed

Author: willmcgugan

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed incorrect auto height in Collapsible https://github.com/Textualize/textual/pull/5703
 - Fixed issue with keymaps and single-letter keys https://github.com/Textualize/textual/pull/5726
 - Fixed `OptionList` size after removing or clearing options https://github.com/Textualize/textual/issues/5728
+- Fixed footer / key panel not updating when keymaps are applied https://github.com/Textualize/textual/pull/5724
+- Fixed alignment not being applied when there are min and max limits on dimensions https://github.com/Textualize/textual/pull/5732
 
 ### Changed
 
@@ -121,7 +123,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Fixed OptionList.add_options exhausting iterator https://github.com/Textualize/textual/pull/5540
 - Fixed screen not refreshing after pop https://github.com/Textualize/textual/pull/5543
-- Fixed footer / key panel not updating when keymaps are applied https://github.com/Textualize/textual/pull/5724
 
 ## [2.0.1] - 2025-02-16
 

src/textual/_arrange.py

@@ -102,7 +102,7 @@ def arrange(
                 container_width, container_height = dock_region.size
                 placement_offset += styles._align_size(
                     bounding_region.size,
-                    Size(
+                    widget._extrema.apply_dimensions(
                         0 if styles.is_auto_width else container_width,
                         0 if styles.is_auto_height else container_height,
                     ),

src/textual/_extrema.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+from fractions import Fraction
+from typing import NamedTuple
+
+from textual.geometry import Size
+
+
+class Extrema(NamedTuple):
+    """Specifies minimum and maximum dimensions."""
+
+    min_width: Fraction | None = None
+    max_width: Fraction | None = None
+    min_height: Fraction | None = None
+    max_height: Fraction | None = None
+
+    def apply_width(self, width: Fraction) -> Fraction:
+        """Apply width extrema.
+
+        Args:
+            width: Width value.
+
+        Returns:
+            Width, clamped between minimum and maximum.
+
+        """
+        min_width, max_width = self[:2]
+        if min_width is not None:
+            width = max(width, min_width)
+        if max_width is not None:
+            width = min(width, max_width)
+        return width
+
+    def apply_height(self, height: Fraction) -> Fraction:
+        """Apply height extrema.
+
+        Args:
+            height: Height value.
+
+        Returns:
+            Height, clamped between minimum and maximum.
+
+        """
+        min_height, max_height = self[2:]
+        if min_height is not None:
+            height = max(height, min_height)
+        if max_height is not None:
+            height = min(height, max_height)
+        return height
+
+    def apply_dimensions(self, width: int, height: int) -> Size:
+        """Apply extrema to integer dimensions.
+
+        Args:
+            width: Integer width.
+            height: Integer height.
+
+        Returns:
+            Size with extrema applied.
+        """
+        return Size(
+            int(self.apply_width(Fraction(width))),
+            int(self.apply_height(Fraction(height))),
+        )

src/textual/canvas.py

@@ -8,6 +8,7 @@
 
 from __future__ import annotations
 
+import sys
 from array import array
 from collections import defaultdict
 from dataclasses import dataclass
@@ -157,7 +158,10 @@ def __init__(self, width: int, height: int) -> None:
         self._width = width
         self._height = height
         blank_line = " " * width
-        self.lines: list[array[str]] = [array("u", blank_line) for _ in range(height)]
+        array_type_code = "w" if sys.version_info >= (3, 13) else "u"
+        self.lines: list[array[str]] = [
+            array(array_type_code, blank_line) for _ in range(height)
+        ]
         self.box: list[defaultdict[int, Quad]] = [
             defaultdict(lambda: (0, 0, 0, 0)) for _ in range(height)
         ]

src/textual/css/styles.py

@@ -1162,9 +1162,9 @@ def append_declaration(name: str, value: str) -> None:
         if "min_height" in rules:
             append_declaration("min-height", str(self.min_height))
         if "max_width" in rules:
-            append_declaration("max-width", str(self.min_width))
+            append_declaration("max-width", str(self.max_width))
         if "max_height" in rules:
-            append_declaration("max-height", str(self.min_height))
+            append_declaration("max-height", str(self.max_height))
         if "transitions" in rules:
             append_declaration(
                 "transition",

src/textual/widget.py

@@ -54,6 +54,7 @@
 from textual._debug import get_caller_file_and_line
 from textual._dispatch_key import dispatch_key
 from textual._easing import DEFAULT_SCROLL_EASING
+from textual._extrema import Extrema
 from textual._styles_cache import StylesCache
 from textual._types import AnimationLevel
 from textual.actions import SkipAction
@@ -504,6 +505,8 @@ def __init__(
         """Time of last scroll."""
         self._user_scroll_interrupt: bool = False
         """Has the user interrupted a scroll to end?"""
+        self._extrema = Extrema()
+        """Optional minimum and maximum values for width and height."""
 
     @property
     def is_mounted(self) -> bool:
@@ -1528,12 +1531,16 @@ def _get_box_model(
         # Container minus padding and border
         content_container = container - gutter.totals
 
+        extrema = self._extrema = self._resolve_extrema(
+            container, viewport, width_fraction, height_fraction
+        )
+        min_width, max_width, min_height, max_height = extrema
+
         if styles.width is None:
             # No width specified, fill available space
             content_width = Fraction(content_container.width - margin.width)
         elif is_auto_width:
             # When width is auto, we want enough space to always fit the content
-
             content_width = Fraction(
                 self.get_content_width(content_container - margin.totals, viewport)
             )
@@ -1555,28 +1562,17 @@ def _get_box_model(
             if is_border_box:
                 content_width -= gutter.width
 
-        if styles.min_width is not None:
+        if min_width is not None:
             # Restrict to minimum width, if set
-            min_width = styles.min_width.resolve(
-                container - margin.totals, viewport, width_fraction
-            )
-            if is_border_box:
-                min_width -= gutter.width
             content_width = max(content_width, min_width, Fraction(0))
 
-        if styles.max_width is not None and not (
+        if max_width is not None and not (
             container.width == 0
             and not styles.max_width.is_cells
             and self._parent is not None
             and self._parent.styles.is_auto_width
         ):
             # Restrict to maximum width, if set
-            max_width = styles.max_width.resolve(
-                container - margin.totals, viewport, width_fraction
-            )
-            if is_border_box:
-                max_width -= gutter.width
-
             content_width = min(content_width, max_width)
 
         content_width = max(Fraction(0), content_width)
@@ -1614,28 +1610,16 @@ def _get_box_model(
             if is_border_box:
                 content_height -= gutter.height
 
-        if styles.min_height is not None:
+        if min_height is not None:
             # Restrict to minimum height, if set
-            min_height = styles.min_height.resolve(
-                container - margin.totals, viewport, height_fraction
-            )
-            if is_border_box:
-                min_height -= gutter.height
             content_height = max(content_height, min_height, Fraction(0))
 
-        if styles.max_height is not None and not (
+        if max_height is not None and not (
             container.height == 0
             and not styles.max_height.is_cells
             and self._parent is not None
             and self._parent.styles.is_auto_height
         ):
-            # Restrict maximum height, if set
-            max_height = styles.max_height.resolve(
-                container - margin.totals, viewport, height_fraction
-            )
-
-            if is_border_box:
-                max_height -= gutter.height
             content_height = min(content_height, max_height)
 
         content_height = max(Fraction(0), content_height)
@@ -2202,6 +2186,63 @@ def is_on_screen(self) -> bool:
             return False
         return True
 
+    def _resolve_extrema(
+        self,
+        container: Size,
+        viewport: Size,
+        width_fraction: Fraction,
+        height_fraction: Fraction,
+    ) -> Extrema:
+        """Resolve minimum and maximum values for width and height.
+
+        Args:
+            container: Size of outer widget.
+            viewport: Viewport size.
+            width_fraction: Size of 1fr width.
+            height_fraction: Size of 1fr height.
+
+        Returns:
+            Extrema object.
+        """
+
+        min_width: Fraction | None = None
+        max_width: Fraction | None = None
+        min_height: Fraction | None = None
+        max_height: Fraction | None = None
+
+        styles = self.styles
+        container -= styles.margin.totals
+        if styles.box_sizing == "border-box":
+            gutter_width, gutter_height = styles.gutter.totals
+        else:
+            gutter_width = gutter_height = 0
+
+        if styles.min_width is not None:
+            min_width = (
+                styles.min_width.resolve(container, viewport, width_fraction)
+                - gutter_width
+            )
+
+        if styles.max_width is not None:
+            max_width = (
+                styles.max_width.resolve(container, viewport, width_fraction)
+                - gutter_width
+            )
+        if styles.min_height is not None:
+            min_height = (
+                styles.min_height.resolve(container, viewport, height_fraction)
+                - gutter_height
+            )
+
+        if styles.max_height is not None:
+            max_height = (
+                styles.max_height.resolve(container, viewport, height_fraction)
+                - gutter_height
+            )
+
+        extrema = Extrema(min_width, max_width, min_height, max_height)
+        return extrema
+
     def animate(
         self,
         attribute: str,