feat: implement nested border-box layout and alignment

This commit is contained in:
2026-11-10 22:17:19 +08:00
parent 525097a0b2
commit 32d7ada3ab
21 changed files with 1368 additions and 74 deletions
+180 -1
View File
@@ -32,6 +32,7 @@ pub enum Kind {
},
Row,
Column,
Overlay,
Button,
Page,
}
@@ -120,6 +121,14 @@ pub struct Data {
pub flex: f32,
pub flex_policy: crate::layout::FlexPolicy,
pub main_align: crate::layout::MainAlign,
pub cross_align: crate::layout::CrossAlign,
pub align_self: Option<crate::layout::CrossAlign>,
pub margin: crate::layout::Insets,
pub sizing: crate::box_model::Sizing,
pub padding_edges: [Option<f32>; 4],
pub border: crate::layout::Insets,
pub border_color: String,
pub clip_children: bool,
pub scroll_axis: crate::scroll::Axis,
pub position: [f32; 2],
pub surface: crate::page::Surface,
@@ -151,6 +160,14 @@ impl Data {
flex: 0.0,
flex_policy: crate::layout::FlexPolicy::default(),
main_align: crate::layout::MainAlign::Start,
cross_align: crate::layout::CrossAlign::Start,
align_self: None,
margin: crate::layout::Insets::default(),
sizing: crate::box_model::Sizing::default(),
padding_edges: [None; 4],
border: crate::layout::Insets::default(),
border_color: "#D8DCE2".into(),
clip_children: false,
scroll_axis: crate::scroll::Axis::Both,
position: [0.0, 0.0],
surface: crate::page::Surface::new(crate::page::Mode::Window),
@@ -167,7 +184,12 @@ impl Data {
pub fn is_container(&self) -> bool {
matches!(
self.kind,
Kind::Row | Kind::Column | Kind::Button | Kind::Page | Kind::Scroll { .. }
Kind::Row
| Kind::Column
| Kind::Overlay
| Kind::Button
| Kind::Page
| Kind::Scroll { .. }
)
}
}
@@ -336,7 +358,50 @@ pub fn native_properties(data: &Data) -> Vec<(&'static str, Value)> {
("flexMin", number(data.flex_policy.min)),
("flexMax", number(data.flex_policy.max)),
("flexShrink", number(data.flex_policy.shrink)),
("marginTop", number(data.margin.top)),
("marginRight", number(data.margin.right)),
("marginBottom", number(data.margin.bottom)),
("marginLeft", number(data.margin.left)),
("boxWidth", data.sizing.width.value()),
("boxHeight", data.sizing.height.value()),
("minWidth", number(data.sizing.min_width)),
("minHeight", number(data.sizing.min_height)),
("maxWidth", number(data.sizing.max_width)),
("maxHeight", number(data.sizing.max_height)),
("borderTop", number(data.border.top)),
("borderRight", number(data.border.right)),
("borderBottom", number(data.border.bottom)),
("borderLeft", number(data.border.left)),
("borderColor", Value::Text(data.border_color.clone())),
(
"overflow",
Value::Text(
if data.clip_children {
"clip"
} else {
"visible"
}
.into(),
),
),
(
"alignSelf",
Value::Text(
data.align_self
.map_or("auto", crate::layout::CrossAlign::name)
.into(),
),
),
];
for (name, edge) in ["paddingTop", "paddingRight", "paddingBottom", "paddingLeft"]
.into_iter()
.zip(data.padding_edges)
{
fields.push((
name,
edge.map_or_else(|| Value::Text("auto".into()), number),
));
}
match &data.kind {
Kind::Page => fields.extend([
("mode", Value::Text(data.surface.mode.name().into())),
@@ -373,6 +438,7 @@ pub fn native_properties(data: &Data) -> Vec<(&'static str, Value)> {
("padding", number(data.padding)),
("gap", number(data.gap)),
("mainAlign", Value::Text(data.main_align.name().into())),
("crossAlign", Value::Text(data.cross_align.name().into())),
]);
}
fields
@@ -390,6 +456,11 @@ pub fn visual_data(store: &ObjectStore, data: &Data) -> Result<Data, VmError> {
if data.flex_policy.min > data.flex_policy.max {
return Err(VmError::InvalidArgument("flexMin exceeds flexMax"));
}
if data.sizing.min_width > data.sizing.max_width
|| data.sizing.min_height > data.sizing.max_height
{
return Err(VmError::InvalidArgument("box minimum exceeds maximum"));
}
Ok(data)
}
@@ -430,6 +501,99 @@ pub fn apply_visual_property(data: &mut Data, name: &str, value: &Value) -> Resu
return Ok(());
}
match name {
"paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" => {
let index = match name {
"paddingTop" => 0,
"paddingRight" => 1,
"paddingBottom" => 2,
_ => 3,
};
data.padding_edges[index] = if matches!(value, Value::Text(text) if text == "auto") {
None
} else {
Some(number()?)
};
return Ok(());
}
"borderTop" => {
data.border.top = number()?;
return Ok(());
}
"borderRight" => {
data.border.right = number()?;
return Ok(());
}
"borderBottom" => {
data.border.bottom = number()?;
return Ok(());
}
"borderLeft" => {
data.border.left = number()?;
return Ok(());
}
"borderColor" => {
let Value::Text(color) = value else {
return Err(bad());
};
crate::document::parse_color(color).map_err(|_| bad())?;
data.border_color.clone_from(color);
return Ok(());
}
"overflow" => {
let Value::Text(overflow) = value else {
return Err(bad());
};
data.clip_children = match overflow.as_str() {
"clip" => true,
"visible" => false,
_ => {
return Err(VmError::InvalidArgument(
"overflow expects visible or clip; use ScrollBlock for scrolling",
));
}
};
return Ok(());
}
"boxWidth" => {
data.sizing.width = crate::box_model::Dimension::parse(value)?;
return Ok(());
}
"boxHeight" => {
data.sizing.height = crate::box_model::Dimension::parse(value)?;
return Ok(());
}
"minWidth" => {
data.sizing.min_width = number()?;
return Ok(());
}
"minHeight" => {
data.sizing.min_height = number()?;
return Ok(());
}
"maxWidth" => {
data.sizing.max_width = number()?;
return Ok(());
}
"maxHeight" => {
data.sizing.max_height = number()?;
return Ok(());
}
"marginTop" => {
data.margin.top = number()?;
return Ok(());
}
"marginRight" => {
data.margin.right = number()?;
return Ok(());
}
"marginBottom" => {
data.margin.bottom = number()?;
return Ok(());
}
"marginLeft" => {
data.margin.left = number()?;
return Ok(());
}
"flexBasis" => {
data.flex_policy.basis = if matches!(value, Value::Nil)
|| matches!(value, Value::Text(text) if text == "auto")
@@ -459,6 +623,21 @@ pub fn apply_visual_property(data: &mut Data, name: &str, value: &Value) -> Resu
return Ok(());
}
let container = data.is_container();
if name == "alignSelf" || (container && name == "crossAlign") {
let Value::Text(value) = value else {
return Err(bad());
};
if name == "alignSelf" {
data.align_self = if value == "auto" {
None
} else {
Some(crate::layout::CrossAlign::parse(value)?)
};
} else {
data.cross_align = crate::layout::CrossAlign::parse(value)?;
}
return Ok(());
}
if container && name == "mainAlign" {
let Value::Text(value) = value else {
return Err(bad());
+8
View File
@@ -183,6 +183,14 @@ mod tests {
flex: 0.0,
flex_policy: crate::layout::FlexPolicy::default(),
main_align: crate::layout::MainAlign::Start,
cross_align: crate::layout::CrossAlign::Start,
align_self: None,
margin: crate::layout::Insets::default(),
sizing: crate::box_model::Sizing::default(),
padding_edges: [None; 4],
border: crate::layout::Insets::default(),
border_color: "#D8DCE2".into(),
clip_children: false,
block_id: "shared".into(),
protocol_key: "rect".into(),
slots: Vec::new(),
+12
View File
@@ -259,6 +259,10 @@ impl RenderCache {
children,
},
Kind::Spacer(size) => UiKind::Spacer(*size),
Kind::Overlay => UiKind::Overlay {
padding: data.padding,
children,
},
Kind::Row => UiKind::Row {
padding: data.padding,
gap: data.gap,
@@ -300,6 +304,14 @@ impl RenderCache {
flex: data.flex,
flex_policy: data.flex_policy,
main_align: data.main_align,
cross_align: data.cross_align,
align_self: data.align_self,
margin: data.margin,
sizing: data.sizing,
padding_edges: data.padding_edges,
border: data.border,
border_color: data.border_color.clone(),
clip_children: data.clip_children,
block_id: block.to_string(),
protocol_key,
slots: data.children.iter().map(|c| c.slot).collect(),