@elastic/eui 94.2.1 → 94.4.0

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

@@ -41,6 +41,9 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, EuiSelectableList);
     _this = _super.call(this, props);
+    _defineProperty(_assertThisInitialized(_this), "animationFrameId", void 0);
+    // counter for tracking list renders and ensuring rerenders
+    _defineProperty(_assertThisInitialized(_this), "listRowRerender", 0);
     _defineProperty(_assertThisInitialized(_this), "listRef", null);
     _defineProperty(_assertThisInitialized(_this), "listBoxRef", null);
     _defineProperty(_assertThisInitialized(_this), "setListRef", function (ref) {
@@ -165,7 +168,6 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
           event.persist(); // NOTE: This is needed for React v16 backwards compatibility
           _this.onAddOrRemoveOption(option, event);
         },
-        ref: ref ? ref.bind(null, index) : undefined,
         isFocused: isFocused,
         title: searchableLabel || label,
         checked: checked,
@@ -266,7 +268,7 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
       _this.focusBadgeOffset = _this.props.onFocusBadge === false ? 0 : 46;
 
       // Wait a tick for the listbox ref to update before proceeding
-      requestAnimationFrame(function () {
+      _this.animationFrameId = requestAnimationFrame(function () {
         var scrollbarOffset = _this.listBoxRef ? containerWidth - _this.listBoxRef.offsetWidth : 0;
         _this.setState({
           defaultOptionWidth: containerWidth - scrollbarOffset - paddingOffset - checkedIconOffset
@@ -418,13 +420,47 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
     return _this;
   }
   _createClass(EuiSelectableList, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      // ensure requestAnimationFrame is canceled on unmount as
+      // it could potentially run on a next tick otherwise
+      if (this.animationFrameId !== undefined) {
+        cancelAnimationFrame(this.animationFrameId);
+        this.animationFrameId = undefined;
+      }
+    }
+  }, {
+    key: "shouldComponentUpdate",
+    value: function shouldComponentUpdate(nextProps) {
+      var _this$props9 = this.props,
+        allowExclusions = _this$props9.allowExclusions,
+        showIcons = _this$props9.showIcons,
+        paddingSize = _this$props9.paddingSize,
+        textWrap = _this$props9.textWrap,
+        onFocusBadge = _this$props9.onFocusBadge,
+        searchable = _this$props9.searchable;
+
+      // using shouldComponentUpdate to determine needed rerender before actual rerender
+      // without needing state updates or lagging behind on updates
+      if (nextProps.allowExclusions !== allowExclusions || nextProps.showIcons !== showIcons || nextProps.paddingSize !== paddingSize || nextProps.textWrap !== textWrap || nextProps.onFocusBadge !== onFocusBadge || nextProps.searchable !== searchable) {
+        this.listRowRerender += 1;
+      }
+      return true;
+    }
+  }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props9 = this.props,
-        isVirtualized = _this$props9.isVirtualized,
-        activeOptionIndex = _this$props9.activeOptionIndex,
-        visibleOptions = _this$props9.visibleOptions,
-        options = _this$props9.options;
+      var _this$props10 = this.props,
+        isVirtualized = _this$props10.isVirtualized,
+        activeOptionIndex = _this$props10.activeOptionIndex,
+        visibleOptions = _this$props10.visibleOptions,
+        options = _this$props10.options,
+        allowExclusions = _this$props10.allowExclusions,
+        showIcons = _this$props10.showIcons,
+        paddingSize = _this$props10.paddingSize,
+        textWrap = _this$props10.textWrap,
+        onFocusBadge = _this$props10.onFocusBadge,
+        searchable = _this$props10.searchable;
       if (prevProps.activeOptionIndex !== activeOptionIndex) {
         var makeOptionId = this.props.makeOptionId;
         if (this.listBoxRef && this.props.searchable !== true) {
@@ -456,41 +492,48 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
           itemData: _objectSpread({}, optionArray)
         }, this.calculateAriaSetAttrs(optionArray)));
       }
+
+      // ensure that ListRow updates based on item props
+      if (isVirtualized) {
+        if (prevProps.allowExclusions !== allowExclusions || prevProps.showIcons !== showIcons || prevProps.paddingSize !== paddingSize || prevProps.textWrap !== textWrap || prevProps.onFocusBadge !== onFocusBadge || prevProps.searchable !== searchable) {
+          this.forceVirtualizedListRowRerender();
+        }
+      }
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props10 = this.props,
-        className = _this$props10.className,
-        options = _this$props10.options,
-        searchValue = _this$props10.searchValue,
-        onOptionClick = _this$props10.onOptionClick,
-        renderOption = _this$props10.renderOption,
-        forcedHeight = _this$props10.height,
-        windowProps = _this$props10.windowProps,
-        rowHeight = _this$props10.rowHeight,
-        activeOptionIndex = _this$props10.activeOptionIndex,
-        makeOptionId = _this$props10.makeOptionId,
-        showIcons = _this$props10.showIcons,
-        singleSelection = _this$props10.singleSelection,
-        visibleOptions = _this$props10.visibleOptions,
-        allowExclusions = _this$props10.allowExclusions,
-        bordered = _this$props10.bordered,
-        paddingSize = _this$props10.paddingSize,
-        searchable = _this$props10.searchable,
-        onFocusBadge = _this$props10.onFocusBadge,
-        listId = _this$props10.listId,
-        setActiveOptionIndex = _this$props10.setActiveOptionIndex,
-        ariaLabel = _this$props10['aria-label'],
-        ariaLabelledby = _this$props10['aria-labelledby'],
-        ariaDescribedby = _this$props10['aria-describedby'],
-        role = _this$props10.role,
-        isPreFiltered = _this$props10.isPreFiltered,
-        isVirtualized = _this$props10.isVirtualized,
-        textWrap = _this$props10.textWrap,
-        truncationProps = _this$props10.truncationProps,
-        rest = _objectWithoutProperties(_this$props10, _excluded3);
+      var _this$props11 = this.props,
+        className = _this$props11.className,
+        options = _this$props11.options,
+        searchValue = _this$props11.searchValue,
+        onOptionClick = _this$props11.onOptionClick,
+        renderOption = _this$props11.renderOption,
+        forcedHeight = _this$props11.height,
+        windowProps = _this$props11.windowProps,
+        rowHeight = _this$props11.rowHeight,
+        activeOptionIndex = _this$props11.activeOptionIndex,
+        makeOptionId = _this$props11.makeOptionId,
+        showIcons = _this$props11.showIcons,
+        singleSelection = _this$props11.singleSelection,
+        visibleOptions = _this$props11.visibleOptions,
+        allowExclusions = _this$props11.allowExclusions,
+        bordered = _this$props11.bordered,
+        paddingSize = _this$props11.paddingSize,
+        searchable = _this$props11.searchable,
+        onFocusBadge = _this$props11.onFocusBadge,
+        listId = _this$props11.listId,
+        setActiveOptionIndex = _this$props11.setActiveOptionIndex,
+        ariaLabel = _this$props11['aria-label'],
+        ariaLabelledby = _this$props11['aria-labelledby'],
+        ariaDescribedby = _this$props11['aria-describedby'],
+        role = _this$props11.role,
+        isPreFiltered = _this$props11.isPreFiltered,
+        isVirtualized = _this$props11.isVirtualized,
+        textWrap = _this$props11.textWrap,
+        truncationProps = _this$props11.truncationProps,
+        rest = _objectWithoutProperties(_this$props11, _excluded3);
       var heightIsFull = forcedHeight === 'full';
       var classes = classNames('euiSelectableList', {
         'euiSelectableList-fullHeight': heightIsFull,
@@ -508,7 +551,7 @@ export var EuiSelectableList = /*#__PURE__*/function (_Component) {
         ref: this.setListBoxRef
       }, this.state.optionArray.map(function (_, index) {
         return /*#__PURE__*/React.createElement(_this2.ListRow, {
-          key: index,
+          key: "".concat(index, "-").concat(_this2.listRowRerender),
           data: _this2.state.optionArray,
           index: index
         }, null);

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

@@ -1,16 +1,9 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["children", "className", "disabled", "checked", "isFocused", "showIcons", "prepend", "append", "allowExclusions", "onFocusBadge", "paddingSize", "role", "searchable", "textWrap"],
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["children", "className", "disabled", "checked", "isFocused", "showIcons", "prepend", "append", "allowExclusions", "onFocusBadge", "paddingSize", "role", "searchable", "textWrap", "toolTipContent", "toolTipProps", "aria-describedby"],
   _excluded2 = ["children", "className"];
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -20,12 +13,13 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  */
 
 import classNames from 'classnames';
-import React, { Component } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { keysOf } from '../../common';
 import { EuiI18n } from '../../i18n';
 import { EuiIcon } from '../../icon';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiBadge } from '../../badge';
+import { EuiToolTip } from '../../tool_tip';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 function resolveIconAndColor(checked) {
   switch (checked) {
@@ -56,194 +50,219 @@ var paddingSizeToClassNameMap = {
   s: 'euiSelectableListItem--paddingSmall'
 };
 export var PADDING_SIZES = keysOf(paddingSizeToClassNameMap);
-export var EuiSelectableListItem = /*#__PURE__*/function (_Component) {
-  _inherits(EuiSelectableListItem, _Component);
-  var _super = _createSuper(EuiSelectableListItem);
-  function EuiSelectableListItem(props) {
-    var _this;
-    _classCallCheck(this, EuiSelectableListItem);
-    _this = _super.call(this, props);
-    // aria-checked is intended to be used with role="checkbox" but
-    // the MDN documentation lists it as a possibility for role="option".
-    // See https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-checked
-    // and https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/option_role
-    _defineProperty(_assertThisInitialized(_this), "isChecked", function (role, checked) {
-      var rolesThatCanBeMixed = ['option', 'checkbox', 'menuitemcheckbox'];
-      var rolesThatCanBeChecked = [].concat(rolesThatCanBeMixed, ['radio', 'menuitemradio', 'switch']);
-      if (!rolesThatCanBeChecked.includes(role)) return undefined;
-      switch (checked) {
-        case 'on':
-        case 'off':
-          return true;
-        case 'mixed':
-          if (rolesThatCanBeMixed.includes(role)) {
-            return 'mixed';
-          } else {
-            return false;
-          }
-        default:
-          return false;
-      }
-    });
-    return _this;
-  }
-  _createClass(EuiSelectableListItem, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        children = _this$props.children,
-        className = _this$props.className,
-        disabled = _this$props.disabled,
-        checked = _this$props.checked,
-        isFocused = _this$props.isFocused,
-        showIcons = _this$props.showIcons,
-        prepend = _this$props.prepend,
-        append = _this$props.append,
-        allowExclusions = _this$props.allowExclusions,
-        onFocusBadge = _this$props.onFocusBadge,
-        _this$props$paddingSi = _this$props.paddingSize,
-        paddingSize = _this$props$paddingSi === void 0 ? 's' : _this$props$paddingSi,
-        _this$props$role = _this$props.role,
-        role = _this$props$role === void 0 ? 'option' : _this$props$role,
-        searchable = _this$props.searchable,
-        textWrap = _this$props.textWrap,
-        rest = _objectWithoutProperties(_this$props, _excluded);
-      var classes = classNames('euiSelectableListItem', {
-        'euiSelectableListItem-isFocused': isFocused
-      }, paddingSizeToClassNameMap[paddingSize], className);
-      var textClasses = classNames('euiSelectableListItem__text', _defineProperty({}, "euiSelectableListItem__text--".concat(textWrap), textWrap));
-      var optionIcon;
-      if (showIcons) {
-        var _resolveIconAndColor = resolveIconAndColor(checked),
-          icon = _resolveIconAndColor.icon,
-          color = _resolveIconAndColor.color;
-        optionIcon = ___EmotionJSX(EuiIcon, {
-          className: "euiSelectableListItem__icon",
-          color: color,
-          type: icon
-        });
-      }
-      var state;
-      var instructions;
-      var screenReaderStrings = {
-        checked: {
-          state: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.checkedOption",
-            default: "Checked option."
-          }),
-          instructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.checkOptionInstructions",
-            default: "To check this option, press Enter."
-          })
-        },
-        unchecked: {
-          instructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.uncheckOptionInstructions",
-            default: "To uncheck this option, press Enter."
-          })
-        },
-        excluded: {
-          state: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.excludedOption",
-            default: "Excluded option."
-          }),
-          instructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.excludeOptionInstructions",
-            default: "To exclude this option, press Enter."
-          })
-        },
-        mixed: {
-          state: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.mixedOption",
-            default: "Mixed (indeterminate) option."
-          }),
-          instructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.mixedOptionInstructions",
-            default: "To check this option for all, press Enter once."
-          }),
-          uncheckInstructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.mixedOptionUncheckInstructions",
-            default: "To uncheck this option for all, press Enter twice."
-          }),
-          excludeInstructions: ___EmotionJSX(EuiI18n, {
-            token: "euiSelectableListItem.mixedOptionExcludeInstructions",
-            default: "To exclude this option for all, press Enter twice."
-          })
-        }
-      };
-      switch (checked) {
-        case 'on':
-          state = screenReaderStrings.checked.state;
-          instructions = allowExclusions ? screenReaderStrings.excluded.instructions : searchable ? screenReaderStrings.unchecked.instructions : undefined;
-          break;
-        case 'off':
-          state = screenReaderStrings.excluded.state;
-          instructions = screenReaderStrings.unchecked.instructions;
-          break;
-        case 'mixed':
-          state = screenReaderStrings.mixed.state;
-          instructions = ___EmotionJSX(React.Fragment, null, screenReaderStrings.mixed.instructions, ' ', allowExclusions ? screenReaderStrings.mixed.excludeInstructions : screenReaderStrings.mixed.uncheckInstructions);
-          break;
-        case undefined:
-        default:
-          instructions = allowExclusions || searchable ? screenReaderStrings.checked.instructions : undefined;
-          break;
-      }
-      var prependNode;
-      if (prepend) {
-        prependNode = ___EmotionJSX("span", {
-          className: "euiSelectableListItem__prepend"
-        }, prepend);
+export var EuiSelectableListItem = function EuiSelectableListItem(_ref) {
+  var children = _ref.children,
+    className = _ref.className,
+    disabled = _ref.disabled,
+    checked = _ref.checked,
+    isFocused = _ref.isFocused,
+    _ref$showIcons = _ref.showIcons,
+    showIcons = _ref$showIcons === void 0 ? true : _ref$showIcons,
+    prepend = _ref.prepend,
+    append = _ref.append,
+    allowExclusions = _ref.allowExclusions,
+    _ref$onFocusBadge = _ref.onFocusBadge,
+    onFocusBadge = _ref$onFocusBadge === void 0 ? true : _ref$onFocusBadge,
+    _ref$paddingSize = _ref.paddingSize,
+    paddingSize = _ref$paddingSize === void 0 ? 's' : _ref$paddingSize,
+    _ref$role = _ref.role,
+    role = _ref$role === void 0 ? 'option' : _ref$role,
+    searchable = _ref.searchable,
+    _ref$textWrap = _ref.textWrap,
+    textWrap = _ref$textWrap === void 0 ? 'truncate' : _ref$textWrap,
+    toolTipContent = _ref.toolTipContent,
+    toolTipProps = _ref.toolTipProps,
+    _ariaDescribedBy = _ref['aria-describedby'],
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var classes = classNames('euiSelectableListItem', {
+    'euiSelectableListItem-isFocused': isFocused
+  }, paddingSizeToClassNameMap[paddingSize], className);
+  var textClasses = classNames('euiSelectableListItem__text', _defineProperty({}, "euiSelectableListItem__text--".concat(textWrap), textWrap));
+  var optionIcon = useMemo(function () {
+    if (showIcons) {
+      var _resolveIconAndColor = resolveIconAndColor(checked),
+        icon = _resolveIconAndColor.icon,
+        color = _resolveIconAndColor.color;
+      return ___EmotionJSX(EuiIcon, {
+        className: "euiSelectableListItem__icon",
+        color: color,
+        type: icon
+      });
+    }
+  }, [showIcons, checked]);
+  var prependNode = useMemo(function () {
+    if (prepend) {
+      return ___EmotionJSX("span", {
+        className: "euiSelectableListItem__prepend"
+      }, prepend);
+    }
+  }, [prepend]);
+  var onFocusBadgeNode = useMemo(function () {
+    var defaultOnFocusBadgeProps = {
+      'aria-hidden': true,
+      iconType: 'returnKey',
+      iconSide: 'left',
+      color: 'hollow'
+    };
+    if (onFocusBadge === true) {
+      return ___EmotionJSX(EuiBadge, _extends({
+        className: "euiSelectableListItem__onFocusBadge"
+      }, defaultOnFocusBadgeProps));
+    } else if (typeof onFocusBadge !== 'boolean' && !!onFocusBadge) {
+      var _children = onFocusBadge.children,
+        _className = onFocusBadge.className,
+        restBadgeProps = _objectWithoutProperties(onFocusBadge, _excluded2);
+      return ___EmotionJSX(EuiBadge, _extends({
+        className: classNames('euiSelectableListItem__onFocusBadge', _className)
+      }, defaultOnFocusBadgeProps, restBadgeProps), _children);
+    }
+  }, [onFocusBadge]);
+  var showOnFocusBadge = !!(isFocused && !disabled && onFocusBadgeNode);
+  var appendNode = useMemo(function () {
+    if (append || showOnFocusBadge) {
+      return ___EmotionJSX("span", {
+        className: "euiSelectableListItem__append"
+      }, append, " ", showOnFocusBadge ? onFocusBadgeNode : null);
+    }
+  }, [append, showOnFocusBadge, onFocusBadgeNode]);
+  var screenReaderText = useMemo(function () {
+    var state;
+    var instructions;
+    var screenReaderStrings = {
+      checked: {
+        state: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.checkedOption",
+          default: "Checked option."
+        }),
+        instructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.checkOptionInstructions",
+          default: "To check this option, press Enter."
+        })
+      },
+      unchecked: {
+        instructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.uncheckOptionInstructions",
+          default: "To uncheck this option, press Enter."
+        })
+      },
+      excluded: {
+        state: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.excludedOption",
+          default: "Excluded option."
+        }),
+        instructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.excludeOptionInstructions",
+          default: "To exclude this option, press Enter."
+        })
+      },
+      mixed: {
+        state: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.mixedOption",
+          default: "Mixed (indeterminate) option."
+        }),
+        instructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.mixedOptionInstructions",
+          default: "To check this option for all, press Enter once."
+        }),
+        uncheckInstructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.mixedOptionUncheckInstructions",
+          default: "To uncheck this option for all, press Enter twice."
+        }),
+        excludeInstructions: ___EmotionJSX(EuiI18n, {
+          token: "euiSelectableListItem.mixedOptionExcludeInstructions",
+          default: "To exclude this option for all, press Enter twice."
+        })
       }
-      var appendNode;
-      if (append || !!onFocusBadge) {
-        var onFocusBadgeNode;
-        var defaultOnFocusBadgeProps = {
-          'aria-hidden': true,
-          iconType: 'returnKey',
-          iconSide: 'left',
-          color: 'hollow'
-        };
-        if (onFocusBadge === true) {
-          onFocusBadgeNode = ___EmotionJSX(EuiBadge, _extends({
-            className: "euiSelectableListItem__onFocusBadge"
-          }, defaultOnFocusBadgeProps));
-        } else if (typeof onFocusBadge !== 'boolean' && !!onFocusBadge) {
-          var _children = onFocusBadge.children,
-            _className = onFocusBadge.className,
-            restBadgeProps = _objectWithoutProperties(onFocusBadge, _excluded2);
-          onFocusBadgeNode = ___EmotionJSX(EuiBadge, _extends({
-            className: classNames('euiSelectableListItem__onFocusBadge', _className)
-          }, defaultOnFocusBadgeProps, restBadgeProps), _children);
-        }
+    };
+    switch (checked) {
+      case 'on':
+        state = screenReaderStrings.checked.state;
+        instructions = allowExclusions ? screenReaderStrings.excluded.instructions : searchable ? screenReaderStrings.unchecked.instructions : undefined;
+        break;
+      case 'off':
+        state = screenReaderStrings.excluded.state;
+        instructions = screenReaderStrings.unchecked.instructions;
+        break;
+      case 'mixed':
+        state = screenReaderStrings.mixed.state;
+        instructions = ___EmotionJSX(React.Fragment, null, screenReaderStrings.mixed.instructions, ' ', allowExclusions ? screenReaderStrings.mixed.excludeInstructions : screenReaderStrings.mixed.uncheckInstructions);
+        break;
+      case undefined:
+      default:
+        instructions = allowExclusions || searchable ? screenReaderStrings.checked.instructions : undefined;
+        break;
+    }
+    return state || instructions ? ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("div", null, state || instructions ? '. ' : null, state, state && instructions ? ' ' : null, instructions)) : null;
+  }, [checked, searchable, allowExclusions]);
 
-        // Only display the append wrapper if append exists or isFocused
-        if (append || isFocused && !disabled) {
-          appendNode = ___EmotionJSX("span", {
-            className: "euiSelectableListItem__append"
-          }, append, " ", isFocused && !disabled ? onFocusBadgeNode : null);
+  // aria-checked is intended to be used with role="checkbox" but
+  // the MDN documentation lists it as a possibility for role="option".
+  // See https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-checked
+  // and https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/option_role
+  var ariaChecked = useMemo(function () {
+    var rolesThatCanBeMixed = ['option', 'checkbox', 'menuitemcheckbox'];
+    var rolesThatCanBeChecked = [].concat(rolesThatCanBeMixed, ['radio', 'menuitemradio', 'switch']);
+    if (!rolesThatCanBeChecked.includes(role)) return undefined;
+    switch (checked) {
+      case 'on':
+      case 'off':
+        return true;
+      case 'mixed':
+        if (rolesThatCanBeMixed.includes(role)) {
+          return 'mixed';
+        } else {
+          return false;
         }
-      }
-      var screenReaderText = (state || instructions) && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("div", null, state || instructions ? '. ' : null, state, state && instructions ? ' ' : null, instructions));
-      return ___EmotionJSX("li", _extends({
-        role: role,
-        "aria-disabled": disabled,
-        "aria-checked": this.isChecked(role, checked) // Whether the item is "checked"
-        ,
-        "aria-selected": !disabled && isFocused // Whether the item has keyboard focus per W3 spec
-        ,
-        className: classes
-      }, rest), ___EmotionJSX("span", {
-        className: "euiSelectableListItem__content"
-      }, optionIcon, prependNode, ___EmotionJSX("span", {
-        className: textClasses
-      }, children, screenReaderText), appendNode));
+      default:
+        return false;
+    }
+  }, [role, checked]);
+  var hasToolTip = !!toolTipContent && !disabled;
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    tooltipRef = _useState2[0],
+    setTooltipRef = _useState2[1]; // Needs to be state and not a ref to trigger useEffect
+  var _useState3 = useState(_ariaDescribedBy),
+    _useState4 = _slicedToArray(_useState3, 2),
+    ariaDescribedBy = _useState4[0],
+    setAriaDescribedBy = _useState4[1];
+
+  // Manually trigger the tooltip on keyboard focus
+  useEffect(function () {
+    if (!tooltipRef) return;
+    if (isFocused) {
+      tooltipRef.showToolTip();
+    } else {
+      tooltipRef.hideToolTip();
+    }
+  }, [isFocused, tooltipRef]);
+
+  // Manually set the `aria-describedby` id on the <li> wrapper
+  useEffect(function () {
+    if (tooltipRef) {
+      var tooltipId = tooltipRef.state.id;
+      setAriaDescribedBy(classNames(tooltipId, _ariaDescribedBy));
     }
-  }]);
-  return EuiSelectableListItem;
-}(Component);
-_defineProperty(EuiSelectableListItem, "defaultProps", {
-  showIcons: true,
-  onFocusBadge: true,
-  textWrap: 'truncate'
-});
+  }, [tooltipRef, _ariaDescribedBy]);
+  var content = ___EmotionJSX("span", {
+    className: "euiSelectableListItem__content"
+  }, optionIcon, prependNode, ___EmotionJSX("span", {
+    className: textClasses
+  }, children, screenReaderText), appendNode);
+  return ___EmotionJSX("li", _extends({
+    role: role,
+    "aria-disabled": disabled,
+    "aria-checked": ariaChecked // Whether the item is "checked"
+    ,
+    "aria-selected": !disabled && isFocused // Whether the item has keyboard focus per W3 spec
+    ,
+    className: classes
+  }, rest, {
+    "aria-describedby": ariaDescribedBy
+  }), hasToolTip ? ___EmotionJSX(EuiToolTip, _extends({
+    ref: setTooltipRef,
+    content: toolTipContent,
+    anchorClassName: "euiSelectableListItem__tooltipAnchor",
+    position: "left"
+  }, toolTipProps), content) : content);
+};

package/optimize/es/components/selectable/selectable_option.js

@@ -1 +1,9 @@
-export {};
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export var OPTION_CHECKED_STATES = ['on', 'off', 'mixed', undefined];