From e4eddc5fe55a2cced3854a14f1ef326a20ad449b Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 15 Nov 2026 00:23:42 +0000 Subject: [PATCH] Preserve legacy XFL style table permissiveness --- crates/xfl/src/shape.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/crates/xfl/src/shape.rs b/crates/xfl/src/shape.rs index 8b0667a1a..24074e165 100644 --- a/crates/xfl/src/shape.rs +++ b/crates/xfl/src/shape.rs @@ -220,12 +220,12 @@ impl<'a, E: XflElement> Shape<'a, E> { /// Fill styles, preserving their native order and index values. pub fn fills(&self) -> impl Iterator> + '_ { - self.element.child("fills").into_iter().flat_map(|table| table.elements_named("FillStyle")).map(|element| FillStyle { element }) + self.element.child("fills").into_iter().flat_map(|table| table.elements()).map(|element| FillStyle { element }) } /// Stroke styles, preserving their native order and index values. pub fn strokes(&self) -> impl Iterator> + '_ { - self.element.child("strokes").into_iter().flat_map(|table| table.elements_named("StrokeStyle")).map(|element| StrokeStyle { element }) + self.element.child("strokes").into_iter().flat_map(|table| table.elements()).map(|element| StrokeStyle { element }) } /// Native edge records, preserving malformed and unknown data for consumer policy. @@ -245,7 +245,7 @@ impl<'a, E: XflElement> FillStyle<'a, E> { integer(self.element, "index") } - /// The first recognized fill definition inside this table entry. + /// The first native definition element inside this table entry. pub fn definition(&self) -> Option> { self.element.elements().next().map(|element| Fill { element }) } @@ -377,7 +377,7 @@ impl<'a, E: XflElement> StrokeStyle<'a, E> { integer(self.element, "index") } - /// The first stroke definition inside this table entry. + /// The first native definition element inside this table entry. pub fn definition(&self) -> Option> { self.element.elements().next().map(|element| Stroke { element }) } @@ -536,6 +536,18 @@ mod tests { assert_eq!(fill.color_value(), Color { rgb: 0, alpha: 1.0 }); } + #[test] + fn style_table_views_keep_the_legacy_first_child_and_index_behavior() { + let root = parse(b""); + let shape = Shape::new(&root).unwrap(); + let fill_style = shape.fills().next().unwrap(); + assert_eq!(fill_style.index(), Some(5)); + assert_eq!(fill_style.definition().map(|fill| fill.kind()), Some(FillKind::SolidColor)); + let stroke_style = shape.strokes().next().unwrap(); + assert_eq!(stroke_style.index(), Some(6)); + assert_eq!(stroke_style.definition().map(|stroke| stroke.kind()), Some(StrokeKind::Solid)); + } + #[test] fn an_application_element_adapter_can_use_the_same_views() { #[derive(Debug)]