@elastic/eui 70.0.0 → 70.2.0

package/optimize/lib/components/context_menu/context_menu_panel.a11y.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _context_menu_item = require("./context_menu_item");
+
+var _context_menu_panel = require("./context_menu_panel");
+
+var _react2 = require("@emotion/react");
+
+/*
+ * 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.
+ */
+/// <reference types="../../../cypress/support"/>
+var items = [(0, _react2.jsx)(_context_menu_item.EuiContextMenuItem, {
+  key: "A",
+  "data-test-subj": "itemA"
+}, "Option A"), (0, _react2.jsx)(_context_menu_item.EuiContextMenuItem, {
+  key: "B",
+  "data-test-subj": "itemB"
+}, "Option B"), (0, _react2.jsx)(_context_menu_item.EuiContextMenuItem, {
+  key: "C",
+  "data-test-subj": "itemC"
+}, "Option C")];
+describe('EuiContextMenuPanel', function () {
+  describe('Automated accessibility check', function () {
+    it('has zero violations', function () {
+      var showNextPanelHandler = cy.stub();
+      cy.mount((0, _react2.jsx)(_context_menu_panel.EuiContextMenuPanel, {
+        items: items,
+        showNextPanel: showNextPanelHandler
+      }));
+      cy.checkAxe();
+    });
+  });
+});

package/optimize/lib/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/optimize/lib/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/optimize/lib/components/datagrid/controls/data_grid_toolbar.js

@@ -12,6 +12,8 @@ exports.renderAdditionalControls = renderAdditionalControls;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _accessibility = require("../../accessibility");
+
 var _utils = require("../../../utils");
 
 var _react2 = require("@emotion/react");
@@ -33,6 +35,7 @@ var EuiDataGridToolbar = function EuiDataGridToolbar(_ref) {
       toolbarVisibility = _ref.toolbarVisibility,
       isFullScreen = _ref.isFullScreen,
       fullScreenSelector = _ref.fullScreenSelector,
+      keyboardShortcuts = _ref.keyboardShortcuts,
       displaySelector = _ref.displaySelector,
       columnSelector = _ref.columnSelector,
       columnSorting = _ref.columnSorting;
@@ -40,12 +43,14 @@ var EuiDataGridToolbar = function EuiDataGridToolbar(_ref) {
   var hasRoomForGridControls = _utils.IS_JEST_ENVIRONMENT ? true : gridWidth > minSizeForControls || isFullScreen;
   return (0, _react2.jsx)("div", {
     className: "euiDataGrid__controls",
-    "data-test-sub": "dataGridControls"
+    "data-test-subj": "dataGridControls"
   }, hasRoomForGridControls && (0, _react2.jsx)("div", {
     className: "euiDataGrid__leftControls"
   }, renderAdditionalControls(toolbarVisibility, 'left.prepend'), checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showColumnSelector') ? columnSelector : null, checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showSortSelector') ? columnSorting : null, renderAdditionalControls(toolbarVisibility, 'left.append')), (0, _react2.jsx)("div", {
     className: "euiDataGrid__rightControls"
-  }, renderAdditionalControls(toolbarVisibility, 'right'), checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showDisplaySelector') ? displaySelector : null, checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showFullScreenSelector') ? fullScreenSelector : null));
+  }, renderAdditionalControls(toolbarVisibility, 'right'), checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showKeyboardShortcuts') ? keyboardShortcuts : (0, _react2.jsx)(_accessibility.EuiScreenReaderOnly, {
+    showOnFocus: true
+  }, (0, _react2.jsx)("span", null, keyboardShortcuts)), checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showDisplaySelector') ? displaySelector : null, checkOrDefaultToolBarDisplayOptions(toolbarVisibility, 'showFullScreenSelector') ? fullScreenSelector : null));
 };
 /**
  * Toolbar utilities

package/optimize/lib/components/datagrid/controls/index.js

@@ -45,6 +45,12 @@ Object.defineProperty(exports, "useDataGridFullScreenSelector", {
     return _fullscreen_selector.useDataGridFullScreenSelector;
   }
 });
+Object.defineProperty(exports, "useDataGridKeyboardShortcuts", {
+  enumerable: true,
+  get: function get() {
+    return _keyboard_shortcuts.useDataGridKeyboardShortcuts;
+  }
+});
 
 var _column_selector = require("./column_selector");
 
@@ -52,6 +58,8 @@ var _column_sorting = require("./column_sorting");
 
 var _display_selector = require("./display_selector");
 
+var _keyboard_shortcuts = require("./keyboard_shortcuts");
+
 var _fullscreen_selector = require("./fullscreen_selector");
 
 var _data_grid_toolbar = require("./data_grid_toolbar");

package/optimize/lib/components/datagrid/controls/keyboard_shortcuts.js

@@ -0,0 +1,207 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDataGridKeyboardShortcuts = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _services = require("../../../services");
+
+var _button = require("../../button");
+
+var _tool_tip = require("../../tool_tip");
+
+var _popover = require("../../popover");
+
+var _description_list = require("../../description_list");
+
+var _text = require("../../text");
+
+var _i18n = require("../../i18n");
+
+var _react2 = require("@emotion/react");
+
+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; }
+
+/*
+ * 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 useDataGridKeyboardShortcuts = function useDataGridKeyboardShortcuts() {
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      isOpen = _useState2[0],
+      setIsOpen = _useState2[1];
+
+  var title = (0, _i18n.useEuiI18n)('euiKeyboardShortcuts.title', 'Keyboard shortcuts');
+  var titleId = (0, _services.useGeneratedHtmlId)();
+  var keyboardShortcuts = (0, _react.useMemo)(function () {
+    return (0, _react2.jsx)(_popover.EuiPopover, {
+      "data-test-subj": "dataGridKeyboardShortcutsPopover",
+      isOpen: isOpen,
+      closePopover: function closePopover() {
+        return setIsOpen(false);
+      },
+      anchorPosition: "downRight",
+      button: (0, _react2.jsx)(_tool_tip.EuiToolTip, {
+        content: title,
+        delay: "long"
+      }, (0, _react2.jsx)(_button.EuiButtonIcon, {
+        size: "xs",
+        iconType: "keyboard",
+        color: "text",
+        "data-test-subj": "dataGridKeyboardShortcutsButton",
+        onClick: function onClick() {
+          return setIsOpen(!isOpen);
+        },
+        "aria-label": title
+      }))
+    }, (0, _react2.jsx)(_popover.EuiPopoverTitle, {
+      paddingSize: "s"
+    }, (0, _react2.jsx)("h2", {
+      id: titleId
+    }, title)), (0, _react2.jsx)(_text.EuiText, {
+      className: "euiDataGrid__keyboardShortcuts",
+      size: "xs"
+    }, (0, _react2.jsx)(_description_list.EuiDescriptionList, {
+      "aria-labelledby": titleId,
+      type: "column",
+      align: "center",
+      compressed: true,
+      gutterSize: "s",
+      listItems: [{
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.upArrowTitle",
+          default: "Up arrow"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.upArrowDescription",
+          default: "Move one cell up"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.downArrowTitle",
+          default: "Down arrow"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.downArrowDescription",
+          default: "Move one cell down"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.rightArrowTitle",
+          default: "Right arrow"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.rightArrowDescription",
+          default: "Move one cell right"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.leftArrowTitle",
+          default: "Left arrow"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.leftArrowDescription",
+          default: "Move one cell left"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.homeTitle",
+          default: "Home"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.homeDescription",
+          default: "Move to the first cell of the current row"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.endTitle",
+          default: "End"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.endDescription",
+          default: "Move to the last cell of the current row"
+        })
+      }, {
+        title: (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.ctrl",
+          default: "Ctrl"
+        })), ' ', (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.homeTitle",
+          default: "Home"
+        }))),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.ctrlHomeDescription",
+          default: "Move to the first cell of the current page"
+        })
+      }, {
+        title: (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.ctrl",
+          default: "Ctrl"
+        })), ' ', (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.endTitle",
+          default: "End"
+        }))),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.ctrlEndDescription",
+          default: "Move to the last cell of the current page"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.pageUpTitle",
+          default: "Page Up"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.pageUpDescription",
+          default: "Go to the last row of the previous page"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.pageDownTitle",
+          default: "Page Down"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.pageDownDescription",
+          default: "Go to the first row of the next page"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.enterTitle",
+          default: "Enter"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.enterDescription",
+          default: "Open cell details and actions"
+        })
+      }, {
+        title: (0, _react2.jsx)("kbd", null, (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.escapeTitle",
+          default: "Escape"
+        })),
+        description: (0, _react2.jsx)(_i18n.EuiI18n, {
+          token: "euiKeyboardShortcuts.escapeDescription",
+          default: "Close cell details and actions"
+        })
+      }]
+    })));
+  }, [isOpen, title, titleId]);
+  return {
+    keyboardShortcuts: keyboardShortcuts
+  };
+};
+
+exports.useDataGridKeyboardShortcuts = useDataGridKeyboardShortcuts;

package/optimize/lib/components/datagrid/data_grid.js

@@ -246,12 +246,15 @@ var EuiDataGrid = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       cellPopoverContext = _useCellPopover.cellPopoverContext,
       cellPopover = _useCellPopover.cellPopover;
   /**
-   * Toolbar & fullscreen
+   * Toolbar, keyboard shortcuts, & fullscreen
    */
 
 
   var showToolbar = !!toolbarVisibility;
 
+  var _useDataGridKeyboardS = (0, _controls.useDataGridKeyboardShortcuts)(),
+      keyboardShortcuts = _useDataGridKeyboardS.keyboardShortcuts;
+
   var _useDataGridFullScree = (0, _controls.useDataGridFullScreenSelector)(),
       isFullScreen = _useDataGridFullScree.isFullScreen,
       setIsFullScreen = _useDataGridFullScree.setIsFullScreen,
@@ -340,6 +343,7 @@ var EuiDataGrid = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     toolbarVisibility: toolbarVisibility,
     isFullScreen: isFullScreen,
     fullScreenSelector: fullScreenSelector,
+    keyboardShortcuts: keyboardShortcuts,
     displaySelector: displaySelector,
     columnSelector: columnSelector,
     columnSorting: columnSorting

package/optimize/lib/components/date_picker/super_date_picker/super_date_picker.js

@@ -267,7 +267,8 @@ var EuiSuperDatePickerInternal = /*#__PURE__*/function (_Component) {
           locale = _this$props2.locale,
           timeFormat = _this$props2.timeFormat,
           utcOffset = _this$props2.utcOffset,
-          compressed = _this$props2.compressed;
+          compressed = _this$props2.compressed,
+          onFocus = _this$props2.onFocus;
 
       if (showPrettyDuration && !isStartDatePopoverOpen && !isEndDatePopoverOpen) {
         return (0, _react2.jsx)(_date_picker_range.EuiDatePickerRange, {
@@ -282,7 +283,8 @@ var EuiSuperDatePickerInternal = /*#__PURE__*/function (_Component) {
           }),
           "data-test-subj": "superDatePickerShowDatesButton",
           disabled: isDisabled,
-          onClick: _this.hidePrettyDuration
+          onClick: _this.hidePrettyDuration,
+          onFocus: onFocus
         }, (0, _react2.jsx)(_pretty_duration.PrettyDuration, {
           timeFrom: start,
           timeTo: end,
@@ -315,7 +317,10 @@ var EuiSuperDatePickerInternal = /*#__PURE__*/function (_Component) {
             isOpen: _this.state.isStartDatePopoverOpen,
             onPopoverToggle: _this.onStartDatePopoverToggle,
             onPopoverClose: _this.onStartDatePopoverClose,
-            timeOptions: timeOptions
+            timeOptions: timeOptions,
+            buttonProps: {
+              onFocus: onFocus
+            }
           }),
           endDateControl: (0, _react2.jsx)(_date_popover_button.EuiDatePopoverButton, {
             position: "end",
@@ -333,7 +338,10 @@ var EuiSuperDatePickerInternal = /*#__PURE__*/function (_Component) {
             isOpen: _this.state.isEndDatePopoverOpen,
             onPopoverToggle: _this.onEndDatePopoverToggle,
             onPopoverClose: _this.onEndDatePopoverClose,
-            timeOptions: timeOptions
+            timeOptions: timeOptions,
+            buttonProps: {
+              onFocus: onFocus
+            }
           })
         });
       });

package/optimize/lib/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"));
@@ -23,7 +25,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;
 
@@ -33,15 +40,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/optimize/lib/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/optimize/lib/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 _classnames = _interopRequireDefault(require("classnames"));
 
@@ -31,6 +33,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; }
@@ -44,6 +50,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) {
@@ -67,11 +85,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/optimize/lib/components/page_template/page_template.js

@@ -155,15 +155,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);
     }
   });
 

package/optimize/lib/components/popover/popover.js

@@ -64,7 +64,7 @@ var _popover2 = require("./popover.styles");
 
 var _popover_panel = require("./popover_panel");
 
-var _excluded = ["anchorClassName", "anchorPosition", "button", "buttonRef", "insert", "isOpen", "ownFocus", "children", "className", "closePopover", "panelClassName", "panelPaddingSize", "panelProps", "panelRef", "panelStyle", "popoverScreenReaderText", "popoverRef", "hasArrow", "arrowChildren", "repositionOnScroll", "zIndex", "attachToAnchor", "display", "offset", "onPositionChange", "onTrapDeactivation", "buffer", "aria-label", "aria-labelledby", "container", "focusTrapProps", "initialFocus", "tabIndex"];
+var _excluded = ["anchorClassName", "anchorPosition", "button", "buttonRef", "insert", "isOpen", "ownFocus", "children", "className", "closePopover", "panelClassName", "panelPaddingSize", "panelProps", "panelRef", "panelStyle", "popoverScreenReaderText", "popoverRef", "hasArrow", "arrowChildren", "repositionOnScroll", "hasDragDrop", "zIndex", "attachToAnchor", "display", "offset", "onPositionChange", "onTrapDeactivation", "buffer", "aria-label", "aria-labelledby", "container", "focusTrapProps", "initialFocus", "tabIndex"];
 
 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); }
 
@@ -401,7 +401,8 @@ var EuiPopover = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this4 = this;
+      var _panelProps$tabIndex,
+          _this4 = this;
 
       var _this$props = this.props,
           anchorClassName = _this$props.anchorClassName,
@@ -424,6 +425,7 @@ var EuiPopover = /*#__PURE__*/function (_Component) {
           hasArrow = _this$props.hasArrow,
           arrowChildren = _this$props.arrowChildren,
           repositionOnScroll = _this$props.repositionOnScroll,
+          hasDragDrop = _this$props.hasDragDrop,
           zIndex = _this$props.zIndex,
           attachToAnchor = _this$props.attachToAnchor,
           display = _this$props.display,
@@ -436,8 +438,9 @@ var EuiPopover = /*#__PURE__*/function (_Component) {
           container = _this$props.container,
           focusTrapProps = _this$props.focusTrapProps,
           initialFocusProp = _this$props.initialFocus,
-          tabIndexProp = _this$props.tabIndex,
+          _tabIndexProp = _this$props.tabIndex,
           rest = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
+      var tabIndexProp = (_panelProps$tabIndex = panelProps === null || panelProps === void 0 ? void 0 : panelProps.tabIndex) !== null && _panelProps$tabIndex !== void 0 ? _panelProps$tabIndex : _tabIndexProp;
       var styles = (0, _popover2.euiPopoverStyles)();
       var popoverStyles = [styles.euiPopover, {
         display: display
@@ -501,6 +504,7 @@ var EuiPopover = /*#__PURE__*/function (_Component) {
           position: this.state.arrowPosition,
           isAttached: attachToAnchor,
           className: (0, _classnames.default)(panelClassName, panelProps === null || panelProps === void 0 ? void 0 : panelProps.className),
+          hasDragDrop: hasDragDrop,
           hasShadow: false,
           paddingSize: panelPaddingSize,
           tabIndex: tabIndex,

package/optimize/lib/components/popover/popover_arrow/_popover_arrow.js

@@ -31,6 +31,7 @@ var EuiPopoverArrow = function EuiPopoverArrow(_ref) {
   var styles = (0, _popover_arrow.euiPopoverArrowStyles)(euiTheme);
   var cssStyles = [styles.euiPopoverArrow, styles[position]];
   return (0, _react2.jsx)("div", (0, _extends2.default)({
+    className: "euiPopover__arrow",
     "data-popover-arrow": position,
     css: cssStyles
   }, rest), children);

package/optimize/lib/components/popover/popover_panel/_popover_panel.js

@@ -27,7 +27,7 @@ var _popover_panel = require("./_popover_panel.styles");
 
 var _react2 = require("@emotion/react");
 
-var _excluded = ["children", "className", "isOpen", "isAttached", "position"];
+var _excluded = ["children", "className", "isOpen", "isAttached", "hasDragDrop", "position"];
 
 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); }
 
@@ -47,6 +47,7 @@ var EuiPopoverPanel = function EuiPopoverPanel(_ref) {
       className = _ref.className,
       isOpen = _ref.isOpen,
       isAttached = _ref.isAttached,
+      hasDragDrop = _ref.hasDragDrop,
       position = _ref.position,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var panelContext = (0, _react.useContext)(EuiPopoverPanelContext);
@@ -61,6 +62,10 @@ var EuiPopoverPanel = function EuiPopoverPanel(_ref) {
     panelCSS = [].concat((0, _toConsumableArray2.default)(panelCSS), [isOpen && styles.attached.isOpen, position && styles.attached[position]]);
   }
 
+  if (hasDragDrop) {
+    panelCSS = [].concat((0, _toConsumableArray2.default)(panelCSS), [styles.hasDragDrop.hasDragDrop, position && styles.hasDragDrop[position]]);
+  }
+
   return (0, _react2.jsx)(EuiPopoverPanelContext.Provider, {
     value: panelContext
   }, (0, _react2.jsx)(_panel.EuiPanel, (0, _extends2.default)({