Ticket #39665: 39665.4.diff

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

@@ -1274 +1274 @@
                 ksort( $exported_args );
                 $exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
 
+                // Add edit shortcuts to fallbacks. See #39665.
+                if ( $can_partial_refresh && is_callable( $exported_args['fallback_cb'] ) ) {
+                        $args['fallback_cb'] = array( $this, 'echo_preview_nav_menu_args_fallback_with_partial_refresh' );
+                }
+
                 $args['customize_preview_nav_menus_args'] = $exported_args;
                 $this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+
                 return $args;
         }
 
@@ -1289 +1295 @@
          *
          * @see wp_nav_menu()
          *
-         * @param string $nav_menu_content The HTML content for the navigation menu.
-         * @param object $args             An object containing wp_nav_menu() arguments.
+         * @param string       $nav_menu_content The HTML content for the navigation menu.
+         * @param object|array $args             wp_nav_menu() arguments.
          * @return null
          */
         public function filter_wp_nav_menu( $nav_menu_content, $args ) {
+                $args = (object) $args;
                 if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
                         $attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
                         $attributes .= ' data-customize-partial-type="nav_menu_instance"';
@@ -1320 +1327 @@
         }
 
         /**
+         * Wraps a previewed nav menu's `fallback_cb` output with attributes for partial refresh.
+         *
+         * @param array $args Array of nav menu arguments.
+         */
+        public function echo_preview_nav_menu_args_fallback_with_partial_refresh( $args ) {
+                if ( ! empty( $args['customize_preview_nav_menus_args']['fallback_cb'] ) ) {
+                        ob_start();
+                        call_user_func( $args['customize_preview_nav_menus_args']['fallback_cb'], $args );
+                        echo $this->filter_wp_nav_menu( ob_get_clean(), $args );
+                }
+        }
+
+        /**
          * Enqueue scripts for the Customizer preview.
          *
          * @since 4.3.0

src/wp-includes/js/customize-preview-nav-menus.js

@@ -212 +212 @@
                                 } else if ( partial.params.navMenuArgs.theme_location && api.has( 'nav_menu_locations[' + partial.params.navMenuArgs.theme_location + ']' ) ) {
                                         menuId = api( 'nav_menu_locations[' + partial.params.navMenuArgs.theme_location + ']' ).get();
                                 }
-                                if ( ! menuId ) {
+                                if ( ! menuId && ! partial.params.navMenuArgs.fallback_cb ) {
                                         partial.fallback();
                                         deferred.reject();
                                         return deferred.promise();