@gitlab/ui 113.4.0 → 113.5.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [113.5.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v113.4.0...v113.5.0) (2025-05-12)
+
+
+### Features
+
+* **GlCollapsibleListbox:** improve a11y support ([13453e7](https://gitlab.com/gitlab-org/gitlab-ui/commit/13453e73c28ddc3acf22951738acfeb9e2ade4c0))
+
 # [113.4.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v113.3.2...v113.4.0) (2025-05-12)
 
 

package/dist/components/base/new_dropdowns/base_dropdown/base_dropdown.js

@@ -496,7 +496,7 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"outside",rawName:"v-outside.click.focusin",value:(_vm.close),expression:"close",modifiers:{"click":true,"focusin":true}}],class:[_vm.$options.BASE_DROPDOWN_CLASS, { '!gl-block': _vm.block }]},[_c(_vm.toggleComponent,_vm._g(_vm._b({ref:"toggle",tag:"component",attrs:{"id":_vm.toggleId,"data-testid":"base-dropdown-toggle"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"esc",27,$event.key,["Esc","Escape"])){ return null; }$event.stopPropagation();$event.preventDefault();return _vm.close.apply(null, arguments)}}},'component',_vm.toggleAttributes,false),_vm.toggleListeners),[_vm._t("toggle",function(){return [_c('span',{staticClass:"gl-new-dropdown-button-text",class:{ 'gl-sr-only': _vm.textSrOnly }},[_vm._v("\n        "+_vm._s(_vm.toggleText)+"\n      ")]),_vm._v(" "),(!_vm.noCaret)?_c('gl-icon',{staticClass:"gl-button-icon gl-new-dropdown-chevron",attrs:{"name":"chevron-down"}}):_vm._e()]})],2),_vm._v(" "),_c('div',{ref:"content",staticClass:"gl-new-dropdown-panel",class:_vm.panelClasses,attrs:{"id":_vm.baseDropdownId,"data-testid":"base-dropdown-menu"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"esc",27,$event.key,["Esc","Escape"])){ return null; }$event.stopPropagation();$event.preventDefault();return _vm.closeAndFocus.apply(null, arguments)}}},[_c('div',{ref:"dropdownArrow",staticClass:"gl-new-dropdown-arrow"}),_vm._v(" "),_c('div',{staticClass:"gl-new-dropdown-inner"},[_vm._t("default")],2)])],1)};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"outside",rawName:"v-outside.click.focusin",value:(_vm.close),expression:"close",modifiers:{"click":true,"focusin":true}}],class:[_vm.$options.BASE_DROPDOWN_CLASS, { '!gl-block': _vm.block }]},[_c(_vm.toggleComponent,_vm._g(_vm._b({ref:"toggle",tag:"component",attrs:{"id":_vm.toggleId,"data-testid":"base-dropdown-toggle"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"esc",27,$event.key,["Esc","Escape"])){ return null; }$event.stopPropagation();$event.preventDefault();return _vm.close.apply(null, arguments)}}},'component',_vm.toggleAttributes,false),_vm.toggleListeners),[_vm._t("toggle",function(){return [_c('span',{staticClass:"gl-new-dropdown-button-text",class:{ 'gl-sr-only': _vm.textSrOnly }},[_vm._v("\n        "+_vm._s(_vm.toggleText)+"\n      ")]),_vm._v(" "),(!_vm.noCaret)?_c('gl-icon',{staticClass:"gl-button-icon gl-new-dropdown-chevron",attrs:{"name":"chevron-down"}}):_vm._e()]})],2),_vm._v(" "),_c('div',{ref:"content",staticClass:"gl-new-dropdown-panel",class:_vm.panelClasses,attrs:{"id":_vm.baseDropdownId,"data-testid":"base-dropdown-menu"},on:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"esc",27,$event.key,["Esc","Escape"])){ return null; }$event.stopPropagation();$event.preventDefault();return _vm.closeAndFocus.apply(null, arguments)}}},[_c('div',{ref:"dropdownArrow",staticClass:"gl-new-dropdown-arrow"}),_vm._v(" "),_c('div',{staticClass:"gl-new-dropdown-inner"},[_vm._t("default",null,{"visible":_vm.visible})],2)])],1)};
 var __vue_staticRenderFns__ = [];
 
   /* style */

package/dist/components/base/new_dropdowns/listbox/listbox.js

@@ -1,14 +1,14 @@
 import clamp from 'lodash/clamp';
 import uniqueId from 'lodash/uniqueId';
 import { stopEvent } from '../../../../utils/utils';
-import { GL_DROPDOWN_SHOWN, GL_DROPDOWN_HIDDEN, POSITION_ABSOLUTE, POSITION_FIXED, GL_DROPDOWN_CONTENTS_CLASS, HOME, END, ARROW_UP, ARROW_DOWN, ENTER } from '../constants';
+import { GL_DROPDOWN_SHOWN, GL_DROPDOWN_HIDDEN, POSITION_ABSOLUTE, POSITION_FIXED, GL_DROPDOWN_CONTENTS_CLASS, ARROW_UP, ENTER, ARROW_DOWN, END, HOME } from '../constants';
 import { buttonCategoryOptions, dropdownVariantOptions, buttonSizeOptions, dropdownPlacements } from '../../../../utils/constants';
 import GlButton from '../../button/button';
 import GlLoadingIcon from '../../loading_icon/loading_icon';
 import GlIntersectionObserver from '../../../utilities/intersection_observer/intersection_observer';
 import GlSearchBoxByType from '../../search_box_by_type/search_box_by_type';
 import GlBaseDropdown from '../base_dropdown/base_dropdown';
-import { translatePlural } from '../../../../utils/i18n';
+import { translatePlural, translate } from '../../../../utils/i18n';
 import GlListboxItem from './listbox_item';
 import GlListboxSearchInput from './listbox_search_input';
 import GlListboxGroup from './listbox_group';
@@ -342,13 +342,22 @@ var script = {
     return {
       selectedValues: [],
       listboxId: uniqueId('listbox-'),
+      searchInputId: uniqueId('listbox-search-input-'),
       nextFocusedItemIndex: null,
       searchStr: '',
       topBoundaryVisible: true,
-      bottomBoundaryVisible: true
+      bottomBoundaryVisible: true,
+      activeItemId: null,
+      itemIds: new Map()
     };
   },
   computed: {
+    ariaLabelledByID() {
+      if (this.searchable) {
+        return this.searchInputId;
+      }
+      return this.listAriaLabelledBy || this.headerId || this.toggleIdComputed;
+    },
     toggleIdComputed() {
       return this.toggleId || uniqueId('dropdown-toggle-btn-');
     },
@@ -451,6 +460,9 @@ var script = {
     showIntersectionObserver() {
       return this.infiniteScroll && !this.infiniteScrollLoading && !this.loading && !this.searching;
     },
+    isBusy() {
+      return this.infiniteScrollLoading || this.loading || this.searching;
+    },
     hasCustomToggle() {
       return Boolean(this.$scopedSlots.toggle);
     },
@@ -469,6 +481,18 @@ var script = {
     },
     hasFooter() {
       return Boolean(this.$scopedSlots.footer);
+    },
+    loadingAnnouncementText() {
+      if (this.infiniteScrollLoading) {
+        return translate('GlCollapsibleListbox.loadingAnnouncementText.loadingMoreItems', 'Loading more items');
+      }
+      if (this.searching) {
+        return translate('GlCollapsibleListbox.loadingAnnouncementText.searching', 'Searching');
+      }
+      if (this.loading) {
+        return translate('GlCollapsibleListbox.loadingAnnouncementText.loadingItems', 'Loading items');
+      }
+      return '';
     }
   },
   watch: {
@@ -561,6 +585,9 @@ var script = {
          */
         if (this.searchHasOptions) {
           this.nextFocusedItemIndex = 0;
+          // Set activeItemId for the first item
+          const firstItem = this.flattenedOptions[0];
+          this.activeItemId = this.generateItemId(firstItem);
         }
       } else {
         var _this$selectedIndices;
@@ -582,6 +609,21 @@ var script = {
       this.$emit(GL_DROPDOWN_HIDDEN);
       this.nextFocusedItemIndex = null;
     },
+    getNextIndex(currentIndex, keyCode, totalLength) {
+      // For UP: move up or wrap to end
+      if (keyCode === ARROW_UP) {
+        return currentIndex > 0 ? currentIndex - 1 : totalLength - 1;
+      }
+
+      // For DOWN: move down or wrap to start
+      return currentIndex < totalLength - 1 ? currentIndex + 1 : 0;
+    },
+    handleListNavigation(keyCode, elements) {
+      var _this$nextFocusedItem;
+      const currentIndex = (_this$nextFocusedItem = this.nextFocusedItemIndex) !== null && _this$nextFocusedItem !== void 0 ? _this$nextFocusedItem : -1;
+      const nextIndex = this.getNextIndex(currentIndex, keyCode, elements.length);
+      this.focusItem(nextIndex, elements, this.searchable);
+    },
     onKeydown(event) {
       const {
         code,
@@ -589,46 +631,54 @@ var script = {
       } = event;
       const elements = this.getFocusableListItemElements();
       if (elements.length < 1) return;
-      let stop = true;
       const isSearchInput = target.matches(SEARCH_INPUT_SELECTOR);
-      if (code === HOME) {
-        if (isSearchInput) {
-          return;
-        }
-        this.focusItem(0, elements);
-      } else if (code === END) {
-        if (isSearchInput) {
-          return;
-        }
-        this.focusItem(elements.length - 1, elements);
-      } else if (code === ARROW_UP) {
-        if (isSearchInput) {
-          return;
-        }
-        if (this.searchable && elements.indexOf(target) === 0) {
-          this.focusSearchInput();
-          if (!this.searchHasOptions) {
-            this.nextFocusedItemIndex = null;
+      let stop = true;
+      switch (code) {
+        case HOME:
+          // Jump to first item if searchable or not in search input
+          if (this.searchable || !isSearchInput) {
+            this.focusItem(0, elements, this.searchable);
           }
-        } else {
-          this.focusNextItem(event, elements, -1);
-        }
-      } else if (code === ARROW_DOWN) {
-        if (isSearchInput) {
-          this.focusItem(0, elements);
-        } else {
-          this.focusNextItem(event, elements, 1);
-        }
-      } else if (code === ENTER && isSearchInput) {
-        if (this.searchHasOptions && elements.length > 0) {
-          // Toggle selection state of the first item
-          const firstItem = this.flattenedOptions[0];
-          this.onSelect(firstItem, !this.isSelected(firstItem));
-        }
-        stop = true;
-      } else {
-        stop = false;
+          break;
+        case END:
+          // Jump to last item if searchable or not in search input
+          if (this.searchable || !isSearchInput) {
+            this.focusItem(elements.length - 1, elements, this.searchable);
+          }
+          break;
+        case ARROW_UP:
+          // Let default behavior work for non-searchable input
+          if (isSearchInput && !this.searchable) {
+            return;
+          }
+          this.handleListNavigation(ARROW_UP, elements);
+          break;
+        case ARROW_DOWN:
+          // Focus first item from search input, otherwise navigate down
+          if (isSearchInput && !this.searchable) {
+            this.focusItem(0, elements);
+          } else {
+            this.handleListNavigation(ARROW_DOWN, elements);
+          }
+          break;
+        case ENTER:
+          if (isSearchInput) {
+            // Toggle selection of highlighted item if one exists
+            if (elements.length > 0 && this.nextFocusedItemIndex !== null) {
+              const highlightedItem = this.flattenedOptions[this.nextFocusedItemIndex];
+              this.onSelect(highlightedItem, !this.isSelected(highlightedItem));
+            }
+          } else {
+            stop = false;
+          }
+          break;
+        default:
+          // Allow default behavior for unhandled keys
+          stop = false;
+          break;
       }
+
+      // Prevent default behavior for handled keys
       if (stop) {
         stopEvent(event);
       }
@@ -647,9 +697,25 @@ var script = {
       this.focusItem(nextIndex, elements);
     },
     focusItem(index, elements) {
-      var _elements$index;
+      let keepSearchFocused = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       this.nextFocusedItemIndex = index;
-      (_elements$index = elements[index]) === null || _elements$index === void 0 ? void 0 : _elements$index.focus();
+
+      // Always update the activeItemId when focus changes
+      const item = this.flattenedOptions[index];
+      if (item) {
+        this.activeItemId = this.generateItemId(item);
+      } else {
+        this.activeItemId = null;
+      }
+
+      // If we're not keeping the search focused, focus the item
+      if (!keepSearchFocused) {
+        var _elements$index;
+        (_elements$index = elements[index]) === null || _elements$index === void 0 ? void 0 : _elements$index.focus();
+      }
+      this.$nextTick(() => {
+        this.scrollActiveItemIntoView();
+      });
     },
     focusSearchInput() {
       this.$refs.searchBox.focusInput();
@@ -767,7 +833,40 @@ var script = {
       }
       this.scrollObserver = observer;
     },
-    isOption
+    isOption,
+    generateItemId(item) {
+      const key = item.value === null ? ITEM_NULL_KEY : item.value;
+      if (!this.itemIds.has(key)) {
+        this.itemIds.set(key, uniqueId('listbox-item-'));
+      }
+      return this.itemIds.get(key);
+    },
+    scrollActiveItemIntoView() {
+      const listContainer = this.$refs.list;
+      if (!this.activeItemId || !this.searchable || !listContainer) return;
+      const activeElement = document.getElementById(this.activeItemId);
+      if (!activeElement) return;
+      const containerRect = listContainer.getBoundingClientRect();
+      const itemRect = activeElement.getBoundingClientRect();
+      const itemTop = activeElement.offsetTop;
+      const padding = 30;
+
+      // If item is above the visible area
+      if (itemRect.top < containerRect.top) {
+        listContainer.scrollTo({
+          top: itemTop - padding,
+          behavior: 'smooth'
+        });
+      }
+
+      // If item is below the visible area
+      else if (itemRect.bottom > containerRect.bottom) {
+        listContainer.scrollTo({
+          top: itemTop - containerRect.height + activeElement.offsetHeight + padding,
+          behavior: 'smooth'
+        });
+      }
+    }
   }
 };
 
@@ -775,7 +874,9 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('gl-base-dropdown',{ref:"baseDropdown",attrs:{"aria-haspopup":"listbox","aria-labelledby":_vm.toggleAriaLabelledBy,"block":_vm.block,"toggle-id":_vm.toggleIdComputed,"toggle-text":_vm.listboxToggleText,"toggle-class":_vm.toggleButtonClasses,"text-sr-only":_vm.textSrOnly,"category":_vm.category,"variant":_vm.variant,"size":_vm.size,"icon":_vm.icon,"disabled":_vm.disabled,"loading":_vm.loading,"no-caret":_vm.noCaret,"placement":_vm.placement,"offset":_vm.dropdownOffset,"fluid-width":_vm.fluidWidth,"positioning-strategy":_vm.positioningStrategy},on:_vm._d({},[_vm.$options.events.GL_DROPDOWN_SHOWN,_vm.onShow,_vm.$options.events.GL_DROPDOWN_HIDDEN,_vm.onHide]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(){return [_vm._t("toggle")]},proxy:true}:null],null,true)},[_vm._v(" "),(_vm.headerText)?_c('div',{staticClass:"gl-flex gl-min-h-8 gl-items-center !gl-p-4",class:_vm.$options.HEADER_ITEMS_BORDER_CLASSES},[_c('div',{staticClass:"gl-grow gl-pr-2 gl-text-sm gl-font-bold gl-text-strong",attrs:{"id":_vm.headerId,"data-testid":"listbox-header-text"}},[_vm._v("\n      "+_vm._s(_vm.headerText)+"\n    ")]),_vm._v(" "),(_vm.showResetButton)?_c('gl-button',{staticClass:"!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset",attrs:{"category":"tertiary","size":"small","data-testid":"listbox-reset-button"},on:{"click":_vm.onResetButtonClicked}},[_vm._v("\n      "+_vm._s(_vm.resetButtonLabel)+"\n    ")]):_vm._e(),_vm._v(" "),(_vm.showSelectAllButton)?_c('gl-button',{staticClass:"!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset",attrs:{"category":"tertiary","size":"small","data-testid":"listbox-select-all-button"},on:{"click":_vm.onSelectAllButtonClicked}},[_vm._v("\n      "+_vm._s(_vm.showSelectAllButtonLabel)+"\n    ")]):_vm._e()],1):_vm._e(),_vm._v(" "),(_vm.searchable)?_c('div',{class:_vm.$options.HEADER_ITEMS_BORDER_CLASSES},[_c('gl-listbox-search-input',{ref:"searchBox",class:{ 'gl-listbox-topmost': !_vm.headerText },attrs:{"data-testid":"listbox-search-input","placeholder":_vm.searchPlaceholder},on:{"input":_vm.search,"keydown":[function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }$event.preventDefault();},_vm.onKeydown]},model:{value:(_vm.searchStr),callback:function ($$v) {_vm.searchStr=$$v;},expression:"searchStr"}}),_vm._v(" "),(_vm.searching)?_c('gl-loading-icon',{staticClass:"gl-my-3",attrs:{"data-testid":"listbox-search-loader","size":"md"}}):_vm._e()],1):_vm._e(),_vm._v(" "),(_vm.showList)?_c(_vm.listboxTag,{ref:"list",tag:"component",staticClass:"gl-new-dropdown-contents gl-new-dropdown-contents-with-scrim-overlay",class:_vm.listboxClasses,attrs:{"id":_vm.listboxId,"aria-labelledby":_vm.listAriaLabelledBy || _vm.headerId || _vm.toggleIdComputed,"role":"listbox","tabindex":"0"},on:{"keydown":_vm.onKeydown}},[_c(_vm.itemTag,{tag:"component",staticClass:"top-scrim-wrapper",attrs:{"aria-hidden":"true","data-testid":"top-scrim"}},[_c('div',{staticClass:"top-scrim",class:{ 'top-scrim-light': !_vm.hasHeader, 'top-scrim-dark': _vm.hasHeader }})]),_vm._v(" "),_c(_vm.itemTag,{ref:"top-boundary",tag:"component",attrs:{"aria-hidden":"true"}}),_vm._v(" "),_vm._l((_vm.items),function(item,index){return [(_vm.isOption(item))?[_c('gl-listbox-item',_vm._b({key:_vm.listboxItemKey(item),attrs:{"data-testid":("listbox-item-" + (item.value)),"is-highlighted":_vm.isHighlighted(item),"is-selected":_vm.isSelected(item),"is-focused":_vm.isFocused(item),"is-check-centered":_vm.isCheckCentered},on:{"select":function($event){return _vm.onSelect(item, $event)}}},'gl-listbox-item',_vm.listboxItemMoreItemsAriaAttributes(index),false),[_vm._t("list-item",function(){return [_vm._v("\n            "+_vm._s(item.text)+"\n          ")]},{"item":item})],2)]:[_c('gl-listbox-group',{key:item.text,class:_vm.groupClasses(index),attrs:{"name":item.text,"text-sr-only":item.textSrOnly},scopedSlots:_vm._u([(_vm.$scopedSlots['group-label'])?{key:"group-label",fn:function(){return [_vm._t("group-label",null,{"group":item})]},proxy:true}:null],null,true)},[_vm._v(" "),_vm._l((item.options),function(option){return _c('gl-listbox-item',{key:_vm.listboxItemKey(option),attrs:{"data-testid":("listbox-item-" + (option.value)),"is-highlighted":_vm.isHighlighted(option),"is-selected":_vm.isSelected(option),"is-focused":_vm.isFocused(option),"is-check-centered":_vm.isCheckCentered},on:{"select":function($event){return _vm.onSelect(option, $event)}}},[_vm._t("list-item",function(){return [_vm._v("\n              "+_vm._s(option.text)+"\n            ")]},{"item":option})],2)})],2)]]}),_vm._v(" "),(_vm.infiniteScrollLoading)?_c(_vm.itemTag,{tag:"component"},[_c('gl-loading-icon',{staticClass:"gl-my-3",attrs:{"data-testid":"listbox-infinite-scroll-loader","size":"md"}})],1):_vm._e(),_vm._v(" "),(_vm.showIntersectionObserver)?_c('gl-intersection-observer',{on:{"appear":_vm.onIntersectionObserverAppear}}):_vm._e(),_vm._v(" "),_c(_vm.itemTag,{ref:"bottom-boundary",tag:"component",attrs:{"aria-hidden":"true"}}),_vm._v(" "),_c(_vm.itemTag,{tag:"component",staticClass:"bottom-scrim-wrapper",attrs:{"aria-hidden":"true","data-testid":"bottom-scrim"}},[_c('div',{staticClass:"bottom-scrim",class:{ '!gl-rounded-none': _vm.hasFooter }})])],2):_vm._e(),_vm._v(" "),(_vm.announceSRSearchResults)?_c('span',{staticClass:"gl-sr-only",attrs:{"data-testid":"listbox-number-of-results","aria-live":"assertive"}},[_vm._t("search-summary-sr-only",function(){return [_vm._v("\n      "+_vm._s(_vm.srOnlyResultsLabel(_vm.flattenedOptions.length))+"\n    ")]})],2):(_vm.showNoResultsText)?_c('div',{staticClass:"gl-py-3 gl-pl-7 gl-pr-5 gl-text-base gl-text-subtle",attrs:{"aria-live":"assertive","data-testid":"listbox-no-results-text"}},[_vm._v("\n    "+_vm._s(_vm.noResultsText)+"\n  ")]):_vm._e(),_vm._v(" "),_vm._t("footer")],2)};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('gl-base-dropdown',{ref:"baseDropdown",attrs:{"aria-haspopup":"listbox","aria-labelledby":_vm.toggleAriaLabelledBy,"block":_vm.block,"toggle-id":_vm.toggleIdComputed,"toggle-text":_vm.listboxToggleText,"toggle-class":_vm.toggleButtonClasses,"text-sr-only":_vm.textSrOnly,"category":_vm.category,"variant":_vm.variant,"size":_vm.size,"icon":_vm.icon,"disabled":_vm.disabled,"loading":_vm.loading,"no-caret":_vm.noCaret,"placement":_vm.placement,"offset":_vm.dropdownOffset,"fluid-width":_vm.fluidWidth,"positioning-strategy":_vm.positioningStrategy},on:_vm._d({},[_vm.$options.events.GL_DROPDOWN_SHOWN,_vm.onShow,_vm.$options.events.GL_DROPDOWN_HIDDEN,_vm.onHide]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(){return [_vm._t("toggle")]},proxy:true}:null,{key:"default",fn:function(ref){
+var visible = ref.visible;
+return [(_vm.headerText)?_c('div',{staticClass:"gl-flex gl-min-h-8 gl-items-center !gl-p-4",class:_vm.$options.HEADER_ITEMS_BORDER_CLASSES},[_c('div',{staticClass:"gl-grow gl-pr-2 gl-text-sm gl-font-bold gl-text-strong",attrs:{"id":_vm.headerId,"data-testid":"listbox-header-text"}},[_vm._v("\n        "+_vm._s(_vm.headerText)+"\n      ")]),_vm._v(" "),(_vm.showResetButton)?_c('gl-button',{staticClass:"!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset",attrs:{"category":"tertiary","size":"small","data-testid":"listbox-reset-button"},on:{"click":_vm.onResetButtonClicked}},[_vm._v("\n        "+_vm._s(_vm.resetButtonLabel)+"\n      ")]):_vm._e(),_vm._v(" "),(_vm.showSelectAllButton)?_c('gl-button',{staticClass:"!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset",attrs:{"category":"tertiary","size":"small","data-testid":"listbox-select-all-button"},on:{"click":_vm.onSelectAllButtonClicked}},[_vm._v("\n        "+_vm._s(_vm.showSelectAllButtonLabel)+"\n      ")]):_vm._e()],1):_vm._e(),_vm._v(" "),(_vm.searchable)?_c('div',{class:_vm.$options.HEADER_ITEMS_BORDER_CLASSES},[_c('gl-listbox-search-input',{ref:"searchBox",class:{ 'gl-listbox-topmost': !_vm.headerText },attrs:{"id":_vm.searchInputId,"data-testid":"listbox-search-input","role":"combobox","aria-expanded":String(visible),"aria-controls":_vm.listboxId,"aria-activedescendant":_vm.activeItemId,"aria-haspopup":"listbox","placeholder":_vm.searchPlaceholder},on:{"input":_vm.search,"keydown":[function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }$event.preventDefault();},_vm.onKeydown]},model:{value:(_vm.searchStr),callback:function ($$v) {_vm.searchStr=$$v;},expression:"searchStr"}}),_vm._v(" "),(_vm.searching)?_c('gl-loading-icon',{staticClass:"gl-my-3",attrs:{"data-testid":"listbox-search-loader","size":"md"}}):_vm._e()],1):_vm._e(),_vm._v(" "),(_vm.showList)?_c(_vm.listboxTag,{ref:"list",tag:"component",staticClass:"gl-new-dropdown-contents gl-new-dropdown-contents-with-scrim-overlay",class:_vm.listboxClasses,attrs:{"id":_vm.listboxId,"aria-busy":_vm.isBusy,"aria-labelledby":_vm.ariaLabelledByID,"aria-multiselectable":_vm.multiple ? 'true' : undefined,"role":"listbox","tabindex":"0"},on:{"keydown":_vm.onKeydown}},[_c(_vm.itemTag,{tag:"component",staticClass:"top-scrim-wrapper",attrs:{"aria-hidden":"true","data-testid":"top-scrim"}},[_c('div',{staticClass:"top-scrim",class:{ 'top-scrim-light': !_vm.hasHeader, 'top-scrim-dark': _vm.hasHeader }})]),_vm._v(" "),_c(_vm.itemTag,{ref:"top-boundary",tag:"component",attrs:{"aria-hidden":"true"}}),_vm._v(" "),_vm._l((_vm.items),function(item,index){return [(_vm.isOption(item))?[_c('gl-listbox-item',_vm._b({key:_vm.listboxItemKey(item),attrs:{"id":_vm.generateItemId(item),"data-testid":("listbox-item-" + (item.value)),"is-highlighted":_vm.isHighlighted(item),"is-selected":_vm.isSelected(item),"is-focused":_vm.isFocused(item),"is-check-centered":_vm.isCheckCentered},on:{"select":function($event){return _vm.onSelect(item, $event)}}},'gl-listbox-item',_vm.listboxItemMoreItemsAriaAttributes(index),false),[_vm._t("list-item",function(){return [_vm._v("\n              "+_vm._s(item.text)+"\n            ")]},{"item":item})],2)]:[_c('gl-listbox-group',{key:item.text,class:_vm.groupClasses(index),attrs:{"name":item.text,"text-sr-only":item.textSrOnly},scopedSlots:_vm._u([(_vm.$scopedSlots['group-label'])?{key:"group-label",fn:function(){return [_vm._t("group-label",null,{"group":item})]},proxy:true}:null],null,true)},[_vm._v(" "),_vm._l((item.options),function(option){return _c('gl-listbox-item',{key:_vm.listboxItemKey(option),attrs:{"id":_vm.generateItemId(option),"data-testid":("listbox-item-" + (option.value)),"is-highlighted":_vm.isHighlighted(option),"is-selected":_vm.isSelected(option),"is-focused":_vm.isFocused(option),"is-check-centered":_vm.isCheckCentered},on:{"select":function($event){return _vm.onSelect(option, $event)}}},[_vm._t("list-item",function(){return [_vm._v("\n                "+_vm._s(option.text)+"\n              ")]},{"item":option})],2)})],2)]]}),_vm._v(" "),(_vm.infiniteScrollLoading)?_c(_vm.itemTag,{tag:"component"},[_c('gl-loading-icon',{staticClass:"gl-my-3",attrs:{"data-testid":"listbox-infinite-scroll-loader","size":"md"}})],1):_vm._e(),_vm._v(" "),(_vm.showIntersectionObserver)?_c('gl-intersection-observer',{on:{"appear":_vm.onIntersectionObserverAppear}}):_vm._e(),_vm._v(" "),_c(_vm.itemTag,{ref:"bottom-boundary",tag:"component",attrs:{"aria-hidden":"true"}}),_vm._v(" "),_c(_vm.itemTag,{tag:"component",staticClass:"bottom-scrim-wrapper",attrs:{"aria-hidden":"true","data-testid":"bottom-scrim"}},[_c('div',{staticClass:"bottom-scrim",class:{ '!gl-rounded-none': _vm.hasFooter }})])],2):_vm._e(),_vm._v(" "),(_vm.announceSRSearchResults)?_c('span',{staticClass:"gl-sr-only",attrs:{"data-testid":"listbox-number-of-results","aria-live":"assertive"}},[_vm._t("search-summary-sr-only",function(){return [_vm._v("\n        "+_vm._s(_vm.srOnlyResultsLabel(_vm.flattenedOptions.length))+"\n      ")]})],2):_vm._e(),_vm._v(" "),(_vm.isBusy)?_c('span',{staticClass:"gl-sr-only",attrs:{"aria-live":"polite","data-testid":"listbox-loading-announcement"}},[_vm._v("\n      "+_vm._s(_vm.loadingAnnouncementText)+"\n    ")]):(_vm.showNoResultsText)?_c('div',{staticClass:"gl-py-3 gl-pl-7 gl-pr-5 gl-text-base gl-text-subtle",attrs:{"aria-live":"assertive","data-testid":"listbox-no-results-text"}},[_vm._v("\n      "+_vm._s(_vm.noResultsText)+"\n    ")]):_vm._e(),_vm._v(" "),_vm._t("footer")]}}],null,true)})};
 var __vue_staticRenderFns__ = [];
 
   /* style */

package/dist/components/base/new_dropdowns/listbox/listbox_search_input.js

@@ -8,6 +8,7 @@ var script = {
     GlClearIconButton,
     GlIcon
   },
+  inheritAttrs: false,
   model: {
     prop: 'value',
     event: 'input'
@@ -58,7 +59,7 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-listbox-search"},[_c('gl-icon',{staticClass:"gl-listbox-search-icon",attrs:{"name":"search-sm","size":12}}),_vm._v(" "),_c('input',_vm._g({ref:"input",staticClass:"gl-listbox-search-input",attrs:{"type":"search","aria-label":_vm.placeholder,"placeholder":_vm.placeholder},domProps:{"value":_vm.value}},_vm.inputListeners)),_vm._v(" "),(_vm.hasValue)?_c('gl-clear-icon-button',{staticClass:"gl-listbox-search-clear-button",on:{"click":function($event){$event.stopPropagation();return _vm.clearInput.apply(null, arguments)}}}):_vm._e()],1)};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-listbox-search"},[_c('gl-icon',{staticClass:"gl-listbox-search-icon",attrs:{"name":"search-sm","size":12}}),_vm._v(" "),_c('input',_vm._g(_vm._b({ref:"input",staticClass:"gl-listbox-search-input",attrs:{"type":"search","aria-label":_vm.placeholder,"placeholder":_vm.placeholder},domProps:{"value":_vm.value}},'input',_vm.$attrs,false),_vm.inputListeners)),_vm._v(" "),(_vm.hasValue)?_c('gl-clear-icon-button',{staticClass:"gl-listbox-search-clear-button",on:{"click":function($event){$event.stopPropagation();return _vm.clearInput.apply(null, arguments)}}}):_vm._e()],1)};
 var __vue_staticRenderFns__ = [];
 
   /* style */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "113.4.0",
+  "version": "113.5.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/base/new_dropdowns/base_dropdown/base_dropdown.vue

@@ -572,7 +572,7 @@ export default {
     >
       <div ref="dropdownArrow" class="gl-new-dropdown-arrow"></div>
       <div class="gl-new-dropdown-inner">
-        <slot></slot>
+        <slot :visible="visible"></slot>
       </div>
     </div>
   </div>

package/src/components/base/new_dropdowns/listbox/listbox.vue

@@ -26,7 +26,7 @@ import GlLoadingIcon from '../../loading_icon/loading_icon.vue';
 import GlIntersectionObserver from '../../../utilities/intersection_observer/intersection_observer.vue';
 import GlSearchBoxByType from '../../search_box_by_type/search_box_by_type.vue';
 import GlBaseDropdown from '../base_dropdown/base_dropdown.vue';
-import { translatePlural } from '../../../../utils/i18n';
+import { translate, translatePlural } from '../../../../utils/i18n';
 import GlListboxItem from './listbox_item.vue';
 import GlListboxSearchInput from './listbox_search_input.vue';
 import GlListboxGroup from './listbox_group.vue';
@@ -373,13 +373,22 @@ export default {
     return {
       selectedValues: [],
       listboxId: uniqueId('listbox-'),
+      searchInputId: uniqueId('listbox-search-input-'),
       nextFocusedItemIndex: null,
       searchStr: '',
       topBoundaryVisible: true,
       bottomBoundaryVisible: true,
+      activeItemId: null,
+      itemIds: new Map(),
     };
   },
   computed: {
+    ariaLabelledByID() {
+      if (this.searchable) {
+        return this.searchInputId;
+      }
+      return this.listAriaLabelledBy || this.headerId || this.toggleIdComputed;
+    },
     toggleIdComputed() {
       return this.toggleId || uniqueId('dropdown-toggle-btn-');
     },
@@ -477,6 +486,9 @@ export default {
     showIntersectionObserver() {
       return this.infiniteScroll && !this.infiniteScrollLoading && !this.loading && !this.searching;
     },
+    isBusy() {
+      return this.infiniteScrollLoading || this.loading || this.searching;
+    },
     hasCustomToggle() {
       return Boolean(this.$scopedSlots.toggle);
     },
@@ -497,6 +509,24 @@ export default {
     hasFooter() {
       return Boolean(this.$scopedSlots.footer);
     },
+    loadingAnnouncementText() {
+      if (this.infiniteScrollLoading) {
+        return translate(
+          'GlCollapsibleListbox.loadingAnnouncementText.loadingMoreItems',
+          'Loading more items'
+        );
+      }
+      if (this.searching) {
+        return translate('GlCollapsibleListbox.loadingAnnouncementText.searching', 'Searching');
+      }
+      if (this.loading) {
+        return translate(
+          'GlCollapsibleListbox.loadingAnnouncementText.loadingItems',
+          'Loading items'
+        );
+      }
+      return '';
+    },
   },
   watch: {
     selected: {
@@ -595,6 +625,9 @@ export default {
          */
         if (this.searchHasOptions) {
           this.nextFocusedItemIndex = 0;
+          // Set activeItemId for the first item
+          const firstItem = this.flattenedOptions[0];
+          this.activeItemId = this.generateItemId(firstItem);
         }
       } else {
         this.focusItem(this.selectedIndices[0] ?? 0, this.getFocusableListItemElements());
@@ -615,54 +648,80 @@ export default {
       this.$emit(GL_DROPDOWN_HIDDEN);
       this.nextFocusedItemIndex = null;
     },
+    getNextIndex(currentIndex, keyCode, totalLength) {
+      // For UP: move up or wrap to end
+      if (keyCode === ARROW_UP) {
+        return currentIndex > 0 ? currentIndex - 1 : totalLength - 1;
+      }
+
+      // For DOWN: move down or wrap to start
+      return currentIndex < totalLength - 1 ? currentIndex + 1 : 0;
+    },
+    handleListNavigation(keyCode, elements) {
+      const currentIndex = this.nextFocusedItemIndex ?? -1;
+      const nextIndex = this.getNextIndex(currentIndex, keyCode, elements.length);
+      this.focusItem(nextIndex, elements, this.searchable);
+    },
     onKeydown(event) {
       const { code, target } = event;
       const elements = this.getFocusableListItemElements();
 
       if (elements.length < 1) return;
 
-      let stop = true;
       const isSearchInput = target.matches(SEARCH_INPUT_SELECTOR);
+      let stop = true;
 
-      if (code === HOME) {
-        if (isSearchInput) {
-          return;
-        }
-        this.focusItem(0, elements);
-      } else if (code === END) {
-        if (isSearchInput) {
-          return;
-        }
-        this.focusItem(elements.length - 1, elements);
-      } else if (code === ARROW_UP) {
-        if (isSearchInput) {
-          return;
-        }
-        if (this.searchable && elements.indexOf(target) === 0) {
-          this.focusSearchInput();
-          if (!this.searchHasOptions) {
-            this.nextFocusedItemIndex = null;
+      switch (code) {
+        case HOME:
+          // Jump to first item if searchable or not in search input
+          if (this.searchable || !isSearchInput) {
+            this.focusItem(0, elements, this.searchable);
           }
-        } else {
-          this.focusNextItem(event, elements, -1);
-        }
-      } else if (code === ARROW_DOWN) {
-        if (isSearchInput) {
-          this.focusItem(0, elements);
-        } else {
-          this.focusNextItem(event, elements, 1);
-        }
-      } else if (code === ENTER && isSearchInput) {
-        if (this.searchHasOptions && elements.length > 0) {
-          // Toggle selection state of the first item
-          const firstItem = this.flattenedOptions[0];
-          this.onSelect(firstItem, !this.isSelected(firstItem));
-        }
-        stop = true;
-      } else {
-        stop = false;
+          break;
+
+        case END:
+          // Jump to last item if searchable or not in search input
+          if (this.searchable || !isSearchInput) {
+            this.focusItem(elements.length - 1, elements, this.searchable);
+          }
+          break;
+
+        case ARROW_UP:
+          // Let default behavior work for non-searchable input
+          if (isSearchInput && !this.searchable) {
+            return;
+          }
+          this.handleListNavigation(ARROW_UP, elements);
+          break;
+
+        case ARROW_DOWN:
+          // Focus first item from search input, otherwise navigate down
+          if (isSearchInput && !this.searchable) {
+            this.focusItem(0, elements);
+          } else {
+            this.handleListNavigation(ARROW_DOWN, elements);
+          }
+          break;
+
+        case ENTER:
+          if (isSearchInput) {
+            // Toggle selection of highlighted item if one exists
+            if (elements.length > 0 && this.nextFocusedItemIndex !== null) {
+              const highlightedItem = this.flattenedOptions[this.nextFocusedItemIndex];
+              this.onSelect(highlightedItem, !this.isSelected(highlightedItem));
+            }
+          } else {
+            stop = false;
+          }
+          break;
+
+        default:
+          // Allow default behavior for unhandled keys
+          stop = false;
+          break;
       }
 
+      // Prevent default behavior for handled keys
       if (stop) {
         stopEvent(event);
       }
@@ -678,10 +737,25 @@ export default {
 
       this.focusItem(nextIndex, elements);
     },
-    focusItem(index, elements) {
+    focusItem(index, elements, keepSearchFocused = false) {
       this.nextFocusedItemIndex = index;
 
-      elements[index]?.focus();
+      // Always update the activeItemId when focus changes
+      const item = this.flattenedOptions[index];
+      if (item) {
+        this.activeItemId = this.generateItemId(item);
+      } else {
+        this.activeItemId = null;
+      }
+
+      // If we're not keeping the search focused, focus the item
+      if (!keepSearchFocused) {
+        elements[index]?.focus();
+      }
+
+      this.$nextTick(() => {
+        this.scrollActiveItemIntoView();
+      });
     },
     focusSearchInput() {
       this.$refs.searchBox.focusInput();
@@ -806,6 +880,41 @@ export default {
       this.scrollObserver = observer;
     },
     isOption,
+    generateItemId(item) {
+      const key = item.value === null ? ITEM_NULL_KEY : item.value;
+      if (!this.itemIds.has(key)) {
+        this.itemIds.set(key, uniqueId('listbox-item-'));
+      }
+      return this.itemIds.get(key);
+    },
+    scrollActiveItemIntoView() {
+      const listContainer = this.$refs.list;
+      if (!this.activeItemId || !this.searchable || !listContainer) return;
+
+      const activeElement = document.getElementById(this.activeItemId);
+      if (!activeElement) return;
+
+      const containerRect = listContainer.getBoundingClientRect();
+      const itemRect = activeElement.getBoundingClientRect();
+      const itemTop = activeElement.offsetTop;
+      const padding = 30;
+
+      // If item is above the visible area
+      if (itemRect.top < containerRect.top) {
+        listContainer.scrollTo({
+          top: itemTop - padding,
+          behavior: 'smooth',
+        });
+      }
+
+      // If item is below the visible area
+      else if (itemRect.bottom > containerRect.bottom) {
+        listContainer.scrollTo({
+          top: itemTop - containerRect.height + activeElement.offsetHeight + padding,
+          behavior: 'smooth',
+        });
+      }
+    },
   },
 };
 </script>
@@ -839,165 +948,191 @@ export default {
       <slot name="toggle"></slot>
     </template>
 
-    <div
-      v-if="headerText"
-      class="gl-flex gl-min-h-8 gl-items-center !gl-p-4"
-      :class="$options.HEADER_ITEMS_BORDER_CLASSES"
-    >
+    <template #default="{ visible }">
       <div
-        :id="headerId"
-        class="gl-grow gl-pr-2 gl-text-sm gl-font-bold gl-text-strong"
-        data-testid="listbox-header-text"
-      >
-        {{ headerText }}
-      </div>
-      <gl-button
-        v-if="showResetButton"
-        category="tertiary"
-        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset"
-        size="small"
-        data-testid="listbox-reset-button"
-        @click="onResetButtonClicked"
+        v-if="headerText"
+        class="gl-flex gl-min-h-8 gl-items-center !gl-p-4"
+        :class="$options.HEADER_ITEMS_BORDER_CLASSES"
       >
-        {{ resetButtonLabel }}
-      </gl-button>
-      <gl-button
-        v-if="showSelectAllButton"
-        category="tertiary"
-        class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset"
-        size="small"
-        data-testid="listbox-select-all-button"
-        @click="onSelectAllButtonClicked"
-      >
-        {{ showSelectAllButtonLabel }}
-      </gl-button>
-    </div>
-
-    <div v-if="searchable" :class="$options.HEADER_ITEMS_BORDER_CLASSES">
-      <gl-listbox-search-input
-        ref="searchBox"
-        v-model="searchStr"
-        data-testid="listbox-search-input"
-        :placeholder="searchPlaceholder"
-        :class="{ 'gl-listbox-topmost': !headerText }"
-        @input="search"
-        @keydown.enter.prevent
-        @keydown="onKeydown"
-      />
-      <gl-loading-icon
-        v-if="searching"
-        data-testid="listbox-search-loader"
-        size="md"
-        class="gl-my-3"
-      />
-    </div>
-
-    <component
-      :is="listboxTag"
-      v-if="showList"
-      :id="listboxId"
-      ref="list"
-      :aria-labelledby="listAriaLabelledBy || headerId || toggleIdComputed"
-      role="listbox"
-      class="gl-new-dropdown-contents gl-new-dropdown-contents-with-scrim-overlay"
-      :class="listboxClasses"
-      tabindex="0"
-      @keydown="onKeydown"
-    >
-      <component :is="itemTag" class="top-scrim-wrapper" aria-hidden="true" data-testid="top-scrim">
         <div
-          class="top-scrim"
-          :class="{ 'top-scrim-light': !hasHeader, 'top-scrim-dark': hasHeader }"
-        ></div>
-      </component>
-      <component :is="itemTag" ref="top-boundary" aria-hidden="true" />
-      <template v-for="(item, index) in items">
-        <template v-if="isOption(item)">
-          <gl-listbox-item
-            :key="listboxItemKey(item)"
-            :data-testid="`listbox-item-${item.value}`"
-            :is-highlighted="isHighlighted(item)"
-            :is-selected="isSelected(item)"
-            :is-focused="isFocused(item)"
-            :is-check-centered="isCheckCentered"
-            v-bind="listboxItemMoreItemsAriaAttributes(index)"
-            @select="onSelect(item, $event)"
-          >
-            <!-- @slot Custom template of the listbox item -->
-            <slot name="list-item" :item="item">
-              {{ item.text }}
-            </slot>
-          </gl-listbox-item>
-        </template>
+          :id="headerId"
+          class="gl-grow gl-pr-2 gl-text-sm gl-font-bold gl-text-strong"
+          data-testid="listbox-header-text"
+        >
+          {{ headerText }}
+        </div>
+        <gl-button
+          v-if="showResetButton"
+          category="tertiary"
+          class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset"
+          size="small"
+          data-testid="listbox-reset-button"
+          @click="onResetButtonClicked"
+        >
+          {{ resetButtonLabel }}
+        </gl-button>
+        <gl-button
+          v-if="showSelectAllButton"
+          category="tertiary"
+          class="!gl-m-0 !gl-w-auto gl-max-w-1/2 gl-flex-shrink-0 gl-text-ellipsis !gl-px-2 !gl-text-sm focus:!gl-focus-inset"
+          size="small"
+          data-testid="listbox-select-all-button"
+          @click="onSelectAllButtonClicked"
+        >
+          {{ showSelectAllButtonLabel }}
+        </gl-button>
+      </div>
 
-        <template v-else>
-          <gl-listbox-group
-            :key="item.text"
-            :name="item.text"
-            :text-sr-only="item.textSrOnly"
-            :class="groupClasses(index)"
-          >
-            <template v-if="$scopedSlots['group-label']" #group-label>
-              <!-- @slot Custom template for group names -->
-              <slot name="group-label" :group="item"></slot>
-            </template>
+      <div v-if="searchable" :class="$options.HEADER_ITEMS_BORDER_CLASSES">
+        <gl-listbox-search-input
+          :id="searchInputId"
+          ref="searchBox"
+          v-model="searchStr"
+          data-testid="listbox-search-input"
+          role="combobox"
+          :aria-expanded="String(visible)"
+          :aria-controls="listboxId"
+          :aria-activedescendant="activeItemId"
+          aria-haspopup="listbox"
+          :placeholder="searchPlaceholder"
+          :class="{ 'gl-listbox-topmost': !headerText }"
+          @input="search"
+          @keydown.enter.prevent
+          @keydown="onKeydown"
+        />
+        <gl-loading-icon
+          v-if="searching"
+          data-testid="listbox-search-loader"
+          size="md"
+          class="gl-my-3"
+        />
+      </div>
 
+      <component
+        :is="listboxTag"
+        v-if="showList"
+        :id="listboxId"
+        ref="list"
+        :aria-busy="isBusy"
+        :aria-labelledby="ariaLabelledByID"
+        :aria-multiselectable="multiple ? 'true' : undefined"
+        role="listbox"
+        class="gl-new-dropdown-contents gl-new-dropdown-contents-with-scrim-overlay"
+        :class="listboxClasses"
+        tabindex="0"
+        @keydown="onKeydown"
+      >
+        <component
+          :is="itemTag"
+          class="top-scrim-wrapper"
+          aria-hidden="true"
+          data-testid="top-scrim"
+        >
+          <div
+            class="top-scrim"
+            :class="{ 'top-scrim-light': !hasHeader, 'top-scrim-dark': hasHeader }"
+          ></div>
+        </component>
+        <component :is="itemTag" ref="top-boundary" aria-hidden="true" />
+        <template v-for="(item, index) in items">
+          <template v-if="isOption(item)">
             <gl-listbox-item
-              v-for="option in item.options"
-              :key="listboxItemKey(option)"
-              :data-testid="`listbox-item-${option.value}`"
-              :is-highlighted="isHighlighted(option)"
-              :is-selected="isSelected(option)"
-              :is-focused="isFocused(option)"
+              :id="generateItemId(item)"
+              :key="listboxItemKey(item)"
+              :data-testid="`listbox-item-${item.value}`"
+              :is-highlighted="isHighlighted(item)"
+              :is-selected="isSelected(item)"
+              :is-focused="isFocused(item)"
               :is-check-centered="isCheckCentered"
-              @select="onSelect(option, $event)"
+              v-bind="listboxItemMoreItemsAriaAttributes(index)"
+              @select="onSelect(item, $event)"
             >
               <!-- @slot Custom template of the listbox item -->
-              <slot name="list-item" :item="option">
-                {{ option.text }}
+              <slot name="list-item" :item="item">
+                {{ item.text }}
               </slot>
             </gl-listbox-item>
-          </gl-listbox-group>
+          </template>
+
+          <template v-else>
+            <gl-listbox-group
+              :key="item.text"
+              :name="item.text"
+              :text-sr-only="item.textSrOnly"
+              :class="groupClasses(index)"
+            >
+              <template v-if="$scopedSlots['group-label']" #group-label>
+                <!-- @slot Custom template for group names -->
+                <slot name="group-label" :group="item"></slot>
+              </template>
+
+              <gl-listbox-item
+                v-for="option in item.options"
+                :id="generateItemId(option)"
+                :key="listboxItemKey(option)"
+                :data-testid="`listbox-item-${option.value}`"
+                :is-highlighted="isHighlighted(option)"
+                :is-selected="isSelected(option)"
+                :is-focused="isFocused(option)"
+                :is-check-centered="isCheckCentered"
+                @select="onSelect(option, $event)"
+              >
+                <!-- @slot Custom template of the listbox item -->
+                <slot name="list-item" :item="option">
+                  {{ option.text }}
+                </slot>
+              </gl-listbox-item>
+            </gl-listbox-group>
+          </template>
         </template>
-      </template>
-      <component :is="itemTag" v-if="infiniteScrollLoading">
-        <gl-loading-icon data-testid="listbox-infinite-scroll-loader" size="md" class="gl-my-3" />
+        <component :is="itemTag" v-if="infiniteScrollLoading">
+          <gl-loading-icon data-testid="listbox-infinite-scroll-loader" size="md" class="gl-my-3" />
+        </component>
+        <gl-intersection-observer
+          v-if="showIntersectionObserver"
+          @appear="onIntersectionObserverAppear"
+        />
+        <component :is="itemTag" ref="bottom-boundary" aria-hidden="true" />
+        <component
+          :is="itemTag"
+          class="bottom-scrim-wrapper"
+          aria-hidden="true"
+          data-testid="bottom-scrim"
+        >
+          <div class="bottom-scrim" :class="{ '!gl-rounded-none': hasFooter }"></div>
+        </component>
       </component>
-      <gl-intersection-observer
-        v-if="showIntersectionObserver"
-        @appear="onIntersectionObserverAppear"
-      />
-      <component :is="itemTag" ref="bottom-boundary" aria-hidden="true" />
-      <component
-        :is="itemTag"
-        class="bottom-scrim-wrapper"
-        aria-hidden="true"
-        data-testid="bottom-scrim"
+      <span
+        v-if="announceSRSearchResults"
+        data-testid="listbox-number-of-results"
+        class="gl-sr-only"
+        aria-live="assertive"
       >
-        <div class="bottom-scrim" :class="{ '!gl-rounded-none': hasFooter }"></div>
-      </component>
-    </component>
-    <span
-      v-if="announceSRSearchResults"
-      data-testid="listbox-number-of-results"
-      class="gl-sr-only"
-      aria-live="assertive"
-    >
-      <!-- @slot Text read by screen reader announcing a number of search results -->
-      <slot name="search-summary-sr-only">
-        {{ srOnlyResultsLabel(flattenedOptions.length) }}
-      </slot>
-    </span>
-
-    <div
-      v-else-if="showNoResultsText"
-      aria-live="assertive"
-      class="gl-py-3 gl-pl-7 gl-pr-5 gl-text-base gl-text-subtle"
-      data-testid="listbox-no-results-text"
-    >
-      {{ noResultsText }}
-    </div>
-    <!-- @slot Content to display in dropdown footer -->
-    <slot name="footer"></slot>
+        <!-- @slot Text read by screen reader announcing a number of search results -->
+        <slot name="search-summary-sr-only">
+          {{ srOnlyResultsLabel(flattenedOptions.length) }}
+        </slot>
+      </span>
+      <span
+        v-if="isBusy"
+        class="gl-sr-only"
+        aria-live="polite"
+        data-testid="listbox-loading-announcement"
+      >
+        {{ loadingAnnouncementText }}
+      </span>
+
+      <div
+        v-else-if="showNoResultsText"
+        aria-live="assertive"
+        class="gl-py-3 gl-pl-7 gl-pr-5 gl-text-base gl-text-subtle"
+        data-testid="listbox-no-results-text"
+      >
+        {{ noResultsText }}
+      </div>
+
+      <!-- @slot Content to display in dropdown footer -->
+      <slot name="footer"></slot>
+    </template>
   </gl-base-dropdown>
 </template>

package/src/components/base/new_dropdowns/listbox/listbox_search_input.vue

@@ -8,6 +8,7 @@ export default {
     GlClearIconButton,
     GlIcon,
   },
+  inheritAttrs: false,
   model: {
     prop: 'value',
     event: 'input',
@@ -65,6 +66,7 @@ export default {
       class="gl-listbox-search-input"
       :aria-label="placeholder"
       :placeholder="placeholder"
+      v-bind="$attrs"
       v-on="inputListeners"
     />
     <gl-clear-icon-button

package/translations.js

@@ -10,6 +10,9 @@ export default {
   'GlChartLegend.current': 'Current',
   'GlChartLegend.max': 'Max',
   'GlChartLegend.min': 'Min',
+  'GlCollapsibleListbox.loadingAnnouncementText.loadingItems': 'Loading items',
+  'GlCollapsibleListbox.loadingAnnouncementText.loadingMoreItems': 'Loading more items',
+  'GlCollapsibleListbox.loadingAnnouncementText.searching': 'Searching',
   'GlCollapsibleListbox.srOnlyResultsLabel': null,
   'GlDatepicker.monthLabel': 'Month',
   'GlDatepicker.yearLabel': 'Year',