Merge PR #2314

crates/ui-egui/src/grid.rs

@@ -2367,7 +2367,15 @@ fn interact(app: &mut SheetApp, ui: &mut egui::Ui, resp: &egui::Response, geo: &
                 d.selection.anchor = sel.anchor;
             }
         } else if mods.command {
-            select_ranges(app, RangeRef::cell(c), true, c);
+            // Ctrl+click on a hyperlink's text follows it instead of adding the cell to the selection.
+            if let Some(h) = sh.hyperlinks.get(&c).cloned()
+                && primary_clicked
+                && p.x < geo.cell_rect(sh, c).left() + geo.cell_rect(sh, c).width() * 0.8
+            {
+                follow_link(app, &h.target);
+            } else {
+                select_ranges(app, RangeRef::cell(c), true, c);
+            }
         } else {
             let _ = app.session.run("selection.set", json!({"cell": c.a1()}));
             if primary_clicked && wb.styles.get(sh.style_id(c)).num_fmt.as_str() == "checkbox" {

crates/ui-egui/tests/hyperlink_ctrl_click.rs

@@ -0,0 +1,85 @@
+//! Ctrl+click on a hyperlink cell follows the link (#1198), like a plain click does.
+
+use egui::{Event, Modifiers, PointerButton, Pos2};
+use gridcraft_engine::Session;
+use gridcraft_engine::core::CellRef;
+use gridcraft_ui_egui::{SheetApp, grid::Geo};
+use serde_json::json;
+
+type Harness = egui_kittest::Harness<'static, SheetApp>;
+
+fn harness() -> Harness {
+    let mut session = Session::new();
+    session.new_workbook();
+    session.execute("cell.set", json!({"cell": "B2", "input": "web"})).unwrap();
+    session.execute("insert.link", json!({"cell": "B2", "target": "https://example.org/a"})).unwrap();
+    session.execute("cell.set", json!({"cell": "B4", "input": "jump"})).unwrap();
+    session.execute("insert.link", json!({"cell": "B4", "target": "Sheet1!F9"})).unwrap();
+    let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1200.0, 800.0)).build_ui_state(
+        |ui, app: &mut SheetApp| {
+            app.logic(ui.ctx());
+            app.ui(ui);
+        },
+        SheetApp::new(session, Default::default()),
+    );
+    h.run_steps(4);
+    h
+}
+
+fn at_fraction(h: &Harness, cell: &str, fraction: f32) -> Pos2 {
+    let app = h.state();
+    let sheet = app.session.active().unwrap().wb.active().unwrap();
+    let geo = Geo::new(sheet, app.grid.rect.unwrap(), app.view().scroll);
+    let r = geo.cell_rect(sheet, CellRef::parse(cell).unwrap());
+    egui::pos2(r.left() + r.width() * fraction, r.center().y)
+}
+
+fn click(h: &mut Harness, cell: &str, modifiers: Modifiers) {
+    click_at(h, cell, 0.3, modifiers);
+}
+
+fn click_at(h: &mut Harness, cell: &str, fraction: f32, modifiers: Modifiers) {
+    let pos = at_fraction(h, cell, fraction);
+    h.input_mut().events.push(Event::ModifiersChanged(modifiers));
+    h.input_mut().events.extend([
+        Event::PointerMoved(pos),
+        Event::PointerButton { pos, button: PointerButton::Primary, pressed: true, modifiers },
+        Event::PointerButton { pos, button: PointerButton::Primary, pressed: false, modifiers },
+    ]);
+    h.run_steps(3);
+    h.input_mut().events.push(Event::ModifiersChanged(Modifiers::NONE));
+    h.run_steps(1);
+}
+
+#[test]
+fn ctrl_click_on_a_web_link_asks_to_open_it() {
+    let mut h = harness();
+    click(&mut h, "B2", Modifiers::COMMAND);
+    let d = h.state().dialog.as_ref().expect("Ctrl+click on a web link opens the confirmation");
+    assert_eq!(d.name, "openLink");
+}
+
+#[test]
+fn ctrl_click_on_an_internal_link_goes_there() {
+    let mut h = harness();
+    click(&mut h, "B4", Modifiers::COMMAND);
+    assert_eq!(h.state().session.active().unwrap().selection.active.a1(), "F9");
+}
+
+#[test]
+fn plain_click_still_follows() {
+    let mut h = harness();
+    click(&mut h, "B4", Modifiers::NONE);
+    assert_eq!(h.state().session.active().unwrap().selection.active.a1(), "F9");
+}
+
+#[test]
+fn ctrl_click_beside_the_link_text_still_extends_the_selection() {
+    let mut h = harness();
+    click_at(&mut h, "B2", 0.9, Modifiers::NONE);
+    click_at(&mut h, "B4", 0.9, Modifiers::COMMAND);
+    let d = h.state().session.active().unwrap();
+    let ranges: Vec<String> = d.selection.ranges.iter().map(|r| r.a1()).collect();
+    assert_eq!(ranges, ["B2", "B4"], "the hyperlink cell joins the selection");
+    assert!(h.state().dialog.is_none(), "no link was followed");
+}