aleleba/figcraft
1
0
Fork 0
mirror of https://github.com/storytold/figcraft.git synced 2026-10-30 05:16:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1405 from Silvertree2010/fix/h2933-cornerradius-padding-strokesides

Browse Source 
Reject cornerRadius/padding/strokeSides arrays with non-numeric entries
This commit is contained in:
BFlat
2026-10-29 11:35:03 +07:00
committed by GitHub
parent e41f484733 5721140cb4
commit 80ffd8308c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/props.rs
+10 -1
View File
@@ -169,7 +169,7 @@ pub(crate) fn letter_spacing(v: &Value) -> Option<LetterSpacing> {
fn four(v: &Value) -> Option<[f64; 4]> {
match v {
Value::Array(a) => {
let f: Vec<f64> = a.iter().filter_map(f64_of).collect();
let f: Vec<f64> = a.iter().map(f64_of).collect::<Option<_>>()?;
match f.as_slice() {
[x] => Some([*x; 4]),
[a, b] => Some([*a, *b, *a, *b]),
@@ -1370,4 +1370,13 @@ mod tests {
}
assert!(matches!(line_height(&json!("150%")), Some(LineHeight::Percent(p)) if p == 150.0));
}
#[test]
fn four_rejects_non_numeric_entries() {
assert_eq!(four(&json!([10, "abc"])), None);
assert_eq!(four(&json!([10, "abc", null, 20])), None);
assert_eq!(four(&json!([10, 20, 30])), None);
assert_eq!(four(&json!([1, 2, 3, 4])), Some([1.0, 2.0, 3.0, 4.0]));
assert_eq!(four(&json!([1, 2])), Some([1.0, 2.0, 1.0, 2.0]));
}
}