duhanbalci/dreport
1
0
Fork 0
mirror of https://github.com/duhanbalci/dreport.git synced 2026-07-02 02:49:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor & improvements

Browse Source
This commit is contained in:
Duhan BALCI
2026-03-29 22:35:57 +03:00
parent cdaf91927b
commit f0a1835fa2
63 changed files with 4803 additions and 7387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
layout-engine/src/sizing.rs
View File

@@ -15,16 +15,16 @@ pub fn pt_to_mm(pt: f32) -> f64 {
/// SizeValue → taffy Dimension (width veya height için)
fn size_value_to_dimension(sv: &SizeValue) -> Dimension {
match sv {
SizeValue::Fixed { value } => Dimension::Length(mm_to_pt(*value)),
SizeValue::Auto => Dimension::Auto,
SizeValue::Fixed { value } => Dimension::length(mm_to_pt(*value)),
SizeValue::Auto => Dimension::auto(),
// Fr için dimension Auto, flex_grow ayrıca set edilir
SizeValue::Fr { .. } => Dimension::Auto,
SizeValue::Fr { .. } => Dimension::auto(),
}
}
/// SizeValue → taffy LengthPercentage (min/max constraint'ler için)
fn mm_to_length(mm: f64) -> Dimension {
Dimension::Length(mm_to_pt(mm))
Dimension::length(mm_to_pt(mm))
}
/// Fr değerini döndür (yoksa 0)
@@ -78,7 +78,7 @@ pub fn apply_size_to_style(
if main_fr > 0.0 {
style.flex_grow = main_fr;
style.flex_shrink = 1.0;
style.flex_basis = Dimension::Length(0.0);
style.flex_basis = Dimension::length(0.0);
// min-width: 0 (row) veya min-height: 0 (column) ayarla —
// taffy'de min_size default Auto = içerik boyutunun altına küçülemez.
@@ -86,12 +86,12 @@ pub fn apply_size_to_style(
match parent_direction {
Some("row") => {
if size.min_width.is_none() {
style.min_size.width = Dimension::Length(0.0);
style.min_size.width = Dimension::length(0.0);
}
}
_ => {
if size.min_height.is_none() {
style.min_size.height = Dimension::Length(0.0);
style.min_size.height = Dimension::length(0.0);
}
}
}
@@ -113,14 +113,14 @@ pub fn container_to_style(el: &ContainerElement, parent_direction: Option<&str>)
_ => FlexDirection::Column,
},
gap: Size {
width: LengthPercentage::Length(mm_to_pt(el.gap)),
height: LengthPercentage::Length(mm_to_pt(el.gap)),
width: LengthPercentage::length(mm_to_pt(el.gap)),
height: LengthPercentage::length(mm_to_pt(el.gap)),
},
padding: Rect {
top: LengthPercentage::Length(mm_to_pt(el.padding.top)),
right: LengthPercentage::Length(mm_to_pt(el.padding.right)),
bottom: LengthPercentage::Length(mm_to_pt(el.padding.bottom)),
left: LengthPercentage::Length(mm_to_pt(el.padding.left)),
top: LengthPercentage::length(mm_to_pt(el.padding.top)),
right: LengthPercentage::length(mm_to_pt(el.padding.right)),
bottom: LengthPercentage::length(mm_to_pt(el.padding.bottom)),
left: LengthPercentage::length(mm_to_pt(el.padding.left)),
},
align_items: Some(match el.align.as_str() {
"center" => AlignItems::Center,
@@ -142,8 +142,8 @@ pub fn container_to_style(el: &ContainerElement, parent_direction: Option<&str>)
PositionMode::Absolute { x, y } => {
style.position = Position::Absolute;
style.inset = Rect {
top: LengthPercentageAuto::Length(mm_to_pt(*y)),
left: LengthPercentageAuto::Length(mm_to_pt(*x)),
top: LengthPercentageAuto::length(mm_to_pt(*y)),
left: LengthPercentageAuto::length(mm_to_pt(*x)),
right: auto(),
bottom: auto(),
};
@@ -158,10 +158,10 @@ pub fn container_to_style(el: &ContainerElement, parent_direction: Option<&str>)
if let Some(bw) = el.style.border_width {
let bpt = mm_to_pt(bw);
style.border = Rect {
top: LengthPercentage::Length(bpt),
right: LengthPercentage::Length(bpt),
bottom: LengthPercentage::Length(bpt),
left: LengthPercentage::Length(bpt),
top: LengthPercentage::length(bpt),
right: LengthPercentage::length(bpt),
bottom: LengthPercentage::length(bpt),
left: LengthPercentage::length(bpt),
};
}
@@ -180,8 +180,8 @@ pub fn leaf_style(
PositionMode::Absolute { x, y } => {
style.position = Position::Absolute;
style.inset = Rect {
top: LengthPercentageAuto::Length(mm_to_pt(*y)),
left: LengthPercentageAuto::Length(mm_to_pt(*x)),
top: LengthPercentageAuto::length(mm_to_pt(*y)),
left: LengthPercentageAuto::length(mm_to_pt(*x)),
right: auto(),
bottom: auto(),
};
@@ -197,6 +197,7 @@ pub fn leaf_style(
#[cfg(test)]
mod tests {
use super::*;
use dreport_core::models::{ContainerStyle, Padding};
#[test]
fn test_mm_to_pt_conversion() {
@@ -205,18 +206,171 @@ mod tests {
assert!((pt - 595.28).abs() < 0.1);
}
#[test]
fn test_mm_to_pt_one_inch() {
// 1 inch = 25.4mm = 72pt
let pt = mm_to_pt(25.4);
assert!((pt - 72.0).abs() < 0.01, "25.4mm should be ~72pt, got {}", pt);
}
#[test]
fn test_pt_to_mm_conversion() {
// 72pt = 25.4mm (1 inch)
let mm = pt_to_mm(72.0);
assert!((mm - 25.4).abs() < 0.01, "72pt should be ~25.4mm, got {}", mm);
}
#[test]
fn test_roundtrip_mm_pt_mm() {
// mm → pt → mm should preserve value within tolerance
let original = 100.0_f64;
let pt = mm_to_pt(original);
let back = pt_to_mm(pt);
assert!(
(back - original).abs() < 0.01,
"Roundtrip failed: {} → {}pt → {}",
original,
pt,
back
);
}
#[test]
fn test_mm_to_pt_zero() {
assert_eq!(mm_to_pt(0.0), 0.0);
}
#[test]
fn test_pt_to_mm_zero() {
assert!((pt_to_mm(0.0) - 0.0).abs() < f64::EPSILON);
}
#[test]
fn test_fixed_size() {
let sv = SizeValue::Fixed { value: 50.0 };
match size_value_to_dimension(&sv) {
Dimension::Length(pt) => assert!((pt - mm_to_pt(50.0)).abs() < 0.01),
_ => panic!("Expected Length"),
}
assert_eq!(size_value_to_dimension(&sv), Dimension::length(mm_to_pt(50.0)));
}
#[test]
fn test_auto_size() {
let sv = SizeValue::Auto;
assert_eq!(size_value_to_dimension(&sv), Dimension::auto());
}
#[test]
fn test_fr_maps_to_auto_dimension() {
let sv = SizeValue::Fr { value: 2.0 };
assert!(matches!(size_value_to_dimension(&sv), Dimension::Auto));
assert_eq!(size_value_to_dimension(&sv), Dimension::auto());
}
#[test]
fn test_fr_value_extraction() {
assert_eq!(fr_value(&SizeValue::Fr { value: 3.0 }), 3.0);
assert_eq!(fr_value(&SizeValue::Auto), 0.0);
assert_eq!(fr_value(&SizeValue::Fixed { value: 10.0 }), 0.0);
}
#[test]
fn test_apply_size_fr_sets_flex_grow() {
let size = SizeConstraint {
width: SizeValue::Fr { value: 2.0 },
height: SizeValue::Auto,
..Default::default()
};
let mut style = Style::default();
apply_size_to_style(&mut style, &size, Some("row"));
assert_eq!(style.flex_grow, 2.0);
assert_eq!(style.flex_basis, Dimension::length(0.0));
}
#[test]
fn test_apply_size_fixed_no_flex_grow() {
let size = SizeConstraint {
width: SizeValue::Fixed { value: 50.0 },
height: SizeValue::Fixed { value: 30.0 },
..Default::default()
};
let mut style = Style::default();
apply_size_to_style(&mut style, &size, Some("row"));
assert_eq!(style.flex_grow, 0.0);
}
#[test]
fn test_apply_size_min_max_constraints() {
let size = SizeConstraint {
width: SizeValue::Auto,
height: SizeValue::Auto,
min_width: Some(20.0),
max_width: Some(100.0),
min_height: Some(10.0),
max_height: Some(50.0),
};
let mut style = Style::default();
apply_size_to_style(&mut style, &size, None);
assert_eq!(style.min_size.width, Dimension::length(mm_to_pt(20.0)));
assert_eq!(style.max_size.width, Dimension::length(mm_to_pt(100.0)));
assert_eq!(style.min_size.height, Dimension::length(mm_to_pt(10.0)));
assert_eq!(style.max_size.height, Dimension::length(mm_to_pt(50.0)));
}
#[test]
fn test_container_to_style_direction() {
let el = ContainerElement {
id: "test".to_string(),
position: PositionMode::Flow,
size: SizeConstraint::default(),
direction: "row".to_string(),
gap: 5.0,
padding: Padding { top: 10.0, right: 10.0, bottom: 10.0, left: 10.0 },
align: "center".to_string(),
justify: "space-between".to_string(),
style: ContainerStyle::default(),
children: vec![],
};
let style = container_to_style(&el, None);
assert_eq!(style.flex_direction, FlexDirection::Row);
assert_eq!(style.align_items, Some(AlignItems::Center));
assert_eq!(style.justify_content, Some(JustifyContent::SpaceBetween));
}
#[test]
fn test_container_to_style_absolute() {
let el = ContainerElement {
id: "test".to_string(),
position: PositionMode::Absolute { x: 20.0, y: 30.0 },
size: SizeConstraint::default(),
direction: "column".to_string(),
gap: 0.0,
padding: Padding::default(),
align: "stretch".to_string(),
justify: "start".to_string(),
style: ContainerStyle::default(),
children: vec![],
};
let style = container_to_style(&el, None);
assert_eq!(style.position, Position::Absolute);
}
#[test]
fn test_leaf_style_flow() {
let size = SizeConstraint {
width: SizeValue::Fixed { value: 60.0 },
height: SizeValue::Auto,
..Default::default()
};
let style = leaf_style(&size, &PositionMode::Flow, Some("column"));
assert_eq!(style.position, Position::Relative);
assert_eq!(style.size.width, Dimension::length(mm_to_pt(60.0)));
}
#[test]
fn test_leaf_style_absolute() {
let size = SizeConstraint {
width: SizeValue::Fixed { value: 40.0 },
height: SizeValue::Fixed { value: 20.0 },
..Default::default()
};
let style = leaf_style(&size, &PositionMode::Absolute { x: 10.0, y: 15.0 }, None);
assert_eq!(style.position, Position::Absolute);
}
}