Port · Build: Zed's gpui at 1a28cff

gpui and gpui_platform now come from Zed's repo by git at 1a28cff,
the code gpui-pre 0.3.7 republishes, so the gallery can later build
for the browser. gpui takes stacker, as 0.2.2 always did, and
gpui_platform takes font-kit, without which macOS draws no text;
runtime_shaders moves to gpui_platform.

The API moved: focus, blur and Tab steps take cx, Corner is Anchor,
shaped lines paint with an alignment, defer_draw takes a content
mask, the inspector registers a factory, async updates return their
value, and wrapped lines are shared, not cloned. Updates through a
window context go through the window, so a closed window still ends
them as it did.

Where the new gpui behaves differently, Ely keeps its old intent.
Holds and reveals under a resting pointer survive typing through
gpui's input-modality-independent hover; previews the keyboard also
moves keep the default, and the calendar's leave ignores a key press.
Enter reaches a button inside the code editor, since gpui now arms a
key click on the press. The event logger skips a lone modifier. A
video and an image grid keep their shape in a flex column under
taffy 0.13, as a picture does.

AGENTS.md records the new stack and the rules this port changes; the
rest of the old gpui and taffy rules are re-tested in T44c.

src/forms/tests/choices.rs

@@ -53,7 +53,7 @@ impl Render for Radios {
 fn radio_arrows_skip_disabled_choices_and_wrap(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Radios { chosen: "a".into() });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("down");
     assert_eq!(view.read_with(cx, |view, _| view.chosen.clone()), "c");
     cx.simulate_keystrokes("down");
@@ -84,7 +84,7 @@ impl Render for Picker {
 fn select_opens_moves_and_picks_from_the_keyboard(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Picker { chosen: "a".into() });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("down down enter");
     assert_eq!(view.read_with(cx, |view, _| view.chosen.clone()), "b");
 }
@@ -213,7 +213,7 @@ impl Render for Level {
 fn slider_keys_step_jump_and_reach_the_end(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Level { value: 10.0 });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("right pageup");
     assert_eq!(view.read_with(cx, |view, _| view.value), 21.0);
     cx.simulate_keystrokes("end");
@@ -242,7 +242,7 @@ impl Render for Agree {
 fn space_toggles_a_focused_checkbox(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Agree { on: false });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("space");
     cx.simulate_event(KeyUpEvent {
         keystroke: Keystroke::parse("space").unwrap(),
@@ -254,7 +254,7 @@ fn space_toggles_a_focused_checkbox(cx: &mut TestAppContext) {
 fn a_disabled_choice_still_leaves_the_group_reachable(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Radios { chosen: "b".into() });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("down");
     assert_eq!(view.read_with(cx, |view, _| view.chosen.clone()), "c");
 }
@@ -281,7 +281,7 @@ impl Render for Several {
 fn a_full_enter_press_opens_a_multi_select_and_keeps_it_open(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Several { chosen: Vec::new() });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter");
     release("enter", cx);
     cx.simulate_keystrokes("enter");
@@ -333,7 +333,7 @@ fn typed<'a>(
 #[gpui::test]
 fn enter_in_a_combobox_skips_a_disabled_first_row(cx: &mut TestAppContext) {
     let (view, cx) = typed(None, cx);
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter");
     assert_eq!(
         view.read_with(cx, |view, _| view.chosen.clone()),
@@ -386,7 +386,7 @@ fn a_disabled_rating_ignores_the_arrows(cx: &mut TestAppContext) {
         value: 2,
         disabled: false,
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     view.update(cx, |view, cx| {
         view.disabled = true;
         cx.notify();
@@ -440,7 +440,7 @@ fn a_shut_select_may_be_empty(cx: &mut TestAppContext) {
     setup(cx);
     let (_, cx) = cx.add_window_view(|_, _| Empty(true));
     cx.run_until_parked();
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     assert!(cx.update(|window, cx| window.focused(cx).is_none()));
 }
 
@@ -469,7 +469,7 @@ fn a_long_choice_keeps_its_list_inside_the_window(cx: &mut TestAppContext) {
     let (_, cx) = cx.add_window_view(|_, _| Named);
     cx.simulate_resize(gpui::size(px(280.0), px(600.0)));
     cx.run_until_parked();
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter");
     release("enter", cx);
     cx.run_until_parked();

src/forms/tests/dates.rs

@@ -1,6 +1,8 @@
+use std::rc::Rc;
+
 use gpui::{
-    Context, IntoElement, KeyUpEvent, Keystroke, ParentElement, Render, Styled, TestAppContext,
-    Window, div,
+    Context, IntoElement, KeyUpEvent, Keystroke, Modifiers, ParentElement, Render, Styled,
+    TestAppContext, Window, div, point, px,
 };
 use jiff::civil::{Date, Time, date, time};
 
@@ -38,7 +40,7 @@ fn a_date_picker_opens_and_picks_from_the_keyboard(cx: &mut TestAppContext) {
         value: Some(date(2026, 9, 10)),
         disabled: false,
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter right enter");
     assert_eq!(
         view.read_with(cx, |view, _| view.value),
@@ -70,7 +72,7 @@ impl Render for Span {
 fn a_range_picker_takes_two_picks_in_either_order(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Span { value: None });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter enter left left enter");
     assert_eq!(
         view.read_with(cx, |view, _| view.value),
@@ -106,7 +108,7 @@ fn a_time_picker_steps_with_the_arrows(cx: &mut TestAppContext) {
     let (view, cx) = cx.add_window_view(|_, _| Clock {
         value: Some(time(9, 30, 0, 0)),
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter down down");
     assert_eq!(
         view.read_with(cx, |view, _| view.value),
@@ -143,7 +145,7 @@ fn a_calendar_refuses_days_past_its_max(cx: &mut TestAppContext) {
         picked: None,
         max: Some(TODAY),
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("right enter");
     assert_eq!(view.read_with(cx, |view, _| view.picked), None);
     cx.simulate_keystrokes("left enter");
@@ -157,7 +159,7 @@ fn a_picker_disabled_while_open_stops_picking(cx: &mut TestAppContext) {
         value: Some(date(2026, 9, 10)),
         disabled: false,
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("enter");
     view.update(cx, |view, cx| {
         view.disabled = true;
@@ -177,18 +179,18 @@ fn the_month_buttons_carry_the_cursor(cx: &mut TestAppContext) {
         picked: None,
         max: None,
     });
-    cx.update(|window, _| {
-        window.focus_next();
-        window.focus_next();
-        window.focus_next();
+    cx.update(|window, cx| {
+        window.focus_next(cx);
+        window.focus_next(cx);
+        window.focus_next(cx);
     });
     cx.simulate_keystrokes("enter");
     cx.simulate_event(KeyUpEvent {
         keystroke: Keystroke::parse("enter").unwrap(),
     });
-    cx.update(|window, _| {
-        window.focus_prev();
-        window.focus_prev();
+    cx.update(|window, cx| {
+        window.focus_prev(cx);
+        window.focus_prev(cx);
     });
     cx.simulate_keystrokes("enter");
     assert_eq!(
@@ -196,3 +198,41 @@ fn the_month_buttons_carry_the_cursor(cx: &mut TestAppContext) {
         Some(date(2026, 10, 25))
     );
 }
+
+/// A calendar that records every preview it reports.
+struct Watched {
+    seen: Vec<Option<Date>>,
+}
+
+impl Render for Watched {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let view = cx.entity();
+        Calendar::new("watched")
+            .selected(TODAY)
+            .today(TODAY)
+            .on_hover(Rc::new(move |date, _, cx| {
+                view.update(cx, |view, cx| {
+                    view.seen.push(date);
+                    cx.notify();
+                })
+            }))
+    }
+}
+
+#[gpui::test]
+fn keys_keep_the_preview_under_a_resting_pointer(cx: &mut TestAppContext) {
+    setup(cx);
+    let (view, cx) = cx.add_window_view(|_, _| Watched { seen: Vec::new() });
+    cx.update(|window, cx| window.focus_next(cx));
+    cx.simulate_mouse_move(point(px(120.0), px(200.0)), None, Modifiers::none());
+    let pointed = view.read_with(cx, |view, _| view.seen.last().copied().flatten());
+    assert!(pointed.is_some(), "the pointer rests on a day");
+    cx.simulate_keystrokes("pagedown");
+    cx.update(|window, _| window.refresh());
+    cx.run_until_parked();
+    assert_eq!(
+        view.read_with(cx, |view, _| view.seen.last().copied().flatten()),
+        Some(date(2026, 10, 25)),
+        "the keyboard's day stays the preview"
+    );
+}

src/forms/tests/mod.rs

@@ -69,7 +69,7 @@ fn text(field: &Entity<TextInput>, cx: &mut VisualTestContext) -> String {
 }
 
 fn focus(field: &Entity<TextInput>, cx: &mut VisualTestContext) {
-    cx.update(|window, cx| window.focus(&field.read(cx).focus().clone()));
+    cx.update(|window, cx| window.focus(&field.read(cx).focus().clone(), cx));
 }
 
 #[gpui::test]
@@ -80,7 +80,7 @@ fn tab_reaches_fields_and_skips_disabled_ones(cx: &mut TestAppContext) {
     let mut order = Vec::new();
     for _ in 0..2 {
         order.push(cx.update(|window, cx| {
-            window.focus_next();
+            window.focus_next(cx);
             fields
                 .iter()
                 .position(|field| field.read(cx).focus().is_focused(window))
@@ -96,9 +96,9 @@ fn enter_on_a_clear_button_clears_its_own_field(cx: &mut TestAppContext) {
         field.update(cx, |input, cx| input.set_text("kept", cx));
     }
     cx.run_until_parked();
-    cx.update(|window, _| {
-        window.focus_next();
-        window.focus_next();
+    cx.update(|window, cx| {
+        window.focus_next(cx);
+        window.focus_next(cx);
     });
     cx.run_until_parked();
     cx.simulate_keystrokes("enter");
@@ -177,7 +177,7 @@ impl Render for Stepped {
 fn stepping_starts_from_the_typed_number(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Stepped { value: 4.0 });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("cmd-a");
     cx.simulate_input("20");
     cx.simulate_keystrokes("up");
@@ -188,7 +188,7 @@ fn stepping_starts_from_the_typed_number(cx: &mut TestAppContext) {
 fn a_typed_number_reaches_the_owner_before_any_blur(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Stepped { value: 100.0 });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_keystrokes("cmd-a");
     cx.simulate_input("250");
     assert_eq!(
@@ -224,7 +224,7 @@ fn select_all_then_typing_replaces_the_pin(cx: &mut TestAppContext) {
     let (view, cx) = cx.add_window_view(|_, _| Pin {
         code: String::new(),
     });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_input("4821");
     cx.simulate_keystrokes("cmd-a");
     cx.simulate_input("1234");

src/forms/tests/other.rs

@@ -29,7 +29,7 @@ impl Render for Icons {
 fn an_icon_is_searched_walked_and_picked_from_the_keyboard(cx: &mut TestAppContext) {
     setup(cx);
     let (view, cx) = cx.add_window_view(|_, _| Icons { picked: None });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_input("arrow down");
     cx.simulate_keystrokes("down right enter");
     let wanted: Vec<IconName> = IconName::ALL
@@ -135,7 +135,7 @@ fn an_inline_edit_takes_tab_opens_on_enter_and_takes_focus_back(cx: &mut TestApp
     cx.update(|cx| cx.bind_keys([KeyBinding::new("tab", FocusNext, None)]));
     let (view, cx) = cx.add_window_view(|_, _| Titled(Vec::new()));
     cx.update(|window, _| window.activate_window());
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     release("enter", cx);
     cx.simulate_input("Stairs");
     release("enter", cx);

src/forms/tests/structure.rs

@@ -59,7 +59,7 @@ fn signup(cx: &mut TestAppContext) -> (Entity<Signup>, &mut VisualTestContext) {
 #[gpui::test]
 fn cmd_enter_in_a_field_submits_the_form_once(cx: &mut TestAppContext) {
     let (view, cx) = signup(cx);
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     cx.simulate_input("Ada");
     cx.simulate_keystrokes("cmd-enter");
     let counts = view.read_with(cx, |view, _| (view.sent, view.field_submits));
@@ -69,9 +69,9 @@ fn cmd_enter_in_a_field_submits_the_form_once(cx: &mut TestAppContext) {
 #[gpui::test]
 fn cmd_enter_on_any_control_in_a_form_submits_it(cx: &mut TestAppContext) {
     let (view, cx) = signup(cx);
-    cx.update(|window, _| {
-        window.focus_next();
-        window.focus_next();
+    cx.update(|window, cx| {
+        window.focus_next(cx);
+        window.focus_next(cx);
     });
     cx.simulate_keystrokes("cmd-enter");
     assert_eq!(
@@ -120,16 +120,16 @@ fn field_array_buttons_remove_their_own_row_and_add_one(cx: &mut TestAppContext)
     let (view, cx) = cx.add_window_view(|_, _| Rows {
         rows: vec!["a", "b", "c"],
     });
-    cx.update(|window, _| {
-        window.focus_next();
-        window.focus_next();
+    cx.update(|window, cx| {
+        window.focus_next(cx);
+        window.focus_next(cx);
     });
     press("space", cx);
     assert_eq!(view.read_with(cx, |view, _| view.rows.clone()), ["a", "c"]);
-    cx.update(|window, _| {
-        window.blur();
+    cx.update(|window, cx| {
+        window.blur(cx);
         for _ in 0..3 {
-            window.focus_next();
+            window.focus_next(cx);
         }
     });
     press("space", cx);

src/forms/tests/tags.rs

@@ -56,9 +56,9 @@ fn typing<'a>(
         tags: Vec::new(),
         asked: Vec::new(),
     });
-    cx.update(|window, _| {
+    cx.update(|window, cx| {
         window.activate_window();
-        window.focus_next();
+        window.focus_next(cx);
     });
     settle(cx);
     cx.simulate_input(words);

src/forms/tests/upload.rs

@@ -54,11 +54,11 @@ fn each_row_offers_what_its_state_allows(cx: &mut TestAppContext) {
     setup(cx);
     cx.update(|cx| cx.bind_keys([KeyBinding::new("tab", FocusNext, None)]));
     let (view, cx) = cx.add_window_view(|_, _| Shelf { log: Vec::new() });
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     press("enter", cx);
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     press("enter", cx);
-    cx.update(|window, _| window.focus_next());
+    cx.update(|window, cx| window.focus_next(cx));
     press("enter", cx);
     let log = view.read_with(cx, |shelf, _| shelf.log.clone());
     assert_eq!(log, ["cancel 0", "retry 1", "remove 2"]);