@elastic/eui 70.0.0 → 70.1.0

package/optimize/lib/components/tabs/tabs.js

@@ -17,7 +17,11 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _common = require("../common");
+var _services = require("../../services");
+
+var _clone_element = require("../../services/theme/clone_element");
+
+var _tabs = require("./tabs.styles");
 
 var _react2 = require("@emotion/react");
 
@@ -27,13 +31,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-var sizeToClassNameMap = {
-  s: 'euiTabs--small',
-  m: null,
-  l: 'euiTabs--large',
-  xl: 'euiTabs--xlarge'
-};
-var SIZES = (0, _common.keysOf)(sizeToClassNameMap);
+var SIZES = ['s', 'm', 'l', 'xl'];
 exports.SIZES = SIZES;
 var EuiTabs = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var children = _ref.children,
@@ -45,16 +43,28 @@ var EuiTabs = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _ref$size = _ref.size,
       size = _ref$size === void 0 ? 'm' : _ref$size,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var classes = (0, _classnames.default)('euiTabs', sizeToClassNameMap[size], {
-    'euiTabs--expand': expand,
-    'euiTabs--bottomBorder': bottomBorder
-  }, className);
+  var euiTheme = (0, _services.useEuiTheme)();
+  var classes = (0, _classnames.default)('euiTabs', className);
+  var tabsStyles = (0, _tabs.euiTabsStyles)(euiTheme);
+  var computedStyles = [tabsStyles.euiTabs, tabsStyles[size], bottomBorder && tabsStyles.bottomBorder];
+
+  var tabItems = _react.default.Children.map(children, function (child) {
+    if ( /*#__PURE__*/_react.default.isValidElement(child)) {
+      return (0, _clone_element.cloneElementWithCss)(child, {
+        // we're passing the parent `size` and `expand` down to the children
+        size: size,
+        expand: expand
+      });
+    }
+  });
+
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     ref: ref,
-    className: classes
+    className: classes,
+    css: computedStyles
   }, children && {
     role: 'tablist'
-  }, rest), children);
+  }, rest), tabItems);
 });
 exports.EuiTabs = EuiTabs;
 EuiTabs.displayName = 'EuiTabs';

package/optimize/lib/components/tabs/tabs.styles.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.euiTabsStyles = void 0;
+
+var _react = require("@emotion/react");
+
+var _global_styling = require("../../global_styling");
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+var euiTabsStyles = function euiTabsStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  return {
+    euiTabs: /*#__PURE__*/(0, _react.css)("display:flex;", (0, _global_styling.logicalCSS)('max-width', '100%'), ";", (0, _global_styling.logicalCSSWithFallback)('overflow-x', 'auto'), ";", (0, _global_styling.logicalCSSWithFallback)('overflow-y', 'hidden'), ";position:relative;flex-shrink:0;;label:euiTabs;"),
+    bottomBorder: /*#__PURE__*/(0, _react.css)("box-shadow:inset 0 ", (0, _global_styling.mathWithUnits)(euiTheme.border.width.thin, function (x) {
+      return x * -1;
+    }), " 0 ", euiTheme.border.color, ";;label:bottomBorder;"),
+    // sizes
+    s: /*#__PURE__*/(0, _react.css)("gap:", euiTheme.size.m, ";;label:s;"),
+    m: /*#__PURE__*/(0, _react.css)("gap:", euiTheme.size.base, ";;label:m;"),
+    l: /*#__PURE__*/(0, _react.css)("gap:", euiTheme.size.l, ";;label:l;"),
+    xl: /*#__PURE__*/(0, _react.css)("gap:", euiTheme.size.xl, ";;label:xl;")
+  };
+};
+
+exports.euiTabsStyles = euiTabsStyles;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "70.0.0",
+  "version": "70.1.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",
@@ -115,7 +115,7 @@
     "@cypress/code-coverage": "^3.10.0",
     "@cypress/react": "^5.10.3",
     "@cypress/webpack-dev-server": "^1.7.0",
-    "@elastic/charts": "^50.0.1",
+    "@elastic/charts": "^50.0.2",
     "@elastic/datemath": "^5.0.3",
     "@elastic/eslint-config-kibana": "^0.15.0",
     "@emotion/babel-preset-css-prop": "^11.10.0",
@@ -124,6 +124,7 @@
     "@emotion/eslint-plugin": "^11.10.0",
     "@emotion/jest": "^11.10.0",
     "@emotion/react": "^11.10.4",
+    "@faker-js/faker": "^7.6.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
     "@svgr/core": "5.5.0",
     "@svgr/plugin-svgo": "^4.0.3",
@@ -192,7 +193,6 @@
     "eslint-plugin-react": "^7.21.3",
     "eslint-plugin-react-hooks": "^4.1.2",
     "expose-gc": "^1.0.0",
-    "faker": "^4.1.0",
     "file-loader": "^6.1.0",
     "findup": "^0.1.5",
     "fork-ts-checker-webpack-plugin": "^5.1.0",
@@ -254,8 +254,8 @@
   },
   "peerDependencies": {
     "@elastic/datemath": "^5.0.2",
-    "@emotion/react": "11.x",
     "@emotion/css": "11.x",
+    "@emotion/react": "11.x",
     "@types/react": "^16.9 || ^17.0",
     "@types/react-dom": "^16.9 || ^17.0",
     "moment": "^2.13.0",

package/src/components/datagrid/controls/_data_grid_toolbar.scss

@@ -52,14 +52,6 @@
   }
 }
 
-.euiDataGrid__controlPopoverWithDragDrop {
-  // Hack because the fixed positions of drag and drop don't work inside of transformed elements
-  // sass-lint:disable-block no-important
-  transform: none !important;
-  transition: none !important;
-  margin-top: -$euiSizeS;
-}
-
 .euiDataGrid__controlScroll {
   @include euiYScrollWithShadows;
   max-height: $euiDataGridPopoverMaxHeight;

package/src/components/index.scss

@@ -29,4 +29,3 @@
 @import 'steps/index';
 @import 'suggest/index';
 @import 'table/index';
-@import 'tabs/index';

package/src/themes/amsterdam/overrides/_index.scss

@@ -24,4 +24,3 @@
 @import 'range_tooltip';
 @import 'side_nav';
 @import 'steps';
-@import 'tabs';

package/test-env/components/badge/beta_badge/beta_badge.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -32,11 +30,6 @@ var _beta_badge = require("./beta_badge.styles");
 var _react2 = require("@emotion/react");
 
 var _excluded = ["className", "label", "color", "tooltipContent", "tooltipPosition", "anchorProps", "title", "iconType", "onClick", "onClickAriaLabel", "href", "rel", "target", "size"];
-
-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 || _typeof3(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; }
-
 var COLORS = ['accent', 'subdued', 'hollow'];
 exports.COLORS = COLORS;
 var SIZES = ['s', 'm'];
@@ -116,7 +109,7 @@ var EuiBetaBadge = function EuiBetaBadge(_ref) {
         anchorProps: anchorProps
       }, content);
     } else {
-      return (0, _react2.jsx)(_react.Fragment, null, content);
+      return (0, _react2.jsx)("span", anchorProps, content);
     }
   } else {
     if (tooltipContent) {
@@ -138,11 +131,11 @@ var EuiBetaBadge = function EuiBetaBadge(_ref) {
         console.warn("Only string titles are permitted on badges that do not use tooltips. Found: ".concat((0, _typeof2.default)(spanTitle)));
       }
 
-      return (0, _react2.jsx)("span", (0, _extends2.default)({
-        css: cssStyles,
+      return (0, _react2.jsx)("span", anchorProps, (0, _react2.jsx)("span", (0, _extends2.default)({
         className: classes,
-        title: spanTitle
-      }, rest), icon || label);
+        title: spanTitle,
+        css: cssStyles
+      }, rest), icon || label));
     }
   }
 };

package/test-env/components/basic_table/in_memory_table.js

@@ -1140,6 +1140,14 @@ EuiInMemoryTable.propTypes = {
        * Date formatter to use when parsing date values
        */
     dateFormat: _propTypes.default.any,
+
+    /**
+       * Hint to render below the search bar
+       */
+    hint: _propTypes.default.shape({
+      content: _propTypes.default.node.isRequired,
+      popoverProps: _propTypes.default.any
+    }),
     className: _propTypes.default.string,
     "aria-label": _propTypes.default.string,
     "data-test-subj": _propTypes.default.string,

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

@@ -10,10 +10,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.EuiButtonDisplay = void 0;
 exports.isButtonDisabled = isButtonDisabled;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -60,7 +60,8 @@ function isButtonDisabled(_ref) {
 var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var children = _ref2.children,
       iconType = _ref2.iconType,
-      iconSide = _ref2.iconSide,
+      _ref2$iconSide = _ref2.iconSide,
+      iconSide = _ref2$iconSide === void 0 ? 'left' : _ref2$iconSide,
       iconSize = _ref2.iconSize,
       _ref2$size = _ref2.size,
       size = _ref2$size === void 0 ? 'm' : _ref2$size,
@@ -94,7 +95,7 @@ var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref)
     iconType: iconType,
     iconSide: iconSide,
     iconSize: iconSize,
-    textProps: _objectSpread({}, textProps)
+    textProps: textProps
   }, contentProps), children);
   var element = href && !buttonIsDisabled ? 'a' : 'button';
   var elementProps = {}; // Element-specific attributes
@@ -122,8 +123,8 @@ var EuiButtonDisplay = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref)
 
   return (0, _react2.createElement)(element, _objectSpread(_objectSpread(_objectSpread({
     css: cssStyles,
-    style: minWidth ? _objectSpread(_objectSpread({}, style), {}, {
-      minWidth: minWidth
+    style: minWidth != null ? _objectSpread(_objectSpread({}, style), {}, {
+      minInlineSize: minWidth
     }) : style,
     ref: ref
   }, elementProps), relObj), rest), innerNode);

package/test-env/components/button/button_display/_button_display.styles.js

@@ -24,11 +24,11 @@ var _buttonSize = function _buttonSize(size) {
 };
 
 var _ref = process.env.NODE_ENV === "production" ? {
-  name: "vifhyf-isDisabled",
-  styles: "pointer-events:none;cursor:not-allowed;label:isDisabled;"
+  name: "8595p9-isDisabled",
+  styles: "cursor:not-allowed;label:isDisabled;"
 } : {
-  name: "vifhyf-isDisabled",
-  styles: "pointer-events:none;cursor:not-allowed;label:isDisabled;",
+  name: "8595p9-isDisabled",
+  styles: "cursor:not-allowed;label:isDisabled;",
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 

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

@@ -43,13 +43,12 @@ var EuiButtonDisplayContent = function EuiButtonDisplayContent(_ref) {
       iconType = _ref.iconType,
       _ref$iconSize = _ref.iconSize,
       iconSize = _ref$iconSize === void 0 ? 'm' : _ref$iconSize,
-      iconSide = _ref.iconSide,
+      _ref$iconSide = _ref.iconSide,
+      iconSide = _ref$iconSide === void 0 ? 'left' : _ref$iconSide,
       contentProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var theme = (0, _services.useEuiTheme)();
   var styles = (0, _button_display_content.euiButtonDisplayContentStyles)(theme);
-  var cssStyles = [styles.euiButtonDisplayContent, iconSide && styles[iconSide]];
-  var cssSpinnerStyles = [styles.euiButtonDisplayContent__spinner];
-  var cssIconStyles = [styles.euiButtonDisplayContent__icon, iconSize && styles[iconSize]]; // Add an icon to the button if one exists.
+  var cssStyles = [styles.euiButtonDisplayContent]; // Add an icon to the button if one exists.
 
   var icon; // When the button is disabled the text gets gray
   // and in some buttons the background gets a light gray
@@ -58,18 +57,16 @@ var EuiButtonDisplayContent = function EuiButtonDisplayContent(_ref) {
   // are always visible. The default spinner color could be very light.
 
   var loadingSpinnerColor = isDisabled ? {
-    border: 'currentColor'
+    border: 'currentcolor'
   } : undefined;
 
   if (isLoading) {
     icon = (0, _react2.jsx)(_loading.EuiLoadingSpinner, {
-      css: cssSpinnerStyles,
       size: iconSize,
       color: loadingSpinnerColor
     });
   } else if (iconType) {
     icon = (0, _react2.jsx)(_icon.EuiIcon, {
-      css: cssIconStyles,
       type: iconType,
       size: iconSize,
       color: "inherit" // forces the icon to inherit its parent color
@@ -80,9 +77,9 @@ var EuiButtonDisplayContent = function EuiButtonDisplayContent(_ref) {
   var isText = typeof children === 'string';
   return (0, _react2.jsx)("span", (0, _extends2.default)({
     css: cssStyles
-  }, contentProps), icon, isText ? (0, _react2.jsx)("span", (0, _extends2.default)({}, textProps, {
+  }, contentProps), iconSide === 'left' && icon, isText || textProps ? (0, _react2.jsx)("span", (0, _extends2.default)({}, textProps, {
     className: (0, _classnames.default)('eui-textTruncate', textProps === null || textProps === void 0 ? void 0 : textProps.className)
-  }), children) : children);
+  }), children) : children, iconSide === 'right' && icon);
 };
 
 exports.EuiButtonDisplayContent = EuiButtonDisplayContent;

package/test-env/components/button/button_display/_button_display_content.styles.js

@@ -9,48 +9,18 @@ var _react = require("@emotion/react");
 
 var _global_styling = require("../../../global_styling");
 
-function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
-
-var _ref = process.env.NODE_ENV === "production" ? {
-  name: "gtg6j-euiButtonDisplayContent__icon",
-  styles: "flex-shrink:0;label:euiButtonDisplayContent__icon;"
-} : {
-  name: "gtg6j-euiButtonDisplayContent__icon",
-  styles: "flex-shrink:0;label:euiButtonDisplayContent__icon;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-
-var _ref2 = process.env.NODE_ENV === "production" ? {
-  name: "10wlo76-euiButtonDisplayContent__spinner",
-  styles: "flex-shrink:0;label:euiButtonDisplayContent__spinner;"
-} : {
-  name: "10wlo76-euiButtonDisplayContent__spinner",
-  styles: "flex-shrink:0;label:euiButtonDisplayContent__spinner;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-
-var _ref3 = process.env.NODE_ENV === "production" ? {
-  name: "qfl6yj-right",
-  styles: "flex-direction:row-reverse;label:right;"
-} : {
-  name: "qfl6yj-right",
-  styles: "flex-direction:row-reverse;label:right;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-
-var euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(_ref4) {
-  var euiTheme = _ref4.euiTheme;
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+var euiButtonDisplayContentStyles = function euiButtonDisplayContentStyles(_ref) {
+  var euiTheme = _ref.euiTheme;
   return {
     // Base
-    euiButtonDisplayContent: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', '100%'), ";", (0, _global_styling.logicalCSS)('width', '100%'), ";display:flex;justify-content:center;align-items:center;vertical-align:middle;gap:", euiTheme.size.s, ";;label:euiButtonDisplayContent;"),
-    // Icon side
-    left: /*#__PURE__*/(0, _react.css)(";label:left;"),
-    right: _ref3,
-    euiButtonDisplayContent__spinner: _ref2,
-    euiButtonDisplayContent__icon: _ref,
-    // Icon size
-    s: /*#__PURE__*/(0, _react.css)(";label:s;"),
-    m: /*#__PURE__*/(0, _react.css)(";label:m;")
+    euiButtonDisplayContent: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', '100%'), ";", (0, _global_styling.logicalCSS)('width', '100%'), ";display:flex;justify-content:center;align-items:center;vertical-align:middle;gap:", euiTheme.size.s, ";;label:euiButtonDisplayContent;")
   };
 };
 

package/test-env/components/datagrid/controls/column_selector.js

@@ -138,7 +138,7 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
     },
     anchorPosition: "downLeft",
     panelPaddingSize: "s",
-    panelClassName: "euiDataGrid__controlPopoverWithDragDrop",
+    hasDragDrop: true,
     button: (0, _react2.jsx)(_button.EuiButtonEmpty, {
       size: "xs",
       iconType: allowColumnHiding ? 'listAdd' : 'list',

package/test-env/components/datagrid/controls/column_sorting.js

@@ -150,7 +150,7 @@ var useDataGridColumnSorting = function useDataGridColumnSorting(columns, sortin
     },
     anchorPosition: "downLeft",
     panelPaddingSize: "s",
-    panelClassName: "euiDataGrid__controlPopoverWithDragDrop",
+    hasDragDrop: true,
     button: (0, _react2.jsx)(_button.EuiButtonEmpty, {
       size: "xs",
       iconType: "sortable",

package/test-env/components/header/header_links/header_links.js

@@ -260,6 +260,12 @@ EuiHeaderLinks.propTypes = {
        */
     repositionOnScroll: _propTypes.default.bool,
 
+    /**
+       * Must be set to true if using `EuiDragDropContext` within a popover,
+       * otherwise your nested drag & drop will have incorrect positioning
+       */
+    hasDragDrop: _propTypes.default.bool,
+
     /**
        * By default, popover content inherits the z-index of the anchor
        * component; pass `zIndex` to override

package/test-env/components/loading/loading_spinner.js

@@ -9,6 +9,8 @@ exports.SIZES = exports.EuiLoadingSpinner = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -25,7 +27,12 @@ var _loading_spinner = require("./loading_spinner.styles");
 
 var _react2 = require("@emotion/react");
 
-var _excluded = ["size", "className", "aria-label", "color"];
+var _excluded = ["size", "className", "aria-label", "color", "style"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 var SIZES = ['s', 'm', 'l', 'xl', 'xxl'];
 exports.SIZES = SIZES;
 
@@ -35,15 +42,20 @@ var EuiLoadingSpinner = function EuiLoadingSpinner(_ref) {
       className = _ref.className,
       ariaLabel = _ref['aria-label'],
       color = _ref.color,
+      style = _ref.style,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var euiTheme = (0, _services.useEuiTheme)();
-  var styles = (0, _loading_spinner.euiLoadingSpinnerStyles)(euiTheme, color);
+  var styles = (0, _loading_spinner.euiLoadingSpinnerStyles)(euiTheme);
   var cssStyles = [styles.euiLoadingSpinner, styles[size]];
   var classes = (0, _classnames.default)('euiLoadingSpinner', className);
   var defaultLabel = (0, _loading_strings.useLoadingAriaLabel)();
+  var customColorStyle = color ? _objectSpread(_objectSpread({}, style), {}, {
+    borderColor: (0, _loading_spinner.euiSpinnerBorderColorsCSS)(euiTheme, color)
+  }) : style;
   return (0, _react2.jsx)("span", (0, _extends2.default)({
     className: classes,
     css: cssStyles,
+    style: customColorStyle,
     role: "progressbar",
     "aria-label": ariaLabel || defaultLabel
   }, rest));

package/test-env/components/loading/loading_spinner.styles.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.euiLoadingSpinnerStyles = void 0;
+exports.euiSpinnerBorderColorsCSS = exports.euiLoadingSpinnerStyles = void 0;
 
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 
@@ -25,14 +25,22 @@ var spinnerSizes = {
   xxl: 'xxl'
 };
 
-var spinnerColorsCSS = function spinnerColorsCSS(border, highlight) {
-  return "\n    border-color: ".concat(highlight, " ").concat(border, " ").concat(border, " ").concat(border, ";\n  ");
+var euiSpinnerBorderColorsCSS = function euiSpinnerBorderColorsCSS(_ref) {
+  var euiTheme = _ref.euiTheme;
+  var colors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _colors$border = colors.border,
+      border = _colors$border === void 0 ? euiTheme.colors.lightShade : _colors$border,
+      _colors$highlight = colors.highlight,
+      highlight = _colors$highlight === void 0 ? euiTheme.colors.primary : _colors$highlight;
+  return "".concat(highlight, " ").concat(border, " ").concat(border, " ").concat(border);
 };
 
-var euiLoadingSpinnerStyles = function euiLoadingSpinnerStyles(_ref, color) {
-  var euiTheme = _ref.euiTheme;
+exports.euiSpinnerBorderColorsCSS = euiSpinnerBorderColorsCSS;
+
+var euiLoadingSpinnerStyles = function euiLoadingSpinnerStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
   return {
-    euiLoadingSpinner: /*#__PURE__*/(0, _react.css)("flex-shrink:0;display:inline-block;border-radius:50%;border:", euiTheme.border.thick, ";", spinnerColorsCSS((color === null || color === void 0 ? void 0 : color.border) || euiTheme.colors.lightShade, (color === null || color === void 0 ? void 0 : color.highlight) || euiTheme.colors.primary), ";", _global_styling.euiCanAnimate, "{animation:", _loadingSpinner, " 0.6s infinite linear;};label:euiLoadingSpinner;"),
+    euiLoadingSpinner: /*#__PURE__*/(0, _react.css)("flex-shrink:0;display:inline-block;border-radius:50%;border:", euiTheme.border.thick, ";border-color:", euiSpinnerBorderColorsCSS(euiThemeContext), ";", _global_styling.euiCanAnimate, "{animation:", _loadingSpinner, " 0.6s infinite linear;};label:euiLoadingSpinner;"),
     // Sizes
     s: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalSizeCSS)(euiTheme.size[spinnerSizes.s], euiTheme.size[spinnerSizes.s]), " border-width:calc(", euiTheme.border.width.thin, " * 1.5);;label:s;"),
     m: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalSizeCSS)(euiTheme.size[spinnerSizes.m], euiTheme.size[spinnerSizes.m]), " border-width:calc(", euiTheme.border.width.thin, " * 1.5);;label:m;"),

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

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,7 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -33,6 +35,10 @@ var _react2 = require("@emotion/react");
 
 var _excluded = ["className", "children", "initialFocus", "onClose", "maxWidth", "style"];
 
+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); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -46,6 +52,18 @@ var EuiModal = function EuiModal(_ref) {
       maxWidth = _ref$maxWidth === void 0 ? true : _ref$maxWidth,
       style = _ref.style,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  // TODO: Remove this onFocus scroll workaround after react-focus-on supports focusOptions
+  // @see https://github.com/elastic/eui/issues/6304
+  var bodyScrollTop = (0, _react.useRef)(typeof window === 'undefined' ? undefined : window.scrollY // Account for SSR
+  );
+  var onFocus = (0, _react.useCallback)(function () {
+    if (bodyScrollTop.current != null) {
+      window.scrollTo({
+        top: bodyScrollTop.current
+      });
+      bodyScrollTop.current = undefined; // Unset after first auto focus
+    }
+  }, []);
 
   var onKeyDown = function onKeyDown(event) {
     if (event.key === _services.keys.ESCAPE) {
@@ -69,11 +87,13 @@ var EuiModal = function EuiModal(_ref) {
 
   var classes = (0, _classnames.default)('euiModal', widthClassName, className);
   return (0, _react2.jsx)(_overlay_mask.EuiOverlayMask, null, (0, _react2.jsx)(_focus_trap.EuiFocusTrap, {
-    initialFocus: initialFocus
+    initialFocus: initialFocus,
+    scrollLock: true
   }, (0, _react2.jsx)("div", (0, _extends2.default)({
     className: classes,
     onKeyDown: onKeyDown,
     tabIndex: 0,
+    onFocus: onFocus,
     style: newStyle || style
   }, rest), (0, _react2.jsx)(_i18n.EuiI18n, {
     token: "euiModal.closeModal",

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

@@ -157,15 +157,12 @@ var _EuiPageTemplate = function _EuiPageTemplate(_ref) {
   _react.default.Children.toArray(children).forEach(function (child, index) {
     if (! /*#__PURE__*/_react.default.isValidElement(child)) return; // Skip non-components
 
-    switch (child.type) {
-      case _page.EuiPageSidebar:
-        sidebar.push( /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({
-          key: "sidebar".concat(index)
-        }, getSideBarProps()), child.props)));
-        break;
-
-      default:
-        sections.push(child);
+    if (child.type === _page.EuiPageSidebar || child.props.__EMOTION_TYPE_PLEASE_DO_NOT_USE__ === _page.EuiPageSidebar) {
+      sidebar.push( /*#__PURE__*/_react.default.cloneElement(child, _objectSpread(_objectSpread({
+        key: "sidebar".concat(index)
+      }, getSideBarProps()), child.props)));
+    } else {
+      sections.push(child);
     }
   });