@elastic/eui 80.0.0 → 81.0.0

package/lib/components/selectable/selectable.a11y.js

@@ -14,7 +14,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
 var options = [{
   label: 'Titan',
   'data-test-subj': 'titanOption'
@@ -23,27 +22,27 @@ var options = [{
 }, {
   label: "Pandora is one of Saturn's moons, named for a Titaness of Greek mythology"
 }];
-var EuiSelectableListboxOnly = function EuiSelectableListboxOnly(args) {
-  return (0, _react2.jsx)(_selectable.EuiSelectable, _extends({
-    options: options
-  }, args), function (list) {
-    return (0, _react2.jsx)(_react.default.Fragment, null, list);
-  });
-};
-var EuiSelectableWithSearchInput = function EuiSelectableWithSearchInput(args) {
-  return (0, _react2.jsx)(_selectable.EuiSelectable, _extends({
-    searchable: true,
-    options: options
-  }, args), function (list, search) {
-    return (0, _react2.jsx)(_react.default.Fragment, null, search, list);
-  });
-};
+var excludedOptions = [{
+  label: 'Titan',
+  'data-test-subj': 'titanOption',
+  checked: 'on'
+}, {
+  label: 'Enceladus',
+  checked: 'off'
+}, {
+  label: "Pandora is one of Saturn's moons, named for a Titaness of Greek mythology",
+  checked: 'mixed'
+}];
 describe('EuiSelectable', function () {
   describe('with a `searchable` configuration', function () {
     it('has no accessibility errors', function () {
       var onChange = cy.stub();
-      cy.realMount((0, _react2.jsx)(EuiSelectableWithSearchInput, {
-        onChange: onChange
+      cy.realMount((0, _react2.jsx)(_selectable.EuiSelectable, {
+        options: options,
+        onChange: onChange,
+        searchable: true
+      }, function (list, search) {
+        return (0, _react2.jsx)(_react.default.Fragment, null, search, list);
       }));
       cy.checkAxe();
     });
@@ -51,9 +50,25 @@ describe('EuiSelectable', function () {
   describe('without a `searchable` configuration', function () {
     it('has no accessibility errors', function () {
       var onChange = cy.stub();
-      cy.realMount((0, _react2.jsx)(EuiSelectableListboxOnly, {
+      cy.realMount((0, _react2.jsx)(_selectable.EuiSelectable, {
         "aria-label": "No search box",
+        options: options,
         onChange: onChange
+      }, function (list) {
+        return (0, _react2.jsx)(_react.default.Fragment, null, list);
+      }));
+      cy.checkAxe();
+    });
+  });
+  describe('with excluded and mixed options configuration', function () {
+    it('has no accessibility errors', function () {
+      var onChange = cy.stub();
+      cy.realMount((0, _react2.jsx)(_selectable.EuiSelectable, {
+        "aria-label": "Excluded and mixed options",
+        options: excludedOptions,
+        onChange: onChange
+      }, function (list) {
+        return (0, _react2.jsx)(_react.default.Fragment, null, list);
       }));
       cy.checkAxe();
     });
@@ -80,12 +95,13 @@ describe('EuiSelectable', function () {
         button: button,
         isOpen: isPopoverOpen,
         closePopover: onClosePopover
-      }, (0, _react2.jsx)(EuiSelectableWithSearchInput, {
+      }, (0, _react2.jsx)(_selectable.EuiSelectable, {
         "aria-label": "With popover",
         options: options,
-        onChange: onChange
-      }, function (list) {
-        return (0, _react2.jsx)(_react.default.Fragment, null, list);
+        onChange: onChange,
+        searchable: true
+      }, function (list, search) {
+        return (0, _react2.jsx)(_react.default.Fragment, null, search, list);
       }));
     };
     it('has no accessibility errors', function () {

package/lib/components/selectable/selectable.js

@@ -598,11 +598,11 @@ EuiSelectable.propTypes = {
        */
     key: _propTypes.default.string,
     /**
-       * Leave `undefined` to indicate not selected,
-       * 'on' to indicate inclusion and
-       * 'off' to indicate exclusion
+       * Leave `undefined` to indicate not selected. Pass a string of
+       * 'on' to indicate inclusion, 'off' to indicate exclusion,
+       * or 'mixed' to indicate inclusion for some.
        */
-    checked: _propTypes.default.oneOf(["on", "off", undefined]),
+    checked: _propTypes.default.oneOf(["on", "off", "mixed", undefined]),
     disabled: _propTypes.default.bool,
     /**
        * Node to add between the selection icon and the label

package/lib/components/selectable/selectable_list/selectable_list.js

@@ -476,11 +476,11 @@ EuiSelectableList.propTypes = {
        */
     key: _propTypes.default.string,
     /**
-       * Leave `undefined` to indicate not selected,
-       * 'on' to indicate inclusion and
-       * 'off' to indicate exclusion
+       * Leave `undefined` to indicate not selected. Pass a string of
+       * 'on' to indicate inclusion, 'off' to indicate exclusion,
+       * or 'mixed' to indicate inclusion for some.
        */
-    checked: _propTypes.default.oneOf(["on", "off", undefined]),
+    checked: _propTypes.default.oneOf(["on", "off", "mixed", undefined]),
     disabled: _propTypes.default.bool,
     /**
        * Node to add between the selection icon and the label
@@ -509,7 +509,7 @@ EuiSelectableList.propTypes = {
     label: _propTypes.default.string,
     searchableLabel: _propTypes.default.string,
     key: _propTypes.default.string,
-    checked: _propTypes.default.oneOf(["on", "off", undefined]),
+    checked: _propTypes.default.oneOf(["on", "off", "mixed", undefined]),
     disabled: _propTypes.default.bool,
     prepend: _propTypes.default.node,
     append: _propTypes.default.node,

package/lib/components/selectable/selectable_list/selectable_list_item.js

@@ -36,18 +36,28 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function resolveIconAndColor(checked) {
-  if (!checked) {
-    return {
-      icon: 'empty'
-    };
+  switch (checked) {
+    case 'on':
+      return {
+        icon: 'check',
+        color: 'text'
+      };
+    case 'off':
+      return {
+        icon: 'cross',
+        color: 'text'
+      };
+    case 'mixed':
+      return {
+        icon: 'minus',
+        color: 'text'
+      };
+    case undefined:
+    default:
+      return {
+        icon: 'empty'
+      };
   }
-  return checked === 'on' ? {
-    icon: 'check',
-    color: 'text'
-  } : {
-    icon: 'cross',
-    color: 'text'
-  };
 }
 var paddingSizeToClassNameMap = {
   none: null,
@@ -60,8 +70,32 @@ var EuiSelectableListItem = /*#__PURE__*/function (_Component) {
   _inherits(EuiSelectableListItem, _Component);
   var _super = _createSuper(EuiSelectableListItem);
   function EuiSelectableListItem(props) {
+    var _this;
     _classCallCheck(this, EuiSelectableListItem);
-    return _super.call(this, props);
+    _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",
@@ -100,41 +134,71 @@ var EuiSelectableListItem = /*#__PURE__*/function (_Component) {
         });
       }
       var state;
-      var instruction;
-      if (allowExclusions && checked === 'on') {
-        state = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.includedOption",
-          default: "Selected option."
-        });
-        instruction = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.includedOptionInstructions",
-          default: "To exclude this option, press enter."
-        });
-      } else if (allowExclusions && checked === 'off') {
-        state = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.excludedOption",
-          default: "Excluded option."
-        });
-        instruction = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.excludedOptionInstructions",
-          default: "To uncheck this option, press enter."
-        });
-      } else if (allowExclusions && !checked) {
-        instruction = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.unckeckedOptionInstructions",
-          default: "To select this option, press enter."
-        });
-      }
-      var isChecked = !disabled && typeof checked === 'string';
-      if (!allowExclusions && isChecked) {
-        state = (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.checkedOption",
-          default: "Checked option."
-        });
-        instruction = searchable ? (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiSelectableListItem.checkedOptionInstructions",
-          default: "To uncheck this option, press enter."
-        }) : undefined;
+      var instructions;
+      var screenReaderStrings = {
+        checked: {
+          state: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.checkedOption",
+            default: "Checked option."
+          }),
+          instructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.checkOptionInstructions",
+            default: "To check this option, press Enter."
+          })
+        },
+        unchecked: {
+          instructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.uncheckOptionInstructions",
+            default: "To uncheck this option, press Enter."
+          })
+        },
+        excluded: {
+          state: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.excludedOption",
+            default: "Excluded option."
+          }),
+          instructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.excludeOptionInstructions",
+            default: "To exclude this option, press Enter."
+          })
+        },
+        mixed: {
+          state: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.mixedOption",
+            default: "Mixed (indeterminate) option."
+          }),
+          instructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.mixedOptionInstructions",
+            default: "To check this option for all, press Enter once."
+          }),
+          uncheckInstructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.mixedOptionUncheckInstructions",
+            default: "To uncheck this option for all, press Enter twice."
+          }),
+          excludeInstructions: (0, _react2.jsx)(_i18n.EuiI18n, {
+            token: "euiSelectableListItem.mixedOptionExcludeInstructions",
+            default: "To exclude this option for all, press Enter twice."
+          })
+        }
+      };
+      switch (checked) {
+        case 'on':
+          state = screenReaderStrings.checked.state;
+          // eslint-disable-next-line no-nested-ternary
+          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 = (0, _react2.jsx)(_react.default.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) {
@@ -171,22 +235,20 @@ var EuiSelectableListItem = /*#__PURE__*/function (_Component) {
           }, append, " ", isFocused && !disabled ? onFocusBadgeNode : null);
         }
       }
-      var instructions = (instruction || state) && (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("div", null, state || instruction ? ' - ' : null, state, state && instruction ? ' ' : null, instruction));
+      var screenReaderText = (state || instructions) && (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, null, (0, _react2.jsx)("div", null, state || instructions ? '. ' : null, state, state && instructions ? ' ' : null, instructions));
       return (0, _react2.jsx)("li", _extends({
         role: role,
-        "data-test-selected": isChecked // Whether the item is checked/selected
-        ,
-        "aria-checked": role === 'option' ? isChecked : undefined // Whether the item is "checked"
+        "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,
-        "aria-disabled": disabled
+        className: classes
       }, rest), (0, _react2.jsx)("span", {
         className: "euiSelectableListItem__content"
       }, optionIcon, prependNode, (0, _react2.jsx)("span", {
         className: textClasses
-      }, children, instructions), appendNode));
+      }, children, screenReaderText), appendNode));
     }
   }]);
   return EuiSelectableListItem;
@@ -206,7 +268,7 @@ EuiSelectableListItem.propTypes = {
   /**
        * Applies an icon and visual styling to activated items
        */
-  checked: _propTypes.default.oneOf(["on", "off", undefined]),
+  checked: _propTypes.default.oneOf(["on", "off", "mixed", undefined]),
   /**
        * Shows icons based on `checked` type
        */
@@ -281,8 +343,8 @@ EuiSelectableListItem.propTypes = {
   searchable: _propTypes.default.bool,
   /**
        * Attribute applied the option `<li>`.
-       * If configured to something besides the default value of `option`,
-       * other ARIA attributes such as `aria-checked` will not be automatically configured.
+       * If set to a role that allows [aria-checked](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-checked),
+       * `aria-checked` will be automatically configured.
        */
   role: _propTypes.default.any,
   /**

package/lib/components/selectable/selectable_templates/selectable_template_sitewide.js

@@ -371,11 +371,11 @@ EuiSelectableTemplateSitewide.propTypes = {
        */
     key: _propTypes.default.string,
     /**
-       * Leave `undefined` to indicate not selected,
-       * 'on' to indicate inclusion and
-       * 'off' to indicate exclusion
+       * Leave `undefined` to indicate not selected. Pass a string of
+       * 'on' to indicate inclusion, 'off' to indicate exclusion,
+       * or 'mixed' to indicate inclusion for some.
        */
-    checked: _propTypes.default.oneOf(["on", "off", undefined]),
+    checked: _propTypes.default.oneOf(["on", "off", "mixed", undefined]),
     disabled: _propTypes.default.bool,
     /**
        * Node to add between the selection icon and the label

package/lib/services/theme/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultComputedTheme = exports.EuiThemeContext = exports.EuiSystemContext = exports.EuiModificationsContext = exports.EuiColorModeContext = void 0;
+exports.defaultComputedTheme = exports.EuiThemeContext = exports.EuiSystemContext = exports.EuiNestedThemeContext = exports.EuiModificationsContext = exports.EuiColorModeContext = void 0;
 var _react = require("react");
 var _theme = require("../../themes/amsterdam/theme");
 var _utils = require("./utils");
@@ -24,4 +24,11 @@ exports.EuiColorModeContext = EuiColorModeContext;
 var defaultComputedTheme = (0, _utils.getComputed)(_theme.EuiThemeAmsterdam, {}, _utils.DEFAULT_COLOR_MODE);
 exports.defaultComputedTheme = defaultComputedTheme;
 var EuiThemeContext = /*#__PURE__*/(0, _react.createContext)(defaultComputedTheme);
-exports.EuiThemeContext = EuiThemeContext;
+exports.EuiThemeContext = EuiThemeContext;
+var EuiNestedThemeContext = /*#__PURE__*/(0, _react.createContext)({
+  isGlobalTheme: true,
+  hasDifferentColorFromGlobalTheme: false,
+  bodyColor: '',
+  colorClassName: ''
+});
+exports.EuiNestedThemeContext = EuiNestedThemeContext;

package/lib/services/theme/index.js

@@ -27,6 +27,12 @@ Object.defineProperty(exports, "EuiModificationsContext", {
     return _context.EuiModificationsContext;
   }
 });
+Object.defineProperty(exports, "EuiNestedThemeContext", {
+  enumerable: true,
+  get: function get() {
+    return _context.EuiNestedThemeContext;
+  }
+});
 Object.defineProperty(exports, "EuiSystemContext", {
   enumerable: true,
   get: function get() {

package/lib/services/theme/provider.js

@@ -6,13 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setEuiDevProviderWarning = exports.getEuiDevProviderWarning = exports.EuiThemeProvider = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _css = require("@emotion/css");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _context = require("./context");
 var _utils = require("./utils");
 var _react2 = require("@emotion/react");
+var _excluded = ["cloneElement", "className"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -37,7 +43,11 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
   var _system = _ref.theme,
     _colorMode = _ref.colorMode,
     _modifications = _ref.modify,
-    children = _ref.children;
+    children = _ref.children,
+    wrapperProps = _ref.wrapperProps;
+  var _useContext = (0, _react.useContext)(_context.EuiNestedThemeContext),
+    isGlobalTheme = _useContext.isGlobalTheme,
+    bodyColor = _useContext.bodyColor;
   var parentSystem = (0, _react.useContext)(_context.EuiSystemContext);
   var parentModifications = (0, _react.useContext)(_context.EuiModificationsContext);
   var parentColorMode = (0, _react.useContext)(_context.EuiColorModeContext);
@@ -92,6 +102,37 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
       setTheme((0, _utils.getComputed)(system, (0, _utils.buildTheme)(modifications, "_".concat(system.key)), colorMode));
     }
   }, [colorMode, system, modifications]);
+  var nestedThemeContext = (0, _react.useMemo)(function () {
+    return {
+      isGlobalTheme: false,
+      // The theme that determines the global body styles
+      bodyColor: isGlobalTheme ? theme.colors.text : bodyColor,
+      hasDifferentColorFromGlobalTheme: isGlobalTheme ? false : bodyColor !== theme.colors.text,
+      colorClassName: /*#__PURE__*/(0, _css.css)("label:euiColorMode-", _colorMode, ";color:", theme.colors.text, ";;label:colorClassName;")
+    };
+  }, [theme, isGlobalTheme, bodyColor, _colorMode]);
+  var renderedChildren = (0, _react.useMemo)(function () {
+    if (isGlobalTheme) {
+      return children; // No wrapper
+    }
+
+    var _ref2 = wrapperProps || {},
+      cloneElement = _ref2.cloneElement,
+      className = _ref2.className,
+      rest = _objectWithoutProperties(_ref2, _excluded);
+    var props = _objectSpread(_objectSpread({}, rest), {}, {
+      className: (0, _classnames.default)(className, nestedThemeContext.colorClassName)
+    });
+    if (cloneElement) {
+      return /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
+        className: (0, _classnames.default)(children.props.className, props.className)
+      }));
+    } else {
+      return (0, _react2.jsx)("span", _extends({}, props, {
+        className: (0, _classnames.default)('euiThemeProvider', props.className)
+      }), children);
+    }
+  }, [isGlobalTheme, nestedThemeContext, wrapperProps, children]);
   return (0, _react2.jsx)(_context.EuiColorModeContext.Provider, {
     value: colorMode
   }, (0, _react2.jsx)(_context.EuiSystemContext.Provider, {
@@ -100,6 +141,8 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
     value: modifications
   }, (0, _react2.jsx)(_context.EuiThemeContext.Provider, {
     value: theme
-  }, children))));
+  }, (0, _react2.jsx)(_context.EuiNestedThemeContext.Provider, {
+    value: nestedThemeContext
+  }, renderedChildren)))));
 };
 exports.EuiThemeProvider = EuiThemeProvider;

package/optimize/es/components/bottom_bar/bottom_bar.js

@@ -125,7 +125,10 @@ var _EuiBottomBar = /*#__PURE__*/forwardRef(function (_ref, ref) {
 export var EuiBottomBar = /*#__PURE__*/forwardRef(function (props, ref) {
   var BottomBar = _EuiBottomBar;
   return ___EmotionJSX(EuiThemeProvider, {
-    colorMode: 'dark'
+    colorMode: 'dark',
+    wrapperProps: {
+      cloneElement: true
+    }
   }, ___EmotionJSX(BottomBar, _extends({
     ref: ref
   }, props)));

package/optimize/es/components/bottom_bar/bottom_bar.styles.js

@@ -17,8 +17,8 @@ export var euiBottomBarStyles = function euiBottomBarStyles(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
   return {
     // Base
-    // Text color needs to be reapplied to properly scope the forced `colorMode`
-    euiBottomBar: /*#__PURE__*/css(euiShadowFlat(euiThemeContext), ";background:", shade(euiTheme.colors.lightestShade, 0.5), ";color:", euiTheme.colors.text, ";", euiCanAnimate, "{animation:", euiBottomBarAppear, " ", euiTheme.animation.slow, " ", euiTheme.animation.resistance, ";};label:euiBottomBar;"),
+    // `color` is inherited from the wrapping `EuiThemeProvider colorMode="dark"`
+    euiBottomBar: /*#__PURE__*/css(euiShadowFlat(euiThemeContext), ";background:", shade(euiTheme.colors.lightestShade, 0.5), ";", euiCanAnimate, "{animation:", euiBottomBarAppear, " ", euiTheme.animation.slow, " ", euiTheme.animation.resistance, ";};label:euiBottomBar;"),
     static: /*#__PURE__*/css(";label:static;"),
     fixed: /*#__PURE__*/css("z-index:", Number(euiTheme.levels.header) - 2, ";;label:fixed;"),
     sticky: /*#__PURE__*/css("z-index:", Number(euiTheme.levels.header) - 2, ";;label:sticky;"),

package/optimize/es/components/button/button.js

@@ -49,7 +49,10 @@ export var EuiButton = function EuiButton(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, ___EmotionJSX(EuiButton, _extends({}, props, {
       color: "text"
     })));

package/optimize/es/components/button/button_empty/button_empty.js

@@ -78,7 +78,10 @@ export var EuiButtonEmpty = function EuiButtonEmpty(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, ___EmotionJSX(EuiButtonEmpty, _extends({}, props, {
       color: "text"
     })));

package/optimize/es/components/button/button_icon/button_icon.js

@@ -80,7 +80,10 @@ export var EuiButtonIcon = function EuiButtonIcon(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return ___EmotionJSX(EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, ___EmotionJSX(EuiButtonIcon, _extends({}, props, {
       color: "text"
     })));

package/optimize/es/components/filter_group/filter_group.a11y.js

@@ -233,10 +233,10 @@ describe('EuiFilterGroup multiselect example', function () {
       cy.realPress('Tab');
       cy.repeatRealPress('ArrowDown', 3);
       cy.realPress('Enter');
-      cy.get('li[aria-selected="true"]').find('span.euiSelectableListItem__text').should('have.text', 'Dmitri Shostakovich - Selected option. To exclude this option, press enter.');
+      cy.get('li[aria-selected="true"]').find('span.euiSelectableListItem__text').should('have.text', 'Dmitri Shostakovich - Checked option. To exclude this option, press Enter.');
       cy.realPress('ArrowDown');
       cy.repeatRealPress('Enter');
-      cy.get('li[aria-selected="true"]').find('span.euiSelectableListItem__text').should('have.text', 'Felix Mendelssohn-Bartholdy - Excluded option. To uncheck this option, press enter.');
+      cy.get('li[aria-selected="true"]').find('span.euiSelectableListItem__text').should('have.text', 'Felix Mendelssohn-Bartholdy - Excluded option. To uncheck this option, press Enter.');
       cy.checkAxe();
     });
     it('has zero violations when filtering by searchbox', function () {

package/optimize/es/components/overlay_mask/overlay_mask.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["className", "children", "headerZindexLocation", "maskRef"];
@@ -9,11 +10,6 @@ var _excluded = ["className", "children", "headerZindexLocation", "maskRef"];
  * Side Public License, v 1.
  */
 
-/**
- * NOTE: We can't test this component because Enzyme doesn't support rendering
- * into portals.
- */
-
 import React, { useEffect, useState } from 'react';
 import { cx } from '@emotion/css';
 import { Global } from '@emotion/react';
@@ -50,11 +46,28 @@ export var EuiOverlayMask = function EuiOverlayMask(_ref) {
     });
   }, [overlayMaskNode]); // eslint-disable-line react-hooks/exhaustive-deps
 
+  // Note: Use `classList.add/remove` instead of setting the entire `className`
+  // so as not to override any existing classes set by `EuiPortal`
   useEffect(function () {
-    if (!overlayMaskNode) return;
-    overlayMaskNode.className = cx('euiOverlayMask', cssStyles, className);
-    overlayMaskNode.dataset.relativeToHeader = headerZindexLocation;
-  }, [overlayMaskNode, className, cssStyles, headerZindexLocation]);
+    if (overlayMaskNode) {
+      overlayMaskNode.classList.add('euiOverlayMask', cssStyles);
+      overlayMaskNode.dataset.relativeToHeader = headerZindexLocation;
+      return function () {
+        return overlayMaskNode.classList.remove(cssStyles);
+      };
+    }
+  }, [overlayMaskNode, cssStyles, headerZindexLocation]);
+  useEffect(function () {
+    if (className && overlayMaskNode) {
+      var _overlayMaskNode$clas;
+      var classNameArgs = className.split(' '); // The `classList` API doesn't support multiple classes in the same string
+      (_overlayMaskNode$clas = overlayMaskNode.classList).add.apply(_overlayMaskNode$clas, _toConsumableArray(classNameArgs));
+      return function () {
+        var _overlayMaskNode$clas2;
+        return (_overlayMaskNode$clas2 = overlayMaskNode.classList).remove.apply(_overlayMaskNode$clas2, _toConsumableArray(classNameArgs));
+      };
+    }
+  }, [overlayMaskNode, className]);
   return ___EmotionJSX(EuiPortal, {
     portalRef: combinedMaskRef
   }, ___EmotionJSX(Global, {