@gitlab/ui 127.1.1 → 128.0.0

package/dist/components/base/form/form_group/form_group.js

@@ -8,6 +8,9 @@ var script = {
   components: {
     BFormGroup
   },
+  provide: {
+    isInFormGroup: true
+  },
   inheritAttrs: false,
   props: {
     /**

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

@@ -106,6 +106,26 @@ var script = {
         return ['menu', 'listbox', 'tree', 'grid', 'dialog', true, false].includes(value);
       }
     },
+    activeItemId: {
+      type: String,
+      required: false,
+      default: undefined
+    },
+    hasExternalLabel: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    hasSearchableListbox: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    isDisclosure: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     /**
      * Id that will be referenced by `aria-labelledby` attribute of the dropdown content`
      */
@@ -113,6 +133,15 @@ var script = {
       type: String,
       required: true
     },
+    /**
+     * Span Id that will be referenced by listbox `aria-labelledby` if there's an external label.
+     * This prop will only be defined by `GlCollapsibleListbox` when `isInFormGroup` injected is true.
+     */
+    listboxId: {
+      type: String,
+      required: false,
+      default: undefined
+    },
     /**
      * The `aria-labelledby` attribute value for the  toggle `button`
      */
@@ -157,6 +186,10 @@ var script = {
     };
   },
   computed: {
+    ariaActiveDescendant() {
+      if (!this.isDisclosure && this.visible) return this.activeItemId;
+      return undefined;
+    },
     hasNoVisibleToggleText() {
       var _this$toggleText;
       return !((_this$toggleText = this.toggleText) !== null && _this$toggleText !== void 0 && _this$toggleText.length) || this.textSrOnly;
@@ -170,12 +203,47 @@ var script = {
     isCaretOnly() {
       return !this.noCaret && !this.icon && this.hasNoVisibleToggleText;
     },
-    ariaAttributes() {
+    isDefaultToggle() {
+      return !this.$scopedSlots.toggle;
+    },
+    isToggleCombobox() {
+      if (this.hasSearchableListbox || this.isDisclosure) {
+        return false;
+      }
+      return true;
+    },
+    isToggleLabelledExternally() {
+      if (this.hasExternalLabel && this.toggleId) return true;
+      return false;
+    },
+    computedToggleId() {
+      if (this.isDisclosure) {
+        return this.isDefaultToggle ? this.toggleId : undefined;
+      }
+      if (this.isToggleLabelledExternally) {
+        return this.isDefaultToggle ? this.toggleId : undefined;
+      }
+      if (this.hasSearchableListbox) {
+        return this.toggleId;
+      }
+      return undefined;
+    },
+    computedToggleInnerId() {
+      if (this.isToggleCombobox && !this.isToggleLabelledExternally) {
+        return this.toggleId;
+      }
+      if (this.isToggleCombobox && this.isToggleLabelledExternally) {
+        return this.listboxId;
+      }
+      return undefined;
+    },
+    toggleAriaAttributes() {
       return {
-        'aria-haspopup': this.ariaHaspopup,
-        'aria-expanded': String(this.visible),
         'aria-controls': this.baseDropdownId,
-        'aria-labelledby': this.toggleLabelledBy
+        'aria-expanded': String(this.visible),
+        'aria-haspopup': this.ariaHaspopup,
+        'aria-labelledby': this.toggleLabelledBy,
+        'aria-activedescendant': this.ariaActiveDescendant
       };
     },
     toggleButtonClasses() {
@@ -191,10 +259,28 @@ var script = {
       return this.block ? 'gl-w-full' : '';
     },
     toggleLabelledBy() {
+      if (this.isToggleCombobox) {
+        if (this.ariaLabelledby) {
+          return `${this.ariaLabelledby} ${this.toggleId}`;
+        }
+        return this.toggleId;
+      }
+
+      // For non-combobox toggles, combine IDs or use the button's own text
       return this.ariaLabelledby ? `${this.ariaLabelledby} ${this.toggleId}` : undefined;
     },
-    isDefaultToggle() {
-      return !this.$scopedSlots.toggle;
+    toggleRole() {
+      if (this.isToggleCombobox) {
+        return 'combobox';
+      }
+      return undefined;
+    },
+    toggleAccessibilityAttributes() {
+      return {
+        ...this.toggleAriaAttributes,
+        id: this.toggleId,
+        role: this.toggleRole
+      };
     },
     toggleOptions() {
       if (this.isDefaultToggle) {
@@ -209,7 +295,8 @@ var script = {
           disabled: this.disabled,
           loading: this.loading,
           class: this.toggleButtonClasses,
-          ...this.ariaAttributes,
+          role: this.toggleRole,
+          ...this.toggleAriaAttributes,
           listeners: {
             keydown: event => this.onKeydown(event),
             click: event => this.toggle(event)
@@ -287,18 +374,6 @@ var script = {
       };
     }
   },
-  watch: {
-    ariaAttributes: {
-      deep: true,
-      handler(ariaAttributes) {
-        if (this.$scopedSlots.toggle) {
-          Object.keys(ariaAttributes).forEach(key => {
-            this.toggleElement.setAttribute(key, ariaAttributes[key]);
-          });
-        }
-      }
-    }
-  },
   mounted() {
     this.checkToggleFocusable();
   },
@@ -538,7 +613,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',{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"}},'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('dropdown-container',{attrs:{"positioning-strategy":_vm.positioningStrategy}},[_c('div',{directives:[{name:"outside",rawName:"v-outside.click.focusin",value:(_vm.handleClickOutside),expression:"handleClickOutside",modifiers:{"click":true,"focusin":true}}],ref:"dropdownContainer",class:_vm.$options.DROPDOWN_CONTAINER_CLASS},[_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_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:[_vm.$options.BASE_DROPDOWN_CLASS, { '!gl-block': _vm.block }]},[_c(_vm.toggleComponent,_vm._g(_vm._b({ref:"toggle",tag:"component",attrs:{"id":_vm.computedToggleId,"data-testid":"base-dropdown-toggle"}},'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 },attrs:{"id":_vm.computedToggleInnerId,"data-testid":"base-dropdown-span"}},[_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()]},{"accessibilityAttributes":_vm.toggleAccessibilityAttributes})],2),_vm._v(" "),_c('dropdown-container',{attrs:{"positioning-strategy":_vm.positioningStrategy}},[_c('div',{directives:[{name:"outside",rawName:"v-outside.click.focusin",value:(_vm.handleClickOutside),expression:"handleClickOutside",modifiers:{"click":true,"focusin":true}}],ref:"dropdownContainer",class:_vm.$options.DROPDOWN_CONTAINER_CLASS},[_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/disclosure/disclosure_dropdown.js

@@ -346,7 +346,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('gl-base-dropdown',{ref:"baseDropdown",staticClass:"gl-disclosure-dropdown",attrs:{"aria-labelledby":_vm.toggleAriaLabelledBy,"arrow-element":_vm.$refs.disclosureArrow,"toggle-id":_vm.toggleId,"toggle-text":_vm.toggleText,"toggle-class":_vm.toggleClass,"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,"block":_vm.block,"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,_vm.$options.events.GL_DROPDOWN_BEFORE_CLOSE,_vm.onBeforeClose,_vm.$options.events.GL_DROPDOWN_FOCUS_CONTENT,_vm.onKeydown]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(){return [_vm._t("toggle")]},proxy:true}:null],null,true)},[_vm._v(" "),_vm._t("header"),_vm._v(" "),_c(_vm.disclosureTag,{ref:"content",tag:"component",class:_vm.$options.GL_DROPDOWN_CONTENTS_CLASS,attrs:{"id":_vm.disclosureId,"aria-labelledby":_vm.listAriaLabelledBy || _vm.toggleId,"data-testid":"disclosure-content","tabindex":"-1"},on:{"keydown":_vm.onKeydown,"click":_vm.handleAutoClose}},[_vm._t("default",function(){return [_vm._l((_vm.items),function(item,index){return [(_vm.isItem(item))?[_c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([('list-item' in _vm.$scopedSlots)?{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":item})]},proxy:true}:null],null,true)})]:[_c('gl-disclosure-dropdown-group',{key:item.name,attrs:{"bordered":index !== 0,"group":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([(_vm.$scopedSlots['group-label'])?{key:"group-label",fn:function(){return [_vm._t("group-label",null,{"group":item})]},proxy:true}:null,(_vm.$scopedSlots['list-item'])?{key:"default",fn:function(){return _vm._l((item.items),function(groupItem){return _c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":groupItem},on:{"action":_vm.handleAction},scopedSlots:_vm._u([{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":groupItem})]},proxy:true}],null,true)})})},proxy:true}:null],null,true)})]]})]})],2),_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",staticClass:"gl-disclosure-dropdown",attrs:{"aria-labelledby":_vm.toggleAriaLabelledBy,"arrow-element":_vm.$refs.disclosureArrow,"toggle-id":_vm.toggleId,"toggle-text":_vm.toggleText,"toggle-class":_vm.toggleClass,"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,"block":_vm.block,"offset":_vm.dropdownOffset,"fluid-width":_vm.fluidWidth,"positioning-strategy":_vm.positioningStrategy,"is-disclosure":""},on:_vm._d({},[_vm.$options.events.GL_DROPDOWN_SHOWN,_vm.onShow,_vm.$options.events.GL_DROPDOWN_HIDDEN,_vm.onHide,_vm.$options.events.GL_DROPDOWN_BEFORE_CLOSE,_vm.onBeforeClose,_vm.$options.events.GL_DROPDOWN_FOCUS_CONTENT,_vm.onKeydown]),scopedSlots:_vm._u([(_vm.hasCustomToggle)?{key:"toggle",fn:function(slotProps){return [_vm._t("toggle",null,null,slotProps)]}}:null],null,true)},[_vm._v(" "),_vm._t("header"),_vm._v(" "),_c(_vm.disclosureTag,{ref:"content",tag:"component",class:_vm.$options.GL_DROPDOWN_CONTENTS_CLASS,attrs:{"id":_vm.disclosureId,"aria-labelledby":_vm.listAriaLabelledBy || _vm.toggleId,"data-testid":"disclosure-content","tabindex":"-1"},on:{"keydown":_vm.onKeydown,"click":_vm.handleAutoClose}},[_vm._t("default",function(){return [_vm._l((_vm.items),function(item,index){return [(_vm.isItem(item))?[_c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([('list-item' in _vm.$scopedSlots)?{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":item})]},proxy:true}:null],null,true)})]:[_c('gl-disclosure-dropdown-group',{key:item.name,attrs:{"bordered":index !== 0,"group":item},on:{"action":_vm.handleAction},scopedSlots:_vm._u([(_vm.$scopedSlots['group-label'])?{key:"group-label",fn:function(){return [_vm._t("group-label",null,{"group":item})]},proxy:true}:null,(_vm.$scopedSlots['list-item'])?{key:"default",fn:function(){return _vm._l((item.items),function(groupItem){return _c('gl-disclosure-dropdown-item',{key:_vm.uniqueItemId(),attrs:{"item":groupItem},on:{"action":_vm.handleAction},scopedSlots:_vm._u([{key:"list-item",fn:function(){return [_vm._t("list-item",null,{"item":groupItem})]},proxy:true}],null,true)})})},proxy:true}:null],null,true)})]]})]})],2),_vm._v(" "),_vm._t("footer")],2)};
 var __vue_staticRenderFns__ = [];
 
   /* style */

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

@@ -1,7 +1,7 @@
 import clamp from 'lodash/clamp';
 import uniqueId from 'lodash/uniqueId';
 import { logWarning, stopEvent } from '../../../../utils/utils';
-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 { GL_DROPDOWN_SHOWN, GL_DROPDOWN_HIDDEN, GL_DROPDOWN_FOCUS_CONTENT, 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';
@@ -25,7 +25,8 @@ var script = {
   HEADER_ITEMS_BORDER_CLASSES,
   events: {
     GL_DROPDOWN_SHOWN,
-    GL_DROPDOWN_HIDDEN
+    GL_DROPDOWN_HIDDEN,
+    GL_DROPDOWN_FOCUS_CONTENT
   },
   components: {
     GlBaseDropdown,
@@ -37,6 +38,11 @@ var script = {
     GlLoadingIcon,
     GlIntersectionObserver
   },
+  inject: {
+    isInFormGroup: {
+      default: false
+    }
+  },
   model: {
     prop: 'selected',
     event: 'select'
@@ -184,7 +190,7 @@ var script = {
     },
     /**
      * The `aria-labelledby` attribute value for the toggle button
-     * Provide the string of ids seperated by space
+     * Provide the string of IDs seperated by space
      */
     toggleAriaLabelledBy: {
       type: String,
@@ -193,7 +199,7 @@ var script = {
     },
     /**
      * The `aria-labelledby` attribute value for the list of options
-     * Provide the string of ids seperated by space
+     * Provide the string of IDs seperated by space
      */
     listAriaLabelledBy: {
       type: String,
@@ -351,15 +357,42 @@ var script = {
     };
   },
   computed: {
-    ariaLabelledByID() {
-      if (this.searchable) {
-        return this.searchInputId;
-      }
+    /**
+     * Determines the `aria-labelledby` attribute value for the listbox by
+     * evaluating a series of conditions in priority order. The returned ID
+     * references the element that best describes the listbox content, with
+     * preference given to headers in searchable lists, followed by search
+     * input, form labels, and finally fallback options.
+     */
+    listboxAriaLabelledByID() {
+      // Listbox is labelled by closest heading, creating a meaningful relationship
+      if (this.headerId && this.searchable) return `${this.headerId}`;
+
+      // Listbox is labelled by the search input with role="combobox"
+      if (this.searchable) return this.searchInputId;
+
+      // Listbox is labelledy by the text inside an externally labelled button
+      if (this.isInFormGroup) return this.listboxIdComputed;
+
+      // Fallback. Return a header ID or the toggle button ID.
       return this.listAriaLabelledBy || this.headerId || this.toggleIdComputed;
     },
     toggleIdComputed() {
       return this.toggleId || uniqueId('dropdown-toggle-btn-');
     },
+    // Generate a custom listbox ID when inside GlFormGroup
+    listboxIdComputed() {
+      if (this.isInFormGroup) {
+        if (this.listAriaLabelledBy) {
+          return this.listAriaLabelledBy;
+        }
+        if (this.toggleId) {
+          return `${this.toggleId}-span`;
+        }
+        return uniqueId('dropdown-toggle-span-');
+      }
+      return undefined;
+    },
     listboxTag() {
       if (!this.hasItems || isOption(this.items[0])) return 'ul';
       return 'div';
@@ -567,6 +600,10 @@ var script = {
     (_this$scrollObserver = this.scrollObserver) === null || _this$scrollObserver === void 0 ? void 0 : _this$scrollObserver.disconnect();
   },
   methods: {
+    onFocusContent(event) {
+      event.preventDefault();
+      this.open();
+    },
     open() {
       this.$refs.baseDropdown.open();
     },
@@ -874,9 +911,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,{key:"default",fn:function(ref){
+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","active-item-id":_vm.activeItemId,"aria-labelledby":_vm.toggleAriaLabelledBy,"block":_vm.block,"has-searchable-listbox":_vm.searchable,"has-external-label":_vm.isInFormGroup,"listbox-id":_vm.listboxIdComputed,"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_FOCUS_CONTENT,_vm.onFocusContent,_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(slotProps){return [_vm._t("toggle",null,null,slotProps)]}}: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)})};
+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.listboxAriaLabelledByID,"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/package.json

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

package/src/components/base/form/form_checkbox/form_checkbox.vue

@@ -8,9 +8,6 @@ export default {
   name: 'GlFormCheckbox',
   inject: {
     getGroup: {
-      // When we remove BFormCheckboxGroup from GlFormCheckboxGroup, we can rename
-      // the `getBvCheckGroup` provide to `getCheckGroup`.
-      from: 'getBvCheckGroup',
       default: () => () => null,
     },
   },

package/src/components/base/form/form_checkbox/form_checkbox_group.vue

@@ -1,44 +1,171 @@
 <script>
+import uniqueId from 'lodash/uniqueId';
+import isBoolean from 'lodash/isBoolean';
+import omit from 'lodash/omit';
+import pick from 'lodash/pick';
+import { looseEqual } from '../../../../vendor/bootstrap-vue/src/utils/loose-equal';
 import { formOptionsMixin } from '../../../../vendor/bootstrap-vue/src/mixins/form-options';
-import { BFormCheckboxGroup } from '../../../../vendor/bootstrap-vue/src/components/form-checkbox/form-checkbox-group';
 import { SafeHtmlDirective as SafeHtml } from '../../../../directives/safe_html/safe_html';
 import GlFormCheckbox from './form_checkbox.vue';
 
+// Attributes to pass down to checks/radios instead of applying them to the group
+const PASS_DOWN_ATTRS = ['aria-describedby', 'aria-labelledby'];
+
 export default {
   name: 'GlFormCheckboxGroup',
-  components: { BFormCheckboxGroup, GlFormCheckbox },
+  components: { GlFormCheckbox },
   directives: {
     SafeHtml,
   },
   mixins: [formOptionsMixin],
+  provide() {
+    return {
+      getGroup: () => this,
+    };
+  },
   inheritAttrs: false,
   model: {
     prop: 'checked',
     event: 'input',
   },
+  props: {
+    /**
+     * Used to set the `id` attribute on the rendered content, and used as the base to generate any additional element IDs as needed.
+     */
+    id: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
+    /**
+     * The current value of the checkbox.
+     */
+    checked: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    /**
+     * Array of items to render in the component
+     */
+    options: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    /**
+     * When set to `true`, disables the component's functionality and places it in a disabled state.
+     */
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    /**
+     * Sets the value of the `name` attribute on the form control.
+     */
+    name: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
+    /**
+     * Adds the `required` attribute to the form control.
+     */
+    required: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    /**
+     * Controls the validation state appearance of the component. `true` for valid, `false` for invalid, or `null` for no validation state.
+     */
+    state: {
+      type: Boolean,
+      required: false,
+      default: null,
+    },
+    /**
+     * Optional value to set for the 'aria-invalid' attribute. Supported values are 'true' and 'false'. If not set, the 'state' prop will dictate the value
+     */
+    ariaInvalid: {
+      type: [Boolean, String],
+      required: false,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      internalId: this.id ? this.id : uniqueId('gitlab_ui_checkbox_group_'),
+      localChecked: this.checked,
+    };
+  },
+  computed: {
+    computedState() {
+      return isBoolean(this.state) ? this.state : null;
+    },
+    stateClass() {
+      if (this.computedState === true) return 'is-valid';
+      if (this.computedState === false) return 'is-invalid';
+      return null;
+    },
+    computedAriaInvalid() {
+      const { ariaInvalid } = this;
+      if (ariaInvalid === true || ariaInvalid === 'true' || ariaInvalid === '') {
+        return 'true';
+      }
+      return this.computedState === false ? 'true' : ariaInvalid;
+    },
+    computedAttrs() {
+      return {
+        ...omit(this.$attrs, PASS_DOWN_ATTRS),
+        id: this.internalId,
+        'aria-invalid': this.computedAriaInvalid,
+        'aria-required': this.required || null,
+      };
+    },
+    passDownAttrs() {
+      return pick(this.$attrs, PASS_DOWN_ATTRS);
+    },
+    groupName() {
+      // Checks/Radios tied to the same model must have the same name,
+      // especially for ARIA accessibility
+      return this.name || this.internalId;
+    },
+  },
+  watch: {
+    checked(newValue) {
+      if (!looseEqual(newValue, this.localChecked)) {
+        this.localChecked = newValue;
+      }
+    },
+    localChecked(newValue, oldValue) {
+      if (!looseEqual(newValue, oldValue)) {
+        this.$emit('input', newValue);
+      }
+    },
+  },
 };
 </script>
 
 <template>
-  <div>
-    <b-form-checkbox-group
-      v-bind="$attrs"
-      class="gl-form-checkbox-group"
-      stacked
-      @change="$emit('change', $event)"
-      @input="$emit('input', $event)"
+  <div
+    v-bind="computedAttrs"
+    role="group"
+    tabindex="-1"
+    class="gl-form-checkbox-group gl-outline-none"
+  >
+    <slot name="first"></slot>
+    <gl-form-checkbox
+      v-for="(option, idx) in formOptions"
+      v-bind="passDownAttrs"
+      :key="idx"
+      :value="option.value"
+      :disabled="option.disabled"
     >
-      <slot name="first"></slot>
-      <gl-form-checkbox
-        v-for="(option, idx) in formOptions"
-        :key="idx"
-        :value="option.value"
-        :disabled="option.disabled"
-      >
-        <span v-if="option.html" v-safe-html="option.html"></span>
-        <span v-else>{{ option.text }}</span>
-      </gl-form-checkbox>
-      <slot></slot>
-    </b-form-checkbox-group>
+      <span v-if="option.html" v-safe-html="option.html"></span>
+      <span v-else>{{ option.text }}</span>
+    </gl-form-checkbox>
+    <slot></slot>
   </div>
 </template>

package/src/components/base/form/form_group/form_group.vue

@@ -8,6 +8,9 @@ export default {
   components: {
     BFormGroup,
   },
+  provide: {
+    isInFormGroup: true,
+  },
   inheritAttrs: false,
   props: {
     /**

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

@@ -138,6 +138,26 @@ export default {
         return ['menu', 'listbox', 'tree', 'grid', 'dialog', true, false].includes(value);
       },
     },
+    activeItemId: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
+    hasExternalLabel: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    hasSearchableListbox: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    isDisclosure: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     /**
      * Id that will be referenced by `aria-labelledby` attribute of the dropdown content`
      */
@@ -145,6 +165,15 @@ export default {
       type: String,
       required: true,
     },
+    /**
+     * Span Id that will be referenced by listbox `aria-labelledby` if there's an external label.
+     * This prop will only be defined by `GlCollapsibleListbox` when `isInFormGroup` injected is true.
+     */
+    listboxId: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
     /**
      * The `aria-labelledby` attribute value for the  toggle `button`
      */
@@ -187,6 +216,10 @@ export default {
     };
   },
   computed: {
+    ariaActiveDescendant() {
+      if (!this.isDisclosure && this.visible) return this.activeItemId;
+      return undefined;
+    },
     hasNoVisibleToggleText() {
       return !this.toggleText?.length || this.textSrOnly;
     },
@@ -199,12 +232,47 @@ export default {
     isCaretOnly() {
       return !this.noCaret && !this.icon && this.hasNoVisibleToggleText;
     },
-    ariaAttributes() {
+    isDefaultToggle() {
+      return !this.$scopedSlots.toggle;
+    },
+    isToggleCombobox() {
+      if (this.hasSearchableListbox || this.isDisclosure) {
+        return false;
+      }
+      return true;
+    },
+    isToggleLabelledExternally() {
+      if (this.hasExternalLabel && this.toggleId) return true;
+      return false;
+    },
+    computedToggleId() {
+      if (this.isDisclosure) {
+        return this.isDefaultToggle ? this.toggleId : undefined;
+      }
+      if (this.isToggleLabelledExternally) {
+        return this.isDefaultToggle ? this.toggleId : undefined;
+      }
+      if (this.hasSearchableListbox) {
+        return this.toggleId;
+      }
+      return undefined;
+    },
+    computedToggleInnerId() {
+      if (this.isToggleCombobox && !this.isToggleLabelledExternally) {
+        return this.toggleId;
+      }
+      if (this.isToggleCombobox && this.isToggleLabelledExternally) {
+        return this.listboxId;
+      }
+      return undefined;
+    },
+    toggleAriaAttributes() {
       return {
-        'aria-haspopup': this.ariaHaspopup,
-        'aria-expanded': String(this.visible),
         'aria-controls': this.baseDropdownId,
+        'aria-expanded': String(this.visible),
+        'aria-haspopup': this.ariaHaspopup,
         'aria-labelledby': this.toggleLabelledBy,
+        'aria-activedescendant': this.ariaActiveDescendant,
       };
     },
     toggleButtonClasses() {
@@ -223,10 +291,28 @@ export default {
       return this.block ? 'gl-w-full' : '';
     },
     toggleLabelledBy() {
+      if (this.isToggleCombobox) {
+        if (this.ariaLabelledby) {
+          return `${this.ariaLabelledby} ${this.toggleId}`;
+        }
+        return this.toggleId;
+      }
+
+      // For non-combobox toggles, combine IDs or use the button's own text
       return this.ariaLabelledby ? `${this.ariaLabelledby} ${this.toggleId}` : undefined;
     },
-    isDefaultToggle() {
-      return !this.$scopedSlots.toggle;
+    toggleRole() {
+      if (this.isToggleCombobox) {
+        return 'combobox';
+      }
+      return undefined;
+    },
+    toggleAccessibilityAttributes() {
+      return {
+        ...this.toggleAriaAttributes,
+        id: this.toggleId,
+        role: this.toggleRole,
+      };
     },
     toggleOptions() {
       if (this.isDefaultToggle) {
@@ -241,7 +327,8 @@ export default {
           disabled: this.disabled,
           loading: this.loading,
           class: this.toggleButtonClasses,
-          ...this.ariaAttributes,
+          role: this.toggleRole,
+          ...this.toggleAriaAttributes,
           listeners: {
             keydown: (event) => this.onKeydown(event),
             click: (event) => this.toggle(event),
@@ -264,7 +351,6 @@ export default {
 
     toggleAttributes() {
       const { listeners, is, ...attributes } = this.toggleOptions;
-
       return attributes;
     },
     toggleComponent() {
@@ -325,18 +411,6 @@ export default {
       };
     },
   },
-  watch: {
-    ariaAttributes: {
-      deep: true,
-      handler(ariaAttributes) {
-        if (this.$scopedSlots.toggle) {
-          Object.keys(ariaAttributes).forEach((key) => {
-            this.toggleElement.setAttribute(key, ariaAttributes[key]);
-          });
-        }
-      },
-    },
-  },
   mounted() {
     this.checkToggleFocusable();
   },
@@ -593,14 +667,19 @@ export default {
     <component
       :is="toggleComponent"
       v-bind="toggleAttributes"
-      :id="toggleId"
+      :id="computedToggleId"
       ref="toggle"
       data-testid="base-dropdown-toggle"
       v-on="toggleListeners"
     >
       <!-- @slot Custom toggle button content -->
-      <slot name="toggle">
-        <span class="gl-new-dropdown-button-text" :class="{ 'gl-sr-only': textSrOnly }">
+      <slot name="toggle" :accessibility-attributes="toggleAccessibilityAttributes">
+        <span
+          :id="computedToggleInnerId"
+          class="gl-new-dropdown-button-text"
+          :class="{ 'gl-sr-only': textSrOnly }"
+          data-testid="base-dropdown-span"
+        >
           {{ toggleText }}
         </span>
         <gl-icon

package/src/components/base/new_dropdowns/disclosure/disclosure_dropdown.vue

@@ -389,14 +389,15 @@ export default {
     :fluid-width="fluidWidth"
     :positioning-strategy="positioningStrategy"
     class="gl-disclosure-dropdown"
+    is-disclosure
     @[$options.events.GL_DROPDOWN_SHOWN]="onShow"
     @[$options.events.GL_DROPDOWN_HIDDEN]="onHide"
     @[$options.events.GL_DROPDOWN_BEFORE_CLOSE]="onBeforeClose"
     @[$options.events.GL_DROPDOWN_FOCUS_CONTENT]="onKeydown"
   >
-    <template v-if="hasCustomToggle" #toggle>
+    <template v-if="hasCustomToggle" #toggle="slotProps">
       <!-- @slot Custom toggle content -->
-      <slot name="toggle"></slot>
+      <slot name="toggle" v-bind="slotProps"></slot>
     </template>
 
     <!-- @slot Content to display in dropdown header -->

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

@@ -11,6 +11,7 @@ import {
   ARROW_DOWN,
   ARROW_UP,
   GL_DROPDOWN_CONTENTS_CLASS,
+  GL_DROPDOWN_FOCUS_CONTENT,
   POSITION_ABSOLUTE,
   POSITION_FIXED,
 } from '../constants';
@@ -53,6 +54,7 @@ export default {
   events: {
     GL_DROPDOWN_SHOWN,
     GL_DROPDOWN_HIDDEN,
+    GL_DROPDOWN_FOCUS_CONTENT,
   },
   components: {
     GlBaseDropdown,
@@ -64,6 +66,11 @@ export default {
     GlLoadingIcon,
     GlIntersectionObserver,
   },
+  inject: {
+    isInFormGroup: {
+      default: false,
+    },
+  },
   model: {
     prop: 'selected',
     event: 'select',
@@ -211,7 +218,7 @@ export default {
     },
     /**
      * The `aria-labelledby` attribute value for the toggle button
-     * Provide the string of ids seperated by space
+     * Provide the string of IDs seperated by space
      */
     toggleAriaLabelledBy: {
       type: String,
@@ -220,7 +227,7 @@ export default {
     },
     /**
      * The `aria-labelledby` attribute value for the list of options
-     * Provide the string of ids seperated by space
+     * Provide the string of IDs seperated by space
      */
     listAriaLabelledBy: {
       type: String,
@@ -382,15 +389,42 @@ export default {
     };
   },
   computed: {
-    ariaLabelledByID() {
-      if (this.searchable) {
-        return this.searchInputId;
-      }
+    /**
+     * Determines the `aria-labelledby` attribute value for the listbox by
+     * evaluating a series of conditions in priority order. The returned ID
+     * references the element that best describes the listbox content, with
+     * preference given to headers in searchable lists, followed by search
+     * input, form labels, and finally fallback options.
+     */
+    listboxAriaLabelledByID() {
+      // Listbox is labelled by closest heading, creating a meaningful relationship
+      if (this.headerId && this.searchable) return `${this.headerId}`;
+
+      // Listbox is labelled by the search input with role="combobox"
+      if (this.searchable) return this.searchInputId;
+
+      // Listbox is labelledy by the text inside an externally labelled button
+      if (this.isInFormGroup) return this.listboxIdComputed;
+
+      // Fallback. Return a header ID or the toggle button ID.
       return this.listAriaLabelledBy || this.headerId || this.toggleIdComputed;
     },
     toggleIdComputed() {
       return this.toggleId || uniqueId('dropdown-toggle-btn-');
     },
+    // Generate a custom listbox ID when inside GlFormGroup
+    listboxIdComputed() {
+      if (this.isInFormGroup) {
+        if (this.listAriaLabelledBy) {
+          return this.listAriaLabelledBy;
+        }
+        if (this.toggleId) {
+          return `${this.toggleId}-span`;
+        }
+        return uniqueId('dropdown-toggle-span-');
+      }
+      return undefined;
+    },
     listboxTag() {
       if (!this.hasItems || isOption(this.items[0])) return 'ul';
       return 'div';
@@ -606,6 +640,10 @@ export default {
     this.scrollObserver?.disconnect();
   },
   methods: {
+    onFocusContent(event) {
+      event.preventDefault();
+      this.open();
+    },
     open() {
       this.$refs.baseDropdown.open();
     },
@@ -922,8 +960,12 @@ export default {
   <gl-base-dropdown
     ref="baseDropdown"
     aria-haspopup="listbox"
+    :active-item-id="activeItemId"
     :aria-labelledby="toggleAriaLabelledBy"
     :block="block"
+    :has-searchable-listbox="searchable"
+    :has-external-label="isInFormGroup"
+    :listbox-id="listboxIdComputed"
     :toggle-id="toggleIdComputed"
     :toggle-text="listboxToggleText"
     :toggle-class="toggleButtonClasses"
@@ -939,12 +981,13 @@ export default {
     :offset="dropdownOffset"
     :fluid-width="fluidWidth"
     :positioning-strategy="positioningStrategy"
+    @[$options.events.GL_DROPDOWN_FOCUS_CONTENT]="onFocusContent"
     @[$options.events.GL_DROPDOWN_SHOWN]="onShow"
     @[$options.events.GL_DROPDOWN_HIDDEN]="onHide"
   >
-    <template v-if="hasCustomToggle" #toggle>
+    <template v-if="hasCustomToggle" #toggle="slotProps">
       <!-- @slot Custom toggle content -->
-      <slot name="toggle"></slot>
+      <slot name="toggle" v-bind="slotProps"></slot>
     </template>
 
     <template #default="{ visible }">
@@ -1013,7 +1056,7 @@ export default {
         :id="listboxId"
         ref="list"
         :aria-busy="isBusy"
-        :aria-labelledby="ariaLabelledByID"
+        :aria-labelledby="listboxAriaLabelledByID"
         :aria-multiselectable="multiple ? 'true' : undefined"
         role="listbox"
         class="gl-new-dropdown-contents gl-new-dropdown-contents-with-scrim-overlay"

package/src/scss/bootstrap_vue.scss

@@ -7,7 +7,6 @@ $bv-enable-popover-variants: false;
 @import '../vendor/bootstrap-vue/src/utilities.scss';
 
 @import '../vendor/bootstrap-vue/src/components/dropdown/index.scss';
-@import '../vendor/bootstrap-vue/src/components/form-checkbox/index.scss';
 @import '../vendor/bootstrap-vue/src/components/form-input/index.scss';
 @import '../vendor/bootstrap-vue/src/components/form-radio/index.scss';
 @import '../vendor/bootstrap-vue/src/components/modal/index.scss';

package/src/vendor/bootstrap-vue/src/constants/components.js

@@ -11,8 +11,6 @@ export const NAME_DROPDOWN_ITEM = 'BDropdownItem'
 export const NAME_DROPDOWN_ITEM_BUTTON = 'BDropdownItemButton'
 export const NAME_DROPDOWN_TEXT = 'BDropdownText'
 export const NAME_FORM = 'BForm'
-export const NAME_FORM_CHECKBOX = 'BFormCheckbox'
-export const NAME_FORM_CHECKBOX_GROUP = 'BFormCheckboxGroup'
 export const NAME_FORM_GROUP = 'BFormGroup'
 export const NAME_FORM_INVALID_FEEDBACK = 'BFormInvalidFeedback'
 export const NAME_FORM_RADIO = 'BFormRadio'

package/src/vendor/bootstrap-vue/src/mixins/form-radio-check-group.js

@@ -6,7 +6,6 @@ import { looseEqual } from '../utils/loose-equal'
 import { makeModelMixin } from '../utils/model'
 import { omit, pick, sortKeys } from '../utils/object'
 import { makeProp, makePropsConfigurable } from '../utils/props'
-import { BFormCheckbox } from '../components/form-checkbox/form-checkbox'
 import { BFormRadio } from '../components/form-radio/form-radio'
 import { formControlMixin, props as formControlProps } from './form-control'
 import { formCustomMixin, props as formCustomProps } from './form-custom'
@@ -99,7 +98,7 @@ export const formRadioCheckGroupMixin = extend({
   render(h) {
     const { isRadioGroup } = this
     const attrs = pick(this.$attrs, PASS_DOWN_ATTRS)
-    const optionComponent = isRadioGroup ? BFormRadio : BFormCheckbox
+    const optionComponent = BFormRadio
 
     const $inputs = this.formOptions.map((option, index) => {
       const key = `BV_option_${index}`

package/src/vendor/bootstrap-vue/src/components/form-checkbox/_form-checkbox-group.scss

@@ -1 +0,0 @@
-@import "../../utilities";

package/src/vendor/bootstrap-vue/src/components/form-checkbox/_form-checkbox.scss

@@ -1,125 +0,0 @@
-// Adds control sizing to Bootstrap custom checkbox/switch inputs
-
-.custom-checkbox.b-custom-control-lg,
-.input-group-lg .custom-checkbox {
-  font-size: $font-size-lg;
-  line-height: $line-height-lg;
-  padding-left: $b-custom-control-gutter-lg + $b-custom-control-indicator-size-lg;
-
-  .custom-control-label::before {
-    top: ($font-size-lg * $line-height-lg - $b-custom-control-indicator-size-lg) * 0.5;
-    left: -($b-custom-control-gutter-lg + $b-custom-control-indicator-size-lg);
-    width: $b-custom-control-indicator-size-lg;
-    height: $b-custom-control-indicator-size-lg;
-    @include border-radius($b-custom-checkbox-indicator-border-radius-lg);
-  }
-
-  .custom-control-label::after {
-    top: ($font-size-lg * $line-height-lg - $b-custom-control-indicator-size-lg) * 0.5;
-    left: -($b-custom-control-gutter-lg + $b-custom-control-indicator-size-lg);
-    width: $b-custom-control-indicator-size-lg;
-    height: $b-custom-control-indicator-size-lg;
-    background-size: $b-custom-control-indicator-bg-size-lg;
-  }
-}
-
-.custom-checkbox.b-custom-control-sm,
-.input-group-sm .custom-checkbox {
-  font-size: $font-size-sm;
-  line-height: $line-height-sm;
-  padding-left: $b-custom-control-gutter-sm + $b-custom-control-indicator-size-sm;
-
-  .custom-control-label::before {
-    top: ($font-size-sm * $line-height-sm - $b-custom-control-indicator-size-sm) * 0.5;
-    left: -($b-custom-control-gutter-sm + $b-custom-control-indicator-size-sm);
-    width: $b-custom-control-indicator-size-sm;
-    height: $b-custom-control-indicator-size-sm;
-    @include border-radius($b-custom-checkbox-indicator-border-radius-sm);
-  }
-
-  .custom-control-label::after {
-    top: ($font-size-sm * $line-height-sm - $b-custom-control-indicator-size-sm) * 0.5;
-    left: -($b-custom-control-gutter-sm + $b-custom-control-indicator-size-sm);
-    width: $b-custom-control-indicator-size-sm;
-    height: $b-custom-control-indicator-size-sm;
-    background-size: $b-custom-control-indicator-bg-size-sm;
-  }
-}
-
-.custom-switch.b-custom-control-lg,
-.input-group-lg .custom-switch {
-  padding-left: $b-custom-switch-width-lg + $b-custom-control-gutter-lg;
-
-  .custom-control-label {
-    font-size: $font-size-lg;
-    line-height: $line-height-lg;
-
-    &::before {
-      top: ($font-size-lg * $line-height-lg - $b-custom-control-indicator-size-lg) * 0.5;
-      height: $b-custom-control-indicator-size-lg;
-      left: -($b-custom-switch-width-lg + $b-custom-control-gutter-lg);
-      width: $b-custom-switch-width-lg;
-      border-radius: $b-custom-switch-indicator-border-radius-lg;
-    }
-
-    &::after {
-      top: calc(
-        #{(($font-size-lg * $line-height-lg - $b-custom-control-indicator-size-lg) * 0.5)} + #{$custom-control-indicator-border-width *
-          2}
-      );
-      left: calc(
-        #{- ($b-custom-switch-width-lg + $b-custom-control-gutter-lg)} + #{$custom-control-indicator-border-width *
-          2}
-      );
-      width: $b-custom-switch-indicator-size-lg;
-      height: $b-custom-switch-indicator-size-lg;
-      border-radius: $b-custom-switch-indicator-border-radius-lg;
-      background-size: $b-custom-control-indicator-bg-size-lg;
-    }
-  }
-
-  .custom-control-input:checked ~ .custom-control-label {
-    &::after {
-      transform: translateX($b-custom-switch-width-lg - $b-custom-control-indicator-size-lg);
-    }
-  }
-}
-
-.custom-switch.b-custom-control-sm,
-.input-group-sm .custom-switch {
-  padding-left: $b-custom-switch-width-sm + $b-custom-control-gutter-sm;
-
-  .custom-control-label {
-    font-size: $font-size-sm;
-    line-height: $line-height-sm;
-
-    &::before {
-      top: ($font-size-sm * $line-height-sm - $b-custom-control-indicator-size-sm) * 0.5;
-      left: -($b-custom-switch-width-sm + $b-custom-control-gutter-sm);
-      width: $b-custom-switch-width-sm;
-      height: $b-custom-control-indicator-size-sm;
-      border-radius: $b-custom-switch-indicator-border-radius-sm;
-    }
-
-    &::after {
-      top: calc(
-        #{(($font-size-sm * $line-height-sm - $b-custom-control-indicator-size-sm) * 0.5)} + #{$custom-control-indicator-border-width *
-          2}
-      );
-      left: calc(
-        #{- ($b-custom-switch-width-sm + $b-custom-control-gutter-sm)} + #{$custom-control-indicator-border-width *
-          2}
-      );
-      width: $b-custom-switch-indicator-size-sm;
-      height: $b-custom-switch-indicator-size-sm;
-      border-radius: $b-custom-switch-indicator-border-radius-sm;
-      background-size: $b-custom-control-indicator-bg-size-sm;
-    }
-  }
-
-  .custom-control-input:checked ~ .custom-control-label {
-    &::after {
-      transform: translateX($b-custom-switch-width-sm - $b-custom-control-indicator-size-sm);
-    }
-  }
-}

package/src/vendor/bootstrap-vue/src/components/form-checkbox/form-checkbox-group.js

@@ -1,42 +0,0 @@
-import { extend } from '../../vue'
-import { NAME_FORM_CHECKBOX_GROUP } from '../../constants/components'
-import { PROP_TYPE_ARRAY, PROP_TYPE_BOOLEAN } from '../../constants/props'
-import { sortKeys } from '../../utils/object'
-import { makeProp, makePropsConfigurable } from '../../utils/props'
-import {
-  MODEL_PROP_NAME,
-  formRadioCheckGroupMixin,
-  props as formRadioCheckGroupProps
-} from '../../mixins/form-radio-check-group'
-
-// --- Props ---
-
-export const props = makePropsConfigurable(
-  sortKeys({
-    ...formRadioCheckGroupProps,
-    [MODEL_PROP_NAME]: makeProp(PROP_TYPE_ARRAY, []),
-    // Custom switch styling
-    switches: makeProp(PROP_TYPE_BOOLEAN, false)
-  }),
-  NAME_FORM_CHECKBOX_GROUP
-)
-
-// --- Main component ---
-
-// @vue/component
-export const BFormCheckboxGroup = /*#__PURE__*/ extend({
-  name: NAME_FORM_CHECKBOX_GROUP,
-  // Includes render function
-  mixins: [formRadioCheckGroupMixin],
-  provide() {
-    return {
-      getBvCheckGroup: () => this
-    }
-  },
-  props,
-  computed: {
-    isRadioGroup() {
-      return false
-    }
-  }
-})

package/src/vendor/bootstrap-vue/src/components/form-checkbox/form-checkbox.js

@@ -1,132 +0,0 @@
-import { extend } from '../../vue'
-import { NAME_FORM_CHECKBOX } from '../../constants/components'
-import { EVENT_NAME_CHANGE, MODEL_EVENT_NAME_PREFIX } from '../../constants/events'
-import { PROP_TYPE_ANY, PROP_TYPE_BOOLEAN } from '../../constants/props'
-import { isArray } from '../../utils/inspect'
-import { looseEqual } from '../../utils/loose-equal'
-import { looseIndexOf } from '../../utils/loose-index-of'
-import { sortKeys } from '../../utils/object'
-import { makeProp, makePropsConfigurable } from '../../utils/props'
-import {
-  MODEL_EVENT_NAME,
-  formRadioCheckMixin,
-  props as formRadioCheckProps
-} from '../../mixins/form-radio-check'
-
-// --- Constants ---
-
-const MODEL_PROP_NAME_INDETERMINATE = 'indeterminate'
-const MODEL_EVENT_NAME_INDETERMINATE = MODEL_EVENT_NAME_PREFIX + MODEL_PROP_NAME_INDETERMINATE
-
-// --- Props ---
-
-export const props = makePropsConfigurable(
-  sortKeys({
-    ...formRadioCheckProps,
-    // Not applicable in multi-check mode
-    [MODEL_PROP_NAME_INDETERMINATE]: makeProp(PROP_TYPE_BOOLEAN, false),
-    // Custom switch styling
-    switch: makeProp(PROP_TYPE_BOOLEAN, false),
-    // Not applicable in multi-check mode
-    uncheckedValue: makeProp(PROP_TYPE_ANY, false),
-    value: makeProp(PROP_TYPE_ANY, true)
-  }),
-  NAME_FORM_CHECKBOX
-)
-
-// --- Main component ---
-
-// @vue/component
-export const BFormCheckbox = /*#__PURE__*/ extend({
-  name: NAME_FORM_CHECKBOX,
-  mixins: [formRadioCheckMixin],
-  inject: {
-    getBvGroup: {
-      from: 'getBvCheckGroup',
-      default: () => () => null
-    }
-  },
-  props,
-  computed: {
-    bvGroup() {
-      return this.getBvGroup()
-    },
-    isChecked() {
-      const { value, computedLocalChecked: checked } = this
-      return isArray(checked) ? looseIndexOf(checked, value) > -1 : looseEqual(checked, value)
-    },
-    isRadio() {
-      return false
-    }
-  },
-  watch: {
-    [MODEL_PROP_NAME_INDETERMINATE](newValue, oldValue) {
-      if (!looseEqual(newValue, oldValue)) {
-        this.setIndeterminate(newValue)
-      }
-    }
-  },
-  mounted() {
-    // Set initial indeterminate state
-    this.setIndeterminate(this[MODEL_PROP_NAME_INDETERMINATE])
-  },
-  methods: {
-    computedLocalCheckedWatcher(newValue, oldValue) {
-      if (!looseEqual(newValue, oldValue)) {
-        this.$emit(MODEL_EVENT_NAME, newValue)
-
-        const $input = this.$refs.input
-        if ($input) {
-          this.$emit(MODEL_EVENT_NAME_INDETERMINATE, $input.indeterminate)
-        }
-      }
-    },
-
-    handleChange({ target: { checked, indeterminate } }) {
-      const { value, uncheckedValue } = this
-
-      // Update `computedLocalChecked`
-      let localChecked = this.computedLocalChecked
-      if (isArray(localChecked)) {
-        const index = looseIndexOf(localChecked, value)
-        if (checked && index < 0) {
-          // Add value to array
-          localChecked = localChecked.concat(value)
-        } else if (!checked && index > -1) {
-          // Remove value from array
-          localChecked = localChecked.slice(0, index).concat(localChecked.slice(index + 1))
-        }
-      } else {
-        localChecked = checked ? value : uncheckedValue
-      }
-      this.computedLocalChecked = localChecked
-
-      // Fire events in a `$nextTick()` to ensure the `v-model` is updated
-      this.$nextTick(() => {
-        // Change is only emitted on user interaction
-        this.$emit(EVENT_NAME_CHANGE, localChecked)
-
-        // If this is a child of a group, we emit a change event on it as well
-        if (this.isGroup) {
-          this.bvGroup.$emit(EVENT_NAME_CHANGE, localChecked)
-        }
-
-        this.$emit(MODEL_EVENT_NAME_INDETERMINATE, indeterminate)
-      })
-    },
-
-    setIndeterminate(state) {
-      // Indeterminate only supported in single checkbox mode
-      if (isArray(this.computedLocalChecked)) {
-        state = false
-      }
-
-      const $input = this.$refs.input
-      if ($input) {
-        $input.indeterminate = state
-        // Emit update event to prop
-        this.$emit(MODEL_EVENT_NAME_INDETERMINATE, state)
-      }
-    }
-  }
-})

package/src/vendor/bootstrap-vue/src/components/form-checkbox/index.js

@@ -1,4 +0,0 @@
-import { BFormCheckbox } from './form-checkbox'
-import { BFormCheckboxGroup } from './form-checkbox-group'
-
-export { BFormCheckbox, BFormCheckboxGroup }

package/src/vendor/bootstrap-vue/src/components/form-checkbox/index.scss

@@ -1,2 +0,0 @@
-@import "form-checkbox";
-@import "form-checkbox-group";