@elastic/eui 114.3.0 → 116.0.0

package/optimize/es/global_styling/mixins/_helpers.js

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { euiCanAnimate, euiCantAnimate } from '@elastic/eui-theme-common';
 import { useEuiTheme } from '../../services/theme';
 import { transparentize } from '../../services/color';
 import { logicalCSS, logicalCSSWithFallback } from '../functions';
@@ -47,11 +48,15 @@ export var useEuiScrollBar = function useEuiScrollBar(options) {
  * Overflow shadow masks for use in YScroll and XScroll helpers
  */
 
-var euiOverflowShadowStyles = function euiOverflowShadowStyles(_ref3) {
-  var size = _ref3.euiTheme.size;
+export var euiOverflowShadowStyles = function euiOverflowShadowStyles(_ref3) {
+  var _ref3$euiTheme = _ref3.euiTheme,
+    size = _ref3$euiTheme.size,
+    colors = _ref3$euiTheme.colors;
   var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     _direction = _ref4.direction,
-    _side = _ref4.side;
+    _side = _ref4.side,
+    _ref4$hasAnimatedOver = _ref4.hasAnimatedOverflowShadow,
+    hasAnimatedOverflowShadow = _ref4$hasAnimatedOver === void 0 ? false : _ref4$hasAnimatedOver;
   var direction = _direction || 'y';
   var side = _side || 'both';
   var hideHeight = size.s;
@@ -75,11 +80,20 @@ var euiOverflowShadowStyles = function euiOverflowShadowStyles(_ref3) {
   // - https://github.com/elastic/kibana/issues/180828
   // - https://github.com/elastic/eui/pull/6343#issuecomment-1302732021
   var chromiumMaskWorkaround = 'transform: translateZ(0);';
-  if (direction === 'y') {
-    return "mask-image: linear-gradient(to bottom, ".concat(gradient, "); ").concat(chromiumMaskWorkaround);
-  } else {
-    return "mask-image: linear-gradient(to right, ".concat(gradient, "); ").concat(chromiumMaskWorkaround);
+  var overflowShadowStatic = direction === 'y' ? "mask-image: linear-gradient(to bottom, ".concat(gradient, "); ").concat(chromiumMaskWorkaround) : "mask-image: linear-gradient(to right, ".concat(gradient, "); ").concat(chromiumMaskWorkaround);
+
+  // If supported, use the scroll timeline API to animate the gradient to show/hide it on the scroll edges.
+  // We only support vertical scrolling as horizontal scrolling has increased complexity on element dimensions.
+  if (hasAnimatedOverflowShadow && direction === 'y') {
+    var featureFlag = 'animation-timeline: scroll()';
+    var gradientStartColor = "var(--euiOverflowShadowColor, ".concat(colors.backgroundBasePlain, ")");
+    var gradientEndColor = 'transparent';
+    var gradientSize = size.base;
+    var gradientScrollRange = size.m;
+    var commonPseudoElementStyles = "\n      content: '';\n      display: block;\n      position: sticky;\n      z-index: 1;\n      block-size: ".concat(gradientSize, ";\n      pointer-events: none;\n    ");
+    return "\n      @supports not (".concat(featureFlag, ") {\n        ").concat(overflowShadowStatic, "\n      }\n\n      ").concat(euiCantAnimate, " {\n        ").concat(overflowShadowStatic, "\n      }\n\n      ").concat(euiCanAnimate, " {\n        @supports (").concat(featureFlag, ") {\n          @keyframes show { \n            from { opacity: 0 } \n            to { opacity: 1 }\n          }\n          @keyframes hide { \n            from { opacity: 1 }\n            to { opacity: 0 }\n          }\n\n          position: relative;\n\n          /* Gradient on start edge */\n          &::before {\n            ").concat(commonPseudoElementStyles, "\n            inset-block-start: 0;\n            /* prevent pushing down the content */\n            ").concat(logicalCSS('margin-bottom', "-".concat(gradientSize)), " \n            /* uses CSS custom property to support customization depending on layout wrapper background color */\n            background: linear-gradient(to bottom, ").concat(gradientStartColor, ", ").concat(gradientEndColor, ");\n            \n            opacity: 0;\n            animation: show linear both;\n            animation-timeline: scroll(y);\n            animation-range: 0px ").concat(gradientScrollRange, ";\n          }\n\n          /* Gradient on end edge */\n          &::after {\n            ").concat(commonPseudoElementStyles, "\n            inset-block-end: 0;\n            /* prevent adding extra space */\n            ").concat(logicalCSS('margin-top', "-".concat(gradientSize)), " \n            background: linear-gradient(to top, ").concat(gradientStartColor, ", ").concat(gradientEndColor, ");\n\n            \n            /* NOTE: To ensure the bottom gradient is not visible when the container has no overflow,\n            we need to use opacity: 0 as default. Using two animations with 'animation-fill-mode: forwards'\n            ensures the show/hide animation works both with and without overflow. */\n            /* scroll animation */\n            opacity: 0;\n            animation-name: show, hide;\n            animation-timing-function: step-start, linear;\n            animation-fill-mode: forwards;\n            animation-timeline: scroll(y);\n            animation-range: 0% 100%, calc(100% - ").concat(gradientScrollRange, ") 100%;\n          }\n        }\n      }\n    ");
   }
+  return overflowShadowStatic;
 };
 
 /**
@@ -105,20 +119,27 @@ export var euiYScrollWithShadows = function euiYScrollWithShadows(euiTheme) {
   var _ref7 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     height = _ref7.height,
     _ref7$side = _ref7.side,
-    side = _ref7$side === void 0 ? 'both' : _ref7$side;
+    side = _ref7$side === void 0 ? 'both' : _ref7$side,
+    _ref7$hasAnimatedOver = _ref7.hasAnimatedOverflowShadow,
+    hasAnimatedOverflowShadow = _ref7$hasAnimatedOver === void 0 ? false : _ref7$hasAnimatedOver;
   return "\n  ".concat(euiYScroll(euiTheme, {
     height: height
   }), "\n  ").concat(euiOverflowShadowStyles(euiTheme, {
     direction: 'y',
-    side: side
+    side: side,
+    hasAnimatedOverflowShadow: hasAnimatedOverflowShadow
   }), "\n");
 };
 export var useEuiYScrollWithShadows = function useEuiYScrollWithShadows() {
   var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    height = _ref8.height;
+    height = _ref8.height,
+    side = _ref8.side,
+    hasAnimatedOverflowShadow = _ref8.hasAnimatedOverflowShadow;
   var euiTheme = useEuiTheme();
   return euiYScrollWithShadows(euiTheme, {
-    height: height
+    height: height,
+    side: side,
+    hasAnimatedOverflowShadow: hasAnimatedOverflowShadow
   });
 };
 export var euiXScroll = function euiXScroll(euiTheme) {

package/optimize/es/test/rtl/component_helpers.d.ts

@@ -6,9 +6,6 @@
 export declare const waitForEuiPopoverOpen: () => Promise<void>;
 export declare const waitForEuiPopoverClose: () => Promise<void>;
 
-export declare const waitForEuiToolTipVisible: () => Promise<void>;
-export declare const waitForEuiToolTipHidden: () => Promise<void>;
-
 export declare const showEuiComboBoxOptions: () => Promise<void>;
 
 export declare const waitForEuiContextMenuPanelTransition: () => Promise<void>;

package/optimize/es/test/rtl/component_helpers.js

@@ -63,81 +63,59 @@ export var waitForEuiPopoverClose = /*#__PURE__*/function () {
 }();
 
 /**
- * Ensure the EuiToolTip being tested is open and visible before continuing
+ * jsdom does not track keyboard vs. mouse input modality, so `:focus-visible`
+ * always returns false. Call this before `fireEvent.focus()` on an element that
+ * should be treated as keyboard-focused.
+ *
+ * Returns a cleanup function, call it after test assertions to restore the spy.
  */
-export var waitForEuiToolTipVisible = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.next = 2;
-          return waitFor(function () {
-            var tooltip = document.querySelector('.euiToolTipPopover');
-            expect(tooltip).toBeVisible();
-          }, {
-            timeout: 3000
-          } // Account for long delay on tooltips
-          );
-        case 2:
-          return _context3.abrupt("return", _context3.sent);
-        case 3:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function waitForEuiToolTipVisible() {
-    return _ref3.apply(this, arguments);
+export var simulateFocusVisible = function simulateFocusVisible(element) {
+  var originalMatches = Element.prototype.matches.bind(element);
+  var spy = jest.spyOn(element, 'matches').mockImplementation(function (selector) {
+    return selector === ':focus-visible' ? true : originalMatches(selector);
+  });
+  return function () {
+    return spy.mockRestore();
   };
-}();
-export var waitForEuiToolTipHidden = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          _context4.next = 2;
-          return waitFor(function () {
-            var tooltip = document.querySelector('.euiToolTipPopover');
-            expect(tooltip).toBeNull();
-          });
-        case 2:
-          return _context4.abrupt("return", _context4.sent);
-        case 3:
-        case "end":
-          return _context4.stop();
-      }
-    }, _callee4);
-  }));
-  return function waitForEuiToolTipHidden() {
-    return _ref4.apply(this, arguments);
-  };
-}();
+};
+
+/**
+ * Prefer this over `fireEvent.focus()` in tooltip tests. Plain `fireEvent.focus`
+ * does not set `:focus-visible` in jsdom and will not trigger the tooltip.
+ *
+ * Returns a cleanup function to restore the mock after assertions.
+ */
+export var focusEuiToolTipTrigger = function focusEuiToolTipTrigger(element) {
+  var cleanup = simulateFocusVisible(element);
+  fireEvent.focus(element);
+  return cleanup;
+};
 
 /**
  * EuiComboBox
  */
 
 export var showEuiComboBoxOptions = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           fireEvent.click(screen.getByTestSubject('comboBoxToggleListButton'));
-          _context5.next = 3;
+          _context3.next = 3;
           return waitForEuiPopoverOpen();
         case 3:
-          _context5.next = 5;
+          _context3.next = 5;
           return waitFor(function () {
             expect(screen.getByRole('listbox')).toBeInTheDocument();
           });
         case 5:
         case "end":
-          return _context5.stop();
+          return _context3.stop();
       }
-    }, _callee5);
+    }, _callee3);
   }));
   return function showEuiComboBoxOptions() {
-    return _ref5.apply(this, arguments);
+    return _ref3.apply(this, arguments);
   };
 }();
 
@@ -146,16 +124,16 @@ export var showEuiComboBoxOptions = /*#__PURE__*/function () {
  */
 
 export var waitForEuiContextMenuPanelTransition = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
     var getPanels;
-    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           // Used document instead of container or screen due to context menus living in portals
           getPanels = function getPanels() {
             return document.querySelectorAll('.euiContextMenuPanel');
           }; // 2 panels will appear for the transition animation
-          _context6.next = 3;
+          _context4.next = 3;
           return waitFor(function () {
             expect(getPanels().length).toEqual(2);
           });
@@ -170,11 +148,11 @@ export var waitForEuiContextMenuPanelTransition = /*#__PURE__*/function () {
           expect(getPanels().length).toEqual(1);
         case 6:
         case "end":
-          return _context6.stop();
+          return _context4.stop();
       }
-    }, _callee6);
+    }, _callee4);
   }));
   return function waitForEuiContextMenuPanelTransition() {
-    return _ref6.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();

package/optimize/lib/components/basic_table/collapsed_item_actions.js

@@ -89,7 +89,6 @@ var CollapsedItemActions = exports.CollapsedItemActions = function CollapsedItem
           },
           toolTipContent: toolTipContent,
           toolTipProps: {
-            delay: 'long',
             // Avoid screen-readers announcing the same text twice
             disableScreenReaderOutput: typeof buttonContent === 'string' && buttonContent === toolTipContent
           }
@@ -113,8 +112,7 @@ var CollapsedItemActions = exports.CollapsedItemActions = function CollapsedItem
     "data-test-subj": "euiCollapsedItemActionsButton"
   });
   var withTooltip = !actionsDisabled && (0, _react2.jsx)(_tool_tip.EuiToolTip, {
-    content: allActionsTooltip,
-    delay: "long"
+    content: allActionsTooltip
   }, popoverButton);
   return (0, _react2.jsx)(_popover.EuiPopover, {
     className: className,

package/optimize/lib/components/basic_table/default_item_action.js

@@ -41,7 +41,6 @@ var DefaultItemAction = exports.DefaultItemAction = function DefaultItemAction(_
   var tooltipContent = (0, _action_types.callWithItemIfFunction)(item)(action.description);
   var tooltipProps = {
     content: tooltipContent,
-    delay: 'long',
     // Avoid screen-readers announcing the same text twice
     disableScreenReaderOutput: typeof actionContent === 'string' && actionContent === tooltipContent
   };

package/optimize/lib/components/collapsible_nav_beta/_kibana_solution/collapsible_nav_kibana_solution.js

@@ -65,7 +65,6 @@ var KibanaCollapsibleNavSolution = exports.KibanaCollapsibleNavSolution = functi
   var solutionSolutionSwitcherAriaLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavKibanaSolution.switcherAriaLabel', ' - click to switch to another solution');
   var solutionSolutionGroupLabel = (0, _i18n.useEuiI18n)('euiCollapsibleNavKibanaSolution.groupLabel', 'Navigate to solution');
   var closeSolutionPopover = (0, _react.useCallback)(function (event) {
-    var _childItem$firstEleme;
     // Allow child items to stop the popover from being closed
     if (event.isPropagationStopped()) return;
     // Only listen for clicks on child items - currentTarget is the parent <ul>
@@ -74,7 +73,7 @@ var KibanaCollapsibleNavSolution = exports.KibanaCollapsibleNavSolution = functi
     // Only close the popover if the item is a clickable link or button
     var target = event.target;
     var childItem = target.closest('.euiListGroupItem');
-    if (['A', 'BUTTON'].includes((childItem === null || childItem === void 0 || (_childItem$firstEleme = childItem.firstElementChild) === null || _childItem$firstEleme === void 0 ? void 0 : _childItem$firstEleme.tagName) || '')) {
+    if (['A', 'BUTTON'].includes((childItem === null || childItem === void 0 ? void 0 : childItem.tagName) || '')) {
       setIsSolutionSwitcherOpen(false);
     }
   }, []);
@@ -87,12 +86,10 @@ var KibanaCollapsibleNavSolution = exports.KibanaCollapsibleNavSolution = functi
       "data-test-subj": "kibanaSolutionSwitcherList",
       "aria-label": solutionSolutionGroupLabel,
       listItems: primaryItems,
-      size: "s",
       bordered: true,
       onClick: closeSolutionPopover
     }), secondaryItems.length > 0 && (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_list_group.EuiListGroup, {
       listItems: secondaryItems,
-      size: "s",
       css: styles.euiCollapsibleNavKibanaSolution__secondaryItems,
       onClick: closeSolutionPopover
     })));

package/optimize/lib/components/color_picker/color_palette_picker/color_palette_picker.js

@@ -96,7 +96,6 @@ var EuiColorPalettePicker = exports.EuiColorPalettePicker = function EuiColorPal
     options: paletteOptions,
     valueOfSelected: valueOfSelected,
     onChange: onChange,
-    hasDividers: true,
     isInvalid: isInvalid,
     compressed: compressed,
     disabled: disabled,

package/optimize/lib/components/combo_box/combo_box.a11y.js

@@ -88,7 +88,7 @@ describe('EuiComboBox', function () {
           rowHeight: rowHeight
         }));
         cy.get('input[data-test-subj="comboBoxSearchInput"]').realClick();
-        cy.get('button[data-test-subj="titanOption"]').should('exist');
+        cy.get('[data-test-subj="titanOption"]').should('exist');
         cy.checkAxe();
       });
       it('has zero violations after keyboard interaction', function () {
@@ -97,7 +97,7 @@ describe('EuiComboBox', function () {
         }));
         cy.realPress('Tab');
         cy.get('input[data-test-subj="comboBoxSearchInput"]').should('have.focus');
-        cy.get('button[data-test-subj="titanOption"]').should('exist');
+        cy.get('[data-test-subj="titanOption"]').should('exist');
         cy.repeatRealPress('ArrowDown');
         cy.realPress('Enter');
         cy.repeatRealPress('ArrowDown');
@@ -123,14 +123,14 @@ describe('EuiComboBox', function () {
         }));
         cy.realPress('Tab');
         cy.get('input[data-test-subj="comboBoxSearchInput"]').should('have.focus');
-        cy.get('button[data-test-subj="titanOption"]').should('exist');
+        cy.get('[data-test-subj="titanOption"]').should('exist');
         cy.realPress('ArrowDown');
         cy.realPress('ArrowDown');
         cy.realPress('ArrowDown');
         cy.get('input[data-test-subj="comboBoxSearchInput"]').invoke('attr', 'aria-activedescendant').should('include', 'option-2');
         cy.realPress('Enter');
         cy.realPress('ArrowDown');
-        cy.get('input[data-test-subj="comboBoxSearchInput"]').invoke('attr', 'aria-activedescendant').should('include', 'option-3');
+        cy.get('input[data-test-subj="comboBoxSearchInput"]').invoke('attr', 'aria-activedescendant').should('include', 'option-4');
       });
       it('sets the correct aria-activedescendant id with custom option ids', function () {
         cy.realMount((0, _react2.jsx)(ComboBox, {
@@ -160,7 +160,7 @@ describe('EuiComboBox', function () {
         cy.get('input[data-test-subj="comboBoxSearchInput"]').should('exist');
         cy.realPress('Tab');
         cy.get('input[data-test-subj="comboBoxSearchInput"]').should('have.focus');
-        cy.get('button[data-test-subj="titanOption"]').should('exist');
+        cy.get('[data-test-subj="titanOption"]').should('exist');
         cy.realPress('ArrowDown');
         cy.realPress('ArrowDown');
         cy.realPress('ArrowDown');

package/optimize/lib/components/combo_box/combo_box.js

@@ -27,7 +27,7 @@ var _combo_box_input = require("./combo_box_input/combo_box_input");
 var _combo_box_options_list = require("./combo_box_options_list");
 var _combo_box = require("./combo_box.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["data-test-subj", "async", "className", "compressed", "customOptionText", "fullWidth", "id", "inputRef", "isCaseSensitive", "isClearable", "isDisabled", "isInvalid", "isLoading", "noSuggestions", "onBlur", "onChange", "onCreateOption", "onSearchChange", "options", "placeholder", "renderOption", "rowHeight", "selectedOptions", "singleSelection", "prepend", "sortMatchesBy", "delimiter", "append", "autoFocus", "truncationProps", "inputPopoverProps", "optionMatcher", "aria-label", "aria-labelledby", "aria-describedby"];
+var _excluded = ["data-test-subj", "async", "className", "compressed", "customOptionText", "fullWidth", "id", "inputRef", "isCaseSensitive", "isClearable", "isDisabled", "isInvalid", "isLoading", "noSuggestions", "onBlur", "onChange", "onCreateOption", "onSearchChange", "options", "placeholder", "renderOption", "rowHeight", "selectedOptions", "singleSelection", "prepend", "sortMatchesBy", "delimiter", "append", "autoFocus", "onFocusBadge", "truncationProps", "inputPopoverProps", "optionMatcher", "aria-label", "aria-labelledby", "aria-describedby"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; }
@@ -93,6 +93,9 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
       _this.listRefInstance = ref;
     });
     (0, _defineProperty2.default)(_this, "setListOptionRefs", function (node, index) {
+      var current = _this.state.listOptionRefs[index];
+      // Skip updating if the ref is null (on cleanup) or didn't change
+      if (node === null || node === current) return;
       _this.setState(function (_ref) {
         var listOptionRefs = _ref.listOptionRefs;
         var _listOptionRefs = listOptionRefs;
@@ -113,41 +116,32 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
         isListOpen: false
       });
     });
-    (0, _defineProperty2.default)(_this, "incrementActiveOptionIndex", function (amount) {
-      // If there are no options available, do nothing.
-      if (!_this.state.matchingOptions.length) {
-        return;
+    (0, _defineProperty2.default)(_this, "findNextSelectableOptionIndex", function (options, startIndex) {
+      var direction = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+      if (!options.length) return -1;
+      var index = startIndex;
+      for (var count = 0; count < options.length; count++) {
+        var option = options[index];
+        if (!option.isGroupLabelOption && !option.disabled) {
+          return index;
+        }
+        index = (index + direction + options.length) % options.length;
       }
+      return -1; // the remaining options can't be selected (group labels or disabled)
+    });
+    (0, _defineProperty2.default)(_this, "incrementActiveOptionIndex", function (amount) {
+      if (!_this.state.matchingOptions.length) return;
       _this.setState(function (_ref2) {
         var activeOptionIndex = _ref2.activeOptionIndex,
           matchingOptions = _ref2.matchingOptions;
-        var nextActiveOptionIndex;
-        if (activeOptionIndex < 0) {
-          // If this is the beginning of the user's keyboard navigation of the menu, then we'll focus
-          // either the first or last item.
-          nextActiveOptionIndex = amount < 0 ? matchingOptions.length - 1 : 0;
-        } else {
-          nextActiveOptionIndex = activeOptionIndex + amount;
-          if (nextActiveOptionIndex < 0) {
-            nextActiveOptionIndex = matchingOptions.length - 1;
-          } else if (nextActiveOptionIndex === matchingOptions.length) {
-            nextActiveOptionIndex = 0;
-          }
-        }
-
-        // Group titles are included in option list but are not selectable
-        // Skip group title options
         var direction = amount > 0 ? 1 : -1;
-        while (matchingOptions[nextActiveOptionIndex].isGroupLabelOption) {
-          nextActiveOptionIndex = nextActiveOptionIndex + direction;
-          if (nextActiveOptionIndex < 0) {
-            nextActiveOptionIndex = matchingOptions.length - 1;
-          } else if (nextActiveOptionIndex === matchingOptions.length) {
-            nextActiveOptionIndex = 0;
-          }
-        }
+        var startIndex = activeOptionIndex < 0 ?
+        // Inintial interaction: jump to first or last item
+        amount < 0 ? matchingOptions.length - 1 : 0 :
+        // Advance by amount, wrapping around
+        (activeOptionIndex + amount + matchingOptions.length) % matchingOptions.length;
         return {
-          activeOptionIndex: nextActiveOptionIndex
+          activeOptionIndex: _this.findNextSelectableOptionIndex(matchingOptions, startIndex, direction)
         };
       });
     });
@@ -365,27 +359,36 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
         onChange = _this$props7.onChange,
         selectedOptions = _this$props7.selectedOptions,
         singleSelectionProp = _this$props7.singleSelection;
+      var _this$state2 = _this.state,
+        matchingOptions = _this$state2.matchingOptions,
+        listOptionRefs = _this$state2.listOptionRefs;
       var singleSelection = Boolean(singleSelectionProp);
       var changeOptions = singleSelection ? [addedOption] : selectedOptions.concat(addedOption);
       onChange === null || onChange === void 0 || onChange(changeOptions);
       _this.clearSearchValue();
-      _this.clearActiveOption();
-      if (!isContainerBlur) {
-        var _this$searchInputRefI2;
-        (_this$searchInputRefI2 = _this.searchInputRefInstance) === null || _this$searchInputRefI2 === void 0 || _this$searchInputRefI2.focus();
-      }
       if (singleSelection) {
+        // List closes after single selection; return focus to the input
+        _this.clearActiveOption();
+        if (!isContainerBlur) {
+          var _this$searchInputRefI2;
+          (_this$searchInputRefI2 = _this.searchInputRefInstance) === null || _this$searchInputRefI2 === void 0 || _this$searchInputRefI2.focus();
+        }
         requestAnimationFrame(function () {
           return _this.closeList();
         });
+      } else if (isContainerBlur) {
+        // User tabbed away. `onContainerBlur` will close the list. We're only cleaning up state
+        _this.clearActiveOption();
       } else {
-        _this.setState(function (_ref4) {
-          var listOptionRefs = _ref4.listOptionRefs,
-            matchingOptions = _ref4.matchingOptions;
-          return {
-            listOptionRefs: listOptionRefs.slice(0, matchingOptions.length - 1),
-            activeOptionIndex: matchingOptions.indexOf(addedOption)
-          };
+        var currentIndex = matchingOptions.indexOf(addedOption);
+        var nextOptions = matchingOptions.filter(function (option) {
+          return option !== addedOption;
+        });
+        _this.setState({
+          listOptionRefs: listOptionRefs.slice(0, matchingOptions.length - 1),
+          activeOptionIndex: _this.findNextSelectableOptionIndex(nextOptions, Math.min(currentIndex, nextOptions.length - 1)
+          // direction defaults to 1 (forward)
+          )
         });
       }
     });
@@ -493,6 +496,7 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
         delimiter = _this$props11.delimiter,
         append = _this$props11.append,
         autoFocus = _this$props11.autoFocus,
+        onFocusBadge = _this$props11.onFocusBadge,
         truncationProps = _this$props11.truncationProps,
         inputPopoverProps = _this$props11.inputPopoverProps,
         optionMatcher = _this$props11.optionMatcher,
@@ -500,12 +504,12 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
         ariaLabelledby = _this$props11['aria-labelledby'],
         ariaDescribedby = _this$props11['aria-describedby'],
         rest = (0, _objectWithoutProperties2.default)(_this$props11, _excluded);
-      var _this$state2 = this.state,
-        activeOptionIndex = _this$state2.activeOptionIndex,
-        hasFocus = _this$state2.hasFocus,
-        isListOpen = _this$state2.isListOpen,
-        searchValue = _this$state2.searchValue,
-        matchingOptions = _this$state2.matchingOptions;
+      var _this$state3 = this.state,
+        activeOptionIndex = _this$state3.activeOptionIndex,
+        hasFocus = _this$state3.hasFocus,
+        isListOpen = _this$state3.isListOpen,
+        searchValue = _this$state3.searchValue,
+        matchingOptions = _this$state3.matchingOptions;
 
       // Make sure we have a valid ID if users don't pass one as a prop
       var inputId = id !== null && id !== void 0 ? id : this.rootId('_eui-combobox-id');
@@ -556,7 +560,8 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
             delimiter: delimiter,
             getSelectedOptionForSearchValue: _matching_options.getSelectedOptionForSearchValue,
             listboxAriaLabel: listboxAriaLabel,
-            truncationProps: truncationProps
+            truncationProps: truncationProps,
+            onFocusBadge: onFocusBadge
           });
         });
       }
@@ -581,11 +586,11 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
             ref: _this2.comboBoxRefCallback
           }), (0, _react2.jsx)(_popover.EuiInputPopover, (0, _extends2.default)({
             fullWidth: fullWidth,
-            panelPaddingSize: "none",
+            panelPaddingSize: "s",
             disableFocusTrap: true,
             closeOnScroll: true
           }, inputPopoverProps, {
-            isOpen: isListOpen,
+            isOpen: isListOpen && !noSuggestions,
             closePopover: _this2.closeList
             /* we don't want content changes to be announced via aria-live 
             because ComboBox uses a virtualized list that updates itself
@@ -593,7 +598,10 @@ var EuiComboBox = exports.EuiComboBox = /*#__PURE__*/function (_Component) {
             "aria-live": "off",
             input: (0, _react2.jsx)(_combo_box_input.EuiComboBoxInput, {
               compressed: compressed,
-              focusedOptionId: _this2.hasActiveOption() ? (_this2$state$listOpti = (_this2$state$listOpti2 = _this2.state.listOptionRefs[_this2.state.activeOptionIndex]) === null || _this2$state$listOpti2 === void 0 ? void 0 : _this2$state$listOpti2.id) !== null && _this2$state$listOpti !== void 0 ? _this2$state$listOpti : _this2.rootId("_option-".concat(_this2.state.activeOptionIndex)) : undefined,
+              focusedOptionId: _this2.hasActiveOption() ? (_this2$state$listOpti = (_this2$state$listOpti2 = _this2.state.listOptionRefs[_this2.state.activeOptionIndex]) === null || _this2$state$listOpti2 === void 0 ? void 0 : _this2$state$listOpti2.id) !== null && _this2$state$listOpti !== void 0 ? _this2$state$listOpti :
+              // uses the original `options` array to ensure a stable `id`, otherwise `aria-activedescendant`
+              // loses focus on selecting an option (due to actively removing it from the list)
+              _this2.rootId("_option-".concat(_this2.props.options.indexOf(matchingOptions[activeOptionIndex]))) : undefined,
               fullWidth: fullWidth,
               hasSelectedOptions: selectedOptions.length > 0,
               id: inputId,