From 4db3d8ff40d05f4b450cc3d231c0017d80bde556 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Sun, 1 Jan 2023 17:21:34 -0600 Subject: [PATCH] fix state --- packages/native-core/src/passes.rs | 1 - packages/native-core/src/real_dom.rs | 16 ++-------------- packages/tui/src/layout.rs | 1 - 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/packages/native-core/src/passes.rs b/packages/native-core/src/passes.rs index 8dd275575..ba26d0605 100644 --- a/packages/native-core/src/passes.rs +++ b/packages/native-core/src/passes.rs @@ -183,7 +183,6 @@ impl TypeErasedPass { } PassDirection::ChildToParent => { while let Some(id) = dirty.pop_back() { - println!("running pass {:?} on {:?}", self.this_type_id, id); if (self.pass)(id, tree, ctx) { nodes_updated.insert(id); if let Some(id) = tree.parent_id(id) { diff --git a/packages/native-core/src/real_dom.rs b/packages/native-core/src/real_dom.rs index 2093a4359..82a1c4e14 100644 --- a/packages/native-core/src/real_dom.rs +++ b/packages/native-core/src/real_dom.rs @@ -76,13 +76,6 @@ impl RealDom { } } - for pass in passes.iter_mut() { - println!("{:?}: {:?}", pass.this_type_id, pass.dependants); - println!("{:?}", pass.child_dependant); - println!("{:?}", pass.parent_dependant); - println!("{:?}", pass.pass_direction); - } - let mut nodes_updated = FxHashMap::default(); let root_id = NodeId(0); nodes_updated.insert(root_id, NodeMask::ALL); @@ -462,11 +455,7 @@ impl RealDom { state: node.state.clone_or_default(), node_data: node.node_data.clone(), }; - let new_id = self.create_node(new_node, false); - let passes = S::non_clone_members(); - for pass_id in &*passes { - self.passes_updated.insert(*pass_id, node_id); - } + let new_id = self.create_node(new_node, true); let self_ptr = self as *mut Self; for child in self.tree.children_ids(node_id).unwrap() { @@ -532,10 +521,9 @@ impl TreeView> for RealDom { impl TreeLike> for RealDom { fn create_node(&mut self, node: Node) -> NodeId { - let mask = NodeMask::ALL; let id = self.tree.create_node(node); self.tree.get_mut(id).unwrap().node_data.node_id = id; - self.mark_dirty(id, mask); + self.nodes_created.insert(id); id } diff --git a/packages/tui/src/layout.rs b/packages/tui/src/layout.rs index eaa7b6139..58c8649d6 100644 --- a/packages/tui/src/layout.rs +++ b/packages/tui/src/layout.rs @@ -65,7 +65,6 @@ impl Pass for TaffyLayout { >, ctx: &SendAnyMap, ) -> bool { - println!("running layout pass on node: \n{:#?}", node_view); let mut changed = false; let taffy: &Arc> = ctx.get().unwrap(); let mut taffy = taffy.lock().expect("poisoned taffy");