refactor: move dismissLivePreviewEditBoxes into pro extension

Author: abose

src/LiveDevelopment/BrowserScripts/RemoteFunctions.js

@@ -5627,7 +5627,6 @@ function RemoteFunctions(config = {}) {
         "startEditing"          : startEditing,
         "finishEditing"         : finishEditing,
         "dismissUIAndCleanupState" : dismissUIAndCleanupState,
-        "enableHoverListeners" : enableHoverListeners,
         "handleDownloadEvent" : handleDownloadEvent,
         "showToastMessage" : showToastMessage
     };

src/LiveDevelopment/LiveDevMultiBrowser.js

@@ -699,16 +699,6 @@ define(function (require, exports, module) {
         }
     }
 
-    /**
-     * Dismiss live preview boxes like info box, options box, AI box
-     */
-    function dismissLivePreviewBoxes() {
-        if (_protocol) {
-            _protocol.evaluate("_LD.enableHoverListeners()"); // so that if hover lock is there it will get cleared
-            _protocol.evaluate("_LD.dismissUIAndCleanupState()");
-        }
-    }
-
     /**
      * Update configuration in the remote browser
      */
@@ -784,7 +774,6 @@ define(function (require, exports, module) {
     exports.showHighlight       = showHighlight;
     exports.hideHighlight       = hideHighlight;
     exports.redrawHighlight     = redrawHighlight;
-    exports.dismissLivePreviewBoxes = dismissLivePreviewBoxes;
     exports.updateConfig        = updateConfig;
     exports.init                = init;
     exports.isActive            = isActive;

src/LiveDevelopment/main.js

@@ -44,8 +44,7 @@ define(function main(require, exports, module) {
         Strings             = require("strings"),
         ExtensionUtils      = require("utils/ExtensionUtils"),
         StringUtils         = require("utils/StringUtils"),
-        EventDispatcher      = require("utils/EventDispatcher"),
-        WorkspaceManager    = require("view/WorkspaceManager");
+        EventDispatcher      = require("utils/EventDispatcher");
 
 
     const KernalModeTrust = window.KernalModeTrust;
@@ -224,19 +223,6 @@ define(function main(require, exports, module) {
         }
     }
 
-    /**
-     * this function handles escape key for live preview to hide boxes if they are visible
-     * @param {Event} event
-     */
-    function _handleLivePreviewEscapeKey(event) {
-        // we only handle the escape keypress for live preview when its active
-        if (MultiBrowserLiveDev.status === MultiBrowserLiveDev.STATUS_ACTIVE) {
-            MultiBrowserLiveDev.dismissLivePreviewBoxes();
-        }
-        // returning false to let the editor also handle the escape key
-        return false;
-    }
-
     // default mode means on first load for pro user we have edit mode
     // for free user we have highlight mode
     function _getDefaultMode() {
@@ -352,10 +338,6 @@ define(function main(require, exports, module) {
         MultiBrowserLiveDev.on(MultiBrowserLiveDev.EVENT_LIVE_PREVIEW_RELOAD, function (_event, clientDetails) {
             exports.trigger(exports.EVENT_LIVE_PREVIEW_RELOAD, clientDetails);
         });
-
-        // allow live preview to handle escape key event
-        // Escape is mainly to hide boxes if they are visible
-        WorkspaceManager.addEscapeKeyEventHandler("livePreview", _handleLivePreviewEscapeKey);
     });
 
     function _updateConfigMode() {
@@ -421,7 +403,6 @@ define(function main(require, exports, module) {
     exports.getConnectionIds = MultiBrowserLiveDev.getConnectionIds;
     exports.getLivePreviewDetails = MultiBrowserLiveDev.getLivePreviewDetails;
     exports.hideHighlight = MultiBrowserLiveDev.hideHighlight;
-    exports.dismissLivePreviewBoxes = MultiBrowserLiveDev.dismissLivePreviewBoxes;
     exports.setMode = setMode;
     exports.getCurrentMode = getCurrentMode;
     exports.isInPreviewMode = isInPreviewMode;

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

@@ -403,10 +403,6 @@ define(function (require, exports, module) {
                 PreferencesManager.set(PREFERENCE_SHOW_RULER_LINES, !currentValue);
                 return; // Don't dismiss highlights for this option
             }
-
-            // need to dismiss the previous highlighting and stuff
-            LiveDevelopment.hideHighlight();
-            LiveDevelopment.dismissLivePreviewBoxes();
         });
 
         // Remove the button after the dropdown is hidden

src/extensionsIntegrated/phoenix-pro/browser-context/remote-utils.js

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2021 - present core.ai . All rights reserved.
+ * Proprietary code, all rights reserved.
+ */
+
+/*global customReturns, enableHoverListeners, dismissUIAndCleanupState*/
+
+function dismissLivePreviewEditBoxes() {
+    enableHoverListeners(); // so that if hover lock is there it will get cleared
+    dismissUIAndCleanupState();
+}
+
+customReturns.dismissLivePreviewEditBoxes = dismissLivePreviewEditBoxes;

src/extensionsIntegrated/phoenix-pro/browser-context/sample-remore-fn.js

@@ -10,11 +10,30 @@ define(function (require, exports, module) {
     require("./remote-styles");
 
     const AppInit = require("utils/AppInit"),
+        WorkspaceManager    = require("view/WorkspaceManager"),
+        LiveDevMultiBrowser = require("LiveDevelopment/LiveDevMultiBrowser"),
         Strings = require("strings");
 
-    const sampleFnText = require("text!./browser-context/sample-remore-fn.js");
+    const remoteUtilsCode = require("text!./browser-context/remote-utils.js");
     const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol");
-    LiveDevProtocol.addRemoteFunctionScript("sampleFn", sampleFnText);
+    LiveDevProtocol.addRemoteFunctionScript("remoteUtilsCode", remoteUtilsCode);
+
+
+    /**
+     * this function handles escape key for live preview to hide boxes if they are visible
+     * @param {Event} event
+     */
+    function _handleLivePreviewEscapeKey(event) {
+        const currLiveDoc = LiveDevMultiBrowser.getCurrentLiveDoc();
+        if (currLiveDoc && currLiveDoc.protocol && currLiveDoc.protocol.evaluate) {
+            currLiveDoc.protocol.evaluate("_LD.dismissLivePreviewEditBoxes()");
+        }
+        // returning false to let the editor also handle the escape key
+        return false;
+    }
+    // allow live preview to handle escape key event
+    // Escape is mainly to hide boxes if they are visible
+    WorkspaceManager.addEscapeKeyEventHandler("livePreview", _handleLivePreviewEscapeKey);
 
     AppInit.appReady(function () {