Skip to content

Add duplicate layer functionality #2847

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions editor/src/messages/portfolio/portfolio_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ pub enum PortfolioMessage {
parent: LayerNodeIdentifier,
insert_index: usize,
},
DuplicateSelectedLayers {
parent: LayerNodeIdentifier,
insert_index: usize,
},
PasteSerializedData {
data: String,
},
Expand Down
41 changes: 41 additions & 0 deletions editor/src/messages/portfolio/portfolio_message_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,47 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageData<'_>> for PortfolioMes
// Load the document into the portfolio so it opens in the editor
self.load_document(document, document_id, responses, to_front);
}
PortfolioMessage::DuplicateSelectedLayers { parent, insert_index } => {
let Some(document) = self.active_document_mut() else {
return;
};

let mut all_new_ids = Vec::new();
let selected_layers = document.network_interface.selected_nodes().selected_layers(document.metadata()).collect::<Vec<_>>();

responses.add(DocumentMessage::DeselectAllLayers);
responses.add(DocumentMessage::AddTransaction);

for layer in selected_layers {
let layer_node_id = layer.to_node();

let mut copy_ids = HashMap::new();
copy_ids.insert(layer_node_id, NodeId(0));

document
.network_interface
.upstream_flow_back_from_nodes(vec![layer_node_id], &[], network_interface::FlowType::LayerChildrenUpstreamFlow)
.enumerate()
.for_each(|(index, node_id)| {
copy_ids.insert(node_id, NodeId((index + 1) as u64));
});

let nodes: Vec<_> = document.network_interface.copy_nodes(&copy_ids, &[]).collect();
let new_ids: HashMap<_, _> = nodes.iter().map(|(id, _)| (*id, NodeId::new())).collect();
let new_layer = LayerNodeIdentifier::new_unchecked(new_ids[&NodeId(0)]);
all_new_ids.extend(new_ids.values().cloned());

responses.add(NodeGraphMessage::AddNodes { nodes, new_ids: new_ids.clone() });
responses.add(NodeGraphMessage::MoveLayerToStack {
layer: new_layer,
parent,
insert_index,
});
}

responses.add(NodeGraphMessage::RunDocumentGraph);
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: all_new_ids });
}
PortfolioMessage::PasteIntoFolder { clipboard, parent, insert_index } => {
let mut all_new_ids = Vec::new();
let paste = |entry: &CopyBufferEntry, responses: &mut VecDeque<_>, all_new_ids: &mut Vec<NodeId>| {
Expand Down
15 changes: 11 additions & 4 deletions frontend/src/components/panels/Layers.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
let draggingData: undefined | DraggingData = undefined;
let fakeHighlightOfNotYetSelectedLayerBeingDragged: undefined | bigint = undefined;
let dragInPanel = false;
let isDuplicating = false;

// Interactive clipping
let layerToClipUponClick: LayerListingInfo | undefined = undefined;
Expand Down Expand Up @@ -382,8 +383,9 @@

// Set style of cursor for drag
if (event.dataTransfer) {
event.dataTransfer.dropEffect = "move";
event.dataTransfer.effectAllowed = "move";
isDuplicating = event.altKey;
event.dataTransfer.dropEffect = isDuplicating ? "copy" : "move";
event.dataTransfer.effectAllowed = isDuplicating ? "copy" : "move";
}

if (list) draggingData = calculateDragIndex(list, event.clientY, select);
Expand All @@ -406,11 +408,15 @@
e.preventDefault();

if (e.dataTransfer) {
// Moving layers
// Moving or duplicating layers
if (e.dataTransfer.items.length === 0) {
if (draggable && dragInPanel) {
select?.();
editor.handle.moveLayerInTree(insertParentId, insertIndex);
if (isDuplicating) {
editor.handle.duplicateLayer(insertParentId, insertIndex);
} else {
editor.handle.moveLayerInTree(insertParentId, insertIndex);
}
}
}
// Importing files
Expand Down Expand Up @@ -444,6 +450,7 @@
draggingData = undefined;
fakeHighlightOfNotYetSelectedLayerBeingDragged = undefined;
dragInPanel = false;
isDuplicating = false;
}

function rebuildLayerHierarchy(updateDocumentLayerStructure: DocumentLayerStructure) {
Expand Down
7 changes: 7 additions & 0 deletions frontend/wasm/src/editor_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,13 @@ impl EditorHandle {
};
self.dispatch(message);
}
/// Duplicate the selected layers
#[wasm_bindgen(js_name = duplicateLayer)]
pub fn duplicate_layer(&self, parent_id: Option<u64>, insert_index: usize) {
let parent = parent_id.map(|id| LayerNodeIdentifier::new_unchecked(NodeId(id))).unwrap_or_default();
let message = PortfolioMessage::DuplicateSelectedLayers { parent, insert_index };
self.dispatch(message);
}

/// Toggle visibility of a layer or node given its node ID
#[wasm_bindgen(js_name = toggleNodeVisibilityLayerPanel)]
Expand Down