fix(mdviewer): restore cursor position on Escape in link popover

Save selection when popover first shows (not just on edit mode entry)
so Escape restores cursor to the correct position. Add stopPropagation
to Escape handlers in link-popover and format-bar so bridge.js doesn't
also forward the key to Phoenix. Simplify cancelEdit to always hide,
restore selection, and refocus editor. Add integration test verifying
Escape dismisses dialog with focus in md editor, second Escape moves
focus to CM.

Author: abose

src-mdviewer/src/components/format-bar.js

@@ -88,6 +88,7 @@ function buildBar() {
         exitLinkMode();
       } else if (e.key === "Escape") {
         e.preventDefault();
+        e.stopPropagation();
         exitLinkMode();
         contentEl?.focus({ preventScroll: true });
       }

src-mdviewer/src/components/link-popover.js

@@ -170,6 +170,7 @@ function buildPopover() {
       applyLink();
     } else if (e.key === "Escape") {
       e.preventDefault();
+      e.stopPropagation();
       cancelEdit();
     }
   };
@@ -227,18 +228,13 @@ function applyLink() {
 }
 
 function cancelEdit() {
-  if (createMode) {
-    hide();
-    restoreSelection();
-    contentEl?.focus({ preventScroll: true });
-  } else {
-    exitEditMode();
-  }
+  hide();
+  restoreSelection();
+  contentEl?.focus({ preventScroll: true });
 }
 
 function enterEditMode() {
   editMode = true;
-  saveSelection();
   const viewDiv = popover.querySelector(".link-popover-view");
   const editDiv = popover.querySelector(".link-popover-edit");
   const textInput = popover.querySelector(".link-popover-text-input");
@@ -274,6 +270,7 @@ function show(anchorEl) {
     urlText.href = href;
   }
   exitEditMode();
+  saveSelection();
   positionPopover(anchorEl);
   popover.classList.add("visible");
 }

src-mdviewer/to-create-tests.md

@@ -1,18 +1,5 @@
 # Markdown Viewer/Editor — Integration Tests To Create
 
-## Cursor/Scroll Sync
-- [x] Clicking in CM scrolls md viewer to corresponding element
-- [x] Clicking in md viewer scrolls CM to corresponding line (centered)
-- [x] Cursor sync toggle button disables/enables bidirectional sync
-- [x] Cursor sync toggle state preserved across toolbar re-renders (file switch, mode toggle)
-- [x] Content sync still works when cursor sync is disabled
-- [x] Cursor sync toggle works in both reader and edit mode
-- [x] Disabling cursor sync in reader mode prevents CM scroll on click
-- [x] Cursor sync works on newly edited elements after edit→reader switch
-- [x] Edit→reader switch re-renders from CM content (data-source-line attrs refreshed)
-- [x] Switching MD files preserves current edit/reader mode
-- [x] Edit mode not reset when switching between MD files
-
 ## Edit Mode & Entitlement Gating
 - [ ] Free user sees Edit button → clicking shows upsell dialog
 - [ ] Pro user sees Edit button → clicking enters edit mode
@@ -51,10 +38,6 @@
 - [ ] Selected item wraps around (last → first, first → last)
 - [ ] Slash menu works at bottom of a long scrolled document
 
-## Keyboard Shortcut Focus
-- [x] Ctrl+S saves file and keeps focus in md editor (not CM)
-- [x] Forwarded shortcuts refocus md editor after Phoenix handles them
-
 ## Code Block Editing
 - [ ] ArrowDown on last line of code block exits to paragraph below
 - [ ] ArrowDown on last line creates new `<p>` if none exists below
@@ -152,8 +135,6 @@
 - [ ] Backspace in middle of heading works normally (deletes character)
 
 ## Undo/Redo
-- [x] Ctrl+Z undoes change in both md editor and CM (single undo stack)
-- [x] Ctrl+Shift+Z / Ctrl+Y redoes change in both
 - [ ] Cursor restored to correct block element (source-line) after undo
 - [ ] Cursor restored to correct offset within block after undo
 - [ ] Undo/redo cursor works when editing at different positions in document

test/spec/md-editor-integ-test.js

@@ -1768,6 +1768,77 @@ define(function (require, exports, module) {
                 await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE, { _forceClose: true }),
                     "force close doc2.md");
             }, 15000);
+
+            it("should Escape in link edit dialog dismiss dialog and keep focus in md editor", async function () {
+                await _openMdFile("doc2.md");
+                await _enterEditMode();
+                await _focusMdContent();
+
+                const mdDoc = _getMdIFrameDoc();
+                const content = mdDoc.getElementById("viewer-content");
+
+                // Click on existing link to trigger popover
+                const link = content.querySelector("a[href*='test-link-doc2']");
+                expect(link).not.toBeNull();
+                const range = mdDoc.createRange();
+                range.selectNodeContents(link);
+                range.collapse(true);
+                _getMdIFrameWin().getSelection().removeAllRanges();
+                _getMdIFrameWin().getSelection().addRange(range);
+                content.dispatchEvent(new KeyboardEvent("keyup", {
+                    key: "ArrowRight", code: "ArrowRight", bubbles: true
+                }));
+
+                // Wait for link popover to appear
+                await awaitsFor(() => {
+                    const popover = mdDoc.getElementById("link-popover");
+                    return popover && popover.classList.contains("visible");
+                }, "link popover to appear");
+
+                // Click Edit button to enter edit mode in popover
+                const popover = mdDoc.getElementById("link-popover");
+                const editBtn = popover.querySelector(".link-popover-edit-btn");
+                expect(editBtn).not.toBeNull();
+                editBtn.click();
+
+                // Wait for edit inputs to be visible
+                await awaitsFor(() => {
+                    const editDiv = popover.querySelector(".link-popover-edit");
+                    return editDiv && editDiv.style.display !== "none";
+                }, "link popover edit mode to be active");
+
+                // Press Escape on the edit input — should dismiss dialog only
+                const popoverInput = popover.querySelector(".link-popover-input");
+                expect(popoverInput).not.toBeNull();
+                popoverInput.dispatchEvent(new KeyboardEvent("keydown", {
+                    key: "Escape", code: "Escape", bubbles: true
+                }));
+
+                // Popover should be dismissed
+                await awaitsFor(() => {
+                    return !popover.classList.contains("visible");
+                }, "link popover to be dismissed after Escape");
+
+                // Focus should remain in md editor, NOT switch to CM
+                await awaitsFor(() => {
+                    return mdDoc.activeElement === content || content.contains(mdDoc.activeElement);
+                }, "focus to remain in md editor after dismissing link dialog");
+
+                // Now press Escape again — this time focus should switch to CM editor
+                content.dispatchEvent(new KeyboardEvent("keydown", {
+                    key: "Escape", code: "Escape", bubbles: true
+                }));
+
+                await awaitsFor(() => {
+                    const activeEl = testWindow.document.activeElement;
+                    return activeEl && (activeEl.classList.contains("CodeMirror") ||
+                        activeEl.tagName === "TEXTAREA" ||
+                        (activeEl.closest && activeEl.closest(".CodeMirror")));
+                }, "focus to switch to CM editor after second Escape");
+
+                await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE, { _forceClose: true }),
+                    "force close doc2.md");
+            }, 15000);
         });
 
         describe("Empty Line Placeholder", function () {