diff --git a/Cargo.lock b/Cargo.lock index edb8ad1bf..53840ddbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7397,7 +7397,7 @@ dependencies = [ [[package]] name = "taffy" version = "0.13.0" -source = "git+https://github.com/DioxusLabs/taffy?rev=864b4fd02e344bf9676f653e945161011cf93c0d#864b4fd02e344bf9676f653e945161011cf93c0d" +source = "git+https://github.com/DioxusLabs/taffy?rev=15de7486a4168ee5ad00c9ea5e0a9389dee7c90a#15de7486a4168ee5ad00c9ea5e0a9389dee7c90a" dependencies = [ "arrayvec", "serde", diff --git a/Cargo.toml b/Cargo.toml index 8501aa6c1..7bbcb0187 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,7 @@ dioxus-cli-config = { version = "0.7.3" } dioxus-core-macro = { version = "0.7.3" } # Taffy + Parley + Fontations -taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "864b4fd02e344bf9676f653e945161011cf93c0d", default-features = false, features = [ +taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "15de7486a4168ee5ad00c9ea5e0a9389dee7c90a", 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 c118cf6a9..da60b7c2b 100644 --- a/packages/blitz-dom/src/layout/inline.rs +++ b/packages/blitz-dom/src/layout/inline.rs @@ -823,10 +823,7 @@ impl BaseDocument { LayoutOutput { size: final_size, content_size: measured_size + padding.sum_axes(), - first_baselines: Point { - x: None, - y: first_baseline, - }, + baselines: taffy::Baselines::from_first(first_baseline), top_margin: CollapsibleMarginSet::ZERO, bottom_margin: CollapsibleMarginSet::ZERO, margins_can_collapse_through: !has_styles_preventing_being_collapsed_through diff --git a/packages/blitz-dom/src/layout/mod.rs b/packages/blitz-dom/src/layout/mod.rs index cd72e276f..789568f5f 100644 --- a/packages/blitz-dom/src/layout/mod.rs +++ b/packages/blitz-dom/src/layout/mod.rs @@ -289,7 +289,7 @@ impl BaseDocument { return taffy::LayoutOutput { size: computed, content_size: computed, - first_baselines: taffy::Point::NONE, + baselines: taffy::Baselines::NONE, top_margin: CollapsibleMarginSet::ZERO, bottom_margin: CollapsibleMarginSet::ZERO, margins_can_collapse_through: false,