Use GraphIdentifier instead of option

Author: 0HyperCube

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -2,7 +2,7 @@ pub use self::document_node_types::*;
 use crate::messages::input_mapper::utility_types::macros::action_keys;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
-use crate::node_graph_executor::NodeGraphExecutor;
+use crate::node_graph_executor::{GraphIdentifier, NodeGraphExecutor};
 
 use document_legacy::document::Document;
 use document_legacy::LayerId;
@@ -347,7 +347,8 @@ impl NodeGraphMessageHandler {
 				})
 				.collect();
 
-			let thumbnail_svg = executor.thumbnails.get(&layer_id).and_then(|thumbnails| thumbnails.get(id)).map(|svg| svg.to_string());
+			let graph_identifier = GraphIdentifier::new(layer_id);
+			let thumbnail_svg = executor.thumbnails.get(&graph_identifier).and_then(|thumbnails| thumbnails.get(id)).map(|svg| svg.to_string());
 
 			nodes.push(FrontendNode {
 				id: *id,

editor/src/node_graph_executor.rs

@@ -29,14 +29,30 @@ use std::rc::Rc;
 use std::sync::mpsc::{Receiver, Sender};
 use std::sync::Arc;
 
+/// Identifies a node graph, either the document graph or a node graph associated with a legacy layer.
+#[derive(Clone, Copy, Hash, PartialEq, Eq, Debug)]
+pub enum GraphIdentifier {
+	DocumentGraph,
+	LayerGraph(LayerId),
+}
+
+impl GraphIdentifier {
+	pub const fn new(layer_id: Option<LayerId>) -> Self {
+		match layer_id {
+			Some(layer_id) => Self::LayerGraph(layer_id),
+			None => Self::DocumentGraph,
+		}
+	}
+}
+
 pub struct NodeRuntime {
 	pub(crate) executor: DynamicExecutor,
 	font_cache: FontCache,
 	receiver: Receiver<NodeRuntimeMessage>,
 	sender: InternalNodeGraphUpdateSender,
 	wasm_io: Option<WasmApplicationIo>,
 	imaginate_preferences: ImaginatePreferences,
-	pub(crate) thumbnails: HashMap<Option<LayerId>, HashMap<NodeId, SvgSegmentList>>,
+	pub(crate) thumbnails: HashMap<GraphIdentifier, HashMap<NodeId, SvgSegmentList>>,
 	canvas_cache: HashMap<Vec<LayerId>, SurfaceId>,
 }
 
@@ -57,7 +73,7 @@ pub(crate) struct GenerationResponse {
 	generation_id: u64,
 	result: Result<TaggedValue, String>,
 	updates: VecDeque<Message>,
-	new_thumbnails: HashMap<Option<LayerId>, HashMap<NodeId, SvgSegmentList>>,
+	new_thumbnails: HashMap<GraphIdentifier, HashMap<NodeId, SvgSegmentList>>,
 }
 
 enum NodeGraphUpdate {
@@ -209,7 +225,8 @@ impl NodeRuntime {
 			debug!("SVG {}", render.svg);
 
 			if let Some(node_id) = node_path.get(node_path.len() - 2).copied() {
-				let old_thumbnail = self.thumbnails.entry(layer_path.last().copied()).or_default().entry(node_id).or_default();
+				let graph_identifier = GraphIdentifier::new(layer_path.last().copied());
+				let old_thumbnail = self.thumbnails.entry(graph_identifier).or_default().entry(node_id).or_default();
 				if *old_thumbnail != render.svg {
 					*old_thumbnail = render.svg;
 					thumbnails_changed = true;
@@ -263,7 +280,7 @@ pub struct NodeGraphExecutor {
 	receiver: Receiver<NodeGraphUpdate>,
 	// TODO: This is a memory leak since layers are never removed
 	pub(crate) last_output_type: HashMap<Vec<LayerId>, Option<Type>>,
-	pub(crate) thumbnails: HashMap<Option<LayerId>, HashMap<NodeId, SvgSegmentList>>,
+	pub(crate) thumbnails: HashMap<GraphIdentifier, HashMap<NodeId, SvgSegmentList>>,
 	futures: HashMap<u64, ExecutionContext>,
 }
 
@@ -516,7 +533,7 @@ impl NodeGraphExecutor {
 
 	/// When a blob url for a thumbnail is loaded, update the state and the UI.
 	pub fn insert_thumbnail_blob_url(&mut self, blob_url: String, layer_id: Option<LayerId>, node_id: NodeId, responses: &mut VecDeque<Message>) {
-		if let Some(layer) = self.thumbnails.get_mut(&layer_id) {
+		if let Some(layer) = self.thumbnails.get_mut(&GraphIdentifier::new(layer_id)) {
 			if let Some(segment) = layer.values_mut().flat_map(|segments| segments.iter_mut()).find(|segment| **segment == SvgSegment::BlobUrl(node_id)) {
 				*segment = SvgSegment::String(blob_url);
 				responses.add(NodeGraphMessage::SendGraph { should_rerender: false });