Migrate Text Editing to rust backend

Cargo.toml

@@ -160,7 +160,7 @@ web-sys = { version = "=0.3.98", features = [
 winit = { git = "https://github.com/rust-windowing/winit.git" }
 keyboard-types = "0.8"
 url = "2.5"
-tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt", "rt-multi-thread"] }
+tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt", "rt-multi-thread", "time"] }
 # Linebender ecosystem (BEGIN)
 kurbo = { version = "0.13", features = ["serde"] }
 vello = "0.9"

editor/src/messages/clipboard/clipboard_message_handler.rs

@@ -47,6 +47,8 @@ impl MessageHandler<ClipboardMessage, ClipboardMessageContext<'_>> for Clipboard
 				ClipboardContentRaw::Text(text) => {
 					if let Some(graphite) = text.strip_prefix(CLIPBOARD_PREFIX) {
 						responses.add(ClipboardMessage::PasteItems { data: graphite.to_string() });
+					} else if current_tool == &ToolType::Text {
+						responses.add(TextToolMessage::PasteText { text });
 					} else {
 						responses.add(FrontendMessage::TriggerSelectionWrite { content: text });
 					}
@@ -100,6 +102,10 @@ impl MessageHandler<ClipboardMessage, ClipboardMessageContext<'_>> for Clipboard
 					responses.add(PathToolMessage::Copy);
 					return;
 				}
+				if current_tool == &ToolType::Text {
+					responses.add(TextToolMessage::Copy);
+					return;
+				}
 
 				let Some(active_document) = portfolio.active_document_id.and_then(|id| portfolio.documents.get_mut(&id)) else {
 					return;
@@ -157,6 +163,10 @@ impl MessageHandler<ClipboardMessage, ClipboardMessageContext<'_>> for Clipboard
 					responses.add(PathToolMessage::Cut);
 					return;
 				}
+				if current_tool == &ToolType::Text {
+					responses.add(TextToolMessage::Cut);
+					return;
+				}
 
 				if let Some(active_document) = portfolio.active_document()
 					&& active_document.graph_view_overlay_open()

editor/src/messages/frontend/frontend_message.rs

@@ -36,32 +36,6 @@ pub enum FrontendMessage {
 		#[serde(rename = "panicInfo")]
 		panic_info: String,
 	},
-	DisplayEditableTextbox {
-		text: String,
-		#[serde(rename = "lineHeightRatio")]
-		line_height_ratio: f64,
-		#[serde(rename = "fontSize")]
-		font_size: f64,
-		color: String,
-		#[serde(rename = "fontData")]
-		font_data: serde_bytes::ByteBuf,
-		transform: [f64; 6],
-		#[serde(rename = "maxWidth")]
-		max_width: Option<f64>,
-		#[serde(rename = "maxHeight")]
-		max_height: Option<f64>,
-		align: String,
-		#[serde(rename = "alignLast")]
-		align_last: String,
-	},
-	DisplayEditableTextboxUpdateFontData {
-		#[serde(rename = "fontData")]
-		font_data: serde_bytes::ByteBuf,
-	},
-	DisplayEditableTextboxTransform {
-		transform: [f64; 6],
-	},
-	DisplayRemoveEditableTextbox,
 
 	// Send prefix: Send global, static data to the frontend that is never updated
 	SendUIMetadata {
@@ -135,7 +109,6 @@ pub enum FrontendMessage {
 		#[cfg_attr(feature = "wasm", tsify(type = "unknown"))]
 		preferences: PreferencesMessageHandler,
 	},
-	TriggerTextCommit,
 	/// Asks the frontend to enter inline-rename mode for a layer in the graph view.
 	TriggerEditLayerNameInGraph {
 		#[serde(rename = "nodeId")]
@@ -206,6 +179,10 @@ pub enum FrontendMessage {
 	UpdateGraphViewOverlay {
 		open: bool,
 	},
+	UpdateTextEditingState {
+		#[serde(rename = "isEditing")]
+		is_editing: bool,
+	},
 	UpdateWorkspacePanelLayout {
 		#[serde(rename = "panelLayout")]
 		panel_layout: WorkspacePanelLayout,

editor/src/messages/input_mapper/input_mapper_message.rs

@@ -16,6 +16,8 @@ pub enum InputMapperMessage {
 	KeyUpNoRepeat(Key),
 	#[child]
 	DoubleClick(MouseButton),
+	#[child]
+	TripleClick(MouseButton),
 
 	// Messages
 	PointerMove,

editor/src/messages/input_mapper/input_mappings.rs

@@ -168,10 +168,54 @@ pub fn input_mappings(zoom_with_scroll: bool) -> Mapping {
 		// TextToolMessage
 		entry!(PointerMove; refresh_keys=[Alt, Shift], action_dispatch=TextToolMessage::PointerMove { center: Alt, lock_ratio: Shift }),
 		entry!(KeyDown(MouseLeft); action_dispatch=TextToolMessage::DragStart),
+		entry!(DoubleClick(MouseButton::Left); action_dispatch=TextToolMessage::DoubleClick),
+		entry!(TripleClick(MouseButton::Left); action_dispatch=TextToolMessage::TripleClick),
 		entry!(KeyUp(MouseLeft); action_dispatch=TextToolMessage::DragStop),
 		entry!(KeyDown(MouseRight); action_dispatch=TextToolMessage::Abort),
 		entry!(KeyDown(Escape); action_dispatch=TextToolMessage::Abort),
 		entry!(KeyDown(Enter); modifiers=[Accel], action_dispatch=TextToolMessage::Abort),
+		entry!(KeyDown(Backspace); action_dispatch=TextToolMessage::BackspaceChar),
+		entry!(KeyDown(Delete); action_dispatch=TextToolMessage::DeleteChar),
+		entry!(KeyDown(ArrowLeft); action_dispatch=TextToolMessage::MoveCursorLeft { word: false, select: false }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Alt], action_dispatch=TextToolMessage::MoveCursorLeft { word: true, select: false }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Control], action_dispatch=TextToolMessage::MoveCursorLeft { word: true, select: false }),
+		entry!(KeyDown(ArrowRight); action_dispatch=TextToolMessage::MoveCursorRight { word: false, select: false }),
+		entry!(KeyDown(ArrowRight); modifiers=[Alt], action_dispatch=TextToolMessage::MoveCursorRight { word: true, select: false }),
+		entry!(KeyDown(ArrowRight); modifiers=[Control], action_dispatch=TextToolMessage::MoveCursorRight { word: true, select: false }),
+		entry!(KeyDown(ArrowUp); action_dispatch=TextToolMessage::MoveCursorUp { select: false }),
+		entry!(KeyDown(ArrowUp); modifiers=[Command], action_dispatch=TextToolMessage::MoveCursorTop { select: false }),
+		entry!(KeyDown(ArrowUp); modifiers=[Control], action_dispatch=TextToolMessage::MoveCursorTop { select: false }),
+		entry!(KeyDown(ArrowDown); action_dispatch=TextToolMessage::MoveCursorDown { select: false }),
+		entry!(KeyDown(ArrowDown); modifiers=[Command], action_dispatch=TextToolMessage::MoveCursorBottom { select: false }),
+		entry!(KeyDown(ArrowDown); modifiers=[Control], action_dispatch=TextToolMessage::MoveCursorBottom { select: false }),
+		entry!(KeyDown(Home); action_dispatch=TextToolMessage::MoveCursorHome { select: false }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Command], action_dispatch=TextToolMessage::MoveCursorHome { select: false }),
+		entry!(KeyDown(End); action_dispatch=TextToolMessage::MoveCursorEnd { select: false }),
+		entry!(KeyDown(ArrowRight); modifiers=[Command], action_dispatch=TextToolMessage::MoveCursorEnd { select: false }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorLeft { word: false, select: true }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Shift, Alt], action_dispatch=TextToolMessage::MoveCursorLeft { word: true, select: true }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Shift, Control], action_dispatch=TextToolMessage::MoveCursorLeft { word: true, select: true }),
+		entry!(KeyDown(ArrowRight); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorRight { word: false, select: true }),
+		entry!(KeyDown(ArrowRight); modifiers=[Shift, Alt], action_dispatch=TextToolMessage::MoveCursorRight { word: true, select: true }),
+		entry!(KeyDown(ArrowRight); modifiers=[Shift, Control], action_dispatch=TextToolMessage::MoveCursorRight { word: true, select: true }),
+		entry!(KeyDown(ArrowUp); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorUp { select: true }),
+		entry!(KeyDown(ArrowDown); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorDown { select: true }),
+		entry!(KeyDown(Home); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorHome { select: true }),
+		entry!(KeyDown(End); modifiers=[Shift], action_dispatch=TextToolMessage::MoveCursorEnd { select: true }),
+		entry!(KeyDown(ArrowLeft); modifiers=[Shift, Command], action_dispatch=TextToolMessage::MoveCursorHome { select: true }),
+		entry!(KeyDown(ArrowRight); modifiers=[Shift, Command], action_dispatch=TextToolMessage::MoveCursorEnd { select: true }),
+		entry!(KeyDown(ArrowUp); modifiers=[Shift, Command], action_dispatch=TextToolMessage::MoveCursorTop { select: true }),
+		entry!(KeyDown(ArrowUp); modifiers=[Shift, Control], action_dispatch=TextToolMessage::MoveCursorTop { select: true }),
+		entry!(KeyDown(ArrowDown); modifiers=[Shift, Command], action_dispatch=TextToolMessage::MoveCursorBottom { select: true }),
+		entry!(KeyDown(ArrowDown); modifiers=[Shift, Control], action_dispatch=TextToolMessage::MoveCursorBottom { select: true }),
+		entry!(KeyDown(Enter); action_dispatch=TextToolMessage::InsertNewline),
+		entry!(KeyDown(KeyA); modifiers=[Accel], action_dispatch=TextToolMessage::SelectAll),
+		entry!(KeyDown(Backspace); modifiers=[Alt], action_dispatch=TextToolMessage::DeletePreviousWord),
+		entry!(KeyDown(Backspace); modifiers=[Control], action_dispatch=TextToolMessage::DeletePreviousWord),
+		entry!(KeyDown(Backspace); modifiers=[Command], action_dispatch=TextToolMessage::DeleteLine),
+		entry!(KeyDown(KeyZ); modifiers=[Accel, Shift], canonical, action_dispatch=TextToolMessage::Redo),
+		entry!(KeyDown(KeyY); modifiers=[Accel], action_dispatch=TextToolMessage::Redo),
+		entry!(KeyDown(KeyZ); modifiers=[Accel], action_dispatch=TextToolMessage::Undo),
 		//
 		// GradientToolMessage
 		entry!(DoubleClick(MouseButton::Left); action_dispatch=GradientToolMessage::DoubleClick),
@@ -463,7 +507,7 @@ pub fn input_mappings(zoom_with_scroll: bool) -> Mapping {
 		entry!(KeyDown(Space); modifiers=[Shift], action_dispatch=AnimationMessage::ToggleLivePreview),
 		entry!(KeyDown(Home); modifiers=[Shift], action_dispatch=AnimationMessage::RestartAnimation),
 	];
-	let (mut key_up, mut key_down, mut key_up_no_repeat, mut key_down_no_repeat, mut double_click, mut wheel_scroll, mut pointer_move, mut pointer_shake) = mappings;
+	let (mut key_up, mut key_down, mut key_up_no_repeat, mut key_down_no_repeat, mut double_click, mut triple_click, mut wheel_scroll, mut pointer_move, mut pointer_shake) = mappings;
 
 	let sort = |list: &mut KeyMappingEntries| list.0.sort_by(|a, b| b.modifiers.count_ones().cmp(&a.modifiers.count_ones()));
 	// Sort the sublists of `key_up`, `key_down`, `key_up_no_repeat`, and `key_down_no_repeat`
@@ -472,10 +516,13 @@ pub fn input_mappings(zoom_with_scroll: bool) -> Mapping {
 			sort(sublist);
 		}
 	}
-	// Sort the sublists of `double_click`
+	// Sort the sublists of `double_click` and `triple_click`
 	for sublist in &mut double_click {
 		sort(sublist)
 	}
+	for sublist in &mut triple_click {
+		sort(sublist)
+	}
 	// Sort `wheel_scroll`
 	sort(&mut wheel_scroll);
 	// Sort `pointer_move`
@@ -489,6 +536,7 @@ pub fn input_mappings(zoom_with_scroll: bool) -> Mapping {
 		key_up_no_repeat,
 		key_down_no_repeat,
 		double_click,
+		triple_click,
 		wheel_scroll,
 		pointer_move,
 		pointer_shake,

editor/src/messages/input_mapper/utility_types/macros.rs

@@ -119,6 +119,7 @@ macro_rules! mapping {
 		let mut key_up_no_repeat = KeyMappingEntries::key_array();
 		let mut key_down_no_repeat = KeyMappingEntries::key_array();
 		let mut double_click = KeyMappingEntries::mouse_buttons_arrays();
+		let mut triple_click = KeyMappingEntries::mouse_buttons_arrays();
 		let mut wheel_scroll = KeyMappingEntries::new();
 		let mut pointer_move = KeyMappingEntries::new();
 		let mut pointer_shake = KeyMappingEntries::new();
@@ -138,6 +139,7 @@ macro_rules! mapping {
 					InputMapperMessage::KeyDownNoRepeat(key) => &mut key_down_no_repeat[key as usize],
 					InputMapperMessage::KeyUpNoRepeat(key) => &mut key_up_no_repeat[key as usize],
 					InputMapperMessage::DoubleClick(key) => &mut double_click[key as usize],
+					InputMapperMessage::TripleClick(key) => &mut triple_click[key as usize],
 					InputMapperMessage::WheelScroll => &mut wheel_scroll,
 					InputMapperMessage::PointerMove => &mut pointer_move,
 					InputMapperMessage::PointerShake => &mut pointer_shake,
@@ -148,7 +150,7 @@ macro_rules! mapping {
 		}
 		)*
 
-		(key_up, key_down, key_up_no_repeat, key_down_no_repeat, double_click, wheel_scroll, pointer_move, pointer_shake)
+		(key_up, key_down, key_up_no_repeat, key_down_no_repeat, double_click, triple_click, wheel_scroll, pointer_move, pointer_shake)
 	}};
 }
 

editor/src/messages/input_mapper/utility_types/misc.rs

@@ -12,6 +12,7 @@ pub struct Mapping {
 	pub key_up_no_repeat: [KeyMappingEntries; NUMBER_OF_KEYS],
 	pub key_down_no_repeat: [KeyMappingEntries; NUMBER_OF_KEYS],
 	pub double_click: [KeyMappingEntries; NUMBER_OF_MOUSE_BUTTONS],
+	pub triple_click: [KeyMappingEntries; NUMBER_OF_MOUSE_BUTTONS],
 	pub wheel_scroll: KeyMappingEntries,
 	pub pointer_move: KeyMappingEntries,
 	pub pointer_shake: KeyMappingEntries,
@@ -36,6 +37,7 @@ impl Mapping {
 			InputMapperMessage::KeyDownNoRepeat(key) => &self.key_down_no_repeat[*key as usize],
 			InputMapperMessage::KeyUpNoRepeat(key) => &self.key_up_no_repeat[*key as usize],
 			InputMapperMessage::DoubleClick(key) => &self.double_click[*key as usize],
+			InputMapperMessage::TripleClick(key) => &self.triple_click[*key as usize],
 			InputMapperMessage::WheelScroll => &self.wheel_scroll,
 			InputMapperMessage::PointerMove => &self.pointer_move,
 			InputMapperMessage::PointerShake => &self.pointer_shake,

editor/src/messages/input_preprocessor/input_preprocessor_message.rs

@@ -6,6 +6,7 @@ use crate::messages::prelude::*;
 #[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub enum InputPreprocessorMessage {
 	DoubleClick { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
+	TripleClick { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
 	KeyDown { key: Key, key_repeat: bool, modifier_keys: ModifierKeys },
 	KeyUp { key: Key, key_repeat: bool, modifier_keys: ModifierKeys },
 	PointerDown { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -41,6 +41,23 @@ impl<'a> MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContex
 					}));
 				}
 			}
+			InputPreprocessorMessage::TripleClick { editor_mouse_state, modifier_keys } => {
+				self.update_states_of_modifier_keys(modifier_keys, responses);
+
+				let mouse_state = editor_mouse_state.to_mouse_state(viewport);
+				self.mouse.position = mouse_state.position;
+
+				for key in mouse_state.mouse_keys {
+					responses.add(InputMapperMessage::TripleClick(match key {
+						MouseKeys::LEFT => MouseButton::Left,
+						MouseKeys::RIGHT => MouseButton::Right,
+						MouseKeys::MIDDLE => MouseButton::Middle,
+						MouseKeys::BACK => MouseButton::Back,
+						MouseKeys::FORWARD => MouseButton::Forward,
+						_ => unimplemented!(),
+					}));
+				}
+			}
 			InputPreprocessorMessage::KeyDown { key, key_repeat, modifier_keys } => {
 				self.update_states_of_modifier_keys(modifier_keys, responses);
 				self.keyboard.set(key as usize);

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

@@ -1722,7 +1722,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 				let mut nodes = Vec::new();
 				for node_id in &self.frontend_nodes {
 					let Some(node_bbox) = network_interface.node_bounding_box(node_id, breadcrumb_network_path) else {
-						log::error!("Could not get bbox for node: {node_id:?}");
+						log::warn!("Could not get bbox for node: {node_id:?}");
 						continue;
 					};