@elastic/eui 80.0.0 → 81.0.0

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

@@ -3,7 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _button = require("../button");
 var _popover = require("../popover");
@@ -31,27 +30,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, (0, _extends2.default)({
-    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, (0, _extends2.default)({
-    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();
     });
@@ -59,9 +58,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();
     });
@@ -88,12 +103,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/optimize/lib/components/selectable/selectable_list/selectable_list_item.js

@@ -10,6 +10,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
@@ -29,18 +30,28 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 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,
@@ -53,8 +64,32 @@ var EuiSelectableListItem = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(EuiSelectableListItem, _Component);
   var _super = _createSuper(EuiSelectableListItem);
   function EuiSelectableListItem(props) {
+    var _this;
     (0, _classCallCheck2.default)(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
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
   }
   (0, _createClass2.default)(EuiSelectableListItem, [{
     key: "render",
@@ -93,41 +128,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) {
@@ -164,22 +229,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", (0, _extends2.default)({
         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;

package/optimize/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/optimize/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/optimize/lib/services/theme/provider.js

@@ -6,13 +6,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setEuiDevProviderWarning = exports.getEuiDevProviderWarning = exports.EuiThemeProvider = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _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 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; }
@@ -30,7 +35,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);
@@ -85,6 +94,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 = (0, _objectWithoutProperties2.default)(_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", (0, _extends2.default)({}, 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, {
@@ -93,6 +133,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "80.0.0",
+  "version": "81.0.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@types/chroma-js": "^2.0.0",
-    "@types/lodash": "^4.14.160",
+    "@types/lodash": "^4.14.194",
     "@types/numeral": "^0.0.28",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-input-autosize": "^2.2.1",
@@ -105,7 +105,6 @@
     "@babel/core": "^7.21.3",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-async-to-generator": "^7.20.7",
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
@@ -150,12 +149,10 @@
     "argparse": "^2.0.1",
     "autoprefixer": "^9.8.6",
     "axe-core": "^4.4.1",
-    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^24.1.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-inline-react-svg": "^1.1.1",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-plugin-pegjs-inline-precompile": "^0.1.1",

package/test-env/components/bottom_bar/bottom_bar.js

@@ -194,7 +194,10 @@ _EuiBottomBar.propTypes = {
 var EuiBottomBar = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var BottomBar = _EuiBottomBar;
   return (0, _react2.jsx)(_provider.EuiThemeProvider, {
-    colorMode: 'dark'
+    colorMode: 'dark',
+    wrapperProps: {
+      cloneElement: true
+    }
   }, (0, _react2.jsx)(BottomBar, (0, _extends2.default)({
     ref: ref
   }, props)));

package/test-env/components/bottom_bar/bottom_bar.styles.js

@@ -16,8 +16,8 @@ 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__*/(0, _react.css)((0, _mixins.euiShadowFlat)(euiThemeContext), ";background:", (0, _services.shade)(euiTheme.colors.lightestShade, 0.5), ";color:", euiTheme.colors.text, ";", _global_styling.euiCanAnimate, "{animation:", euiBottomBarAppear, " ", euiTheme.animation.slow, " ", euiTheme.animation.resistance, ";};label:euiBottomBar;"),
+    // `color` is inherited from the wrapping `EuiThemeProvider colorMode="dark"`
+    euiBottomBar: /*#__PURE__*/(0, _react.css)((0, _mixins.euiShadowFlat)(euiThemeContext), ";background:", (0, _services.shade)(euiTheme.colors.lightestShade, 0.5), ";", _global_styling.euiCanAnimate, "{animation:", euiBottomBarAppear, " ", euiTheme.animation.slow, " ", euiTheme.animation.resistance, ";};label:euiBottomBar;"),
     static: /*#__PURE__*/(0, _react.css)(";label:static;"),
     fixed: /*#__PURE__*/(0, _react.css)("z-index:", Number(euiTheme.levels.header) - 2, ";;label:fixed;"),
     sticky: /*#__PURE__*/(0, _react.css)("z-index:", Number(euiTheme.levels.header) - 2, ";;label:sticky;"),

package/test-env/components/button/button.js

@@ -54,7 +54,10 @@ var EuiButton = function EuiButton(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, (0, _react2.jsx)(EuiButton, (0, _extends2.default)({}, props, {
       color: "text"
     })));

package/test-env/components/button/button_empty/button_empty.js

@@ -79,7 +79,10 @@ var EuiButtonEmpty = function EuiButtonEmpty(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, (0, _react2.jsx)(EuiButtonEmpty, (0, _extends2.default)({}, props, {
       color: "text"
     })));

package/test-env/components/button/button_icon/button_icon.js

@@ -81,7 +81,10 @@ var EuiButtonIcon = function EuiButtonIcon(props) {
   if (_color === 'ghost') {
     // INCEPTION: If `ghost`, re-implement with a wrapping dark mode theme provider
     return (0, _react2.jsx)(_services.EuiThemeProvider, {
-      colorMode: "dark"
+      colorMode: "dark",
+      wrapperProps: {
+        cloneElement: true
+      }
     }, (0, _react2.jsx)(EuiButtonIcon, (0, _extends2.default)({}, props, {
       color: "text"
     })));

package/test-env/components/filter_group/filter_group.a11y.js

@@ -239,10 +239,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/test-env/components/overlay_mask/overlay_mask.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiOverlayMask = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
@@ -47,11 +48,28 @@ 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`
   (0, _react.useEffect)(function () {
-    if (!overlayMaskNode) return;
-    overlayMaskNode.className = (0, _css.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]);
+  (0, _react.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, (0, _toConsumableArray2.default)(classNameArgs));
+      return function () {
+        var _overlayMaskNode$clas2;
+        return (_overlayMaskNode$clas2 = overlayMaskNode.classList).remove.apply(_overlayMaskNode$clas2, (0, _toConsumableArray2.default)(classNameArgs));
+      };
+    }
+  }, [overlayMaskNode, className]);
   return (0, _react2.jsx)(_portal.EuiPortal, {
     portalRef: combinedMaskRef
   }, (0, _react2.jsx)(_react2.Global, {

package/test-env/components/portal/portal.js

@@ -15,6 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactDom = require("react-dom");
+var _services = require("../../services");
 var _common = require("../common");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
@@ -52,6 +53,7 @@ var EuiPortal = /*#__PURE__*/function (_Component) {
   (0, _createClass2.default)(EuiPortal, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.setThemeColor();
       this.updatePortalRef(this.portalNode);
     }
   }, {
@@ -63,6 +65,20 @@ var EuiPortal = /*#__PURE__*/function (_Component) {
       }
       this.updatePortalRef(null);
     }
+
+    // Set the inherited color of the portal based on the wrapping EuiThemeProvider
+  }, {
+    key: "setThemeColor",
+    value: function setThemeColor() {
+      if (this.portalNode && this.context) {
+        var _this$context = this.context,
+          hasDifferentColorFromGlobalTheme = _this$context.hasDifferentColorFromGlobalTheme,
+          colorClassName = _this$context.colorClassName;
+        if (hasDifferentColorFromGlobalTheme && this.props.insert == null) {
+          this.portalNode.classList.add(colorClassName);
+        }
+      }
+    }
   }, {
     key: "updatePortalRef",
     value: function updatePortalRef(ref) {
@@ -79,6 +95,7 @@ var EuiPortal = /*#__PURE__*/function (_Component) {
   return EuiPortal;
 }(_react.Component);
 exports.EuiPortal = EuiPortal;
+(0, _defineProperty2.default)(EuiPortal, "contextType", _services.EuiNestedThemeContext);
 EuiPortal.propTypes = {
   /**
      * ReactNode to render as this component's content