3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-19 11:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem when moving masks, bools, groups with wasm

Browse source
This commit is contained in:
alonso.torres 2025-06-18 14:51:46 +02:00
parent 58e5748b4f
commit 5b4cd9f4f1
8 changed files with 86 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

34
render-wasm/src/shapes.rs
View file

@ -728,7 +728,11 @@ impl Shape {
self.children.first()
}
pub fn children_ids(&self) -> IndexSet<Uuid> {
pub fn children_ids(&self, include_hidden: bool) -> IndexSet<Uuid> {
if include_hidden {
return self.children.clone().into_iter().rev().collect();
}
if let Type::Bool(_) = self.shape_type {
IndexSet::<Uuid>::new()
} else if let Type::Group(group) = self.shape_type {
@ -747,14 +751,22 @@ impl Shape {
}
}
pub fn all_children_with_self(&self, shapes: &HashMap<Uuid, &mut Shape>) -> IndexSet<Uuid> {
pub fn all_children_with_self(
&self,
shapes: &HashMap<Uuid, &mut Shape>,
include_hidden: bool,
) -> IndexSet<Uuid> {
once(self.id)
.chain(self.children_ids().into_iter().flat_map(|id| {
shapes
.get(&id)
.map(|s| s.all_children_with_self(shapes))
.unwrap_or_default()
}))
.chain(
self.children_ids(include_hidden)
.into_iter()
.flat_map(|id| {
shapes
.get(&id)
.map(|s| s.all_children_with_self(shapes, include_hidden))
.unwrap_or_default()
}),
)
.collect()
}
@ -935,9 +947,11 @@ impl Shape {
pub fn modified_children_ids(
element: &Shape,
structure: Option<&Vec<StructureEntry>>,
include_hidden: bool,
) -> IndexSet<Uuid> {
if let Some(structure) = structure {
let mut result: Vec<Uuid> = Vec::from_iter(element.children_ids().iter().copied());
let mut result: Vec<Uuid> =
Vec::from_iter(element.children_ids(include_hidden).iter().copied());
let mut to_remove = HashSet::<&Uuid>::new();
for st in structure {
@ -960,7 +974,7 @@ pub fn modified_children_ids(
ret
} else {
element.children_ids()
element.children_ids(include_hidden)
}
}