Skip to content

Fix: Ctrl+Z on 'Edit > Convert to Infinite Canvas' creates leftover merge nodes #3548

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
Annonnymmousss wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix: Ctrl+Z on 'Edit > Convert to Infinite Canvas' creates leftover merge nodes #3548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d8faac
fix : flow of transaction
Annonnymmousss Dec 31, 2025
3b8327e
fix : type difference
Annonnymmousss Jan 21, 2026
575cd93
fix : Non-aborting transaction
Annonnymmousss Feb 19, 2026
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
1 change: 1 addition & 0 deletions editor/src/messages/portfolio/document/document_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
}
}
DocumentMessage::RemoveArtboards => {
responses.add(DocumentMessage::AddTransaction);
responses.add(GraphOperationMessage::RemoveArtboards);
}
DocumentMessage::ClearLayersPanel => {
Expand Down
16 changes: 8 additions & 8 deletions editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use super::transform_utils;
use super::utility_types::ModifyInputsContext;
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_network_node_type;
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeNetworkInterface, OutputConnector};
use crate::messages::portfolio::document::utility_types::nodes::CollapsedLayers;
Expand Down Expand Up @@ -231,15 +232,10 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
}
GraphOperationMessage::RemoveArtboards => {
if network_interface.all_artboards().is_empty() {
responses.add(DocumentMessage::AbortTransaction);
return;
}

responses.add(DocumentMessage::AddTransaction);
Copy link
Member

@Keavon Keavon Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you removed this from below the early return, now you can repeatedly activate Edit > Convert to Infinite Canvas and add more and more history transactions.

responses.add(NodeGraphMessage::DeleteNodes {
node_ids: network_interface.all_artboards().iter().map(|layer_node| layer_node.to_node()).collect(),
delete_children: false,
});

let mut artboard_data: HashMap<NodeId, ArtboardInfo> = HashMap::new();

// Go through all artboards and create merge nodes
Expand All @@ -264,8 +260,8 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
},
);

let mut modify_inputs = ModifyInputsContext::new(network_interface, responses);
modify_inputs.create_layer(node_id);
let new_merge_node = resolve_network_node_type("Merge").expect("Merge node").default_node_template();
network_interface.insert_node(node_id, new_merge_node, &[]);

responses.add(NodeGraphMessage::SetDisplayName {
node_id,
Expand Down Expand Up @@ -310,6 +306,10 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
});
}

responses.add(NodeGraphMessage::DeleteNodes {
node_ids: network_interface.all_artboards().iter().map(|layer_node| layer_node.to_node()).collect(),
delete_children: false,
});
responses.add(NodeGraphMessage::RunDocumentGraph);
responses.add(NodeGraphMessage::SelectedNodesUpdated);
responses.add(NodeGraphMessage::SendGraph);
Expand Down
Loading