Fix intrinsic sizing min size (#723)

* Add failing test * Fix bug
DioxusLabs · Oct 22, 2024 · 84ab995 · 84ab995
1 parent b92dcec
commit 84ab995
Show file tree

Hide file tree

Showing 4 changed files with 315 additions and 2 deletions.
diff --git a/src/compute/flexbox.rs b/src/compute/flexbox.rs
@@ -900,7 +900,9 @@ fn determine_container_main_size(
                             .iter()
                             .map(|child| {
                                 let padding_border_sum = (child.padding + child.border).main_axis_sum(constants.dir);
-                                (child.flex_basis + child.margin.main_axis_sum(constants.dir)).max(padding_border_sum)
+                                (child.flex_basis.maybe_max(child.min_size.main(constants.dir))
+                                    + child.margin.main_axis_sum(constants.dir))
+                                .max(padding_border_sum)
                             })
                             .sum::<f32>();
                         total_target_size + line_main_axis_gap
@@ -924,7 +926,9 @@ fn determine_container_main_size(
                             .iter()
                             .map(|child| {
                                 let padding_border_sum = (child.padding + child.border).main_axis_sum(constants.dir);
-                                (child.flex_basis + child.margin.main_axis_sum(constants.dir)).max(padding_border_sum)
+                                (child.flex_basis.maybe_max(child.min_size.main(constants.dir))
+                                    + child.margin.main_axis_sum(constants.dir))
+                                .max(padding_border_sum)
                             })
                             .sum::<f32>();
                         total_target_size + line_main_axis_gap

diff --git a/test_fixtures/grid/grid_taffy_issue_591.html b/test_fixtures/grid/grid_taffy_issue_591.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <script src="../../scripts/gentest/test_helper.js"></script>
+  <link rel="stylesheet" type="text/css" href="../../scripts/gentest/test_base_style.css">
+  <title>
+    Test description
+  </title>
+</head>
+<body style="margin: 20px;">
+
+<div id="test-root" style="display: flex; width: 300px; height: 200px;">
+ <div id="outer" style="display: flex; position: absolute; top: 0; left: 0; max-width: 100px; max-height: 100px; padding: 10px; align-items: center; justify-content: center;">
+  <div id="inner" style="display: flex; min-width: 50px; min-height: 50px; padding: 10px;"></div>
+ </div>
+</div>
+
+</body>
+</html>
+
+
diff --git a/tests/generated/grid/grid_taffy_issue_591.rs b/tests/generated/grid/grid_taffy_issue_591.rs
diff --git a/tests/generated/grid/mod.rs b/tests/generated/grid/mod.rs