@atlaskit/react-select 2.6.6 → 2.7.0

package/dist/es2019/compiled/components/live-region.js

@@ -1,5 +1,4 @@
-import React, { Fragment, useMemo, useRef } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
+import React, { Fragment, useMemo } from 'react';
 import { defaultAriaLiveMessages } from '../../accessibility';
 import A11yText from './internal/a11y-text';
 
@@ -10,35 +9,24 @@ import A11yText from './internal/a11y-text';
 const LiveRegion = props => {
   const {
     ariaSelection,
-    focusedOption,
-    focusedValue,
     focusableOptions,
     isFocused,
     selectValue,
     selectProps,
-    id,
-    isAppleDevice
+    id
   } = props;
   const {
     ariaLiveMessages,
     getOptionLabel,
     inputValue,
-    isMulti,
     isOptionDisabled,
-    isSearchable,
-    label,
     menuIsOpen,
     options,
     screenReaderStatus,
-    tabSelectsValue,
     isLoading
   } = selectProps;
-  const ariaLabel = selectProps['aria-label'] || label;
   const ariaLive = selectProps['aria-live'];
 
-  // for safari, we will use minimum support from aria-live region
-  const isA11yImprovementEnabled = fg('design_system_select-a11y-improvement') && !isAppleDevice;
-
   // Update aria live message configuration when prop changes
   const messages = useMemo(() => ({
     ...defaultAriaLiveMessages,
@@ -48,7 +36,7 @@ const LiveRegion = props => {
   // Update aria live selected option when prop changes
   const ariaSelected = useMemo(() => {
     let message = '';
-    if (isA11yImprovementEnabled && menuIsOpen) {
+    if (menuIsOpen) {
       // we don't need to have selected message when the menu is open
       return '';
     }
@@ -70,7 +58,7 @@ const LiveRegion = props => {
       // If there are multiple items from the action then return an array of labels
       const multiSelected = selectedOptions || removedValues || undefined;
       const labels = multiSelected ? multiSelected.map(getOptionLabel) : [];
-      if (isA11yImprovementEnabled && !label && !labels.length) {
+      if (!label && !labels.length) {
         // return empty string if no labels provided
         return '';
       }
@@ -85,33 +73,7 @@ const LiveRegion = props => {
       message = messages.onChange(onChangeProps);
     }
     return message;
-  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, isA11yImprovementEnabled, menuIsOpen]);
-  const prevInputValue = useRef('');
-  const ariaFocused = useMemo(() => {
-    let focusMsg = '';
-    const focused = focusedOption || focusedValue;
-    const isSelected = !!(focusedOption && selectValue && selectValue.includes(focusedOption));
-    if (inputValue === prevInputValue.current && isA11yImprovementEnabled) {
-      // only announce focus option when searching when ff is on and the input value changed
-      // for safari, we will announce for all
-      return '';
-    }
-    if (focused && messages.onFocus) {
-      const onFocusProps = {
-        focused,
-        label: getOptionLabel(focused),
-        isDisabled: isOptionDisabled(focused, selectValue),
-        isSelected,
-        options: focusableOptions,
-        context: focused === focusedOption ? 'menu' : 'value',
-        selectValue,
-        isMulti
-      };
-      focusMsg = messages.onFocus(onFocusProps);
-    }
-    prevInputValue.current = inputValue;
-    return focusMsg;
-  }, [inputValue, focusedOption, focusedValue, getOptionLabel, isOptionDisabled, messages, focusableOptions, selectValue, isA11yImprovementEnabled, isMulti]);
+  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, menuIsOpen]);
   const ariaResults = useMemo(() => {
     let resultsMsg = '';
     if (isLoading) {
@@ -132,43 +94,17 @@ const LiveRegion = props => {
     return resultsMsg;
   }, [focusableOptions, inputValue, menuIsOpen, messages, options, screenReaderStatus, isLoading]);
   const isInitialFocus = (ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action) === 'initial-input-focus';
-  const ariaGuidance = useMemo(() => {
-    if (fg('design_system_select-a11y-improvement')) {
-      // don't announce guidance at all when ff is on
-      return '';
-    }
-    let guidanceMsg = '';
-    if (messages.guidance) {
-      const context = focusedValue ? 'value' : menuIsOpen ? 'menu' : 'input';
-      guidanceMsg = messages.guidance({
-        'aria-label': ariaLabel,
-        context,
-        isDisabled: focusedOption && isOptionDisabled(focusedOption, selectValue),
-        isMulti,
-        isSearchable,
-        tabSelectsValue,
-        isInitialFocus
-      });
-    }
-    return guidanceMsg;
-  }, [ariaLabel, focusedOption, focusedValue, isMulti, isOptionDisabled, isSearchable, menuIsOpen, messages, selectValue, tabSelectsValue, isInitialFocus]);
   const ScreenReaderText = /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
     id: "aria-selection"
   }, ariaSelected), /*#__PURE__*/React.createElement("span", {
     id: "aria-results"
-  }, ariaResults), !fg('design_system_select-a11y-improvement') && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-    id: "aria-focused"
-  }, ariaFocused), /*#__PURE__*/React.createElement("span", {
-    id: "aria-guidance"
-  }, ariaGuidance)));
+  }, ariaResults));
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(A11yText, {
     id: id
   }, isInitialFocus && ScreenReaderText), /*#__PURE__*/React.createElement(A11yText, {
     "aria-live": ariaLive // Should be undefined by default unless a specific use case requires it
     ,
-    "aria-atomic": fg('design_system_select-a11y-improvement') ? undefined : 'false',
-    "aria-relevant": fg('design_system_select-a11y-improvement') ? undefined : 'additions text',
-    role: fg('design_system_select-a11y-improvement') ? 'status' : 'log'
+    role: "status"
   }, isFocused && !isInitialFocus && ScreenReaderText));
 };
 

package/dist/es2019/emotion/components/live-region.js

@@ -1,14 +1,12 @@
-/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /**
  * @jsxRuntime classic
  * @jsx jsx
  * @jsxFrag React.Fragment
  */
-import React, { Fragment, useMemo, useRef } from 'react';
+import { Fragment, useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
 import { jsx } from '@emotion/react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { defaultAriaLiveMessages } from '../../accessibility';
 import A11yText from './internal/a11y-text';
 
@@ -19,35 +17,24 @@ import A11yText from './internal/a11y-text';
 const LiveRegion = props => {
   const {
     ariaSelection,
-    focusedOption,
-    focusedValue,
     focusableOptions,
     isFocused,
     selectValue,
     selectProps,
-    id,
-    isAppleDevice
+    id
   } = props;
   const {
     ariaLiveMessages,
     getOptionLabel,
     inputValue,
-    isMulti,
     isOptionDisabled,
-    isSearchable,
-    label,
     menuIsOpen,
     options,
     screenReaderStatus,
-    tabSelectsValue,
     isLoading
   } = selectProps;
-  const ariaLabel = selectProps['aria-label'] || label;
   const ariaLive = selectProps['aria-live'];
 
-  // for safari, we will use minimum support from aria-live region
-  const isA11yImprovementEnabled = fg('design_system_select-a11y-improvement') && !isAppleDevice;
-
   // Update aria live message configuration when prop changes
   const messages = useMemo(() => ({
     ...defaultAriaLiveMessages,
@@ -57,7 +44,7 @@ const LiveRegion = props => {
   // Update aria live selected option when prop changes
   const ariaSelected = useMemo(() => {
     let message = '';
-    if (isA11yImprovementEnabled && menuIsOpen) {
+    if (menuIsOpen) {
       // we don't need to have selected message when the menu is open
       return '';
     }
@@ -79,7 +66,7 @@ const LiveRegion = props => {
       // If there are multiple items from the action then return an array of labels
       const multiSelected = selectedOptions || removedValues || undefined;
       const labels = multiSelected ? multiSelected.map(getOptionLabel) : [];
-      if (isA11yImprovementEnabled && !label && !labels.length) {
+      if (!label && !labels.length) {
         // return empty string if no labels provided
         return '';
       }
@@ -94,33 +81,7 @@ const LiveRegion = props => {
       message = messages.onChange(onChangeProps);
     }
     return message;
-  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, isA11yImprovementEnabled, menuIsOpen]);
-  const prevInputValue = useRef('');
-  const ariaFocused = useMemo(() => {
-    let focusMsg = '';
-    const focused = focusedOption || focusedValue;
-    const isSelected = !!(focusedOption && selectValue && selectValue.includes(focusedOption));
-    if (inputValue === prevInputValue.current && isA11yImprovementEnabled) {
-      // only announce focus option when searching when ff is on and the input value changed
-      // for safari, we will announce for all
-      return '';
-    }
-    if (focused && messages.onFocus) {
-      const onFocusProps = {
-        focused,
-        label: getOptionLabel(focused),
-        isDisabled: isOptionDisabled(focused, selectValue),
-        isSelected,
-        options: focusableOptions,
-        context: focused === focusedOption ? 'menu' : 'value',
-        selectValue,
-        isMulti
-      };
-      focusMsg = messages.onFocus(onFocusProps);
-    }
-    prevInputValue.current = inputValue;
-    return focusMsg;
-  }, [inputValue, focusedOption, focusedValue, getOptionLabel, isOptionDisabled, messages, focusableOptions, selectValue, isA11yImprovementEnabled, isMulti]);
+  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, menuIsOpen]);
   const ariaResults = useMemo(() => {
     let resultsMsg = '';
     if (isLoading) {
@@ -141,43 +102,17 @@ const LiveRegion = props => {
     return resultsMsg;
   }, [focusableOptions, inputValue, menuIsOpen, messages, options, screenReaderStatus, isLoading]);
   const isInitialFocus = (ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action) === 'initial-input-focus';
-  const ariaGuidance = useMemo(() => {
-    if (fg('design_system_select-a11y-improvement')) {
-      // don't announce guidance at all when ff is on
-      return '';
-    }
-    let guidanceMsg = '';
-    if (messages.guidance) {
-      const context = focusedValue ? 'value' : menuIsOpen ? 'menu' : 'input';
-      guidanceMsg = messages.guidance({
-        'aria-label': ariaLabel,
-        context,
-        isDisabled: focusedOption && isOptionDisabled(focusedOption, selectValue),
-        isMulti,
-        isSearchable,
-        tabSelectsValue,
-        isInitialFocus
-      });
-    }
-    return guidanceMsg;
-  }, [ariaLabel, focusedOption, focusedValue, isMulti, isOptionDisabled, isSearchable, menuIsOpen, messages, selectValue, tabSelectsValue, isInitialFocus]);
   const ScreenReaderText = jsx(Fragment, null, jsx("span", {
     id: "aria-selection"
   }, ariaSelected), jsx("span", {
     id: "aria-results"
-  }, ariaResults), !fg('design_system_select-a11y-improvement') && jsx(React.Fragment, null, jsx("span", {
-    id: "aria-focused"
-  }, ariaFocused), jsx("span", {
-    id: "aria-guidance"
-  }, ariaGuidance)));
+  }, ariaResults));
   return jsx(Fragment, null, jsx(A11yText, {
     id: id
   }, isInitialFocus && ScreenReaderText), jsx(A11yText, {
     "aria-live": ariaLive // Should be undefined by default unless a specific use case requires it
     ,
-    "aria-atomic": fg('design_system_select-a11y-improvement') ? undefined : 'false',
-    "aria-relevant": fg('design_system_select-a11y-improvement') ? undefined : 'additions text',
-    role: fg('design_system_select-a11y-improvement') ? 'status' : 'log'
+    role: "status"
   }, isFocused && !isInitialFocus && ScreenReaderText));
 };
 

package/dist/es2019/select.js

@@ -1,8 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import React, { Component } from 'react';
-import { isAppleDevice } from '@atlaskit/ds-lib/device-check';
+import { isAppleDevice, isSafari } from '@atlaskit/ds-lib/device-check';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { formatGroupLabel as formatGroupLabelBuiltin, getOptionLabel as getOptionLabelBuiltin, getOptionValue as getOptionValueBuiltin, isOptionDisabled as isOptionDisabledBuiltin } from './builtins';
 import { defaultComponents } from './components';
@@ -14,9 +13,6 @@ import { createFilter } from './filters';
 import { defaultStyles } from './styles';
 import { classNames, cleanValue, filterUnsupportedSelectors, isDocumentElement, isMobileDevice, isTouchCapable, multiValueAsValue, noop, notNullish, scrollIntoView, singleValueAsValue, valueTernary } from './utils';
 export const defaultProps = {
-  // aria-live is by default with the live region so we don't need it
-  // eslint-disable-next-line @atlaskit/platform/no-module-level-eval
-  'aria-live': fg('design_system_select-a11y-improvement') ? undefined : 'polite',
   backspaceRemovesValue: true,
   blurInputOnSelect: isTouchCapable(),
   captureMenuScroll: !isTouchCapable(),
@@ -230,7 +226,6 @@ export default class Select extends Component {
     _defineProperty(this, "initialTouchY", 0);
     _defineProperty(this, "openAfterFocus", false);
     _defineProperty(this, "scrollToFocusedOptionOnUpdate", false);
-    _defineProperty(this, "isVoiceOver", fg('design_system_select-a11y-improvement') && isAppleDevice());
     // Refs
     // ------------------------------
     _defineProperty(this, "controlRef", null);
@@ -992,15 +987,62 @@ export default class Select extends Component {
         openAtIndex = selectedIndex;
       }
     }
+    const focusedOption = focusableOptions[openAtIndex];
 
     // only scroll if the menu isn't already open
     this.scrollToFocusedOptionOnUpdate = !(isFocused && this.menuListRef);
     this.setState({
       inputIsHiddenAfterUpdate: false,
       focusedValue: null,
-      focusedOption: focusableOptions[openAtIndex],
-      focusedOptionId: this.getFocusedOptionId(focusableOptions[openAtIndex])
+      focusedOption: focusedOption,
+      focusedOptionId: this.getFocusedOptionId(focusedOption)
     }, () => this.onMenuOpen());
+    isSafari() && focusedOption && this.updateInputLabel(this.calculateInputLabel(focusedOption, openAtIndex));
+  }
+  updateInputLabel(inputLabel) {
+    if (inputLabel) {
+      var _this$inputRef;
+      (_this$inputRef = this.inputRef) === null || _this$inputRef === void 0 ? void 0 : _this$inputRef.setAttribute('aria-label', inputLabel);
+      setTimeout(() => {
+        const normalizedLabel = this.props['aria-label'] || this.props.label;
+        if (normalizedLabel) {
+          var _this$inputRef2;
+          (_this$inputRef2 = this.inputRef) === null || _this$inputRef2 === void 0 ? void 0 : _this$inputRef2.setAttribute('aria-label', normalizedLabel);
+        } else {
+          var _this$inputRef3;
+          (_this$inputRef3 = this.inputRef) === null || _this$inputRef3 === void 0 ? void 0 : _this$inputRef3.removeAttribute('aria-label');
+        }
+      }, 500);
+    }
+  }
+  calculateInputLabel(focusedOption, optionIndex) {
+    const {
+      options
+    } = this.props;
+    const isOptionsGrouped = options === null || options === void 0 ? void 0 : options.every(obj => typeof obj === 'object' && obj !== null && 'options' in obj);
+    let inputLabel = this.getOptionLabel(focusedOption);
+    const isOptionFocused = option => {
+      return this.getOptionLabel(option) === inputLabel;
+    };
+    const groupData = options === null || options === void 0 ? void 0 : options.find(option => {
+      var _groupCandidate$optio, _groupCandidate$optio2;
+      const groupCandidate = option;
+      return (_groupCandidate$optio = (_groupCandidate$optio2 = groupCandidate.options) === null || _groupCandidate$optio2 === void 0 ? void 0 : _groupCandidate$optio2.some(isOptionFocused)) !== null && _groupCandidate$optio !== void 0 ? _groupCandidate$optio : false;
+    });
+    if (isOptionsGrouped) {
+      var _groupData$options$fi;
+      const groupOptionIndex = (_groupData$options$fi = groupData === null || groupData === void 0 ? void 0 : groupData.options.findIndex(isOptionFocused)) !== null && _groupData$options$fi !== void 0 ? _groupData$options$fi : 0;
+      const totalLength = options === null || options === void 0 ? void 0 : options.reduce((acc, currentGroup) => {
+        var _group$options;
+        const group = currentGroup;
+        acc += group === null || group === void 0 ? void 0 : (_group$options = group.options) === null || _group$options === void 0 ? void 0 : _group$options.length;
+        return acc;
+      }, 0);
+      inputLabel = `${inputLabel}, ${groupData === null || groupData === void 0 ? void 0 : groupData.label} (${groupOptionIndex + 1} of ${totalLength})`;
+    } else {
+      inputLabel = `${inputLabel} (${optionIndex + 1} of ${options === null || options === void 0 ? void 0 : options.length})`;
+    }
+    return inputLabel;
   }
   focusValue(direction) {
     const {
@@ -1174,28 +1216,38 @@ export default class Select extends Component {
   formatGroupLabel(data) {
     return this.props.formatGroupLabel(data);
   }
-  calculateDescription(action) {
-    const descriptionProp = this.props['aria-describedby'] || this.props['descriptionId'];
+  calculateDescription() {
+    const descriptionProp = this.props['aria-describedby'] || this.props.descriptionId;
     const {
       isMulti
     } = this.props;
-    const {
-      selectValue
-    } = this.state;
-    const defaultDescription = selectValue.length ? this.getElementId('live-region') : this.getElementId('placeholder');
-    if (!isMulti && selectValue.length && action !== 'initial-input-focus') {
-      return;
+    const hasValue = this.state.selectValue.length > 0;
+
+    // Determine base description based on selection state
+    const baseDescriptionId = hasValue ? isMulti ? '' : this.getElementId('single-value') : this.getElementId('placeholder');
+
+    // Fast path for single select with no description prop
+    if (!isMulti && !descriptionProp) {
+      return {
+        'aria-describedby': baseDescriptionId
+      };
+    }
+
+    // Build the describedby string efficiently
+    let describedBy = baseDescriptionId;
+    // Add description prop if it exists
+    if (descriptionProp) {
+      describedBy = describedBy ? `${descriptionProp} ${describedBy}` : descriptionProp;
     }
+
+    // For multi-select, always add multi-message ID
     if (isMulti) {
       const multiMessage = this.getElementId('multi-message');
-      return {
-        'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, multiMessage].join(' ') : [defaultDescription, multiMessage].join(' ')
-      };
-    } else {
-      return {
-        'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription].join(' ') : defaultDescription
-      };
+      describedBy = describedBy ? `${describedBy} ${multiMessage}` : multiMessage;
     }
+    return {
+      'aria-describedby': describedBy
+    };
   }
   // ==============================
   // Composition Handlers
@@ -1246,7 +1298,6 @@ export default class Select extends Component {
   // ==============================
   renderInput() {
     const {
-      descriptionId,
       form,
       inputId,
       inputValue,
@@ -1265,8 +1316,7 @@ export default class Select extends Component {
       Input
     } = this.getComponents();
     const {
-      inputIsHidden,
-      ariaSelection
+      inputIsHidden
     } = this.state;
     const {
       commonProps
@@ -1280,7 +1330,6 @@ export default class Select extends Component {
       'aria-expanded': menuIsOpen,
       // TODO: aria-haspopup is implied as listbox with role="combobox" and was deprecated for aria 1.2, we still might need to keep it for back compat
       'aria-haspopup': this.props['UNSAFE_is_experimental_generic'] ? 'dialog' : 'listbox',
-      'aria-describedby': this.props['aria-describedby'] || descriptionId,
       'aria-invalid': this.props['aria-invalid'] || isInvalid,
       'aria-label': this.props['aria-label'] || label,
       'aria-labelledby': this.props['aria-labelledby'] || labelId,
@@ -1294,7 +1343,7 @@ export default class Select extends Component {
       ...(!isSearchable && {
         'aria-readonly': true
       }),
-      ...this.calculateDescription(ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action)
+      ...this.calculateDescription()
     };
     if (!isSearchable) {
       // use a dummy input to maintain focus/blur functionality
@@ -1410,7 +1459,10 @@ export default class Select extends Component {
     const singleValue = selectValue[0];
     return /*#__PURE__*/React.createElement(SingleValue, _extends({}, commonProps, {
       data: singleValue,
-      isDisabled: isDisabled
+      isDisabled: isDisabled,
+      innerProps: {
+        id: this.getElementId('single-value')
+      }
     }), this.formatOptionLabel(singleValue, 'value'));
   }
   renderClearIndicator() {
@@ -1548,8 +1600,6 @@ export default class Select extends Component {
       noOptionsMessage,
       onMenuScrollToTop,
       onMenuScrollToBottom,
-      labelId,
-      label,
       testId
     } = this.props;
     if (!menuIsOpen) {
@@ -1578,8 +1628,8 @@ export default class Select extends Component {
         role: this.props['UNSAFE_is_experimental_generic'] ? 'listitem' : 'option',
         'aria-selected': this.props['UNSAFE_is_experimental_generic'] ? undefined : isSelected,
         // We don't want aria-disabled if it's false. It's just noisy.
-        'aria-disabled': !isDisabled && fg('design_system_select-a11y-improvement') ? undefined : isDisabled,
-        'aria-describedby': fg('design_system_select-a11y-improvement') ? headingId : undefined,
+        'aria-disabled': !isDisabled ? undefined : isDisabled,
+        'aria-describedby': headingId,
         ...(testId && {
           'data-testid': `${testId}-select--option-${id}`
         })
@@ -1657,26 +1707,6 @@ export default class Select extends Component {
       menuPosition,
       menuShouldScrollIntoView
     };
-    const calculateListboxLabel = () => {
-      var _this$inputRef;
-      // First in name calculation, overwrites aria-label
-      if (labelId) {
-        return {
-          'aria-labelledby': labelId
-        };
-      }
-      // Second in name calcuation, overwrites everything else except aria-labelledby
-      if (label) {
-        return {
-          'aria-label': label
-        };
-      }
-      // Fallback if no label or labelId is provided, might catch label via <label for> otherwise
-      // will most likely not have an accessible name
-      return {
-        'aria-labelledby': ((_this$inputRef = this.inputRef) === null || _this$inputRef === void 0 ? void 0 : _this$inputRef.id) || this.getElementId('input')
-      };
-    };
     const menuElement = /*#__PURE__*/React.createElement(MenuPlacer, _extends({}, commonProps, menuPlacementProps), ({
       ref,
       placerProps: {
@@ -1700,28 +1730,35 @@ export default class Select extends Component {
       onTopArrive: onMenuScrollToTop,
       onBottomArrive: onMenuScrollToBottom,
       lockEnabled: menuShouldBlockScroll
-    }, scrollTargetRef => /*#__PURE__*/React.createElement(MenuList, _extends({}, commonProps, {
-      innerRef: instance => {
-        this.getMenuListRef(instance);
-        scrollTargetRef(instance);
-      },
-      innerProps: {
-        role: this.props['UNSAFE_is_experimental_generic'] ? 'dialog' : 'listbox',
-        'aria-label': this.props['UNSAFE_is_experimental_generic'] ? `${this.props['aria-label'] || label}-dialog` : null,
-        'aria-multiselectable': (this.isVoiceOver || !commonProps.isMulti) && fg('design_system_select-a11y-improvement') || this.props['UNSAFE_is_experimental_generic'] ? undefined : commonProps.isMulti,
-        id: this.getElementId('listbox'),
-        ...(testId && {
-          'data-testid': `${testId}-select--listbox`
-        }),
-        // add aditional label on listbox when ff is on
-        ...(fg('design_system_select-a11y-improvement') && calculateListboxLabel())
-      },
-      isLoading: isLoading,
-      maxHeight: maxHeight,
-      focusedOption: focusedOption
-    }), this.props['UNSAFE_is_experimental_generic'] ? /*#__PURE__*/React.createElement("div", {
-      role: "list"
-    }, menuUI) : menuUI))));
+    }, scrollTargetRef => {
+      var _this$inputRef4, _this$inputRef5;
+      return /*#__PURE__*/React.createElement(MenuList, _extends({}, commonProps, {
+        innerRef: instance => {
+          this.getMenuListRef(instance);
+          scrollTargetRef(instance);
+        },
+        innerProps: {
+          role: this.props['UNSAFE_is_experimental_generic'] ? 'dialog' : 'listbox',
+          ...(this.props['UNSAFE_is_experimental_generic'] && {
+            'aria-labelledby': ((_this$inputRef4 = this.inputRef) === null || _this$inputRef4 === void 0 ? void 0 : _this$inputRef4.id) || this.getElementId('input')
+          }),
+          'aria-multiselectable': !commonProps.isMulti || this.props['UNSAFE_is_experimental_generic'] ? undefined : commonProps.isMulti,
+          id: this.getElementId('listbox'),
+          ...(testId && {
+            'data-testid': `${testId}-select--listbox`
+          }),
+          // add aditional label on listbox for safari to announce first option
+          ...(isSafari() && !this.props['UNSAFE_is_experimental_generic'] && {
+            'aria-describedby': ((_this$inputRef5 = this.inputRef) === null || _this$inputRef5 === void 0 ? void 0 : _this$inputRef5.id) || this.getElementId('input')
+          })
+        },
+        isLoading: isLoading,
+        maxHeight: maxHeight,
+        focusedOption: focusedOption
+      }), this.props['UNSAFE_is_experimental_generic'] ? /*#__PURE__*/React.createElement("div", {
+        role: "list"
+      }, menuUI) : menuUI);
+    })));
 
     // positioning behaviour is almost identical for portalled and fixed,
     // so we use the same component. the actual portalling logic is forked
@@ -1789,8 +1826,6 @@ export default class Select extends Component {
     } = this;
     const {
       ariaSelection,
-      focusedOption,
-      focusedValue,
       isFocused,
       selectValue
     } = this.state;
@@ -1798,22 +1833,22 @@ export default class Select extends Component {
     return /*#__PURE__*/React.createElement(LiveRegion, _extends({}, commonProps, {
       id: this.getElementId('live-region'),
       ariaSelection: ariaSelection,
-      focusedOption: focusedOption,
-      focusedValue: focusedValue,
       isFocused: isFocused,
       selectValue: selectValue,
-      focusableOptions: focusableOptions,
-      isAppleDevice: this.isVoiceOver
+      focusableOptions: focusableOptions
     }));
   }
   renderMultiselectMessage() {
+    // In the future, when we actually support touch devices, we'll need to update this to not be keyboard specific.
+    // Also, since this is rendered onscreen, it should be transtlated automatically.
+    const msg = `, multiple selections available, ${this.state.selectValue.length ? 'Use left or right arrow keys to navigate selected items' : ''}`;
     return (
       /*#__PURE__*/
       // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
       React.createElement("span", {
         id: this.getElementId('multi-message'),
         hidden: true
-      }, ", multiple selections available,")
+      }, msg)
     );
   }
   render() {