tawasuyu/taffy

diff --git a/test_fixtures/padding_border_overrides_size_flex_basis.html b/test_fixtures/padding_border_overrides_size_flex_basis.html
new file mode 100644
index 000000000..f34599a1b
--- /dev/null
+++ b/test_fixtures/padding_border_overrides_size_flex_basis.html
@@ -0,0 +1,18 @@
+<!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>
+
+<div id="test-root">
+  <div style="flex-basis: 0;flex-grow:1;width: 12px; height: 12px;padding:2px 4px 6px 8px;border-width: 1px 3px 5px 7px;border-style:solid;border-color:red"></div>
+  <div style="flex-basis: 0;flex-grow:1;width: 12px; height: 12px"></div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/generated/mod.rs b/tests/generated/mod.rs
index 79c1ea559..b16b14af0 100644
--- a/tests/generated/mod.rs
+++ b/tests/generated/mod.rs
@@ -838,6 +838,7 @@ mod padding_align_end_child;
 mod padding_border_overrides_max_size;
 mod padding_border_overrides_min_size;
 mod padding_border_overrides_size;
+mod padding_border_overrides_size_flex_basis;
 mod padding_center_child;
 mod padding_container_match_child;
 mod padding_flex_child;
diff --git a/tests/generated/padding_border_overrides_size_flex_basis.rs b/tests/generated/padding_border_overrides_size_flex_basis.rs
new file mode 100644
index 000000000..14e18d5b4
--- /dev/null
+++ b/tests/generated/padding_border_overrides_size_flex_basis.rs
@@ -0,0 +1,61 @@
+#[test]
+fn padding_border_overrides_size_flex_basis() {
+    use slotmap::Key;
+    #[allow(unused_imports)]
+    use taffy::{layout::Layout, prelude::*};
+    let mut taffy = taffy::Taffy::new();
+    let node0 = taffy
+        .new_leaf(taffy::style::Style {
+            flex_grow: 1f32,
+            flex_basis: taffy::style::Dimension::Points(0f32),
+            size: taffy::geometry::Size {
+                width: taffy::style::Dimension::Points(12f32),
+                height: taffy::style::Dimension::Points(12f32),
+            },
+            padding: taffy::geometry::Rect {
+                left: taffy::style::LengthPercentage::Points(8f32),
+                right: taffy::style::LengthPercentage::Points(4f32),
+                top: taffy::style::LengthPercentage::Points(2f32),
+                bottom: taffy::style::LengthPercentage::Points(6f32),
+            },
+            border: taffy::geometry::Rect {
+                left: taffy::style::LengthPercentage::Points(7f32),
+                right: taffy::style::LengthPercentage::Points(3f32),
+                top: taffy::style::LengthPercentage::Points(1f32),
+                bottom: taffy::style::LengthPercentage::Points(5f32),
+            },
+            ..Default::default()
+        })
+        .unwrap();
+    let node1 = taffy
+        .new_leaf(taffy::style::Style {
+            flex_grow: 1f32,
+            flex_basis: taffy::style::Dimension::Points(0f32),
+            size: taffy::geometry::Size {
+                width: taffy::style::Dimension::Points(12f32),
+                height: taffy::style::Dimension::Points(12f32),
+            },
+            ..Default::default()
+        })
+        .unwrap();
+    let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0, node1]).unwrap();
+    taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap();
+    println!("\nComputed tree:");
+    taffy::debug::print_tree(&taffy, node);
+    println!();
+    let Layout { size, location, .. } = taffy.layout(node).unwrap();
+    assert_eq!(size.width, 34f32, "width of node {:?}. Expected {}. Actual {}", node.data(), 34f32, size.width);
+    assert_eq!(size.height, 14f32, "height of node {:?}. Expected {}. Actual {}", node.data(), 14f32, size.height);
+    assert_eq!(location.x, 0f32, "x of node {:?}. Expected {}. Actual {}", node.data(), 0f32, location.x);
+    assert_eq!(location.y, 0f32, "y of node {:?}. Expected {}. Actual {}", node.data(), 0f32, location.y);
+    let Layout { size, location, .. } = taffy.layout(node0).unwrap();
+    assert_eq!(size.width, 28f32, "width of node {:?}. Expected {}. Actual {}", node0.data(), 28f32, size.width);
+    assert_eq!(size.height, 14f32, "height of node {:?}. Expected {}. Actual {}", node0.data(), 14f32, size.height);
+    assert_eq!(location.x, 0f32, "x of node {:?}. Expected {}. Actual {}", node0.data(), 0f32, location.x);
+    assert_eq!(location.y, 0f32, "y of node {:?}. Expected {}. Actual {}", node0.data(), 0f32, location.y);
+    let Layout { size, location, .. } = taffy.layout(node1).unwrap();
+    assert_eq!(size.width, 6f32, "width of node {:?}. Expected {}. Actual {}", node1.data(), 6f32, size.width);
+    assert_eq!(size.height, 12f32, "height of node {:?}. Expected {}. Actual {}", node1.data(), 12f32, size.height);
+    assert_eq!(location.x, 28f32, "x of node {:?}. Expected {}. Actual {}", node1.data(), 28f32, location.x);
+    assert_eq!(location.y, 0f32, "y of node {:?}. Expected {}. Actual {}", node1.data(), 0f32, location.y);
+}