Fix tests.

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `SelectionList` option IDs are usable as soon as the widget is instantiated https://github.com/Textualize/textual/issues/3903
 - Fix issue with `Strip.crop` when crop window start aligned with strip end https://github.com/Textualize/textual/pull/3998
 - Fixed Strip.crop_extend https://github.com/Textualize/textual/pull/4011
+- `width`, `max-width`, `min-width`, `height`, `max-height`, and `min-height`, calculations were off for certain combinations of padding, margin, and units https://github.com/Textualize/textual/issues/3721
 
 
 ## [0.47.1] - 2023-01-05

docs/examples/styles/border.tcss

@@ -21,7 +21,7 @@ Screen {
 }
 
 Screen > Label {
-    width: 100%;
+    width: 1fr;
     height: 5;
     content-align: center middle;
     color: white;

docs/examples/styles/border_subtitle_align.tcss

@@ -14,7 +14,7 @@
 }
 
 Screen > Label {
-    width: 100%;
+    width: 1fr;
     height: 5;
     content-align: center middle;
     color: white;

docs/examples/styles/border_title_align.tcss

@@ -14,7 +14,7 @@
 }
 
 Screen > Label {
-    width: 100%;
+    width: 1fr;
     height: 5;
     content-align: center middle;
     color: white;

docs/examples/styles/margin.tcss

@@ -7,5 +7,5 @@ Label {
     margin: 4 8;
     background: blue 20%;
     border: blue wide;
-    width: 100%;
+    width: 1fr;
 }

docs/examples/styles/margin_all.tcss

@@ -8,13 +8,13 @@ Grid {
 }
 
 Placeholder {
-    width: 100%;
-    height: 100%;
+    width: 1fr;
+    height: 1fr;
 }
 
 Container {
-    width: 100%;
-    height: 100%;
+    width: 1fr;
+    height: 1fr;
 }
 
 .bordered {

docs/examples/styles/outline.tcss

@@ -7,5 +7,5 @@ Label {
     margin: 4 8;
     background: green 20%;
     outline: wide green;
-    width: 100%;
+    width: 1fr;
 }

docs/examples/widgets/sparkline.tcss

@@ -1,4 +1,4 @@
 Sparkline {
-    width: 100%;
+    width: 1fr;
     margin: 2;
 }

docs/examples/widgets/sparkline_colors.tcss

@@ -1,5 +1,5 @@
 Sparkline {
-    width: 100%;
+    width: 1fr;
     margin: 1;
 }
 

tests/snapshot_tests/snapshot_apps/input_validation.py

@@ -17,6 +17,7 @@ class InputApp(App):
     }
     Input {
         margin: 1 2;
+        width: 1fr;
     }
     """
 
@@ -41,5 +42,5 @@ def compose(self) -> ComposeResult:
 
 app = InputApp()
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.run()

tests/test_box_model.py

@@ -84,7 +84,7 @@ def get_content_height(self, container: Size, parent: Size, width: int) -> int:
     styles.width = "100%"
 
     box_model = widget._get_box_model(Size(60, 20), Size(80, 24), one, one)
-    assert box_model == BoxModel(Fraction(54), Fraction(16), Spacing(1, 2, 3, 4))
+    assert box_model == BoxModel(Fraction(60), Fraction(16), Spacing(1, 2, 3, 4))
 
     styles.width = "100vw"
     styles.max_width = "50%"
@@ -127,7 +127,7 @@ def get_content_height(self, container: Size, parent: Size, width: int) -> int:
     styles.height = "100%"
 
     box_model = widget._get_box_model(Size(60, 20), Size(80, 24), one, one)
-    assert box_model == BoxModel(Fraction(54), Fraction(16), Spacing(1, 2, 3, 4))
+    assert box_model == BoxModel(Fraction(54), Fraction(20), Spacing(1, 2, 3, 4))
 
     styles.height = "auto"
     styles.margin = 2