From 426217327b1a569837cb771a1fa86db91d7d5a6b Mon Sep 17 00:00:00 2001 From: bflatastic Date: Sat, 17 Oct 2026 15:11:23 +0700 Subject: [PATCH] #647: text copied in another app after a design paste pastes as text again --- crates/ui-egui/src/design_paste_tests.rs | 23 +++++++++++++++++++++++ crates/ui-egui/src/menus.rs | 2 ++ 2 files changed, 25 insertions(+) diff --git a/crates/ui-egui/src/design_paste_tests.rs b/crates/ui-egui/src/design_paste_tests.rs index ad33e0059..3174275a5 100644 --- a/crates/ui-egui/src/design_paste_tests.rs +++ b/crates/ui-egui/src/design_paste_tests.rs @@ -62,3 +62,26 @@ fn html_that_only_mentions_the_marker_pastes_its_text() { assert_eq!(pasted_text(&app), text); assert!(app.ui.last_error.is_none(), "{:?}", app.ui.last_error); } + +/// A clipboard whose contents the test replaces between pastes. +struct SharedClip(std::rc::Rc>); + +impl Services for SharedClip { + fn clipboard_get_html(&mut self) -> Option { + Some(self.0.borrow().html.clone()) + } + fn clipboard_get_text(&mut self) -> Option { + self.0.borrow().text.clone() + } +} + +#[test] +fn text_copied_after_a_design_paste_pastes_as_text() { + let clip = std::rc::Rc::new(std::cell::RefCell::new(Clip { html: copied_html(), text: None })); + let mut app = FigApp::new(Session::new(), Box::new(SharedClip(clip.clone()))); + crate::menus::paste(&mut app, None); + assert_eq!(selected_names(&app), ["Copied layer"]); + *clip.borrow_mut() = Clip { html: String::new(), text: Some("Fresh text".into()) }; + crate::menus::paste(&mut app, None); + assert_eq!(pasted_text(&app), "Fresh text"); +} diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs index 8bd98cc5d..8e86953c2 100644 --- a/crates/ui-egui/src/menus.rs +++ b/crates/ui-egui/src/menus.rs @@ -38,6 +38,8 @@ pub fn paste(app: &mut FigApp, event_text: Option<&str>) { // Only HTML that holds readable design data takes this path; other HTML pastes as before. if let Some(html) = app.services.clipboard_get_html().filter(|h| figcraft_engine::cmd::edit::design_clipboard_buffer(h).is_some()) { if let Some(r) = app.run("edit.pasteDesignLayers", json!({"html": html})) { + // The pasted layers are now our copy: text another app puts on the clipboard later is newer. + app.ui.last_copy = Some(app.services.clipboard_get_text().unwrap_or_default()); let left_out = r["warnings"].as_array().map_or(0, Vec::len); if left_out > 0 { app.toast(trn("Pasted design layers; {n} kinds of content were left out", left_out, &[]));