Merge pull request #287 from marcoarnulfo/fix/midi-backspace-rename

fix(midi-editor): Backspace in a text field leaves the selected notes alone (#223)

crates/ui-egui/src/midi_editor.rs

@@ -330,7 +330,10 @@ pub fn show(app: &mut SoundApp, ui: &mut Ui) {
             let _ = app.run("midi.notes_move", json!({"clip": cid.0, "indices": app.midi.selected, "ticks": ticks, "semitones": semi}));
         }
     }
-    if !app.midi.selected.is_empty() && ui.input(|i| i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace)) {
+    if !app.midi.selected.is_empty()
+        && !ui.ctx().egui_wants_keyboard_input()
+        && ui.input(|i| i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace))
+    {
         let _ = app.run("midi.note_delete", json!({"clip": cid.0, "indices": app.midi.selected}));
         app.midi.selected.clear();
     }

crates/ui-egui/tests/midi_editor_keys.rs

@@ -0,0 +1,57 @@
+use egui::{Event, Key, Modifiers, vec2};
+use egui_kittest::Harness;
+use serde_json::json;
+use soundcraft_ui_egui::dialogs::Dialog;
+use soundcraft_ui_egui::{Services, SoundApp};
+
+/// The Keys track's MIDI clip in the editor with its first two notes selected, the Rename Track dialog open or not.
+fn harness(rename: bool) -> Harness<'static, SoundApp> {
+    let mut app = SoundApp::new(soundcraft_engine::demo::demo_engine(), None, Services::default());
+    app.ui.show_midi_editor = true;
+    app.run("edit.select", json!({"tracks": ["Keys"]})).unwrap();
+    let keys = app.engine.session().track_by_name("Keys").unwrap().id;
+    if rename {
+        app.dialogs.open_rename_track(keys, "Keys");
+    }
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_ui_state(
+        |ui, app: &mut SoundApp| {
+            let ctx = ui.ctx().clone();
+            app.logic(&ctx);
+            app.ui(ui);
+        },
+        app,
+    );
+    for _ in 0..3 {
+        h.step();
+    }
+    h.state_mut().midi.selected = vec![0, 1];
+    h
+}
+
+fn press(h: &mut Harness<'_, SoundApp>, key: Key) {
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+    h.step();
+}
+
+#[test]
+fn deleting_text_in_the_rename_field_keeps_the_selected_notes() {
+    for key in [Key::Backspace, Key::Delete] {
+        let mut h = harness(true);
+        let before = h.state().engine.session().clone();
+        press(&mut h, key);
+        // The field opens with the old name selected, so the key clears it.
+        assert!(matches!(&h.state().dialogs.open, Some(Dialog::RenameTrack { name, .. }) if name.is_empty()), "{key:?}");
+        assert!(*h.state().engine.session() == before, "{key:?} edited the session");
+    }
+}
+
+#[test]
+fn deleting_in_the_editor_still_removes_the_selected_notes() {
+    for key in [Key::Backspace, Key::Delete] {
+        let mut h = harness(false);
+        let before = h.state().engine.session().clone();
+        press(&mut h, key);
+        assert!(*h.state().engine.session() != before, "{key:?} left the notes");
+        assert!(h.state().midi.selected.is_empty());
+    }
+}