Skip to content

Fix duplicate shared upstream nodes when duplicating layers #3654

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

Open
afrdbaig7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicate shared upstream nodes when duplicating layers #3654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 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 @@ -2690,15 +2690,20 @@ impl NodeNetworkInterface {
return Vec::new();
};
let mut all_selected_nodes = selected_nodes.selected_nodes().cloned().collect::<Vec<_>>();
let mut seen = all_selected_nodes.iter().cloned().collect::<HashSet<_>>();

for selected_node_id in selected_nodes.selected_nodes() {
if self.is_layer(selected_node_id, network_path) {
let unique_upstream_chain = self
let upstream_chain = self
.upstream_flow_back_from_nodes(vec![*selected_node_id], network_path, FlowType::HorizontalFlow)
.skip(1)
.take_while(|node_id| self.is_chain(node_id, network_path))
.filter(|upstream_node| all_selected_nodes.iter().all(|new_selected_node| new_selected_node != upstream_node))
.collect::<Vec<_>>();
all_selected_nodes.extend(unique_upstream_chain);
.take_while(|node_id| self.is_chain(node_id, network_path));

for upstream_node in upstream_chain {
if seen.insert(upstream_node) {
all_selected_nodes.push(upstream_node);
}
}
}
}
all_selected_nodes
Expand Down