Merge remote-tracking branch 'trigger/MC-1416' into MC-3308

Author: kieuphan2406

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js

@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+import $ from "jquery";
 import Config from "../../config";
 import BasePreview from "../preview";
 import Wysiwyg from "../wysiwyg";
@@ -16,6 +17,11 @@ export default class Preview extends BasePreview {
      */
     private wysiwyg: Wysiwyg;
 
+    /**
+     * The element the text content type is bound to
+     */
+    private element: HTMLElement;
+
     /**
      * @param {HTMLElement} element
      */
@@ -24,6 +30,8 @@ export default class Preview extends BasePreview {
             return;
         }
 
+        this.element = element;
+
         element.id = this.parent.id + "-editor";
 
         this.wysiwyg = new Wysiwyg(
@@ -32,5 +40,24 @@ export default class Preview extends BasePreview {
             this.config.additional_data.wysiwygConfig,
             this.parent.dataStore,
         );
+
+        this.wysiwyg.onFocus(this.onFocus.bind(this));
+        this.wysiwyg.onBlur(this.onBlur.bind(this));
+    }
+
+    /**
+     * Event handler for wysiwyg focus
+     * Fixes z-index issues for tabs and column
+     */
+    private onFocus() {
+        $(this.element).closest('.tabs-content, .pagebuilder-column').css("z-index", 100);
+    }
+
+    /**
+     * Event handler for wysiwyg blue
+     * Fixes z-index issues for tabs and column
+     */
+    private onBlur() {
+        $(this.element).closest('.tabs-content, .pagebuilder-column').css("z-index", "");
     }
 }