Ticket #46830: 46830.diff

src/js/_enqueues/wp/customize/nav-menus.js

@@ -1807 +1807 @@
                                         $adjacentFocusTarget = control.container.nextAll( '.customize-control-nav_menu' ).find( '.add-new-menu-item' ).first();
                                 }
 
+                                /*
+                                 * If the menu item deleted is the only of it's instance left,
+                                 * remove the check icon of this menu item in the right panel.
+                                 * 
+                                 * @see https://core.trac.wordpress.org/ticket/46830
+                                 */ 
+                                // Instance count of the menu item deleted.
+                                var instanceCounter          = 0;
+                                var deleteItemOriginalItemId = control.params.original_item_id;
+                                var addedItems               = control.getMenuControl().$sectionContent.find( '.menu-item' );
+
+                                _.each( addedItems, function( addedItem ) {
+                                        // This is because menu item that's deleted is just hidden.
+                                        if ( ! $( addedItem ).is( ':visible' ) ) {
+                                                return;
+                                        }
+
+                                        var menuItemId, menuItemControl, matches;
+                                                
+                                        matches = addedItem.getAttribute('id').match( /^customize-control-nav_menu_item-(-?\d+)$/, '' );
+                                        if ( ! matches ) {
+                                                return;
+                                        }
+
+                                        menuItemId = parseInt( matches[1], 10 );
+                                        menuItemControl = api.control( 'nav_menu_item[' + String( menuItemId ) + ']' );
+
+                                        // Check for duplicate menu items.
+                                        if ( menuItemControl && deleteItemOriginalItemId == menuItemControl.params.original_item_id ) {
+                                                instanceCounter++;
+                                        }
+                                } );
+
+                                if ( 1 >= instanceCounter ) {
+                                        // Revert the check icon to add icon.
+                                        var availableMenuItem = $( '#menu-item-tpl-' + control.params.original_item_id );
+                                        availableMenuItem.removeClass( 'selected' );
+                                        availableMenuItem.find( '.menu-item-handle' ).removeClass( 'item-added' );
+                                }
+
                                 control.container.slideUp( function() {
                                         control.setting.set( false );
                                         wp.a11y.speak( api.Menus.data.l10n.itemDeleted );
@@ -2957 +2997 @@
                  * @returns {wp.customize.Menus.controlConstructor.nav_menu_item} The newly-created nav_menu_item control instance.
                  */
                 addItemToMenu: function( item ) {
+                        var originalItemId = item.id || '';
+
                         var menuControl = this, customizeId, settingArgs, setting, menuItemControl, placeholderId, position = 0, priority = 10;
 
                         _.each( menuControl.getMenuItemControls(), function( control ) {
@@ -3001 +3043 @@
                                 settings: {
                                         'default': customizeId
                                 },
-                                menu_item_id: placeholderId
+                                menu_item_id: placeholderId,
+                                original_item_id: originalItemId
                         } );
 
                         api.control.add( menuItemControl );