Ticket #41158: increase-z-index.diff

src/wp-includes/class-wp-customize-nav-menus.php

@@ -1132 +1132 @@
                 add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
                 add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
                 add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
-                add_filter( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
+                add_action( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
                 add_filter( 'customize_render_partials_response', array( $this, 'export_partial_rendered_nav_menu_instances' ) );
         }
 

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -1 +1 @@
 /* global getUserSetting, setUserSetting */
 ( function( tinymce ) {
-// Set the minimum value for the modals z-index higher than #wpadminbar (100000)
-tinymce.ui.FloatPanel.zIndex = 100100;
+// Set the minimum value for the modals z-index higher than .wp-full-overlay (500000)
+if ( tinymce.ui.FloatPanel.zIndex < 500001 ) {
+        tinymce.ui.FloatPanel.zIndex = 500001;
+}
 
 tinymce.PluginManager.add( 'wordpress', function( editor ) {
         var wpAdvButton, style,