feat: constrain flex bases and redistribute bounded growth and shrink
Verify Tessera GUI / verify (push) Failing after 9m4s

This commit is contained in:
2026-10-23 00:42:48 +08:00
parent 78fb66277d
commit 1fda07ebc5
12 changed files with 298 additions and 55 deletions
+42 -1
View File
@@ -118,6 +118,7 @@ pub struct Data {
pub padding: f32,
pub gap: f32,
pub flex: f32,
pub flex_policy: crate::layout::FlexPolicy,
pub main_align: crate::layout::MainAlign,
pub scroll_axis: crate::scroll::Axis,
pub next_slot: u64,
@@ -146,6 +147,7 @@ impl Data {
padding,
gap,
flex: 0.0,
flex_policy: crate::layout::FlexPolicy::default(),
main_align: crate::layout::MainAlign::Start,
scroll_axis: crate::scroll::Axis::Both,
next_slot,
@@ -317,7 +319,18 @@ pub fn native_properties(data: &Data) -> Vec<(&'static str, Value)> {
fn number(value: f32) -> Value {
Value::Number((value as f64).into())
}
let mut fields = vec![("flex", number(data.flex))];
let mut fields = vec![
("flex", number(data.flex)),
(
"flexBasis",
data.flex_policy
.basis
.map_or_else(|| Value::Text("auto".into()), number),
),
("flexMin", number(data.flex_policy.min)),
("flexMax", number(data.flex_policy.max)),
("flexShrink", number(data.flex_policy.shrink)),
];
match &data.kind {
Kind::Text { value, size, color } => fields.extend([
("text", Value::Text(value.clone())),
@@ -362,6 +375,9 @@ pub fn visual_data(store: &ObjectStore, data: &Data) -> Result<Data, VmError> {
let value = store.get_attr(properties, name)?;
apply_visual_property(&mut data, name, &value)?;
}
if data.flex_policy.min > data.flex_policy.max {
return Err(VmError::InvalidArgument("flexMin exceeds flexMax"));
}
Ok(data)
}
@@ -377,6 +393,31 @@ pub fn apply_visual_property(data: &mut Data, name: &str, value: &Value) -> Resu
}
Ok(n)
};
match name {
"flexBasis" => {
data.flex_policy.basis = if matches!(value, Value::Nil)
|| matches!(value, Value::Text(text) if text == "auto")
{
None
} else {
Some(number()?)
};
return Ok(());
}
"flexMin" => {
data.flex_policy.min = number()?;
return Ok(());
}
"flexMax" => {
data.flex_policy.max = number()?;
return Ok(());
}
"flexShrink" => {
data.flex_policy.shrink = number()?;
return Ok(());
}
_ => {}
}
if name == "flex" {
data.flex = number()?;
return Ok(());