diff --git a/Cargo.lock b/Cargo.lock index ee5352f3e..09d30e63a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7917,8 +7917,7 @@ dependencies = [ [[package]] name = "taffy" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639627c87f43b9181c811f40a6296409e093a17bc761214cba3c15df74f86b99" +source = "git+https://github.com/DioxusLabs/taffy?rev=1b918bafcab101dd234ebeb27da0443e24fd9de2#1b918bafcab101dd234ebeb27da0443e24fd9de2" dependencies = [ "arrayvec", "serde", diff --git a/Cargo.toml b/Cargo.toml index 7e6552be1..7a9eb0fdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,7 +98,7 @@ dioxus-cli-config = { version = "0.7.3" } dioxus-core-macro = { version = "0.7.3" } # Taffy + Parley + Fontations -taffy = { version = "0.14.0", default-features = false, features = [ +taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "1b918bafcab101dd234ebeb27da0443e24fd9de2", default-features = false, features = [ "std", "flexbox", "grid", diff --git a/packages/blitz-dom/src/layout/inline.rs b/packages/blitz-dom/src/layout/inline.rs index 0b46d3b77..14362bc3a 100644 --- a/packages/blitz-dom/src/layout/inline.rs +++ b/packages/blitz-dom/src/layout/inline.rs @@ -259,8 +259,9 @@ impl BaseDocument { .maybe_set(known_dimensions.width) .maybe_set(node_size.width) .map_definite_value(|size| { - size.maybe_clamp(node_min_size.width, node_max_size.width) - - content_box_inset.horizontal_axis_sum() + (size.maybe_clamp(node_min_size.width, node_max_size.width) + - content_box_inset.horizontal_axis_sum()) + .max(0.0) }), height: known_dimensions .height @@ -270,8 +271,9 @@ impl BaseDocument { .maybe_set(known_dimensions.height) .maybe_set(node_size.height) .map_definite_value(|size| { - size.maybe_clamp(node_min_size.height, node_max_size.height) - - content_box_inset.vertical_axis_sum() + (size.maybe_clamp(node_min_size.height, node_max_size.height) + - content_box_inset.vertical_axis_sum()) + .max(0.0) }), };