@elastic/eui 76.0.2 → 76.2.0

package/es/components/form/range/dual_range.js

@@ -62,6 +62,7 @@ import { EuiRangeWrapper } from './range_wrapper';
 import { calculateThumbPosition } from './utils';
 import { euiRangeStyles } from './range.styles';
 import { euiDualRangeStyles } from './dual_range.styles';
+import { EuiI18n } from '../../i18n';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
   _inherits(EuiDualRangeClass, _Component);
@@ -571,6 +572,11 @@ export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
         backgroundColor: euiRangeLevelColor(rightThumbColor, theme.euiTheme)
       }) : rightThumbPosition;
 
+      var dualSliderScreenReaderInstructions = ___EmotionJSX(EuiI18n, {
+        token: "euiDualRange.sliderScreenReaderInstructions",
+        default: "You are in a custom range slider. Use the Up and Down arrow keys to change the minimum value. Press Tab to interact with the maximum value."
+      });
+
       var theRange = ___EmotionJSX(EuiRangeWrapper, {
         css: cssStyles,
         className: classes,
@@ -626,8 +632,8 @@ export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
           onFocus: _this2.onThumbFocus,
           onBlur: _this2.onThumbBlur,
           onKeyDown: _this2.handleDraggableKeyDown,
-          "aria-describedby": _this2.props['aria-describedby'],
-          "aria-label": _this2.props['aria-label']
+          "aria-describedby": showInputOnly ? undefined : _this2.props['aria-describedby'],
+          "aria-label": showInputOnly ? undefined : _this2.props['aria-label']
         }), ___EmotionJSX(EuiRangeThumb, {
           min: min,
           max: Number(_this2.upperValue),
@@ -639,8 +645,8 @@ export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
           onFocus: _this2.onThumbFocus,
           onBlur: _this2.onThumbBlur,
           style: logicalStyles(leftThumbStyles),
-          "aria-describedby": _this2.props['aria-describedby'],
-          "aria-label": _this2.props['aria-label']
+          "aria-describedby": showInputOnly ? undefined : _this2.props['aria-describedby'],
+          "aria-label": showInputOnly ? undefined : _this2.props['aria-label']
         }), ___EmotionJSX(EuiRangeThumb, {
           min: Number(_this2.lowerValue),
           max: max,
@@ -652,8 +658,8 @@ export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
           onFocus: _this2.onThumbFocus,
           onBlur: _this2.onThumbBlur,
           style: logicalStyles(rightThumbStyles),
-          "aria-describedby": _this2.props['aria-describedby'],
-          "aria-label": _this2.props['aria-label']
+          "aria-describedby": showInputOnly ? undefined : _this2.props['aria-describedby'],
+          "aria-label": showInputOnly ? undefined : _this2.props['aria-label']
         })), showRange && _this2.isValid && ___EmotionJSX(EuiRangeHighlight, {
           showTicks: showTicks,
           min: Number(min),
@@ -687,7 +693,8 @@ export var EuiDualRangeClass = /*#__PURE__*/function (_Component) {
         isOpen: this.state.isPopoverOpen,
         closePopover: this.closePopover,
         disableFocusTrap: true,
-        onPanelResize: this.onResize
+        onPanelResize: this.onResize,
+        popoverScreenReaderText: dualSliderScreenReaderInstructions
       }, theRange) : undefined;
       return thePopover || theRange;
     }

package/es/components/form/range/range.js

@@ -53,6 +53,7 @@ import { EuiRangeTooltip } from './range_tooltip';
 import { EuiRangeTrack } from './range_track';
 import { EuiRangeWrapper } from './range_wrapper';
 import { euiRangeStyles } from './range.styles';
+import { EuiI18n } from '../../i18n';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiRangeClass = /*#__PURE__*/function (_Component) {
   _inherits(EuiRangeClass, _Component);
@@ -198,6 +199,11 @@ export var EuiRangeClass = /*#__PURE__*/function (_Component) {
       var cssStyles = [styles.euiRange, showInput && styles.hasInput];
       var thumbColor = levels && getLevelColor(levels, Number(value));
 
+      var sliderScreenReaderInstructions = ___EmotionJSX(EuiI18n, {
+        token: "euiRange.sliderScreenReaderInstructions",
+        default: "You are in a custom range slider. Use the Up and Down arrow keys to change the value."
+      });
+
       var theRange = ___EmotionJSX(EuiRangeWrapper, {
         className: classes,
         css: cssStyles,
@@ -218,7 +224,7 @@ export var EuiRangeClass = /*#__PURE__*/function (_Component) {
         levels: levels,
         onChange: this.handleOnChange,
         value: value,
-        "aria-hidden": showInput === true,
+        "aria-hidden": !!showInput,
         showRange: showRange
       }, function (trackWidth) {
         return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiRangeSlider, _extends({
@@ -239,7 +245,7 @@ export var EuiRangeClass = /*#__PURE__*/function (_Component) {
           } : undefined,
           onFocus: showInput === true ? undefined : onFocus,
           onBlur: showInputOnly ? _this2.onInputBlur : onBlur,
-          "aria-hidden": showInput === true ? true : false,
+          "aria-hidden": !!showInput,
           thumbColor: thumbColor
         }, rest)), showRange && _this2.isValid && ___EmotionJSX(EuiRangeHighlight, {
           showTicks: showTicks,
@@ -273,7 +279,8 @@ export var EuiRangeClass = /*#__PURE__*/function (_Component) {
         fullWidth: fullWidth,
         isOpen: this.state.isPopoverOpen,
         closePopover: this.closePopover,
-        disableFocusTrap: true
+        disableFocusTrap: true,
+        popoverScreenReaderText: sliderScreenReaderInstructions
       }, theRange) : undefined;
       return thePopover ? thePopover : theRange;
     }

package/es/components/form/super_select/super_select.js

@@ -1,6 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var _excluded = ["className", "options", "valueOfSelected", "onChange", "isOpen", "isInvalid", "hasDividers", "itemClassName", "itemLayoutAlign", "fullWidth", "popoverProps", "compressed"],
+var _excluded = ["className", "options", "valueOfSelected", "placeholder", "onChange", "isOpen", "isInvalid", "hasDividers", "itemClassName", "itemLayoutAlign", "fullWidth", "popoverProps", "compressed"],
     _excluded2 = ["value", "dropdownDisplay", "inputDisplay"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -77,8 +77,6 @@ export var EuiSuperSelect = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "describedById", htmlIdGenerator('euiSuperSelect_')('_screenreaderDescribeId'));
 
-    _defineProperty(_assertThisInitialized(_this), "labelledById", htmlIdGenerator('euiSuperSelect_')('_screenreaderLabelId'));
-
     _defineProperty(_assertThisInitialized(_this), "state", {
       isPopoverOpen: _this.props.isOpen || false
     });
@@ -244,6 +242,7 @@ export var EuiSuperSelect = /*#__PURE__*/function (_Component) {
           className = _this$props.className,
           options = _this$props.options,
           valueOfSelected = _this$props.valueOfSelected,
+          placeholder = _this$props.placeholder,
           onChange = _this$props.onChange,
           isOpen = _this$props.isOpen,
           isInvalid = _this$props.isInvalid,
@@ -264,9 +263,9 @@ export var EuiSuperSelect = /*#__PURE__*/function (_Component) {
       }, itemClassName);
 
       var button = ___EmotionJSX(EuiSuperSelectControl, _extends({
-        screenReaderId: this.labelledById,
         options: options,
         value: valueOfSelected,
+        placeholder: placeholder,
         onClick: this.state.isPopoverOpen ? this.closePopover : this.openPopover,
         onKeyDown: this.onSelectKeyDown,
         className: buttonClasses,
@@ -311,14 +310,19 @@ export var EuiSuperSelect = /*#__PURE__*/function (_Component) {
       }, ___EmotionJSX(EuiI18n, {
         token: "euiSuperSelect.screenReaderAnnouncement",
         default: "You are in a form selector and must select a single option. Use the Up and Down arrow keys to navigate or Escape to close."
-      }))), ___EmotionJSX("div", {
-        "aria-labelledby": this.labelledById,
-        "aria-describedby": this.describedById,
-        className: "euiSuperSelect__listbox",
-        role: "listbox",
-        "aria-activedescendant": valueOfSelected,
-        tabIndex: 0
-      }, items));
+      }))), ___EmotionJSX(EuiI18n, {
+        token: "euiSuperSelect.ariaLabel",
+        default: "Select listbox"
+      }, function (ariaLabel) {
+        return ___EmotionJSX("div", {
+          "aria-label": ariaLabel,
+          "aria-describedby": _this2.describedById,
+          className: "euiSuperSelect__listbox",
+          role: "listbox",
+          "aria-activedescendant": valueOfSelected,
+          tabIndex: 0
+        }, items);
+      }));
     }
   }]);
 
@@ -363,6 +367,11 @@ EuiSuperSelect.propTypes = {
   readOnly: PropTypes.bool,
   name: PropTypes.string,
 
+  /**
+       * Placeholder to display when the current selected value is empty.
+       */
+  placeholder: PropTypes.node,
+
   /**
      * Creates an input group with element(s) coming before input.
      * `string` | `ReactElement` or an array of these
@@ -375,12 +384,6 @@ EuiSuperSelect.propTypes = {
      */
   append: PropTypes.oneOfType([PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.element.isRequired]).isRequired, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string.isRequired, PropTypes.element.isRequired]).isRequired).isRequired]),
 
-  /**
-     * Creates a semantic label ID for the `div[role="listbox"]` that's opened on click or keypress.
-     * __Generated and passed down by `EuiSuperSelect`.__
-     */
-  screenReaderId: PropTypes.string,
-
   /**
        * Pass an array of options that must at least include:
        * `value`: storing unique value of item,

package/es/components/form/super_select/super_select_control.js

@@ -1,4 +1,4 @@
-var _excluded = ["className", "options", "id", "name", "fullWidth", "isLoading", "isInvalid", "readOnly", "defaultValue", "compressed", "value", "prepend", "append", "screenReaderId", "disabled"];
+var _excluded = ["className", "options", "id", "name", "fullWidth", "isLoading", "isInvalid", "readOnly", "defaultValue", "compressed", "value", "placeholder", "prepend", "append", "disabled"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -15,9 +15,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  */
 import React, { Fragment } from 'react';
 import classNames from 'classnames';
-import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiFormControlLayout } from '../form_control_layout';
-import { EuiI18n } from '../../i18n';
 import { getFormControlClassNameForIconCount } from '../form_control_layout/_num_icons';
 import { useFormContext } from '../eui_form_context';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -41,9 +39,9 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
       _props$compressed = props.compressed,
       compressed = _props$compressed === void 0 ? false : _props$compressed,
       value = props.value,
+      placeholder = props.placeholder,
       prepend = props.prepend,
       append = props.append,
-      screenReaderId = props.screenReaderId,
       disabled = props.disabled,
       rest = _objectWithoutProperties(props, _excluded);
 
@@ -76,6 +74,7 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
     selectedValue = selectedOption ? selectedOption.inputDisplay : selectedValue;
   }
 
+  var showPlaceholder = !!placeholder && !selectedValue;
   return ___EmotionJSX(Fragment, null, ___EmotionJSX("input", {
     type: "hidden",
     id: id,
@@ -93,20 +92,14 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
     compressed: compressed,
     prepend: prepend,
     append: append
-  }, ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("span", {
-    id: screenReaderId
-  }, ___EmotionJSX(EuiI18n, {
-    token: "euiSuperSelectControl.selectAnOption",
-    default: "Select an option: {selectedValue}, is selected",
-    values: {
-      selectedValue: selectedValue
-    }
-  }))), ___EmotionJSX("button", _extends({
+  }, ___EmotionJSX("button", _extends({
     type: "button",
     className: classes,
     "aria-haspopup": "listbox",
     disabled: disabled || readOnly // @ts-ignore Using as a selector only for mixin use
     ,
     readOnly: readOnly
-  }, rest), selectedValue)));
+  }, rest), showPlaceholder ? ___EmotionJSX("span", {
+    className: "euiSuperSelectControl__placeholder"
+  }, placeholder) : selectedValue)));
 };

package/es/components/selectable/selectable.js

@@ -1,9 +1,11 @@
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var _excluded = ["children", "className", "options", "onChange", "onActiveOptionChange", "searchable", "searchProps", "singleSelection", "isLoading", "listProps", "renderOption", "height", "allowExclusions", "aria-label", "aria-describedby", "loadingMessage", "noMatchesMessage", "emptyMessage", "errorMessage", "isPreFiltered"],
+var _excluded = ["children", "className", "options", "onChange", "onActiveOptionChange", "searchable", "searchProps", "singleSelection", "isLoading", "listProps", "renderOption", "height", "allowExclusions", "aria-label", "aria-describedby", "loadingMessage", "noMatchesMessage", "emptyMessage", "errorMessage", "selectableScreenReaderText", "isPreFiltered"],
     _excluded2 = ["aria-label", "aria-describedby", "onChange", "defaultValue", "inputRef"],
     _excluded3 = ["aria-label", "aria-describedby", "isVirtualized", "rowHeight"];
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,8 +18,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -96,6 +96,16 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "listId", void 0);
 
+    _defineProperty(_assertThisInitialized(_this), "isFocusOnSearchOrListBox", function (target) {
+      var _this$optionsListRef$, _this$optionsListRef$2;
+
+      var searchHasFocus = _this.props.searchable && target === _this.inputRef;
+      var listBox = (_this$optionsListRef$ = _this.optionsListRef.current) === null || _this$optionsListRef$ === void 0 ? void 0 : (_this$optionsListRef$2 = _this$optionsListRef$.listBoxRef) === null || _this$optionsListRef$2 === void 0 ? void 0 : _this$optionsListRef$2.parentElement;
+      var listBoxContainsFocus = target instanceof Node && (listBox === null || listBox === void 0 ? void 0 : listBox.contains(target));
+      var listBoxHasFocus = target === listBox || listBoxContainsFocus;
+      return searchHasFocus || listBoxHasFocus;
+    });
+
     _defineProperty(_assertThisInitialized(_this), "onMouseDown", function () {
       // Bypass onFocus when a click event originates from this.containerRef.
       // Prevents onFocus from scrolling away from a clicked option and negating the selection event.
@@ -103,7 +113,7 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
       _this.preventOnFocus = true;
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onFocus", function () {
+    _defineProperty(_assertThisInitialized(_this), "onFocus", function (event) {
       if (_this.preventOnFocus) {
         _this.preventOnFocus = false;
         return;
@@ -113,6 +123,10 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
         return;
       }
 
+      if (event && !_this.isFocusOnSearchOrListBox(event.target)) {
+        return;
+      }
+
       var firstSelected = _this.state.visibleOptions.findIndex(function (option) {
         return option.checked && !option.disabled && !option.isGroupLabel;
       });
@@ -133,7 +147,19 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "onKeyDown", function (event) {
-      var optionsList = _this.optionsListRef.current;
+      var optionsList = _this.optionsListRef.current; // Check if the user is interacting with something other than the
+      // searchbox or selection list. If so, the user may be attempting to
+      // interact with the search clear button or a totally custom button,
+      // and listbox keyboard navigation/selection should not be triggered.
+
+      if (!_this.isFocusOnSearchOrListBox(event.target)) {
+        _this.setState({
+          activeOptionIndex: undefined,
+          isFocused: false
+        });
+
+        return;
+      }
 
       switch (event.key) {
         case keys.ARROW_UP:
@@ -158,20 +184,10 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
         case keys.ENTER:
         case keys.SPACE:
           if (_this.props.searchable) {
-            var _this$optionsListRef$, _this$optionsListRef$2;
-
             // For searchable instances, SPACE is reserved as a character for filtering
             // via the input box, and as such only ENTER will toggle selection.
             if (event.target === _this.inputRef && event.key === keys.SPACE) {
               return;
-            } // Check if the user is interacting with something other than the
-            // searchbox or selection list. If not, the user is attempting to
-            // interact with an internal button such as the clear button,
-            // and the event should not be altered.
-
-
-            if (!(event.target === _this.inputRef || event.target === ((_this$optionsListRef$ = _this.optionsListRef.current) === null || _this$optionsListRef$ === void 0 ? void 0 : (_this$optionsListRef$2 = _this$optionsListRef$.listBoxRef) === null || _this$optionsListRef$2 === void 0 ? void 0 : _this$optionsListRef$2.parentElement))) {
-              return;
             }
           }
 
@@ -262,10 +278,8 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "onContainerBlur", function (e) {
-      var _e$relatedTarget, _e$relatedTarget$firs;
-
       // Ignore blur events when moving from search to option to avoid activeOptionIndex conflicts
-      if (((_e$relatedTarget = e.relatedTarget) === null || _e$relatedTarget === void 0 ? void 0 : (_e$relatedTarget$firs = _e$relatedTarget.firstChild) === null || _e$relatedTarget$firs === void 0 ? void 0 : _e$relatedTarget$firs.id) === _this.listId) {
+      if (_this.isFocusOnSearchOrListBox(e.relatedTarget)) {
         return;
       }
 
@@ -372,6 +386,7 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
           noMatchesMessage = _this$props3.noMatchesMessage,
           emptyMessage = _this$props3.emptyMessage,
           errorMessage = _this$props3.errorMessage,
+          selectableScreenReaderText = _this$props3.selectableScreenReaderText,
           isPreFiltered = _this$props3.isPreFiltered,
           rest = _objectWithoutProperties(_this$props3, _excluded);
 
@@ -507,10 +522,15 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
       var searchAccessibleName = getAccessibleName(searchProps, this.messageContentId);
       var searchHasAccessibleName = Boolean(Object.keys(searchAccessibleName).length);
       var search = searchable ? ___EmotionJSX(EuiI18n, {
-        token: "euiSelectable.placeholderName",
-        default: "Filter options"
-      }, function (placeholderName) {
-        return ___EmotionJSX(EuiSelectableSearch, _extends({
+        tokens: ['euiSelectable.screenReaderInstructions', 'euiSelectable.placeholderName'],
+        defaults: ['Use the Up and Down arrow keys to move focus over options. Press Enter to select. Press Escape to collapse options.', 'Filter options']
+      }, function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+            screenReaderInstructions = _ref5[0],
+            placeholderName = _ref5[1];
+
+        return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiSelectableSearch, _extends({
+          "aria-describedby": listAriaDescribedbyId,
           key: "listSearch",
           options: options,
           value: searchValue,
@@ -529,7 +549,9 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
           }
         }, searchHasAccessibleName ? searchAccessibleName : {
           'aria-label': placeholderName
-        }, cleanedSearchProps));
+        }, cleanedSearchProps)), ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", {
+          id: listAriaDescribedbyId
+        }, selectableScreenReaderText, " ", screenReaderInstructions)));
       }) : undefined;
       var resultsLength = visibleOptions.filter(function (option) {
         return !option.disabled;
@@ -537,8 +559,8 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
 
       var listScreenReaderStatus = searchable && ___EmotionJSX(EuiI18n, {
         token: "euiSelectable.searchResults",
-        default: function _default(_ref4) {
-          var resultsLength = _ref4.resultsLength;
+        default: function _default(_ref6) {
+          var resultsLength = _ref6.resultsLength;
           return "".concat(resultsLength, " result").concat(resultsLength === 1 ? '' : 's', " available");
         },
         values: {
@@ -551,18 +573,12 @@ export var EuiSelectable = /*#__PURE__*/function (_Component) {
       var listHasAccessibleName = Boolean(Object.keys(listAccessibleName).length);
 
       var list = ___EmotionJSX(EuiI18n, {
-        tokens: ['euiSelectable.screenReaderInstructions', 'euiSelectable.placeholderName'],
-        defaults: ['Use up and down arrows to move focus over options. Enter to select. Escape to collapse options.', 'Filter options']
-      }, function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
-            placeholderName = _ref6[0],
-            screenReaderInstructions = _ref6[1];
-
+        token: "euiSelectable.placeholderName",
+        default: "Filter options"
+      }, function (placeholderName) {
         return ___EmotionJSX(React.Fragment, null, searchable && ___EmotionJSX(EuiScreenReaderLive, {
           isActive: messageContent != null || activeOptionIndex != null
-        }, messageContent || listScreenReaderStatus), ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", {
-          id: listAriaDescribedbyId
-        }, screenReaderInstructions)), messageContent ? ___EmotionJSX(EuiSelectableMessage, {
+        }, messageContent || listScreenReaderStatus), messageContent ? ___EmotionJSX(EuiSelectableMessage, {
           "data-test-subj": "euiSelectableMessage",
           id: _this2.messageContentId,
           bordered: listProps && listProps.bordered
@@ -801,5 +817,12 @@ EuiSelectable.propTypes = {
        * Control whether or not options get filtered internally or if consumer will filter
        * Default: false
        */
-  isPreFiltered: PropTypes.bool
+  isPreFiltered: PropTypes.bool,
+
+  /**
+       * Optional screen reader instructions to announce upon focus/interaction. This text is read out
+       * after the `EuiSelectable` label and a brief pause, but before the default keyboard instructions for
+       * interacting with a selectable are read out.
+       */
+  selectableScreenReaderText: PropTypes.string
 };

package/es/components/selectable/selectable_list/selectable_list.js

@@ -112,7 +112,7 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
         }
 
         if (typeof ariaDescribedby === 'string') {
-          ref.setAttribute('aria-labelledby', ariaDescribedby);
+          ref.setAttribute('aria-describedby', ariaDescribedby);
         }
       }
     });

package/es/components/suggest/suggest.js

@@ -32,8 +32,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useState, useCallback } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
-import { useGeneratedHtmlId } from '../../services';
-import { EuiScreenReaderOnly } from '../accessibility';
 import { EuiIcon } from '../icon';
 import { useEuiI18n } from '../i18n';
 import { EuiInputPopover } from '../popover';
@@ -128,14 +126,11 @@ export var EuiSuggest = function EuiSuggest(_ref) {
   var searchOnChange = function searchOnChange(value) {
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(value);
   };
-
-  var inputDescribedbyId = useGeneratedHtmlId({
-    prefix: id
-  });
   /**
    * Status
    */
 
+
   var icon = '';
   var color = '';
 
@@ -226,6 +221,7 @@ export var EuiSuggest = function EuiSuggest(_ref) {
     }
   }, [onItemClick, suggestions]);
   return ___EmotionJSX(React.Fragment, null, ___EmotionJSX(EuiSelectable, {
+    selectableScreenReaderText: stateMessage,
     singleSelection: true,
     height: isVirtualized ? undefined : 'full',
     options: suggestionList,
@@ -250,7 +246,6 @@ export var EuiSuggest = function EuiSuggest(_ref) {
       onBlur: searchOnBlur,
       onInput: searchOnInput,
       onChange: searchOnChange,
-      'aria-describedby': inputDescribedbyId,
       'aria-label': ariaLabel,
       'aria-labelledby': labelId
     }, rest)
@@ -274,9 +269,7 @@ export var EuiSuggest = function EuiSuggest(_ref) {
       },
       className: "eui-yScroll"
     }, list));
-  }), ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("p", {
-    id: inputDescribedbyId
-  }, stateMessage)));
+  }));
 };
 EuiSuggest.propTypes = {
   className: PropTypes.string,