Skip to content

Fix traversal when deleting nodes #3358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix traversal when deleting nodes #3358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7cefc
Fix deletion
adamgerhant Nov 10, 2025
e025a93
Code review cleanup
Keavon Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions editor/src/messages/portfolio/document/utility_types/network_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4603,40 +4603,37 @@ impl NodeNetworkInterface {

if !delete_children {
continue;
};
}

// Perform an upstream traversal to try deleting children
for upstream_id in self.upstream_flow_back_from_nodes(vec![*node_id], network_path, FlowType::LayerChildrenUpstreamFlow) {
// This does a downstream traversal starting from the current node, and ending at either a node in the `delete_nodes` set or the output.
// If the traversal find as child node of a node in the `delete_nodes` set, then it is a sole dependent. If the output node is eventually reached, then it is not a sole dependent.
// For each potential child: perform a complete downstream traveral, ending at either a node in the `delete_nodes` set, the output, or a dead end.
// If the output node is eventually reached, then it is not a sole dependent and will not be deleted.
let mut stack = vec![OutputConnector::node(upstream_id, 0)];
let mut can_delete = true;

while let Some(current_node) = stack.pop() {
let current_node_id = current_node.node_id().expect("The current node in the delete stack cannot be the export");
let Some(downstream_nodes) = outward_wires.get(&current_node) else { continue };

// If there are no outward wires, then we have reached a dead end, and the node cannot be deleted
if downstream_nodes.is_empty() {
can_delete = false;
break;
}

for downstream_node in downstream_nodes {
if let InputConnector::Node { node_id: downstream_id, .. } = downstream_node {
if !delete_nodes.contains(downstream_id) {
can_delete = false;
break;
}
// Continue traversing over the downstream sibling, if the current node is a sibling to a node that will be deleted and it is a layer
else {
for deleted_node_id in &nodes_to_delete {
let Some(downstream_node) = self.document_node(deleted_node_id, network_path) else { continue };
let Some(input) = downstream_node.inputs.first() else { continue };
// If the traversal reaches the export, then the current node is not a sole dependent and cannot be deleted
let InputConnector::Node { node_id: downstream_id, .. } = downstream_node else {
can_delete = false;
break;
};

if let NodeInput::Node { node_id, .. } = input {
if *node_id == current_node_id {
stack.push(OutputConnector::node(*deleted_node_id, 0));
}
}
}
// If the downstream node is not in the `delete_nodes` set, then continue iterating
if !delete_nodes.contains(downstream_id) {
for output_index in 0..self.number_of_outputs(downstream_id, network_path) {
stack.push(OutputConnector::node(*downstream_id, output_index));
}
}
// If the traversal reaches the export, then the current node is not a sole dependent
else {
can_delete = false;
}
}
}
if can_delete {
Expand Down