@atlaskit/react-select 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/react-select
 
+## 2.0.2
+
+### Patch Changes
+
+- [#119038](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/119038)
+  [`5c68906e5ab22`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c68906e5ab22) -
+  [ux] Update accessible description for when multiple selections are available
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/cjs/select.js

@@ -1149,13 +1149,13 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
       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') {
+      if (!isMulti && selectValue.length && action !== 'initial-input-focus') {
         return;
       }
-      if (isMulti && (0, _deviceCheck.isAppleDevice)() && !(0, _deviceCheck.isSafari)()) {
-        // chrome only friends
+      if (isMulti) {
+        var multiMessage = this.getElementId('multi-message');
         return {
-          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, this.getElementId('multi-message')].join(' ') : [defaultDescription, this.getElementId('multi-message')].join(' ')
+          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, multiMessage].join(' ') : [defaultDescription, multiMessage].join(' ')
         };
       } else {
         return {
@@ -1639,7 +1639,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
               'data-testid': "".concat(testId, "-select--listbox")
             }), (0, _platformFeatureFlags.fg)('design_system_select-a11y-improvement') && {
               'aria-label': label,
-              'aria-labelledby': "".concat(labelId || ((_this4$inputRef = _this4.inputRef) === null || _this4$inputRef === void 0 ? void 0 : _this4$inputRef.id) || _this4.getElementId('input'), " ").concat(commonProps.isMulti && (0, _deviceCheck.isSafari)() ? _this4.getElementId('multi-message') : '')
+              'aria-labelledby': "".concat(labelId || ((_this4$inputRef = _this4.inputRef) === null || _this4$inputRef === void 0 ? void 0 : _this4$inputRef.id) || _this4.getElementId('input'))
             }),
             isLoading: isLoading,
             maxHeight: maxHeight,

package/dist/es2019/select.js

@@ -2,7 +2,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, isSafari } from '@atlaskit/ds-lib/device-check';
+import { isAppleDevice } 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';
@@ -1168,13 +1168,13 @@ export default class Select extends Component {
       selectValue
     } = this.state;
     const defaultDescription = selectValue.length ? this.getElementId('live-region') : this.getElementId('placeholder');
-    if (selectValue.length && action !== 'initial-input-focus') {
+    if (!isMulti && selectValue.length && action !== 'initial-input-focus') {
       return;
     }
-    if (isMulti && isAppleDevice() && !isSafari()) {
-      // chrome only friends
+    if (isMulti) {
+      const multiMessage = this.getElementId('multi-message');
       return {
-        'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, this.getElementId('multi-message')].join(' ') : [defaultDescription, this.getElementId('multi-message')].join(' ')
+        'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, multiMessage].join(' ') : [defaultDescription, multiMessage].join(' ')
       };
     } else {
       return {
@@ -1677,7 +1677,7 @@ export default class Select extends Component {
           // add aditional label on listbox when ff is on
           ...(fg('design_system_select-a11y-improvement') && {
             'aria-label': label,
-            'aria-labelledby': `${labelId || ((_this$inputRef = this.inputRef) === null || _this$inputRef === void 0 ? void 0 : _this$inputRef.id) || this.getElementId('input')} ${commonProps.isMulti && isSafari() ? this.getElementId('multi-message') : ''}`
+            'aria-labelledby': `${labelId || ((_this$inputRef = this.inputRef) === null || _this$inputRef === void 0 ? void 0 : _this$inputRef.id) || this.getElementId('input')}`
           })
         },
         isLoading: isLoading,

package/dist/esm/select.js

@@ -13,7 +13,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 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 { isAppleDevice, isSafari } from '@atlaskit/ds-lib/device-check';
+import { isAppleDevice } 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';
@@ -1140,13 +1140,13 @@ var Select = /*#__PURE__*/function (_Component) {
       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') {
+      if (!isMulti && selectValue.length && action !== 'initial-input-focus') {
         return;
       }
-      if (isMulti && isAppleDevice() && !isSafari()) {
-        // chrome only friends
+      if (isMulti) {
+        var multiMessage = this.getElementId('multi-message');
         return {
-          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, this.getElementId('multi-message')].join(' ') : [defaultDescription, this.getElementId('multi-message')].join(' ')
+          'aria-describedby': descriptionProp ? [descriptionProp, defaultDescription, multiMessage].join(' ') : [defaultDescription, multiMessage].join(' ')
         };
       } else {
         return {
@@ -1630,7 +1630,7 @@ var Select = /*#__PURE__*/function (_Component) {
               'data-testid': "".concat(testId, "-select--listbox")
             }), fg('design_system_select-a11y-improvement') && {
               'aria-label': label,
-              'aria-labelledby': "".concat(labelId || ((_this4$inputRef = _this4.inputRef) === null || _this4$inputRef === void 0 ? void 0 : _this4$inputRef.id) || _this4.getElementId('input'), " ").concat(commonProps.isMulti && isSafari() ? _this4.getElementId('multi-message') : '')
+              'aria-labelledby': "".concat(labelId || ((_this4$inputRef = _this4.inputRef) === null || _this4$inputRef === void 0 ? void 0 : _this4$inputRef.id) || _this4.getElementId('input'))
             }),
             isLoading: isLoading,
             maxHeight: maxHeight,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-select",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"description": "A forked version of react-select to only be used in atlaskit/select",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",