Canvas · Graphs and boards: a field hands focus back on Enter and Escape

writing::begin records the owner's focus, the mind map's or the tool
layer's, through forms::Editing::returning. The field keeps its words on
Enter's release and drops them on Escape, and both hand focus back, so
the map's arrows and the board's Backspace work at once after a write.

src/canvas/mindmap_view.rs

@@ -125,15 +125,27 @@ impl RenderOnce for MindMap {
             );
         }
         let rename = {
-            let (editing, placed, on_rename) =
-                (editing.clone(), placed.clone(), self.on_rename.clone());
+            let (editing, placed, on_rename, home) = (
+                editing.clone(),
+                placed.clone(),
+                self.on_rename.clone(),
+                focus.clone(),
+            );
             move |key: &SharedString, window: &mut Window, cx: &mut App| {
                 let topic = placed
                     .iter()
                     .find(|topic| topic.key == *key)
                     .expect("a placed topic");
                 let words = topic.text.to_string();
-                writing::begin(&editing, key.clone(), words, on_rename.clone(), window, cx);
+                writing::begin(
+                    &editing,
+                    key.clone(),
+                    words,
+                    on_rename.clone(),
+                    home.clone(),
+                    window,
+                    cx,
+                );
             }
         };
         let rename = Rc::new(rename);

src/canvas/press.rs

@@ -1,4 +1,4 @@
-use gpui::{App, Entity, SharedString, Window};
+use gpui::{App, Entity, FocusHandle, SharedString, Window};
 
 use super::{
     edit::{Tool, hit},
@@ -11,7 +11,7 @@ use super::{
 };
 use crate::forms::Editing;
 
-/// A press on a tool layer: the tool, where it landed in canvas units and in view pixels, how many presses it counts, whether Shift is held, and a handle's side.
+/// A press on a tool layer: the tool, where it landed in canvas units and in view pixels, how many presses it counts, whether Shift is held, a handle's side, and the layer's focus, which a field hands back.
 pub(super) struct Press {
     pub tool: Tool,
     pub at: (f32, f32),
@@ -19,6 +19,7 @@ pub(super) struct Press {
     pub count: usize,
     pub shift: bool,
     pub side: f32,
+    pub back: FocusHandle,
 }
 
 /// The gesture a press sets going, after what it asks the owner at once: a selection, a dropped text or note, an ended path, or words to rewrite.
@@ -68,6 +69,7 @@ pub(super) fn pressed(
                         shape.key.clone(),
                         words,
                         handlers.on_text.clone(),
+                        press.back.clone(),
                         window,
                         cx,
                     );

src/canvas/tests/boards.rs

@@ -207,3 +207,41 @@ fn a_link_released_on_its_own_shape_links_nothing(cx: &mut TestAppContext) {
     drag((50.0, 50.0), (60.0, 70.0), cx);
     assert!(said(&host, cx).is_empty());
 }
+
+#[gpui::test]
+fn enter_and_escape_in_a_topic_hand_the_keys_back_to_the_map(cx: &mut TestAppContext) {
+    let (host, cx) = stage(map, cx);
+    press(276.0, 126.0, 1, cx);
+    tap("f2", cx);
+    cx.simulate_input("Web");
+    tap("enter", cx);
+    tap("down", cx);
+    tap("f2", cx);
+    cx.simulate_input("Gone");
+    tap("escape", cx);
+    tap("down", cx);
+    assert_eq!(
+        said(&host, cx),
+        [
+            "select Some(\"a\")",
+            "rename a Web",
+            "select Some(\"b\")",
+            "select Some(\"b\")",
+        ],
+        "the owner keeps a selected, so each Down steps from a"
+    );
+}
+
+#[gpui::test]
+fn after_writing_on_a_shape_its_board_still_takes_backspace(cx: &mut TestAppContext) {
+    let (host, cx) = stage(board, cx);
+    press(250.0, 50.0, 1, cx);
+    press(250.0, 50.0, 2, cx);
+    cx.simulate_input("Idea");
+    tap("enter", cx);
+    tap("backspace", cx);
+    assert_eq!(
+        said(&host, cx),
+        ["shapes [\"a\", \"b\"] links 1", "shapes [\"a\"] links 0"]
+    );
+}

src/canvas/tools.rs

@@ -355,6 +355,7 @@ impl RenderOnce for ToolLayer {
                     count: event.click_count,
                     shift: event.modifiers.shift,
                     side,
+                    back: held_focus.clone(),
                 };
                 let gesture = pressed_with(
                     &press,

src/canvas/writing.rs

@@ -1,19 +1,20 @@
 use std::rc::Rc;
 
 use gpui::{
-    AnyElement, App, Entity, InteractiveElement, IntoElement, MouseButton, ParentElement, Pixels,
-    SharedString, Styled, Window, div,
+    AnyElement, App, Entity, FocusHandle, InteractiveElement, IntoElement, MouseButton,
+    ParentElement, Pixels, SharedString, Styled, Window, div,
 };
 
 use super::{gesture::OnPair, view::Frame};
 use crate::forms::{Editing, Input};
 
-/// Opens a field on the words of what `key` names. Enter or leaving hands them to the owner; Escape drops them.
+/// Opens a field on the words of what `key` names. Enter or leaving hands them to the owner; Escape drops them. Enter and Escape hand focus back to `back`.
 pub(super) fn begin(
     editing: &Entity<Editing>,
     key: SharedString,
     words: String,
     on_text: Option<OnPair>,
+    back: FocusHandle,
     window: &mut Window,
     cx: &mut App,
 ) {
@@ -29,12 +30,13 @@ pub(super) fn begin(
         ));
     });
     Editing::begin(editing, words, window, cx);
+    editing.update(cx, |editing, _| editing.returning(back));
 }
 
 /// The open field over `frame`, in view pixels.
 pub(super) fn field(editing: &Entity<Editing>, frame: Frame, cx: &App) -> Option<AnyElement> {
     let field = editing.read(cx).field()?;
-    let closing = editing.clone();
+    let (closing, keeping) = (editing.clone(), editing.clone());
     Some(
         div()
             .absolute()
@@ -45,7 +47,19 @@ pub(super) fn field(editing: &Entity<Editing>, frame: Frame, cx: &App) -> Option
             .on_key_down(move |event, window, cx| {
                 if event.keystroke.key == "escape" {
                     cx.stop_propagation();
-                    closing.update(cx, |editing, cx| editing.finish(true, window, cx));
+                    closing.update(cx, |editing, cx| {
+                        editing.finish(true, window, cx);
+                        editing.give_back(window);
+                    });
+                }
+            })
+            .on_key_up(move |event, window, cx| {
+                if event.keystroke.key == "enter" {
+                    cx.stop_propagation();
+                    keeping.update(cx, |editing, cx| {
+                        editing.finish(false, window, cx);
+                        editing.give_back(window);
+                    });
                 }
             })
             .child(Input::new(&field))