deploy: 84352e3

Author: phoenixide

LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js

@@ -367,6 +367,16 @@
     * the HTML tag corresponding to the clicked element.
     */
     function onDocumentClick(event) {
+        // Get the user's current selection
+        const selection = window.getSelection();
+
+        // Check if there is a selection
+        if (selection.toString().length > 0) {
+            // if there is any selection like text or others, we don't see it as a live selection event
+            // Eg: user may selects ome text in live preview to copy, in which case we should nt treat it
+            // as a live select.
+            return;
+        }
         var element = event.target;
         if (element && element.hasAttribute('data-brackets-id')) {
             MessageBroker.send({

LiveDevelopment/BrowserScripts/LivePreviewTransportRemote.js

@@ -298,25 +298,53 @@
             targetElement = targetElement.parentElement;
         }
 
-        if (targetElement && targetElement.tagName === 'A' && (targetElement.target === '_blank')) {
+        if (window.__PHOENIX_EMBED_INFO && window.__PHOENIX_EMBED_INFO.isTauri &&
+            targetElement && targetElement.tagName === 'A' && (targetElement.target === '_blank')) {
+            // in desktop phoenix builds, tauri will not open anchor tags in browser if it is in
+            // an iframe(except for the intel mac bug)
+            // in normal browsers, we dont need to do this and the borwser will do its thing.
             const href = getAbsoluteUrl(targetElement.getAttribute('href'));
             window.parent.postMessage({
                 handlerName: "ph-liveServer",
                 eventName: 'embeddedIframeHrefClick',
                 href: href
             }, "*");
+            // in intel mac desktop, tauri seems to open in browser
+            // causing 2 tabs to open. in m1 macs its not there. so we prevent default behavior.
+            event.stopImmediatePropagation();
+            event.preventDefault();
         }
-    });
+    }, true);
     document.addEventListener('contextmenu', function(event) {
         (document.activeElement || document.body).focus();
     });
     document.addEventListener('keydown', function(event) {
-        if (event.key === 'Escape' || event.key === 'Esc') { // Check for Escape key
-            // Perform the desired action for the Escape key
+        if (window.__PHOENIX_EMBED_INFO &&
+            (event.key === 'Escape' || event.key === 'Esc')) { // Check for Escape key
+            // Perform the desired action for the Escape key only if its within iframe inside phoenix
             window.parent.postMessage({
                 handlerName: "ph-liveServer",
                 eventName: 'embeddedEscapeKeyPressed'
             }, "*");
         }
     });
+
+    // this is for managing who am i context in iframes embedded in phoenix to have special handling.
+    window.addEventListener('message', function(event) {
+        if (!TRANSPORT_CONFIG.TRUSTED_ORIGINS_EMBED[event.origin]) {
+            return; // Ignore messages from unexpected origins
+        }
+
+        window.__PHOENIX_EMBED_INFO = {
+            isTauri: event.data.isTauri
+        };
+    });
+    if(window.self !== window.parent){
+        // in an iframe
+        window.parent.postMessage({
+            handlerName: "ph-liveServer",
+            eventName: 'whoAmIframePhoenix',
+            href: location.href
+        }, "*");
+    }
 }(this));

LiveDevelopment/BrowserScripts/RemoteFunctions.js

@@ -28,7 +28,7 @@
  * modules should define a single function that returns an object of all
  * exported functions.
  */
-function RemoteFunctions(config, remoteWSPort) {
+function RemoteFunctions(config) {
 
 
     var experimental;
@@ -997,42 +997,7 @@ function RemoteFunctions(config, remoteWSPort) {
     if (experimental) {
         window.document.addEventListener("keydown", onKeyDown);
     }
-    
-    var _ws = null;
-
-    function onDocumentClick(event) {
-        var element = event.target,
-            currentDataId,
-            newDataId;
-        
-        if (_ws && element && element.hasAttribute('data-brackets-id')) {
-            _ws.send(JSON.stringify({
-                type: "message",
-                message: element.getAttribute('data-brackets-id')
-            }));
-        }
-    }
-    
-    
-    function createWebSocket() {
-        _ws = new WebSocket("ws://localhost:" + remoteWSPort);
-        _ws.onopen = function () {
-            window.document.addEventListener("click", onDocumentClick);
-        };
-                
-        _ws.onmessage = function (evt) {
-        };
-                
-        _ws.onclose = function () {
-            // websocket is closed
-            window.document.removeEventListener("click", onDocumentClick);
-        };
-    }
-    
-    if (remoteWSPort) {
-        createWebSocket();
-    }
-    
+
     return {
         "DOMEditHandler"        : DOMEditHandler,
         "showGoto"              : showGoto,

LiveDevelopment/MultiBrowserImpl/transports/LivePreviewTransport.js

@@ -77,6 +77,7 @@ define(function (require, exports, module) {
             `TRANSPORT_CONFIG.PHOENIX_INSTANCE_ID = "${Phoenix.PHOENIX_INSTANCE_ID}";\n` +
             `TRANSPORT_CONFIG.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = "${LiveDevProtocol.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME}";\n` +
             `TRANSPORT_CONFIG.LIVE_PREVIEW_DEBUG_ENABLED = ${logger.loggingOptions.logLivePreview};\n`+
+            `TRANSPORT_CONFIG.TRUSTED_ORIGINS_EMBED = ${JSON.stringify(Phoenix.TRUSTED_ORIGINS)};\n`+
             transportScript;
         return LivePreviewTransportRemote.replace(replaceString, transportScript)
             + "\n";

appConfig.js

@@ -24,7 +24,7 @@ window.AppConfig = {
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2024-03-23T05:30:58.578Z",
+        "build_timestamp": "2024-03-27T09:43:45.968Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -36,8 +36,8 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "3.5.2-20051",
-    "apiVersion": "3.5.2",
+    "version": "3.5.7-20071",
+    "apiVersion": "3.5.7",
     "homepage": "https://core.ai",
     "issues": {
         "url": "https://github.com/phcode-dev/phoenix/issues"