@atlaskit/react-select 2.6.6 → 2.7.0

package/dist/esm/accessibility/index.js

@@ -1,73 +1,27 @@
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 
-import { fg } from '@atlaskit/platform-feature-flags';
 export var defaultAriaLiveMessages = {
-  guidance: function guidance(props) {
-    var isSearchable = props.isSearchable,
-      isMulti = props.isMulti,
-      tabSelectsValue = props.tabSelectsValue,
-      context = props.context,
-      isInitialFocus = props.isInitialFocus;
-    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".concat(tabSelectsValue ? ', press Tab to select the option and exit the menu' : '', ".");
-      case 'input':
-        return isInitialFocus ? "".concat(props['aria-label'] || 'Select', " is focused ").concat(isSearchable ? ',type to refine list' : '', ", press Down to open the menu, ").concat(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: function onChange(props) {
     var action = props.action,
       _props$label = props.label,
       label = _props$label === void 0 ? '' : _props$label,
-      labels = props.labels,
       isDisabled = props.isDisabled;
     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 ".concat(label, ", deselected") : '';
-      // TODO: this should be handled on backspace|delete if no value, but doing it here first
+        return label.length ? "option ".concat(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".concat(labels.length > 1 ? 's' : '', " ").concat(labels.join(','), ", selected.") : '';
       case 'select-option':
-        return isDisabled ? "option ".concat(label, " is disabled. Select another option.") : "option ".concat(label, ", selected.");
+        return label.length && !isDisabled ? "option ".concat(label, ", selected.") : '';
       default:
         return '';
     }
   },
-  onFocus: function onFocus(props) {
-    var context = props.context,
-      focused = props.focused,
-      options = props.options,
-      _props$label2 = props.label,
-      label = _props$label2 === void 0 ? '' : _props$label2,
-      selectValue = props.selectValue,
-      isDisabled = props.isDisabled,
-      isSelected = props.isSelected;
-    var getArrayIndex = function getArrayIndex(arr, item) {
-      return arr && arr.length ? "(".concat(arr.indexOf(item) + 1, " of ").concat(arr.length, ")") : '';
-    };
-    if (context === 'value' && selectValue) {
-      return "value ".concat(label, " focused, ").concat(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')) {
-      var disabled = isDisabled ? ' disabled' : '';
-      var status = "".concat(isSelected ? ' selected' : ' not selected').concat(disabled);
-      return "".concat(label).concat(status, ", ").concat(getArrayIndex(options, focused), ", completion selected");
-    }
-    return '';
-  },
   onFilter: function onFilter(props) {
     var inputValue = props.inputValue,
       resultsMessage = props.resultsMessage;
-    return "".concat(resultsMessage).concat(inputValue ? ' for search term ' + inputValue : '', ".");
+    return inputValue ? "".concat(resultsMessage, " for search term ").concat(inputValue, ".") : '';
   }
 };

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

@@ -1,8 +1,7 @@
 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; }
-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';
 
@@ -12,32 +11,21 @@ import A11yText from './internal/a11y-text';
 
 var LiveRegion = function LiveRegion(props) {
   var ariaSelection = props.ariaSelection,
-    focusedOption = props.focusedOption,
-    focusedValue = props.focusedValue,
     focusableOptions = props.focusableOptions,
     isFocused = props.isFocused,
     selectValue = props.selectValue,
     selectProps = props.selectProps,
-    id = props.id,
-    isAppleDevice = props.isAppleDevice;
+    id = props.id;
   var ariaLiveMessages = selectProps.ariaLiveMessages,
     getOptionLabel = selectProps.getOptionLabel,
     inputValue = selectProps.inputValue,
-    isMulti = selectProps.isMulti,
     isOptionDisabled = selectProps.isOptionDisabled,
-    isSearchable = selectProps.isSearchable,
-    label = selectProps.label,
     menuIsOpen = selectProps.menuIsOpen,
     options = selectProps.options,
     screenReaderStatus = selectProps.screenReaderStatus,
-    tabSelectsValue = selectProps.tabSelectsValue,
     isLoading = selectProps.isLoading;
-  var ariaLabel = selectProps['aria-label'] || label;
   var ariaLive = selectProps['aria-live'];
 
-  // for safari, we will use minimum support from aria-live region
-  var isA11yImprovementEnabled = fg('design_system_select-a11y-improvement') && !isAppleDevice;
-
   // Update aria live message configuration when prop changes
   var messages = useMemo(function () {
     return _objectSpread(_objectSpread({}, defaultAriaLiveMessages), ariaLiveMessages || {});
@@ -46,7 +34,7 @@ var LiveRegion = function LiveRegion(props) {
   // Update aria live selected option when prop changes
   var ariaSelected = useMemo(function () {
     var message = '';
-    if (isA11yImprovementEnabled && menuIsOpen) {
+    if (menuIsOpen) {
       // we don't need to have selected message when the menu is open
       return '';
     }
@@ -63,12 +51,12 @@ var LiveRegion = function LiveRegion(props) {
 
       // If there is just one item from the action then get its label
       var selected = removedValue || option || asOption(value);
-      var _label = selected ? getOptionLabel(selected) : '';
+      var label = selected ? getOptionLabel(selected) : '';
 
       // If there are multiple items from the action then return an array of labels
       var multiSelected = selectedOptions || removedValues || undefined;
       var labels = multiSelected ? multiSelected.map(getOptionLabel) : [];
-      if (isA11yImprovementEnabled && !_label && !labels.length) {
+      if (!label && !labels.length) {
         // return empty string if no labels provided
         return '';
       }
@@ -76,39 +64,13 @@ var LiveRegion = function LiveRegion(props) {
         // multiSelected items are usually items that have already been selected
         // or set by the user as a default value so we assume they are not disabled
         isDisabled: selected && isOptionDisabled(selected, selectValue),
-        label: _label,
+        label: label,
         labels: labels
       }, ariaSelection);
       message = messages.onChange(onChangeProps);
     }
     return message;
-  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, isA11yImprovementEnabled, menuIsOpen]);
-  var prevInputValue = useRef('');
-  var ariaFocused = useMemo(function () {
-    var focusMsg = '';
-    var focused = focusedOption || focusedValue;
-    var 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) {
-      var onFocusProps = {
-        focused: focused,
-        label: getOptionLabel(focused),
-        isDisabled: isOptionDisabled(focused, selectValue),
-        isSelected: isSelected,
-        options: focusableOptions,
-        context: focused === focusedOption ? 'menu' : 'value',
-        selectValue: selectValue,
-        isMulti: 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]);
   var ariaResults = useMemo(function () {
     var resultsMsg = '';
     if (isLoading) {
@@ -129,43 +91,17 @@ var LiveRegion = function LiveRegion(props) {
     return resultsMsg;
   }, [focusableOptions, inputValue, menuIsOpen, messages, options, screenReaderStatus, isLoading]);
   var isInitialFocus = (ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action) === 'initial-input-focus';
-  var ariaGuidance = useMemo(function () {
-    if (fg('design_system_select-a11y-improvement')) {
-      // don't announce guidance at all when ff is on
-      return '';
-    }
-    var guidanceMsg = '';
-    if (messages.guidance) {
-      var context = focusedValue ? 'value' : menuIsOpen ? 'menu' : 'input';
-      guidanceMsg = messages.guidance({
-        'aria-label': ariaLabel,
-        context: context,
-        isDisabled: focusedOption && isOptionDisabled(focusedOption, selectValue),
-        isMulti: isMulti,
-        isSearchable: isSearchable,
-        tabSelectsValue: tabSelectsValue,
-        isInitialFocus: isInitialFocus
-      });
-    }
-    return guidanceMsg;
-  }, [ariaLabel, focusedOption, focusedValue, isMulti, isOptionDisabled, isSearchable, menuIsOpen, messages, selectValue, tabSelectsValue, isInitialFocus]);
   var 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/esm/emotion/components/live-region.js

@@ -1,17 +1,15 @@
 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; }
-/* 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';
 
@@ -21,32 +19,21 @@ import A11yText from './internal/a11y-text';
 
 var LiveRegion = function LiveRegion(props) {
   var ariaSelection = props.ariaSelection,
-    focusedOption = props.focusedOption,
-    focusedValue = props.focusedValue,
     focusableOptions = props.focusableOptions,
     isFocused = props.isFocused,
     selectValue = props.selectValue,
     selectProps = props.selectProps,
-    id = props.id,
-    isAppleDevice = props.isAppleDevice;
+    id = props.id;
   var ariaLiveMessages = selectProps.ariaLiveMessages,
     getOptionLabel = selectProps.getOptionLabel,
     inputValue = selectProps.inputValue,
-    isMulti = selectProps.isMulti,
     isOptionDisabled = selectProps.isOptionDisabled,
-    isSearchable = selectProps.isSearchable,
-    label = selectProps.label,
     menuIsOpen = selectProps.menuIsOpen,
     options = selectProps.options,
     screenReaderStatus = selectProps.screenReaderStatus,
-    tabSelectsValue = selectProps.tabSelectsValue,
     isLoading = selectProps.isLoading;
-  var ariaLabel = selectProps['aria-label'] || label;
   var ariaLive = selectProps['aria-live'];
 
-  // for safari, we will use minimum support from aria-live region
-  var isA11yImprovementEnabled = fg('design_system_select-a11y-improvement') && !isAppleDevice;
-
   // Update aria live message configuration when prop changes
   var messages = useMemo(function () {
     return _objectSpread(_objectSpread({}, defaultAriaLiveMessages), ariaLiveMessages || {});
@@ -55,7 +42,7 @@ var LiveRegion = function LiveRegion(props) {
   // Update aria live selected option when prop changes
   var ariaSelected = useMemo(function () {
     var message = '';
-    if (isA11yImprovementEnabled && menuIsOpen) {
+    if (menuIsOpen) {
       // we don't need to have selected message when the menu is open
       return '';
     }
@@ -72,12 +59,12 @@ var LiveRegion = function LiveRegion(props) {
 
       // If there is just one item from the action then get its label
       var selected = removedValue || option || asOption(value);
-      var _label = selected ? getOptionLabel(selected) : '';
+      var label = selected ? getOptionLabel(selected) : '';
 
       // If there are multiple items from the action then return an array of labels
       var multiSelected = selectedOptions || removedValues || undefined;
       var labels = multiSelected ? multiSelected.map(getOptionLabel) : [];
-      if (isA11yImprovementEnabled && !_label && !labels.length) {
+      if (!label && !labels.length) {
         // return empty string if no labels provided
         return '';
       }
@@ -85,39 +72,13 @@ var LiveRegion = function LiveRegion(props) {
         // multiSelected items are usually items that have already been selected
         // or set by the user as a default value so we assume they are not disabled
         isDisabled: selected && isOptionDisabled(selected, selectValue),
-        label: _label,
+        label: label,
         labels: labels
       }, ariaSelection);
       message = messages.onChange(onChangeProps);
     }
     return message;
-  }, [ariaSelection, messages, isOptionDisabled, selectValue, getOptionLabel, isA11yImprovementEnabled, menuIsOpen]);
-  var prevInputValue = useRef('');
-  var ariaFocused = useMemo(function () {
-    var focusMsg = '';
-    var focused = focusedOption || focusedValue;
-    var 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) {
-      var onFocusProps = {
-        focused: focused,
-        label: getOptionLabel(focused),
-        isDisabled: isOptionDisabled(focused, selectValue),
-        isSelected: isSelected,
-        options: focusableOptions,
-        context: focused === focusedOption ? 'menu' : 'value',
-        selectValue: selectValue,
-        isMulti: 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]);
   var ariaResults = useMemo(function () {
     var resultsMsg = '';
     if (isLoading) {
@@ -138,43 +99,17 @@ var LiveRegion = function LiveRegion(props) {
     return resultsMsg;
   }, [focusableOptions, inputValue, menuIsOpen, messages, options, screenReaderStatus, isLoading]);
   var isInitialFocus = (ariaSelection === null || ariaSelection === void 0 ? void 0 : ariaSelection.action) === 'initial-input-focus';
-  var ariaGuidance = useMemo(function () {
-    if (fg('design_system_select-a11y-improvement')) {
-      // don't announce guidance at all when ff is on
-      return '';
-    }
-    var guidanceMsg = '';
-    if (messages.guidance) {
-      var context = focusedValue ? 'value' : menuIsOpen ? 'menu' : 'input';
-      guidanceMsg = messages.guidance({
-        'aria-label': ariaLabel,
-        context: context,
-        isDisabled: focusedOption && isOptionDisabled(focusedOption, selectValue),
-        isMulti: isMulti,
-        isSearchable: isSearchable,
-        tabSelectsValue: tabSelectsValue,
-        isInitialFocus: isInitialFocus
-      });
-    }
-    return guidanceMsg;
-  }, [ariaLabel, focusedOption, focusedValue, isMulti, isOptionDisabled, isSearchable, menuIsOpen, messages, selectValue, tabSelectsValue, isInitialFocus]);
   var 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));
 };