fix(core): state order and handling of new trees

pop-os · Jul 5, 2024 · 5d0e029 · 5d0e029
1 parent 4c609e7
commit 5d0e029
Showing 1 changed file with 8 additions and 33 deletions.
diff --git a/core/src/widget/tree.rs b/core/src/widget/tree.rs
@@ -76,7 +76,7 @@ impl Tree {
                 let state = mem::replace(&mut tree.state, State::None);
                 let children_count = tree.children.len();
                 let children =
-                    tree.children.iter_mut().rev().enumerate().map(|(i, c)| {
+                    tree.children.iter_mut().enumerate().rev().map(|(i, c)| {
                         if matches!(c.id, Some(Id(Internal::Custom(_, _)))) {
                             (c, None)
                         } else {
@@ -167,37 +167,8 @@ impl Tree {
         let mut needs_reset = false;
         let tag_match = self.tag == borrowed.tag();
         if let Some(Id(Internal::Custom(_, n))) = borrowed.id() {
-            if let Some((mut state, children)) = NAMED
-                .with(|named| named.borrow_mut().remove(&n))
-                .or_else(|| {
-                    //check self.id
-                    if let Some(Id(Internal::Custom(_, ref name))) = self.id {
-                        if name == &n {
-                            Some((
-                                mem::replace(&mut self.state, State::None),
-                                self.children
-                                    .iter_mut()
-                                    .map(|s| {
-                                        // take the data
-                                        mem::replace(
-                                            s,
-                                            Tree {
-                                                id: s.id.clone(),
-                                                tag: s.tag,
-                                                ..Tree::empty()
-                                            },
-                                        )
-                                    })
-                                    .enumerate()
-                                    .collect(),
-                            ))
-                        } else {
-                            None
-                        }
-                    } else {
-                        None
-                    }
-                })
+            if let Some((mut state, children)) =
+                NAMED.with(|named| named.borrow_mut().remove(&n))
             {
                 std::mem::swap(&mut self.state, &mut state);
                 let widget_children = borrowed.children();
@@ -350,7 +321,11 @@ impl Tree {
         }
 
         for (new_tree, i) in new_trees {
-            self.children.insert(i, new_tree);
+            if self.children.len() > i {
+                self.children[i] = new_tree;
+            } else {
+                self.children.push(new_tree);
+            }
         }
     }
 }