@atlaskit/react-select 1.4.0 → 1.4.2

package/dist/esm/components/menu.js

@@ -201,7 +201,7 @@ export var menuCSS = function menuCSS(_ref2) {
     colors = _ref2$theme.colors;
   return _ref3 = {
     label: 'menu'
-  }, _defineProperty(_ref3, alignToControl(placement), '100%'), _defineProperty(_ref3, "position", 'absolute'), _defineProperty(_ref3, "width", '100%'), _defineProperty(_ref3, "zIndex", 1), _defineProperty(_ref3, "backgroundColor", colors.neutral0), _defineProperty(_ref3, "borderRadius", borderRadius), _defineProperty(_ref3, "boxShadow", '0 0 0 1px hsla(0, 0%, 0%, 0.1), 0 4px 11px hsla(0, 0%, 0%, 0.1)'), _defineProperty(_ref3, "marginBottom", spacing.menuGutter), _defineProperty(_ref3, "marginTop", spacing.menuGutter), _ref3;
+  }, _defineProperty(_ref3, alignToControl(placement), '100%'), _defineProperty(_ref3, "position", 'absolute'), _defineProperty(_ref3, "width", '100%'), _defineProperty(_ref3, "zIndex", 1), _defineProperty(_ref3, "borderRadius", borderRadius), _defineProperty(_ref3, "marginBottom", spacing.menuGutter), _defineProperty(_ref3, "marginTop", spacing.menuGutter), _defineProperty(_ref3, "backgroundColor", "var(--ds-surface-overlay, white)"), _defineProperty(_ref3, "boxShadow", "var(--ds-shadow-overlay, 0 0 0 1px hsl(0deg 0% 0% / 10%), 0 4px 11px hsl(0deg 0% 0% / 10%))"), _ref3;
 };
 var PortalPlacementContext = /*#__PURE__*/createContext(null);
 
@@ -276,16 +276,15 @@ export default Menu;
 // ==============================
 
 export var menuListCSS = function menuListCSS(_ref5) {
-  var maxHeight = _ref5.maxHeight,
-    baseUnit = _ref5.theme.spacing.baseUnit;
+  var maxHeight = _ref5.maxHeight;
   return {
     maxHeight: maxHeight,
     overflowY: 'auto',
     position: 'relative',
     // required for offset[Height, Top] > keyboard scroll
     WebkitOverflowScrolling: 'touch',
-    paddingBottom: baseUnit,
-    paddingTop: baseUnit
+    paddingTop: "var(--ds-space-100, 8px)",
+    paddingBottom: "var(--ds-space-100, 8px)"
   };
 };
 

package/dist/esm/components/multi-value.js

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
 /**
@@ -8,57 +8,113 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 
 import { jsx } from '@emotion/react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getStyleProps } from '../utils';
 import { CrossIcon } from './indicators';
 export var multiValueCSS = function multiValueCSS(_ref) {
-  var _ref$theme = _ref.theme,
+  var isDisabled = _ref.isDisabled,
+    isFocused = _ref.isFocused,
+    _ref$theme = _ref.theme,
     spacing = _ref$theme.spacing,
     borderRadius = _ref$theme.borderRadius,
     colors = _ref$theme.colors;
-  return {
+  var backgroundColor;
+  var color;
+  if (isDisabled) {
+    // Use the basic neutral background so it is slightly separate from the
+    // field's background
+    backgroundColor = "var(--ds-background-neutral, #091E420F)";
+    color = "var(--ds-text-disabled, #091E424F)";
+  } else if (isFocused) {
+    backgroundColor = "var(--ds-background-selected, #E9F2FF)";
+    color = "var(--ds-text-selected, hsl(0, 0%, 20%))";
+  } else {
+    backgroundColor = fg('platform-component-visual-refresh') ? "var(--ds-background-neutral-subtle-hovered, #091E420F)" : "var(--ds-background-neutral, #091E420F)";
+    color = "var(--ds-text, hsl(0, 0%, 20%))";
+  }
+  return _objectSpread({
     label: 'multiValue',
     display: 'flex',
     minWidth: 0,
     // resolves flex/text-overflow bug
-    backgroundColor: colors.neutral10,
-    borderRadius: borderRadius / 2,
-    margin: spacing.baseUnit / 2
-  };
+    margin: "var(--ds-space-025, 2px)",
+    borderRadius: "var(--ds-border-radius-050, 2px)",
+    backgroundColor: backgroundColor,
+    boxShadow: isFocused ? "0 0 0 2px ".concat("var(--ds-surface, transparent)", ", 0 0 0 4px ", "var(--ds-border-focused, transparent)") : 'none',
+    maxWidth: '100%',
+    '@media screen and (-ms-high-contrast: active)': {
+      border: isFocused ? '1px solid transparent' : 'none'
+    },
+    color: color
+  }, fg('platform-component-visual-refresh') && {
+    borderRadius: "var(--ds-border-radius-100, 4px)",
+    // Hardcode this color for visual refresh as there is no token color yet
+    borderColor: '#B7B9BE',
+    borderWidth: "var(--ds-border-width, 1px)",
+    borderStyle: 'solid',
+    backgroundColor: "var(--ds-background-input, #FFFFFF)"
+  });
 };
 export var multiValueLabelCSS = function multiValueLabelCSS(_ref2) {
-  var _ref2$theme = _ref2.theme,
-    borderRadius = _ref2$theme.borderRadius,
-    colors = _ref2$theme.colors,
-    cropWithEllipsis = _ref2.cropWithEllipsis;
-  return {
+  var cropWithEllipsis = _ref2.cropWithEllipsis,
+    isDisabled = _ref2.isDisabled;
+  return _objectSpread({
     overflow: 'hidden',
     textOverflow: cropWithEllipsis || cropWithEllipsis === undefined ? 'ellipsis' : undefined,
     whiteSpace: 'nowrap',
-    borderRadius: borderRadius / 2,
-    color: colors.neutral80,
+    borderRadius: "var(--ds-border-radius-050, 2px)",
     fontSize: '85%',
-    padding: 3,
-    paddingLeft: 6
-  };
+    font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+    padding: "var(--ds-space-025, 2px)",
+    color: isDisabled ? "var(--ds-text-disabled, #091E424F)" : 'inherit',
+    paddingLeft: "var(--ds-space-075, 6px)"
+  }, fg('platform-component-visual-refresh') && {
+    font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+    paddingTop: 0,
+    paddingBottom: 0,
+    paddingLeft: "var(--ds-space-050, 4px)"
+  });
 };
 export var multiValueRemoveCSS = function multiValueRemoveCSS(_ref3) {
-  var _ref3$theme = _ref3.theme,
-    spacing = _ref3$theme.spacing,
-    borderRadius = _ref3$theme.borderRadius,
-    colors = _ref3$theme.colors,
-    isFocused = _ref3.isFocused;
-  return {
+  var isFocused = _ref3.isFocused;
+  return _objectSpread({
     alignItems: 'center',
     display: 'flex',
-    borderRadius: borderRadius / 2,
-    backgroundColor: isFocused ? colors.dangerLight : undefined,
-    paddingLeft: spacing.baseUnit,
-    paddingRight: spacing.baseUnit,
+    backgroundColor: isFocused ? "var(--ds-UNSAFE-transparent, transparent)" : undefined,
+    fill: isFocused ? "var(--ds-text-selected, #000)" : "var(--ds-text, #000)",
+    paddingLeft: "var(--ds-space-025, 2px)",
+    paddingRight: "var(--ds-space-025, 2px)",
+    borderRadius: '0px 2px 2px 0px',
+    // DSP-6470 we should style like Tag once we have the :has selector
+    ':hover': {
+      backgroundColor: "var(--ds-background-danger-hovered, #FFD5D2)",
+      fill: "var(--ds-text-danger, #000)"
+    },
+    ':active': {
+      backgroundColor: "var(--ds-background-danger-pressed, #FD9891)",
+      fill: "var(--ds-text-danger, #000)"
+    }
+  }, fg('platform-component-visual-refresh') && {
+    backgroundColor: "var(--ds-background-neutral-subtle, #00000000)",
+    border: 'none',
+    alignItems: 'center',
+    justifyContent: 'center',
+    alignSelf: 'center',
+    appearance: 'none',
+    borderRadius: "var(--ds-border-radius, 4px)",
+    color: "var(--ds-text, #172B4D)",
+    padding: "var(--ds-space-025, 2px)",
+    marginRight: "var(--ds-space-025, 2px)",
+    ':focus-visible': {
+      outlineOffset: "var(--ds-space-negative-025, -2px)"
+    },
     ':hover': {
-      backgroundColor: colors.dangerLight,
-      color: colors.danger
+      backgroundColor: "var(--ds-background-neutral-subtle-hovered, #091E420F)"
+    },
+    ':active': {
+      backgroundColor: "var(--ds-background-neutral-subtle-pressed, #091E4224)"
     }
-  };
+  });
 };
 // eslint-disable-next-line @repo/internal/react/require-jsdoc
 export var MultiValueGeneric = function MultiValueGeneric(_ref4) {

package/dist/esm/components/option.js

@@ -5,28 +5,52 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 
 import { jsx } from '@emotion/react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { isAppleDevice } from '../accessibility/helpers';
 import { getStyleProps } from '../utils';
+import A11yText from './internal/a11y-text';
 export var optionCSS = function optionCSS(_ref) {
   var isDisabled = _ref.isDisabled,
     isFocused = _ref.isFocused,
-    isSelected = _ref.isSelected,
-    _ref$theme = _ref.theme,
-    spacing = _ref$theme.spacing,
-    colors = _ref$theme.colors;
+    isSelected = _ref.isSelected;
+  var color = "var(--ds-text, #172B4D)";
+  if (isDisabled) {
+    color = "var(--ds-text-disabled, #091E424F)";
+  } else if (isSelected) {
+    color = "var(--ds-text-selected, #0C66E4)";
+  }
+  var boxShadow;
+  var backgroundColor;
+  if (isDisabled) {
+    backgroundColor = undefined;
+  } else if (isSelected && isFocused) {
+    backgroundColor = "var(--ds-background-selected-hovered, #CCE0FF)";
+  } else if (isSelected) {
+    backgroundColor = "var(--ds-background-selected, #E9F2FF)";
+  } else if (isFocused) {
+    backgroundColor = "var(--ds-background-neutral-subtle-hovered, #091E420F)";
+  }
+  if (!isDisabled && (isFocused || isSelected)) {
+    boxShadow = "inset 2px 0px 0px ".concat("var(--ds-border-selected, #0C66E4)");
+  }
+  var cursor = isDisabled ? 'not-allowed' : 'default';
   return {
     label: 'option',
-    cursor: 'default',
     display: 'block',
     fontSize: 'inherit',
     width: '100%',
     userSelect: 'none',
     WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
-    backgroundColor: isSelected ? colors.primary : isFocused ? colors.primary25 : 'transparent',
-    color: isDisabled ? colors.neutral20 : isSelected ? colors.neutral0 : 'inherit',
-    padding: "".concat(spacing.baseUnit * 2, "px ").concat(spacing.baseUnit * 3, "px"),
-    // provide some affordance on touch devices
+    padding: "var(--ds-space-075, 6px)".concat(" ", "var(--ds-space-150, 12px)"),
+    backgroundColor: backgroundColor,
+    color: color,
+    cursor: cursor,
+    boxShadow: boxShadow,
     ':active': {
-      backgroundColor: !isDisabled ? isSelected ? colors.primary : colors.primary50 : undefined
+      backgroundColor: !isDisabled ? isSelected ? "var(--ds-background-selected-pressed, #85B8FF)" : "var(--ds-background-neutral-subtle-pressed, #091E4224)" : undefined
+    },
+    '@media screen and (-ms-high-contrast: active)': {
+      borderLeft: !isDisabled && (isFocused || isSelected) ? '2px solid transparent' : ''
     }
   };
 };
@@ -37,17 +61,18 @@ var Option = function Option(props) {
     isSelected = props.isSelected,
     innerRef = props.innerRef,
     innerProps = props.innerProps;
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  var isVoiceOver = isAppleDevice() && fg('design_system_select-a11y-improvement');
   return jsx("div", _extends({}, getStyleProps(props, 'option', {
     option: true,
     'option--is-disabled': isDisabled,
     'option--is-focused': isFocused,
     'option--is-selected': isSelected
   }), {
-    ref: innerRef,
-    "aria-disabled": isDisabled
+    ref: innerRef
   }, innerProps, {
     tabIndex: -1
-  }), children);
+  }), children, isVoiceOver && (isSelected || isDisabled) && jsx(A11yText, null, "".concat(isSelected ? ',selected' : '').concat(isDisabled ? ',dimmed' : '')));
 };
 
 // eslint-disable-next-line @repo/internal/react/require-jsdoc

package/dist/esm/components/placeholder.js

@@ -7,15 +7,12 @@ import _extends from "@babel/runtime/helpers/extends";
 import { jsx } from '@emotion/react';
 import { getStyleProps } from '../utils';
 export var placeholderCSS = function placeholderCSS(_ref) {
-  var _ref$theme = _ref.theme,
-    spacing = _ref$theme.spacing,
-    colors = _ref$theme.colors;
+  var isDisabled = _ref.isDisabled;
   return {
     label: 'placeholder',
     gridArea: '1 / 1 / 2 / 3',
-    color: colors.neutral50,
-    marginLeft: spacing.baseUnit / 2,
-    marginRight: spacing.baseUnit / 2
+    margin: "0 ".concat("var(--ds-space-025, 2px)"),
+    color: isDisabled ? "var(--ds-text-disabled, #091E424F)" : "var(--ds-text-subtlest, #626F86)"
   };
 };
 var Placeholder = function Placeholder(props) {

package/dist/esm/components/single-value.js

@@ -8,9 +8,7 @@ import { jsx } from '@emotion/react';
 import { getStyleProps } from '../utils';
 export var css = function css(_ref) {
   var isDisabled = _ref.isDisabled,
-    _ref$theme = _ref.theme,
-    spacing = _ref$theme.spacing,
-    colors = _ref$theme.colors;
+    spacing = _ref.theme.spacing;
   return {
     label: 'singleValue',
     gridArea: '1 / 1 / 2 / 3',
@@ -18,9 +16,8 @@ export var css = function css(_ref) {
     overflow: 'hidden',
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
-    color: isDisabled ? colors.neutral40 : colors.neutral80,
-    marginLeft: spacing.baseUnit / 2,
-    marginRight: spacing.baseUnit / 2
+    margin: "0 ".concat("var(--ds-space-025, 2px)"),
+    color: isDisabled ? "var(--ds-text-disabled, #091E424F)" : "var(--ds-text, #172B4D)"
   };
 };
 var SingleValue = function SingleValue(props) {

package/dist/esm/select.js

@@ -11,6 +11,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, 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 */
 import React, { Component } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isAppleDevice, isSafari } from './accessibility/helpers';
@@ -24,7 +25,8 @@ import { defaultStyles } from './styles';
 import { defaultTheme } from './theme';
 import { classNames, cleanValue, isDocumentElement, isMobileDevice, isTouchCapable, multiValueAsValue, noop, notNullish, scrollIntoView, singleValueAsValue, valueTernary } from './utils';
 export var defaultProps = {
-  'aria-live': 'polite',
+  // aria-live is by default with the live region so we don't need it
+  'aria-live': fg('design_system_select-a11y-improvement') ? undefined : 'polite',
   backspaceRemovesValue: true,
   blurInputOnSelect: isTouchCapable(),
   captureMenuScroll: !isTouchCapable(),
@@ -248,7 +250,7 @@ var Select = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "initialTouchY", 0);
     _defineProperty(_assertThisInitialized(_this), "openAfterFocus", false);
     _defineProperty(_assertThisInitialized(_this), "scrollToFocusedOptionOnUpdate", false);
-    _defineProperty(_assertThisInitialized(_this), "isAppleDevice", fg('design_system_select-a11y-improvement') ? isSafari() : isAppleDevice());
+    _defineProperty(_assertThisInitialized(_this), "isVoiceOver", fg('design_system_select-a11y-improvement') && isAppleDevice());
     // Refs
     // ------------------------------
     _defineProperty(_assertThisInitialized(_this), "controlRef", null);
@@ -749,6 +751,7 @@ var Select = /*#__PURE__*/function (_Component) {
               prevInputValue: inputValue
             });
             _this.onMenuClose();
+            fg('design_system_select-a11y-improvement') && event.stopPropagation(); // keep ESC on select from dismissing parent layers
           } else if (isClearable && escapeClearsValue) {
             _this.clearValue();
           }
@@ -1152,6 +1155,27 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function formatGroupLabel(data) {
       return this.props.formatGroupLabel(data);
     }
+  }, {
+    key: "calculateDescription",
+    value: function calculateDescription(action) {
+      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 (selectValue.length && action !== 'initial-input-focus') {
+        return;
+      }
+      if (isMulti && isAppleDevice() && !isSafari()) {
+        // chrome only friends
+        return {
+          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, this.getElementId('multi-message')].join(' ') : [defaultDescription, this.getElementId('multi-message')].join(' ')
+        };
+      } else {
+        return {
+          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription].join(' ') : defaultDescription
+        };
+      }
+    }
   }, {
     key: "startListeningComposition",
     value:
@@ -1235,30 +1259,28 @@ var Select = /*#__PURE__*/function (_Component) {
         ariaSelection = _this$state4.ariaSelection;
       var commonProps = this.commonProps;
       var id = inputId || this.getElementId('input');
-      var description = this.props['aria-describedby'] || descriptionId;
 
       // aria attributes makes the JSX "noisy", separated for clarity
       var ariaAttributes = _objectSpread(_objectSpread(_objectSpread({
         'aria-autocomplete': 'both',
         'aria-errormessage': this.props['aria-errormessage'],
         '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': 'listbox',
-        'aria-describedby': description,
+        '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,
         'aria-required': required || isRequired,
         role: 'combobox',
-        'aria-activedescendant': this.state.focusedOptionId || undefined
+        'aria-activedescendant': this.state.focusedOptionId || undefined,
+        // Safari needs aria-owns in order for aria-activedescendant to work properly
+        'aria-owns': isSafari() && fg('design_system_select-a11y-improvement') ? this.getElementId('listbox') : undefined
       }, menuIsOpen && {
         'aria-controls': this.getElementId('listbox')
       }), !isSearchable && {
         'aria-readonly': true
-      }), this.hasValue() ? (ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action) === 'initial-input-focus' && {
-        'aria-describedby': description ? [description, this.getElementId('live-region')].join(' ') : this.getElementId('live-region')
-      } : {
-        'aria-describedby': description ? [description, this.getElementId('placeholder')].join(' ') : this.getElementId('placeholder')
-      });
+      }), this.calculateDescription(ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action));
       if (!isSearchable) {
         // use a dummy input to maintain focus/blur functionality
         return /*#__PURE__*/React.createElement(DummyInput, _extends({
@@ -1371,7 +1393,8 @@ var Select = /*#__PURE__*/function (_Component) {
       var _this$props10 = this.props,
         clearControlLabel = _this$props10.clearControlLabel,
         isDisabled = _this$props10.isDisabled,
-        isLoading = _this$props10.isLoading;
+        isLoading = _this$props10.isLoading,
+        spacing = _this$props10.spacing;
       var isFocused = this.state.isFocused;
       if (!this.isClearable() || !ClearIndicator || isDisabled || !this.hasValue() || isLoading) {
         return null;
@@ -1381,11 +1404,13 @@ var Select = /*#__PURE__*/function (_Component) {
         onTouchEnd: this.onClearIndicatorTouchEnd,
         'aria-hidden': 'true'
       };
+      var isCompact = spacing === 'compact';
       return /*#__PURE__*/React.createElement(ClearIndicator, _extends({
         clearControlLabel: clearControlLabel
       }, commonProps, {
         innerProps: innerProps,
-        isFocused: isFocused
+        isFocused: isFocused,
+        isCompact: isCompact
       }));
     }
   }, {
@@ -1396,18 +1421,21 @@ var Select = /*#__PURE__*/function (_Component) {
       var commonProps = this.commonProps;
       var _this$props11 = this.props,
         isDisabled = _this$props11.isDisabled,
-        isLoading = _this$props11.isLoading;
+        isLoading = _this$props11.isLoading,
+        spacing = _this$props11.spacing;
       var isFocused = this.state.isFocused;
       if (!LoadingIndicator || !isLoading) {
         return null;
       }
+      var isCompact = spacing === 'compact';
       var innerProps = {
         'aria-hidden': 'true'
       };
       return /*#__PURE__*/React.createElement(LoadingIndicator, _extends({}, commonProps, {
         innerProps: innerProps,
         isDisabled: isDisabled,
-        isFocused: isFocused
+        isFocused: isFocused,
+        isCompact: isCompact
       }));
     }
   }, {
@@ -1438,8 +1466,11 @@ var Select = /*#__PURE__*/function (_Component) {
         return null;
       }
       var commonProps = this.commonProps;
-      var isDisabled = this.props.isDisabled;
+      var _this$props12 = this.props,
+        isDisabled = _this$props12.isDisabled,
+        spacing = _this$props12.spacing;
       var isFocused = this.state.isFocused;
+      var isCompact = spacing === 'compact';
       var innerProps = {
         onMouseDown: this.onDropdownIndicatorMouseDown,
         onTouchEnd: this.onDropdownIndicatorTouchEnd,
@@ -1448,7 +1479,8 @@ var Select = /*#__PURE__*/function (_Component) {
       return /*#__PURE__*/React.createElement(DropdownIndicator, _extends({}, commonProps, {
         innerProps: innerProps,
         isDisabled: isDisabled,
-        isFocused: isFocused
+        isFocused: isFocused,
+        isCompact: isCompact
       }));
     }
   }, {
@@ -1466,24 +1498,24 @@ var Select = /*#__PURE__*/function (_Component) {
         Option = _this$getComponents7.Option;
       var commonProps = this.commonProps;
       var focusedOption = this.state.focusedOption;
-      var _this$props12 = this.props,
-        captureMenuScroll = _this$props12.captureMenuScroll,
-        inputValue = _this$props12.inputValue,
-        isLoading = _this$props12.isLoading,
-        loadingMessage = _this$props12.loadingMessage,
-        minMenuHeight = _this$props12.minMenuHeight,
-        maxMenuHeight = _this$props12.maxMenuHeight,
-        menuIsOpen = _this$props12.menuIsOpen,
-        menuPlacement = _this$props12.menuPlacement,
-        menuPosition = _this$props12.menuPosition,
-        menuPortalTarget = _this$props12.menuPortalTarget,
-        menuShouldBlockScroll = _this$props12.menuShouldBlockScroll,
-        menuShouldScrollIntoView = _this$props12.menuShouldScrollIntoView,
-        noOptionsMessage = _this$props12.noOptionsMessage,
-        onMenuScrollToTop = _this$props12.onMenuScrollToTop,
-        onMenuScrollToBottom = _this$props12.onMenuScrollToBottom,
-        labelId = _this$props12.labelId,
-        label = _this$props12.label;
+      var _this$props13 = this.props,
+        captureMenuScroll = _this$props13.captureMenuScroll,
+        inputValue = _this$props13.inputValue,
+        isLoading = _this$props13.isLoading,
+        loadingMessage = _this$props13.loadingMessage,
+        minMenuHeight = _this$props13.minMenuHeight,
+        maxMenuHeight = _this$props13.maxMenuHeight,
+        menuIsOpen = _this$props13.menuIsOpen,
+        menuPlacement = _this$props13.menuPlacement,
+        menuPosition = _this$props13.menuPosition,
+        menuPortalTarget = _this$props13.menuPortalTarget,
+        menuShouldBlockScroll = _this$props13.menuShouldBlockScroll,
+        menuShouldScrollIntoView = _this$props13.menuShouldScrollIntoView,
+        noOptionsMessage = _this$props13.noOptionsMessage,
+        onMenuScrollToTop = _this$props13.onMenuScrollToTop,
+        onMenuScrollToBottom = _this$props13.onMenuScrollToBottom,
+        labelId = _this$props13.labelId,
+        label = _this$props13.label;
       if (!menuIsOpen) {
         return null;
       }
@@ -1510,7 +1542,10 @@ var Select = /*#__PURE__*/function (_Component) {
           onMouseMove: onHover,
           onMouseOver: onHover,
           role: 'option',
-          'aria-selected': !commonProps.isMulti && fg('design_system_select-a11y-improvement') ? isSelected || undefined : isSelected,
+          // We don't want aria-selected on Apple devices or if it's false. It does nasty things.
+          'aria-selected': (!commonProps.isMulti || _this4.isVoiceOver || !isSelected) && fg('design_system_select-a11y-improvement') ? undefined : isSelected,
+          // We don't want aria-disabled on Apple devices or if it's false. It's just noisy.
+          'aria-disabled': (isAppleDevice() || !isDisabled) && fg('design_system_select-a11y-improvement') ? undefined : isDisabled,
           'aria-describedby': fg('design_system_select-a11y-improvement') ? headingId : undefined
         };
         return /*#__PURE__*/React.createElement(Option, _extends({}, commonProps, {
@@ -1604,12 +1639,11 @@ var Select = /*#__PURE__*/function (_Component) {
             },
             innerProps: _objectSpread({
               role: 'listbox',
-              // don't add aria-multiselectable when ff is on and the value is false
-              'aria-multiselectable': fg('design_system_select-a11y-improvement') ? commonProps.isMulti || undefined : commonProps.isMulti,
+              'aria-multiselectable': (_this4.isVoiceOver || !commonProps.isMulti) && fg('design_system_select-a11y-improvement') ? undefined : commonProps.isMulti,
               id: _this4.getElementId('listbox')
             }, fg('design_system_select-a11y-improvement') && {
               'aria-label': label,
-              'aria-labelledby': labelId
+              'aria-labelledby': "".concat(labelId || _this4.getElementId('input'), " ").concat(commonProps.isMulti && isSafari() ? _this4.getElementId('multi-message') : '')
             }),
             isLoading: isLoading,
             maxHeight: maxHeight,
@@ -1632,12 +1666,12 @@ var Select = /*#__PURE__*/function (_Component) {
     key: "renderFormField",
     value: function renderFormField() {
       var _this5 = this;
-      var _this$props13 = this.props,
-        delimiter = _this$props13.delimiter,
-        isDisabled = _this$props13.isDisabled,
-        isMulti = _this$props13.isMulti,
-        required = _this$props13.required,
-        name = _this$props13.name;
+      var _this$props14 = this.props,
+        delimiter = _this$props14.delimiter,
+        isDisabled = _this$props14.isDisabled,
+        isMulti = _this$props14.isMulti,
+        required = _this$props14.required,
+        name = _this$props14.name;
       var selectValue = this.state.selectValue;
       if (required && !this.hasValue() && !isDisabled) {
         return /*#__PURE__*/React.createElement(RequiredInput, {
@@ -1701,9 +1735,17 @@ var Select = /*#__PURE__*/function (_Component) {
         isFocused: isFocused,
         selectValue: selectValue,
         focusableOptions: focusableOptions,
-        isAppleDevice: this.isAppleDevice
+        isAppleDevice: this.isVoiceOver
       }));
     }
+  }, {
+    key: "renderMultiselectMessage",
+    value: function renderMultiselectMessage() {
+      return /*#__PURE__*/React.createElement("span", {
+        id: this.getElementId('multi-message'),
+        hidden: true
+      }, ", multiple selections available,");
+    }
   }, {
     key: "render",
     value: function render() {
@@ -1712,13 +1754,19 @@ var Select = /*#__PURE__*/function (_Component) {
         IndicatorsContainer = _this$getComponents8.IndicatorsContainer,
         SelectContainer = _this$getComponents8.SelectContainer,
         ValueContainer = _this$getComponents8.ValueContainer;
-      var _this$props14 = this.props,
-        className = _this$props14.className,
-        id = _this$props14.id,
-        isDisabled = _this$props14.isDisabled,
-        menuIsOpen = _this$props14.menuIsOpen;
+      var _this$props15 = this.props,
+        className = _this$props15.className,
+        id = _this$props15.id,
+        isDisabled = _this$props15.isDisabled,
+        menuIsOpen = _this$props15.menuIsOpen,
+        isInvalid = _this$props15.isInvalid,
+        _this$props15$appeara = _this$props15.appearance,
+        appearance = _this$props15$appeara === void 0 ? 'default' : _this$props15$appeara,
+        _this$props15$spacing = _this$props15.spacing,
+        spacing = _this$props15$spacing === void 0 ? 'default' : _this$props15$spacing;
       var isFocused = this.state.isFocused;
       var commonProps = this.commonProps = this.getCommonProps();
+      var isCompact = spacing === 'compact';
       return /*#__PURE__*/React.createElement(SelectContainer, _extends({}, commonProps, {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
         className: className,
@@ -1728,17 +1776,21 @@ var Select = /*#__PURE__*/function (_Component) {
         },
         isDisabled: isDisabled,
         isFocused: isFocused
-      }), this.renderLiveRegion(), /*#__PURE__*/React.createElement(Control, _extends({}, commonProps, {
+      }), this.renderLiveRegion(), commonProps.isMulti && this.isVoiceOver && this.renderMultiselectMessage(), /*#__PURE__*/React.createElement(Control, _extends({}, commonProps, {
         innerRef: this.getControlRef,
         innerProps: {
           onMouseDown: this.onControlMouseDown,
           onTouchEnd: this.onControlTouchEnd
         },
+        appearance: appearance,
+        isInvalid: isInvalid,
         isDisabled: isDisabled,
         isFocused: isFocused,
-        menuIsOpen: menuIsOpen
+        menuIsOpen: menuIsOpen,
+        isCompact: isCompact
       }), /*#__PURE__*/React.createElement(ValueContainer, _extends({}, commonProps, {
-        isDisabled: isDisabled
+        isDisabled: isDisabled,
+        isCompact: isCompact
       }), this.renderPlaceholderOrValue(), this.renderInput()), /*#__PURE__*/React.createElement(IndicatorsContainer, _extends({}, commonProps, {
         isDisabled: isDisabled
       }), this.renderClearIndicator(), this.renderLoadingIndicator(), this.renderIndicatorSeparator(), this.renderDropdownIndicator())), this.renderMenu(), this.renderFormField());

package/dist/types/components/containers.d.ts

@@ -32,8 +32,12 @@ export interface ValueContainerProps<Option = unknown, IsMulti extends boolean =
      */
     children: ReactNode;
     isDisabled: boolean;
+    /**
+     * Whether the select is compact.
+     */
+    isCompact?: boolean;
 }
-export declare const valueContainerCSS: <Option, IsMulti extends boolean, Group extends GroupBase<Option>>({ theme: { spacing }, isMulti, hasValue, selectProps: { controlShouldRenderValue }, }: ValueContainerProps<Option, IsMulti, Group>) => CSSObjectWithLabel;
+export declare const valueContainerCSS: <Option, IsMulti extends boolean, Group extends GroupBase<Option>>({ isMulti, hasValue, isCompact, selectProps: { controlShouldRenderValue }, }: ValueContainerProps<Option, IsMulti, Group>) => CSSObjectWithLabel;
 export declare const ValueContainer: <Option, IsMulti extends boolean, Group extends GroupBase<Option>>(props: ValueContainerProps<Option, IsMulti, Group>) => jsx.JSX.Element;
 export interface IndicatorsContainerProps<Option = unknown, IsMulti extends boolean = boolean, Group extends GroupBase<Option> = GroupBase<Option>> extends CommonPropsAndClassName<Option, IsMulti, Group> {
     isDisabled: boolean;