Skip to content

Commit dde71e9

Browse files
committed
optimizations
1 parent edaa970 commit dde71e9

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

editor/src/messages/portfolio/portfolio_message_handler.rs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -175,23 +175,11 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
175175
.metadata()
176176
.shallowest_unique_layers(active_document.selected_nodes.selected_layers(active_document.metadata()));
177177

178-
let mut get_last_elements: Vec<_> = binding.iter().map(|x| x.last().expect("empty path")).collect();
179-
180-
let selected_to_vector = active_document
181-
.selected_nodes
182-
.selected_layers(active_document.metadata())
183-
.filter(|_x| true)
184-
.map(|x| x.clone())
185-
.collect::<Vec<_>>();
186-
187-
// sort last elements by their appearance in selected vector
188-
get_last_elements.sort_by(|a, b| {
189-
let index_a = selected_to_vector.iter().position(|x| x == *a).unwrap_or(9999);
190-
let index_b = selected_to_vector.iter().position(|x| x == *b).unwrap_or(9999);
191-
index_a.cmp(&index_b)
192-
});
178+
let get_last_elements: Vec<_> = binding.iter().map(|x| x.last().expect("empty path")).collect();
179+
180+
let ordered_last_elements: Vec<_> = active_document.metadata.all_layers().filter(|layer| get_last_elements.contains(&layer)).collect();
193181

194-
for layer in get_last_elements {
182+
for layer in ordered_last_elements {
195183
let node = layer.to_node();
196184
let previous_alias = active_document.network().nodes.get(&node).map(|node| node.alias.clone()).unwrap_or_default();
197185

@@ -210,7 +198,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
210198
.collect(),
211199
)
212200
.collect(),
213-
selected: active_document.selected_nodes.selected_layers_contains(*layer, active_document.metadata()),
201+
selected: active_document.selected_nodes.selected_layers_contains(layer, active_document.metadata()),
214202
collapsed: false,
215203
alias: previous_alias,
216204
});

0 commit comments

Comments
 (0)