Ticket #33404: 33404.3.diff

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

@@ -115 +115 @@
                 pages: {},
                 sectionContent: '',
                 loading: false,
+                excludeTerms: [],
 
                 initialize: function() {
                         var self = this;
@@ -218 +219 @@
                         }
                         
                         this.searchTerm = event.target.value;
+                        this.excludeTerms = [];
                         this.pages.search = 1;
                         this.doSearch( 1 );
                 },
@@ -251 +253 @@
                                 'customize-menus-nonce': api.Menus.data.nonce,
                                 'wp_customize': 'on',
                                 'search': self.searchTerm,
-                                'page': page
+                                'page': page,
+                                'exclude': _.filter( self.excludeTerms, function( value, index, list ) { 
+                                        return list.indexOf( value ) === index;
+                                } )
                         };
 
                         self.currentRequest = wp.ajax.post( 'search-available-menu-items-customizer', params );
 
                         self.currentRequest.done(function( data ) {
-                                var items;
+                                var items, lastItem, lastItemPosition;
                                 if ( 1 === page ) {
                                         // Clear previous results as it's a new search.
                                         $content.empty();
@@ -270 +275 @@
                                 self.collection.add( items.models );
                                 items.each( function( menuItem ) {
                                         $content.append( itemTemplate( menuItem.attributes ) );
+                                        if ( 'taxonomy' === menuItem.attributes.type ) {
+                                                self.excludeTerms.push( menuItem.attributes.object_id );
+                                        }
                                 } );
                                 if ( 20 > items.length ) {
                                         self.pages.search = -1; // Up to 20 posts and 20 terms in results, if <20, no more results for either.
@@ -281 +289 @@
                                 } else if ( items && page === 1 ) {
                                         wp.a11y.speak( api.Menus.data.l10n.itemsFound.replace( '%d', items.length ) );
                                 }
+
+                                lastItem = $content.find( 'li' ).last();
+                                lastItemPosition = lastItem.position().top + lastItem.outerHeight( true );
+
+                                // The window is larger than the results. Initiate a scroll event to query page 2.
+                                if ( -1 !== self.pages.search && 1 === page && $content.prop( 'scrollHeight' ) > lastItemPosition ) {
+                                        $content.scroll();
+                                }
                         });
 
                         self.currentRequest.fail(function( data ) {

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

@@ -208 +208 @@
                         wp_send_json_error( 'nav_menus_missing_search_parameter' );
                 }
 
+                $e = ! empty( $_POST['exclude'] ) ? array_filter( $_POST['exclude'], 'absint' ) : array();
                 $p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
                 if ( $p < 1 ) {
                         $p = 1;
                 }
 
                 $s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-                $items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+                $items = $this->search_available_items_query( array( 'exclude' => $e, 'pagenum' => $p, 's' => $s ) );
 
                 if ( empty( $items ) ) {
                         wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
@@ -231 +232 @@
          * @since 4.3.0
          * @access public
          *
-         * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
+         * @param array $args Optional. Accepts 'exclude' (term IDs), 'pagenum', and 's' (search) arguments.
          * @return array Menu items.
          */
         public function search_available_items_query( $args = array() ) {
@@ -254 +255 @@
                         $query['s'] = $args['s'];
                 }
 
+                if ( ! isset( $args['exclude'] ) ) {
+                        $args['exclude'] = array();
+                }
+
                 // Query posts.
                 $get_posts = new WP_Query( $query );
 
@@ -282 +287 @@
                 $terms = get_terms( $taxonomies, array(
                         'name__like' => $args['s'],
                         'number'     => 20,
-                        'offset'     => 20 * ($args['pagenum'] - 1),
+                        'exclude'    => $args['exclude'],
                 ) );
 
                 // Check if any taxonomies were found.