Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(layout): integrate ratio and orthogonal grid regression fixes

ldm06424f9e55582
diff --git a/Cargo.lock b/Cargo.lock
index 952cf3322..756559e44 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5650,7 +5650,7 @@ dependencies = [
[[package]]
name = "taffy"
version = "0.15.0"
-source = "git+https://github.com/ldm0/taffy?rev=e2ce07300697a9d8196117cd343e7b158ae5320d#e2ce07300697a9d8196117cd343e7b158ae5320d"
+source = "git+https://github.com/ldm0/taffy?rev=eb97b9cc386746c1ba870aa249f4ae5119dfffb4#eb97b9cc386746c1ba870aa249f4ae5119dfffb4"
dependencies = [
"serde",
"slotmap",
diff --git a/Cargo.toml b/Cargo.toml
index 4ae70267a..7df161db0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -117,10 +117,10 @@ stylo_dom = { git = "https://github.com/lexmount/stylo", rev = "2fce24a36f03223f
stylo_static_prefs = { git = "https://github.com/lexmount/stylo", rev = "2fce24a36f03223f9ad75672bf1d8b35e47fc285" }
stylo_traits = { git = "https://github.com/lexmount/stylo", rev = "2fce24a36f03223f9ad75672bf1d8b35e47fc285" }
svgtypes = { git = "https://github.com/lexmount/svgtypes", branch = "moli" }
-taffy = { git = "https://github.com/ldm0/taffy", rev = "e2ce07300697a9d8196117cd343e7b158ae5320d" }
+taffy = { git = "https://github.com/ldm0/taffy", rev = "eb97b9cc386746c1ba870aa249f4ae5119dfffb4" }
[patch."https://github.com/DioxusLabs/taffy"]
-taffy = { git = "https://github.com/ldm0/taffy", rev = "e2ce07300697a9d8196117cd343e7b158ae5320d" }
+taffy = { git = "https://github.com/ldm0/taffy", rev = "eb97b9cc386746c1ba870aa249f4ae5119dfffb4" }
[workspace.lints.clippy]
disallowed_methods = "deny"
diff --git a/moli-layout/src/table.rs b/moli-layout/src/table.rs
index 28ab8c46d..b229c1ebd 100644
--- a/moli-layout/src/table.rs
+++ b/moli-layout/src/table.rs
@@ -754,12 +754,14 @@ impl TableContext {
inline_insets: f32,
) -> f32 {
let space = inputs.constraint_space(self.writing_mode);
- let (min_content, max_content) =
- if space.sizing_purpose == SizingPurpose::IntrinsicContribution {
- (intrinsic.min_content, intrinsic.max_content)
- } else {
- (grid.min, grid.max)
- };
+ let (min_content, max_content) = if matches!(
+ space.sizing_purpose,
+ SizingPurpose::IntrinsicContribution | SizingPurpose::ContentProbe
+ ) {
+ (intrinsic.min_content, intrinsic.max_content)
+ } else {
+ (grid.min, grid.max)
+ };
let available = space.available_size.inline_size;
let fit_content = || match available {
AvailableSpace::Definite(value) => min_content.max(value.max(0.0).min(max_content)),