github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-23 06:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10697 from penpot/elenatorro-10537-fix-mask-position-within-layout

Browse Source 
🐛 Fix masked group position in flex layout on child visibility change
This commit is contained in:
Alejandro Alonso 2026-07-15 11:05:41 +02:00 committed by GitHub
commit ec4c5a75a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
render-wasm/src/shapes/modifiers.rs
View File

@ -108,6 +108,15 @@ fn calculate_group_bounds(
shape_bounds.with_points(result) shape_bounds.with_points(result)
} }
fn calculate_masked_group_bounds(
shape: &Shape,
shapes: ShapesPoolRef,
bounds: &HashMap<Uuid, Bounds>,
) -> Option<Bounds> {
let mask = shape.mask_id().and_then(|id| shapes.get(id))?;
Some(bounds.find(mask))
}
fn calculate_bool_bounds( fn calculate_bool_bounds(
shape: &Shape, shape: &Shape,
shapes: ShapesPoolRef, shapes: ShapesPoolRef,
@ -349,10 +358,10 @@ fn propagate_reflow(
layout_reflows.insert(*id); layout_reflows.insert(*id);
} }
Type::Group(Group { masked: true }) => { Type::Group(Group { masked: true }) => {
let children_ids = shape.children_ids(true); // Masked group bounds are the mask shape bounds (first child in stored
if let Some(child) = children_ids.first().and_then(|id| shapes.get(id)) { // order, children_ids returns children in reverse order)
let child_bounds = bounds.find(child); if let Some(shape_bounds) = calculate_masked_group_bounds(shape, shapes, bounds) {
bounds.insert(shape.id, child_bounds); bounds.insert(shape.id, shape_bounds);
} }
reflown.insert(*id); reflown.insert(*id);
} }
@ -588,4 +597,35 @@ mod tests {
assert_eq!(bounds.width(), 3.0); assert_eq!(bounds.width(), 3.0);
assert_eq!(bounds.height(), 3.0); assert_eq!(bounds.height(), 3.0);
} }
#[test]
fn test_masked_group_bounds_are_mask_bounds() {
let parent_id = Uuid::new_v4();
let shapes = {
let mut shapes = ShapesPool::new();
shapes.initialize(10);
let mask_id = Uuid::new_v4();
let mask = shapes.add_shape(mask_id);
mask.set_selrect(1.0, 1.0, 5.0, 5.0);
let content_id = Uuid::new_v4();
let content = shapes.add_shape(content_id);
content.set_selrect(0.0, 0.0, 10.0, 10.0);
let parent = shapes.add_shape(parent_id);
parent.set_shape_type(Type::Group(Group { masked: true }));
parent.add_child(mask_id);
parent.add_child(content_id);
parent.set_selrect(1.0, 1.0, 5.0, 5.0);
shapes
};
let parent = shapes.get(&parent_id).unwrap();
let bounds = calculate_masked_group_bounds(parent, &shapes, &HashMap::new()).unwrap();
assert_eq!(bounds.width(), 4.0);
assert_eq!(bounds.height(), 4.0);
}
} }