Ticket #41158: 41158.patch

src/wp-admin/js/widgets/text-widgets.js

@@ -130 +130 @@
                                         wp.editor.remove( id );
                                 }
 
-                                // Adjust z-index for the customizer.
-                                window.tinymce.ui.FloatPanel.zIndex = 500001;
-
                                 wp.editor.initialize( id, {
                                         tinymce: {
                                                 wpautop: true

src/wp-includes/class-wp-editor.php

@@ -864 +864 @@
                 window.wp = window.wp || {};
                 window.wp.editor = window.wp.editor || {};
                 window.wp.editor.getDefaultSettings = function() {
+                        <?php if ( is_customize_preview() ) : ?>
+                        // Adjust z-index for the customizer.
+                        if ( tinymce.ui.FloatPanel.zIndex < 500001 ) {
+                                tinymce.ui.FloatPanel.zIndex = 500001;
+                        }
+                        <?php endif; ?>
                         return {
                                 tinymce: <?php echo $settings; ?>,
                                 quicktags: {