@atlaskit/react-select 2.6.6 → 2.7.0

package/dist/cjs/select.js

@@ -1,13 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultProps = exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -27,15 +28,12 @@ var _menu = require("./components/menu");
 var _filters = require("./filters");
 var _styles = require("./styles");
 var _utils = require("./utils");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var defaultProps = exports.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': (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') ? undefined : 'polite',
   backspaceRemovesValue: true,
   blurInputOnSelect: (0, _utils.isTouchCapable)(),
   captureMenuScroll: !(0, _utils.isTouchCapable)(),
@@ -259,7 +257,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)(_this, "initialTouchY", 0);
     (0, _defineProperty2.default)(_this, "openAfterFocus", false);
     (0, _defineProperty2.default)(_this, "scrollToFocusedOptionOnUpdate", false);
-    (0, _defineProperty2.default)(_this, "isVoiceOver", (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') && (0, _deviceCheck.isAppleDevice)());
     // Refs
     // ------------------------------
     (0, _defineProperty2.default)(_this, "controlRef", null);
@@ -965,17 +962,70 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
           openAtIndex = selectedIndex;
         }
       }
+      var 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)
       }, function () {
         return _this2.onMenuOpen();
       });
+      (0, _deviceCheck.isSafari)() && focusedOption && this.updateInputLabel(this.calculateInputLabel(focusedOption, openAtIndex));
+    }
+  }, {
+    key: "updateInputLabel",
+    value: function updateInputLabel(inputLabel) {
+      var _this3 = this;
+      if (inputLabel) {
+        var _this$inputRef;
+        (_this$inputRef = this.inputRef) === null || _this$inputRef === void 0 || _this$inputRef.setAttribute('aria-label', inputLabel);
+        setTimeout(function () {
+          var normalizedLabel = _this3.props['aria-label'] || _this3.props.label;
+          if (normalizedLabel) {
+            var _this3$inputRef;
+            (_this3$inputRef = _this3.inputRef) === null || _this3$inputRef === void 0 || _this3$inputRef.setAttribute('aria-label', normalizedLabel);
+          } else {
+            var _this3$inputRef2;
+            (_this3$inputRef2 = _this3.inputRef) === null || _this3$inputRef2 === void 0 || _this3$inputRef2.removeAttribute('aria-label');
+          }
+        }, 500);
+      }
+    }
+  }, {
+    key: "calculateInputLabel",
+    value: function calculateInputLabel(focusedOption, optionIndex) {
+      var _this4 = this;
+      var options = this.props.options;
+      var isOptionsGrouped = options === null || options === void 0 ? void 0 : options.every(function (obj) {
+        return (0, _typeof2.default)(obj) === 'object' && obj !== null && 'options' in obj;
+      });
+      var inputLabel = this.getOptionLabel(focusedOption);
+      var isOptionFocused = function isOptionFocused(option) {
+        return _this4.getOptionLabel(option) === inputLabel;
+      };
+      var groupData = options === null || options === void 0 ? void 0 : options.find(function (option) {
+        var _groupCandidate$optio, _groupCandidate$optio2;
+        var 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;
+        var 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;
+        var totalLength = options === null || options === void 0 ? void 0 : options.reduce(function (acc, currentGroup) {
+          var _group$options;
+          var group = currentGroup;
+          acc += group === null || group === void 0 || (_group$options = group.options) === null || _group$options === void 0 ? void 0 : _group$options.length;
+          return acc;
+        }, 0);
+        inputLabel = "".concat(inputLabel, ", ").concat(groupData === null || groupData === void 0 ? void 0 : groupData.label, " (").concat(groupOptionIndex + 1, " of ").concat(totalLength, ")");
+      } else {
+        inputLabel = "".concat(inputLabel, " (").concat(optionIndex + 1, " of ").concat(options === null || options === void 0 ? void 0 : options.length, ")");
+      }
+      return inputLabel;
     }
   }, {
     key: "focusValue",
@@ -1158,24 +1208,36 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "calculateDescription",
-    value: function calculateDescription(action) {
-      var descriptionProp = this.props['aria-describedby'] || this.props['descriptionId'];
+    value: function calculateDescription() {
+      var descriptionProp = this.props['aria-describedby'] || this.props.descriptionId;
       var isMulti = this.props.isMulti;
-      var selectValue = this.state.selectValue;
-      var defaultDescription = selectValue.length ? this.getElementId('live-region') : this.getElementId('placeholder');
-      if (!isMulti && selectValue.length && action !== 'initial-input-focus') {
-        return;
+      var hasValue = this.state.selectValue.length > 0;
+
+      // Determine base description based on selection state
+      var 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
+      var describedBy = baseDescriptionId;
+      // Add description prop if it exists
+      if (descriptionProp) {
+        describedBy = describedBy ? "".concat(descriptionProp, " ").concat(describedBy) : descriptionProp;
+      }
+
+      // For multi-select, always add multi-message ID
       if (isMulti) {
         var 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 ? "".concat(describedBy, " ").concat(multiMessage) : multiMessage;
       }
+      return {
+        'aria-describedby': describedBy
+      };
     }
   }, {
     key: "startListeningComposition",
@@ -1239,7 +1301,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
     // ==============================
     function renderInput() {
       var _this$props8 = this.props,
-        descriptionId = _this$props8.descriptionId,
         form = _this$props8.form,
         inputId = _this$props8.inputId,
         inputValue = _this$props8.inputValue,
@@ -1256,9 +1317,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         testId = _this$props8.testId;
       var _this$getComponents = this.getComponents(),
         Input = _this$getComponents.Input;
-      var _this$state4 = this.state,
-        inputIsHidden = _this$state4.inputIsHidden,
-        ariaSelection = _this$state4.ariaSelection;
+      var inputIsHidden = this.state.inputIsHidden;
       var commonProps = this.commonProps;
       var id = inputId || this.getElementId('input');
 
@@ -1269,7 +1328,6 @@ var Select = exports.default = /*#__PURE__*/function (_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,
@@ -1280,7 +1338,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         'aria-controls': this.getElementId('listbox')
       }), !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
         return /*#__PURE__*/_react.default.createElement(_internal.DummyInput, (0, _extends2.default)({
@@ -1319,7 +1377,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderPlaceholderOrValue",
     value: function renderPlaceholderOrValue() {
-      var _this3 = this;
+      var _this5 = this;
       var _this$getComponents2 = this.getComponents(),
         MultiValue = _this$getComponents2.MultiValue,
         MultiValueContainer = _this$getComponents2.MultiValueContainer,
@@ -1335,10 +1393,10 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         inputValue = _this$props9.inputValue,
         placeholder = _this$props9.placeholder,
         testId = _this$props9.testId;
-      var _this$state5 = this.state,
-        selectValue = _this$state5.selectValue,
-        focusedValue = _this$state5.focusedValue,
-        isFocused = _this$state5.isFocused;
+      var _this$state4 = this.state,
+        selectValue = _this$state4.selectValue,
+        focusedValue = _this$state4.focusedValue,
+        isFocused = _this$state4.isFocused;
       if (!this.hasValue() || !controlShouldRenderValue) {
         return inputValue ? null : /*#__PURE__*/_react.default.createElement(Placeholder, (0, _extends2.default)({}, commonProps, {
           key: "placeholder",
@@ -1354,7 +1412,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
       if (isMulti) {
         return selectValue.map(function (opt, index) {
           var isOptionFocused = opt === focusedValue;
-          var key = "".concat(_this3.getOptionLabel(opt), "-").concat(_this3.getOptionValue(opt));
+          var key = "".concat(_this5.getOptionLabel(opt), "-").concat(_this5.getOptionValue(opt));
           return /*#__PURE__*/_react.default.createElement(MultiValue, (0, _extends2.default)({}, commonProps, {
             components: {
               Container: MultiValueContainer,
@@ -1367,10 +1425,10 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
             index: index,
             removeProps: _objectSpread(_objectSpread({
               onClick: function onClick() {
-                return _this3.removeValue(opt);
+                return _this5.removeValue(opt);
               },
               onTouchEnd: function onTouchEnd() {
-                return _this3.removeValue(opt);
+                return _this5.removeValue(opt);
               },
               onMouseDown: function onMouseDown(e) {
                 e.preventDefault();
@@ -1378,15 +1436,15 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
             }, testId && {
               'data-testid': "".concat(testId, "-select--multivalue-").concat(index, "-remove")
             }), {}, {
-              id: "".concat(_this3.getElementId('selected-value'), "-").concat(index, "-remove")
+              id: "".concat(_this5.getElementId('selected-value'), "-").concat(index, "-remove")
             }),
             data: opt,
             innerProps: _objectSpread(_objectSpread({}, testId && {
               'data-testid': "".concat(testId, "-select--multivalue-").concat(index)
             }), {}, {
-              id: "".concat(_this3.getElementId('selected-value'), "-").concat(index)
+              id: "".concat(_this5.getElementId('selected-value'), "-").concat(index)
             })
-          }), _this3.formatOptionLabel(opt, 'value'));
+          }), _this5.formatOptionLabel(opt, 'value'));
         });
       }
       if (inputValue) {
@@ -1395,7 +1453,10 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
       var singleValue = selectValue[0];
       return /*#__PURE__*/_react.default.createElement(SingleValue, (0, _extends2.default)({}, commonProps, {
         data: singleValue,
-        isDisabled: isDisabled
+        isDisabled: isDisabled,
+        innerProps: {
+          id: this.getElementId('single-value')
+        }
       }), this.formatOptionLabel(singleValue, 'value'));
     }
   }, {
@@ -1489,7 +1550,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderMenu",
     value: function renderMenu() {
-      var _this4 = this;
+      var _this6 = this;
       var _this$getComponents6 = this.getComponents(),
         Group = _this$getComponents6.Group,
         GroupHeading = _this$getComponents6.GroupHeading,
@@ -1517,8 +1578,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         noOptionsMessage = _this$props11.noOptionsMessage,
         onMenuScrollToTop = _this$props11.onMenuScrollToTop,
         onMenuScrollToBottom = _this$props11.onMenuScrollToBottom,
-        labelId = _this$props11.labelId,
-        label = _this$props11.label,
         testId = _this$props11.testId;
       if (!menuIsOpen) {
         return null;
@@ -1534,22 +1593,22 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
           value = props.value;
         var isFocused = focusedOption === data;
         var onHover = isDisabled ? undefined : function () {
-          return _this4.onOptionHover(data);
+          return _this6.onOptionHover(data);
         };
         var onSelect = isDisabled ? undefined : function () {
-          return _this4.selectOption(data);
+          return _this6.selectOption(data);
         };
-        var optionId = "".concat(_this4.getElementId('option'), "-").concat(id);
+        var optionId = "".concat(_this6.getElementId('option'), "-").concat(id);
         var innerProps = _objectSpread({
           id: optionId,
           onClick: onSelect,
           onMouseMove: onHover,
           onMouseOver: onHover,
-          role: _this4.props['UNSAFE_is_experimental_generic'] ? 'listitem' : 'option',
-          'aria-selected': _this4.props['UNSAFE_is_experimental_generic'] ? undefined : isSelected,
+          role: _this6.props['UNSAFE_is_experimental_generic'] ? 'listitem' : 'option',
+          'aria-selected': _this6.props['UNSAFE_is_experimental_generic'] ? undefined : isSelected,
           // We don't want aria-disabled if it's false. It's just noisy.
-          'aria-disabled': !isDisabled && (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') ? undefined : isDisabled,
-          'aria-describedby': (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') ? headingId : undefined
+          'aria-disabled': !isDisabled ? undefined : isDisabled,
+          'aria-describedby': headingId
         }, testId && {
           'data-testid': "".concat(testId, "-select--option-").concat(id)
         });
@@ -1563,8 +1622,8 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
           type: type,
           value: value,
           isFocused: isFocused,
-          innerRef: isFocused ? _this4.getFocusedOptionRef : undefined
-        }), _this4.formatOptionLabel(props.data, 'menu'));
+          innerRef: isFocused ? _this6.getFocusedOptionRef : undefined
+        }), _this6.formatOptionLabel(props.data, 'menu'));
       };
       var menuUI;
       if (this.hasOptions()) {
@@ -1574,7 +1633,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
             var data = item.data,
               options = item.options,
               groupIndex = item.index;
-            var groupId = "".concat(_this4.getElementId('group'), "-").concat(groupIndex);
+            var groupId = "".concat(_this6.getElementId('group'), "-").concat(groupIndex);
             var headingId = "".concat(groupId, "-heading");
             return /*#__PURE__*/_react.default.createElement(Group, (0, _extends2.default)({}, commonProps, {
               key: groupId,
@@ -1587,7 +1646,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
               }, testId && {
                 'data-testid': "".concat(testId, "-select--group-").concat(groupIndex, "-heading")
               }),
-              label: _this4.formatGroupLabel(item.data)
+              label: _this6.formatGroupLabel(item.data)
             }), item.options.map(function (option) {
               return render(option, "".concat(groupIndex, "-").concat(option.index), headingId);
             }));
@@ -1623,26 +1682,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         menuPosition: menuPosition,
         menuShouldScrollIntoView: menuShouldScrollIntoView
       };
-      var calculateListboxLabel = function calculateListboxLabel() {
-        var _this4$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': ((_this4$inputRef = _this4.inputRef) === null || _this4$inputRef === void 0 ? void 0 : _this4$inputRef.id) || _this4.getElementId('input')
-        };
-      };
       var menuElement = /*#__PURE__*/_react.default.createElement(_menu.MenuPlacer, (0, _extends2.default)({}, commonProps, menuPlacementProps), function (_ref4) {
         var ref = _ref4.ref,
           _ref4$placerProps = _ref4.placerProps,
@@ -1651,9 +1690,9 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/_react.default.createElement(Menu, (0, _extends2.default)({}, commonProps, menuPlacementProps, {
           innerRef: ref,
           innerProps: _objectSpread({
-            onMouseDown: _this4.onMenuMouseDown,
-            onMouseMove: _this4.onMenuMouseMove,
-            id: _this4.props.components.Menu ? _this4.getElementId('listbox') : undefined
+            onMouseDown: _this6.onMenuMouseDown,
+            onMouseMove: _this6.onMenuMouseMove,
+            id: _this6.props.components.Menu ? _this6.getElementId('listbox') : undefined
           }, testId && {
             'data-testid': "".concat(testId, "-select--listbox-container")
           }),
@@ -1665,23 +1704,28 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
           onBottomArrive: onMenuScrollToBottom,
           lockEnabled: menuShouldBlockScroll
         }, function (scrollTargetRef) {
+          var _this6$inputRef, _this6$inputRef2;
           return /*#__PURE__*/_react.default.createElement(MenuList, (0, _extends2.default)({}, commonProps, {
             innerRef: function innerRef(instance) {
-              _this4.getMenuListRef(instance);
+              _this6.getMenuListRef(instance);
               scrollTargetRef(instance);
             },
-            innerProps: _objectSpread(_objectSpread({
-              role: _this4.props['UNSAFE_is_experimental_generic'] ? 'dialog' : 'listbox',
-              'aria-label': _this4.props['UNSAFE_is_experimental_generic'] ? "".concat(_this4.props['aria-label'] || label, "-dialog") : null,
-              'aria-multiselectable': (_this4.isVoiceOver || !commonProps.isMulti) && (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') || _this4.props['UNSAFE_is_experimental_generic'] ? undefined : commonProps.isMulti,
-              id: _this4.getElementId('listbox')
+            innerProps: _objectSpread(_objectSpread(_objectSpread({
+              role: _this6.props['UNSAFE_is_experimental_generic'] ? 'dialog' : 'listbox'
+            }, _this6.props['UNSAFE_is_experimental_generic'] && {
+              'aria-labelledby': ((_this6$inputRef = _this6.inputRef) === null || _this6$inputRef === void 0 ? void 0 : _this6$inputRef.id) || _this6.getElementId('input')
+            }), {}, {
+              'aria-multiselectable': !commonProps.isMulti || _this6.props['UNSAFE_is_experimental_generic'] ? undefined : commonProps.isMulti,
+              id: _this6.getElementId('listbox')
             }, testId && {
               'data-testid': "".concat(testId, "-select--listbox")
-            }), (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') && calculateListboxLabel()),
+            }), (0, _deviceCheck.isSafari)() && !_this6.props['UNSAFE_is_experimental_generic'] && {
+              'aria-describedby': ((_this6$inputRef2 = _this6.inputRef) === null || _this6$inputRef2 === void 0 ? void 0 : _this6$inputRef2.id) || _this6.getElementId('input')
+            }),
             isLoading: isLoading,
             maxHeight: maxHeight,
             focusedOption: focusedOption
-          }), _this4.props['UNSAFE_is_experimental_generic'] ? /*#__PURE__*/_react.default.createElement("div", {
+          }), _this6.props['UNSAFE_is_experimental_generic'] ? /*#__PURE__*/_react.default.createElement("div", {
             role: "list"
           }, menuUI) : menuUI);
         }));
@@ -1700,7 +1744,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderFormField",
     value: function renderFormField() {
-      var _this5 = this;
+      var _this7 = this;
       var _this$props12 = this.props,
         delimiter = _this$props12.delimiter,
         isDisabled = _this$props12.isDisabled,
@@ -1720,7 +1764,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
       if (isMulti) {
         if (delimiter) {
           var value = selectValue.map(function (opt) {
-            return _this5.getOptionValue(opt);
+            return _this7.getOptionValue(opt);
           }).join(delimiter);
           return /*#__PURE__*/_react.default.createElement("input", {
             name: name,
@@ -1733,7 +1777,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
               key: "i-".concat(i),
               name: name,
               type: "hidden",
-              value: _this5.getOptionValue(opt)
+              value: _this7.getOptionValue(opt)
             });
           }) : /*#__PURE__*/_react.default.createElement("input", {
             name: name,
@@ -1755,34 +1799,32 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
     key: "renderLiveRegion",
     value: function renderLiveRegion() {
       var commonProps = this.commonProps;
-      var _this$state6 = this.state,
-        ariaSelection = _this$state6.ariaSelection,
-        focusedOption = _this$state6.focusedOption,
-        focusedValue = _this$state6.focusedValue,
-        isFocused = _this$state6.isFocused,
-        selectValue = _this$state6.selectValue;
+      var _this$state5 = this.state,
+        ariaSelection = _this$state5.ariaSelection,
+        isFocused = _this$state5.isFocused,
+        selectValue = _this$state5.selectValue;
       var focusableOptions = this.getFocusableOptions();
       return /*#__PURE__*/_react.default.createElement(_liveRegion.default, (0, _extends2.default)({}, commonProps, {
         id: this.getElementId('live-region'),
         ariaSelection: ariaSelection,
-        focusedOption: focusedOption,
-        focusedValue: focusedValue,
         isFocused: isFocused,
         selectValue: selectValue,
-        focusableOptions: focusableOptions,
-        isAppleDevice: this.isVoiceOver
+        focusableOptions: focusableOptions
       }));
     }
   }, {
     key: "renderMultiselectMessage",
     value: function 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.
+      var msg = ", multiple selections available, ".concat(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.default.createElement("span", {
           id: this.getElementId('multi-message'),
           hidden: true
-        }, ", multiple selections available,")
+        }, msg)
       );
     }
   }, {

package/dist/es2019/accessibility/index.js

@@ -1,77 +1,30 @@
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 
-import { fg } from '@atlaskit/platform-feature-flags';
 export const defaultAriaLiveMessages = {
-  guidance: props => {
-    const {
-      isSearchable,
-      isMulti,
-      tabSelectsValue,
-      context,
-      isInitialFocus
-    } = props;
-    switch (context) {
-      case 'menu':
-        return `Use Up and Down to choose options, press Enter to select the currently focused option, press Escape to exit the menu${tabSelectsValue ? ', press Tab to select the option and exit the menu' : ''}.`;
-      case 'input':
-        return isInitialFocus ? `${props['aria-label'] || 'Select'} is focused ${isSearchable ? ',type to refine list' : ''}, press Down to open the menu, ${isMulti ? ' press left to focus selected values' : ''}` : '';
-      case 'value':
-        return 'Use left and right to toggle between focused values, press Backspace to remove the currently focused value';
-      default:
-        return '';
-    }
-  },
   onChange: props => {
     const {
       action,
       label = '',
-      labels,
       isDisabled
     } = props;
     switch (action) {
       case 'deselect-option':
       case 'pop-value':
       case 'remove-value':
-        return label.length && fg('design_system_select-a11y-improvement') || !fg('design_system_select-a11y-improvement') ? `option ${label}, deselected` : '';
-      // TODO: this should be handled on backspace|delete if no value, but doing it here first
+        return label.length ? `option ${label}, deselected` : '';
       case 'clear':
         return 'All selected options have been cleared.';
-      case 'initial-input-focus':
-        return label.length && fg('design_system_select-a11y-improvement') || !fg('design_system_select-a11y-improvement') ? `option${labels.length > 1 ? 's' : ''} ${labels.join(',')}, selected.` : '';
       case 'select-option':
-        return isDisabled ? `option ${label} is disabled. Select another option.` : `option ${label}, selected.`;
+        return label.length && !isDisabled ? `option ${label}, selected.` : '';
       default:
         return '';
     }
   },
-  onFocus: props => {
-    const {
-      context,
-      focused,
-      options,
-      label = '',
-      selectValue,
-      isDisabled,
-      isSelected
-    } = props;
-    const getArrayIndex = (arr, item) => arr && arr.length ? `(${arr.indexOf(item) + 1} of ${arr.length})` : '';
-    if (context === 'value' && selectValue) {
-      return `value ${label} focused, ${getArrayIndex(selectValue, focused)}.`;
-    }
-
-    // No longer needed after fg('design_system_select-a11y-improvement') is cleaned up
-    if (context === 'menu' && !fg('design_system_select-a11y-improvement')) {
-      const disabled = isDisabled ? ' disabled' : '';
-      const status = `${isSelected ? ' selected' : ' not selected'}${disabled}`;
-      return `${label}${status}, ${getArrayIndex(options, focused)}, completion selected`;
-    }
-    return '';
-  },
   onFilter: props => {
     const {
       inputValue,
       resultsMessage
     } = props;
-    return `${resultsMessage}${inputValue ? ' for search term ' + inputValue : ''}.`;
+    return inputValue ? `${resultsMessage} for search term ${inputValue}.` : '';
   }
 };