fix: resolve cross-platform Actions failures and update Pro pin

Author: abose

src/extensionsIntegrated/Phoenix-live-preview/MarkdownSync.js

@@ -137,8 +137,9 @@ define(function (require, exports, module) {
             if (!data || data.type !== "MDVIEWR_EVENT") {
                 return;
             }
-            // Verify message is from our iframe
-            if (_$iframe && _$iframe[0] && event.source !== _$iframe[0].contentWindow) {
+            // Verify both the viewer window and its expected (normally opaque) origin.
+            if (!_$iframe || !_$iframe[0] || event.source !== _$iframe[0].contentWindow ||
+                event.origin !== _viewerOrigin(_$iframe[0])) {
                 return;
             }
 
@@ -1384,6 +1385,16 @@ define(function (require, exports, module) {
         _revealPendingSelection();
     }
 
+    /**
+     * The bundled viewer is served with Phoenix, but its production sandbox gives it an opaque origin.
+     * @param {HTMLIFrameElement} iframe Markdown viewer frame.
+     * @return {string} Expected message origin; "null" for a sandbox without allow-same-origin.
+     */
+    function _viewerOrigin(iframe) {
+        return iframe.hasAttribute("sandbox") && !iframe.sandbox.contains("allow-same-origin") ?
+            "null" : window.location.origin;
+    }
+
     /**
      * Retrieve rendered snapshot lines to clarify a previously attached Markdown selection.
      * @param {Object} params Attachment selectionId, rendered line range, and optional per-line character limit.
@@ -1395,6 +1406,7 @@ define(function (require, exports, module) {
         if (!frame) {
             return Promise.resolve({error: "Markdown selection snapshot unavailable. Attach the selection again."});
         }
+        const origin = _viewerOrigin(_mdIframeRef);
         return new Promise(resolve => {
             const requestId = crypto.randomUUID();
             const timeout = setTimeout(() => finish({error: "Markdown preview did not respond."}), 3000);
@@ -1405,13 +1417,14 @@ define(function (require, exports, module) {
             }
             function onResult(event) {
                 const data = event.data;
-                if (event.source === frame && data && data.type === "MDVIEWR_EVENT" &&
+                if (event.source === frame && event.origin === origin && data && data.type === "MDVIEWR_EVENT" &&
                         data.eventName === "mdviewrRenderedLines" && data.requestId === requestId) {
                     finish(data.result);
                 }
             }
             window.addEventListener("message", onResult);
-            frame.postMessage({type: "MDVIEWR_RENDERED_LINES", requestId, params}, "*");
+            // Opaque sandbox origins cannot be named as a postMessage target.
+            frame.postMessage({type: "MDVIEWR_RENDERED_LINES", requestId, params}, origin === "null" ? "*" : origin);
         });
     }
 

src/features/SelectionViewManager.js

@@ -595,16 +595,24 @@ define(function (require, exports, module) {
         }
     }
 
+    /** Dismiss on editor viewport scrolling, except while workspace layout is being restored. */
+    function onEditorScroll() {
+        if (resizingPanels.size || (popoverState && popoverState.layoutPending)) { return; }
+        hidePreview(false);
+    }
+
     function onActiveEditorChange(_event, current, previous) {
         // Hide preview when editor changes
         hidePreview();
 
         if (previous && previous.document) {
             previous.document.off("change", hidePreview);
+            previous.off("scroll", onEditorScroll);
         }
 
         if (current && current.document) {
             current.document.on("change", hidePreview);
+            current.on("scroll", onEditorScroll);
         }
     }
 
@@ -618,12 +626,10 @@ define(function (require, exports, module) {
             enabled = _enabled;
             let editorHolder = $("#editor-holder")[0];
             if (enabled) {
-                // Note: listening to "scroll" also catches text edits, which bubble a scroll
-                // event up from the hidden text area. This means
-                // we auto-hide on text edit, which is probably actually a good thing.
+                // Editor scroll events exclude Firefox's hidden input scrolling on selection/focus.
+                // Text edits already dismiss through the document change listener.
                 editorHolder.addEventListener("mouseup", handleMouseUp, true);
                 editorHolder.addEventListener("mousemove", _processMouseMove, true);
-                editorHolder.addEventListener("scroll", hidePreview, true);
 
                 // Setup doc "change" listener
                 onActiveEditorChange(null, EditorManager.getActiveEditor(), null);
@@ -632,7 +638,6 @@ define(function (require, exports, module) {
             } else {
                 editorHolder.removeEventListener("mouseup", handleMouseUp, true);
                 editorHolder.removeEventListener("mousemove", _processMouseMove, true);
-                editorHolder.removeEventListener("scroll", hidePreview, true);
 
                 // Cleanup doc "change" listener
                 onActiveEditorChange(null, null, EditorManager.getActiveEditor());

test/spec/SelectionViewManager-test.js

@@ -361,12 +361,13 @@ define(function (require, exports, module) {
                 const scroll = editor.getScrollPos();
                 SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
                 try {
-                    editor.setSize(null, 90);
-                    editor.setSelection({line: 2, ch: 0}, {line: 2, ch: 6});
+                    // Keep both vertical gaps too small for the popup, including with smaller editor fonts.
+                    editor.setSize(null, 70);
+                    editor.setSelection({line: 0, ch: 0}, {line: 0, ch: 6});
                     editor.setScrollPos(0, 0);
-                    await showPopoverAtPos(2, 6);
+                    await showPopoverAtPos(0, 6);
                     const popup = getBounds(testWindow.$("#selection-view-container"));
-                    expect(popup.left).toBeGreaterThan(editor.charCoords({line: 2, ch: 6}).left);
+                    expect(popup.left).toBeGreaterThan(editor.charCoords({line: 0, ch: 6}).left);
                     expect(boundsInsideWindow(testWindow.$("#selection-view-container"))).toBe(true);
                 } finally {
                     SelectionViewManager.hidePreview();
@@ -407,6 +408,9 @@ define(function (require, exports, module) {
                 SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
                 try {
                     editor.setSelection({line: 0, ch: 0}, {line: 10, ch: 0});
+                    editor.setScrollPos(0, 0);
+                    // Finish the programmatic selection's scroll before simulating the user's mouseup.
+                    await new Promise(resolve => testWindow.requestAnimationFrame(resolve));
                     const point = editor.charCoords({line: 4, ch: 3});
                     const root = editor.getRootElement();
                     root.dispatchEvent(new testWindow.MouseEvent("mouseup", {bubbles: true, buttons: 0,
@@ -422,6 +426,35 @@ define(function (require, exports, module) {
                 }
             });
 
+            it("ignores scroll events from the hidden selection input", async function () {
+                SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
+                try {
+                    editor.setSelection({line: 0, ch: 0}, {line: 10, ch: 0});
+                    await showPopoverAtPos(4, 0);
+                    editor.getRootElement().querySelector("textarea").dispatchEvent(new testWindow.Event("scroll"));
+                    expect(SelectionViewManager.isSelectionViewShown()).toBe(true);
+                } finally {
+                    SelectionViewManager.hidePreview();
+                    SelectionViewManager.removeSelectionViewProvider(provider, ["all"]);
+                }
+            });
+
+            it("dismisses when the editor viewport actually scrolls", async function () {
+                const scroll = editor.getScrollPos();
+                SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
+                try {
+                    editor.setSelection({line: 0, ch: 0}, {line: 10, ch: 0});
+                    editor.setScrollPos(0, 0);
+                    await showPopoverAtPos(4, 0);
+                    editor.setScrollPos(0, 100);
+                    await awaitsFor(() => !SelectionViewManager.isSelectionViewShown(), "popup dismissed on scroll");
+                } finally {
+                    SelectionViewManager.hidePreview();
+                    SelectionViewManager.removeSelectionViewProvider(provider, ["all"]);
+                    editor.setScrollPos(scroll.x, scroll.y);
+                }
+            });
+
             it("keeps its anchor when the mouse moves and provider content updates", async function () {
                 SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
                 try {
@@ -459,9 +492,13 @@ define(function (require, exports, module) {
                     SelectionViewManager.registerSelectionViewProvider(provider, ["all"]);
                     SelectionViewManager.hidePreview();
                     try {
-                        if (action !== "opens") { panel.show(); }
+                        if (action !== "opens") {
+                            panel.show();
+                            workspace.setPluginPanelWidth(250);
+                        }
                         editor.setSelection({line: 7, ch: 0}, {line: 10, ch: 0});
                         editor.setScrollPos(0, 0);
+                        await new Promise(resolve => testWindow.requestAnimationFrame(resolve));
                         await showPopoverAtPos(7, 0);
                         const popup = testWindow.$("#selection-view-container");
                         const content = popup.find("#blinker-fluid")[0];
@@ -471,13 +508,12 @@ define(function (require, exports, module) {
                         if (action === "resizes") { workspace.setPluginPanelWidth(400); }
                         if (action === "closes") { panel.hide(); }
                         expect(SelectionViewManager.isSelectionViewShown()).toBe(false);
-                        await awaitsFor(() => {
-                            const bounds = getBounds(popup);
-                            const root = editor.getRootElement().getBoundingClientRect();
-                            return SelectionViewManager.isSelectionViewShown() &&
-                                Math.abs(bounds.right - before) > 30 &&
-                                Math.abs((bounds.right - before) - (root.right - beforeEditorRight)) < 2;
-                        }, "popup follows the resized editor", 3000);
+                        await awaitsFor(() => SelectionViewManager.isSelectionViewShown(),
+                            "popup restored after editor layout", 3000);
+                        const bounds = getBounds(popup);
+                        const root = editor.getRootElement().getBoundingClientRect();
+                        expect(Math.abs(bounds.right - before)).toBeGreaterThan(30);
+                        expect(Math.abs((bounds.right - before) - (root.right - beforeEditorRight))).toBeLessThan(2);
                         expect(boundsInsideWindow(popup)).toBe(true);
                         expect(popup.find("#blinker-fluid")[0]).toBe(content);
                     } finally {

test/spec/md-ask-ai-integ-test.js

@@ -81,6 +81,10 @@ define(function (require, exports, module) {
             const previousCount = received.length;
             const doc = frame.contentDocument;
             const element = doc.querySelectorAll("#viewer-content " + selector)[occurrence];
+            // File switches and large re-renders queue scroll restoration. A real user selects
+            // after that layout; otherwise its late scroll dismisses the freshly opened toolbar.
+            element.scrollIntoView({block: "nearest"});
+            await new Promise(resolve => frame.contentWindow.requestAnimationFrame(resolve));
             const walker = doc.createTreeWalker(element, win.NodeFilter.SHOW_TEXT);
             let node;
             while ((node = walker.nextNode())) { if (node.data.includes(text)) { break; } }
@@ -247,6 +251,32 @@ define(function (require, exports, module) {
             const result = await sync.getRenderedMdSelectionFollowUp({selectionId: "missing", lineStart: 1, lineEnd: 3});
             expect(result.error).toContain("expired");
         });
+        ["origin", "source"].forEach(function (field) {
+            it("ignores a snapshot reply from an unrelated " + field, async function () {
+                const selection = await attach("strong", "bold words", 2, 8);
+                const viewer = frame.contentWindow;
+                const onRequest = function (event) {
+                    const message = event.data;
+                    if (message.type === "MDVIEWR_RENDERED_LINES") {
+                        win.dispatchEvent(new win.MessageEvent("message", {
+                            source: field === "source" ? win : viewer,
+                            origin: field === "origin" ? "https://unrelated.invalid" : win.location.origin,
+                            data: {type: "MDVIEWR_EVENT", eventName: "mdviewrRenderedLines",
+                                requestId: message.requestId, result: {error: "unrelated reply"}}
+                        }));
+                    }
+                };
+                viewer.addEventListener("message", onRequest);
+                try {
+                    const result = await sync.getRenderedMdSelectionFollowUp({selectionId: selection.selectionId,
+                        lineStart: selection.rendered.startLine, lineEnd: selection.rendered.endLine});
+                    expect(result.error).toBeUndefined();
+                    expect(result.lines[0].text).toContain("⟦ld wor⟧");
+                } finally {
+                    viewer.removeEventListener("message", onRequest);
+                }
+            });
+        });
         /** Replace only this spec's unsaved buffer and wait for the real preview render. */
         async function setSource(source) {
             editor.document.setText(source);

tracking-repos.json

@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "4187429a957a91180496b206eb7f076ebbdcc24a"
+    "commitID": "f9f0b5afa4ed7292e1c77afc17b5ac25bc601b28"
   }
 }