AC-1445: Unable to click Underline in TinyMCE on PageBuilder

Author: krissyhiserote

app/code/Magento/Ui/view/base/web/js/modal/modal.js

@@ -14,10 +14,11 @@ define([
     'text!ui/template/modal/modal-slide.html',
     'text!ui/template/modal/modal-custom.html',
     'Magento_Ui/js/lib/key-codes',
+    'jquery/patches/z-index',
     'jquery-ui-modules/widget',
     'jquery-ui-modules/core',
     'mage/translate'
-], function ($, _, template, popupTpl, slideTpl, customTpl, keyCodes) {
+], function ($, _, template, popupTpl, slideTpl, customTpl, keyCodes, zIndex) {
     'use strict';
 
     /**
@@ -39,39 +40,7 @@ define([
                 return transitions[transition];
             }
         }
-    })(),
-
-    /**
-     * Implementation of zIndex used from jQuery UI
-     * @param {Element} elem
-     * @private
-     */
-    getZIndex = function (elem) {
-        var position, zIndex;
-
-        /* eslint-disable max-depth */
-        while (elem.length && elem[ 0 ] !== document) {
-            // Ignore z-index if position is set to a value where z-index is ignored by the browser
-            // This makes behavior of this function consistent across browsers
-            // WebKit always returns auto if the element is positioned
-            position = elem.css('position');
-
-            if (position === 'absolute' || position === 'relative' || position === 'fixed') {
-                // IE returns 0 when zIndex is not specified
-                // other browsers return a string
-                // we ignore the case of nested elements with an explicit value of 0
-                zIndex = parseInt(elem.css('zIndex'), 10);
-
-                if (!isNaN(zIndex) && zIndex !== 0) {
-                    return zIndex;
-                }
-            }
-            elem = elem.parent();
-        }
-
-        return 0;
-        /* eslint-enable max-depth */
-    };
+    })();
 
     /**
      * Modal Window Widget
@@ -373,8 +342,8 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = getZIndex(this.modal),
-                baseIndex = zIndex + this._getVisibleCount();
+            var zIndexValue = zIndex.getValue(this.modal),
+                baseIndex = zIndexValue + this._getVisibleCount();
 
             if (this.modal.data('active')) {
                 return;

lib/web/jquery/patches/z-index.js

@@ -0,0 +1,42 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        /**
+         * Implementation of zIndex used from jQuery UI
+         * @param {Element} elem
+         * @private
+         */
+        getValue: function (elem) {
+            var position, zIndex;
+
+            /* eslint-disable max-depth */
+            while (elem.length && elem[0] !== document) {
+                // Ignore z-index if position is set to a value where z-index is ignored by the browser
+                // This makes behavior of this function consistent across browsers
+                // WebKit always returns auto if the element is positioned
+                position = elem.css('position');
+
+                if (position === 'absolute' || position === 'relative' || position === 'fixed') {
+                    // IE returns 0 when zIndex is not specified
+                    // other browsers return a string
+                    // we ignore the case of nested elements with an explicit value of 0
+                    zIndex = parseInt(elem.css('zIndex'), 10);
+
+                    if (!isNaN(zIndex) && zIndex !== 0) {
+                        return zIndex;
+                    }
+                }
+                elem = elem.parent();
+            }
+
+            return 0;
+            /* eslint-enable max-depth */
+        }
+    }
+});