@elastic/eui 88.1.0 → 88.3.0

package/optimize/lib/services/theme/provider.js

@@ -10,14 +10,15 @@ 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 _react = require("@emotion/react");
+var _react2 = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _css = require("@emotion/css");
+var _css2 = require("@emotion/css");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _emotion = require("../emotion");
 var _context = require("./context");
-var _emotion = require("./emotion");
+var _emotion2 = require("./emotion");
 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; }
@@ -35,35 +36,37 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
     _modifications = _ref.modify,
     children = _ref.children,
     wrapperProps = _ref.wrapperProps;
-  var _useContext = (0, _react.useContext)(_context.EuiNestedThemeContext),
+  var _useContext = (0, _react2.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);
-  var parentTheme = (0, _react.useContext)(_context.EuiThemeContext);
-  var _useState = (0, _react.useState)(_system || parentSystem),
+    bodyColor = _useContext.bodyColor,
+    globalCSSVariables = _useContext.globalCSSVariables,
+    setGlobalCSSVariables = _useContext.setGlobalCSSVariables;
+  var parentSystem = (0, _react2.useContext)(_context.EuiSystemContext);
+  var parentModifications = (0, _react2.useContext)(_context.EuiModificationsContext);
+  var parentColorMode = (0, _react2.useContext)(_context.EuiColorModeContext);
+  var parentTheme = (0, _react2.useContext)(_context.EuiThemeContext);
+  var _useState = (0, _react2.useState)(_system || parentSystem),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     system = _useState2[0],
     setSystem = _useState2[1];
-  var prevSystemKey = (0, _react.useRef)(system.key);
-  var _useState3 = (0, _react.useState)((0, _utils.mergeDeep)(parentModifications, _modifications)),
+  var prevSystemKey = (0, _react2.useRef)(system.key);
+  var _useState3 = (0, _react2.useState)((0, _utils.mergeDeep)(parentModifications, _modifications)),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     modifications = _useState4[0],
     setModifications = _useState4[1];
-  var prevModifications = (0, _react.useRef)(modifications);
-  var _useState5 = (0, _react.useState)((0, _utils.getColorMode)(_colorMode, parentColorMode)),
+  var prevModifications = (0, _react2.useRef)(modifications);
+  var _useState5 = (0, _react2.useState)((0, _utils.getColorMode)(_colorMode, parentColorMode)),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     colorMode = _useState6[0],
     setColorMode = _useState6[1];
-  var prevColorMode = (0, _react.useRef)(colorMode);
-  var isParentTheme = (0, _react.useRef)(prevSystemKey.current === parentSystem.key && colorMode === parentColorMode && (0, _isEqual.default)(parentModifications, modifications));
-  var _useState7 = (0, _react.useState)(isParentTheme.current && Object.keys(parentTheme).length ? _objectSpread({}, parentTheme) // Intentionally create a new object to break referential equality
+  var prevColorMode = (0, _react2.useRef)(colorMode);
+  var isParentTheme = (0, _react2.useRef)(prevSystemKey.current === parentSystem.key && colorMode === parentColorMode && (0, _isEqual.default)(parentModifications, modifications));
+  var _useState7 = (0, _react2.useState)(isParentTheme.current && Object.keys(parentTheme).length ? _objectSpread({}, parentTheme) // Intentionally create a new object to break referential equality
     : (0, _utils.getComputed)(system, (0, _utils.buildTheme)(modifications, "_".concat(system.key)), colorMode)),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     theme = _useState8[0],
     setTheme = _useState8[1];
-  (0, _react.useEffect)(function () {
+  (0, _react2.useEffect)(function () {
     var newSystem = _system || parentSystem;
     if (prevSystemKey.current !== newSystem.key) {
       setSystem(newSystem);
@@ -71,7 +74,7 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
       isParentTheme.current = false;
     }
   }, [_system, parentSystem]);
-  (0, _react.useEffect)(function () {
+  (0, _react2.useEffect)(function () {
     var newModifications = (0, _utils.mergeDeep)(parentModifications, _modifications);
     if (!(0, _isEqual.default)(prevModifications.current, newModifications)) {
       setModifications(newModifications);
@@ -79,7 +82,7 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
       isParentTheme.current = false;
     }
   }, [_modifications, parentModifications]);
-  (0, _react.useEffect)(function () {
+  (0, _react2.useEffect)(function () {
     var newColorMode = (0, _utils.getColorMode)(_colorMode, parentColorMode);
     if (!(0, _isEqual.default)(newColorMode, prevColorMode.current)) {
       setColorMode(newColorMode);
@@ -87,21 +90,34 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
       isParentTheme.current = false;
     }
   }, [_colorMode, parentColorMode]);
-  (0, _react.useEffect)(function () {
+  (0, _react2.useEffect)(function () {
     if (!isParentTheme.current) {
       setTheme((0, _utils.getComputed)(system, (0, _utils.buildTheme)(modifications, "_".concat(system.key)), colorMode));
     }
   }, [colorMode, system, modifications]);
-  var nestedThemeContext = (0, _react.useMemo)(function () {
+  var _useState9 = (0, _react2.useState)(),
+    _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+    themeCSSVariables = _useState10[0],
+    _setThemeCSSVariables = _useState10[1];
+  var setThemeCSSVariables = (0, _react2.useCallback)(function (variables) {
+    return _setThemeCSSVariables(function (previous) {
+      return _objectSpread(_objectSpread({}, previous), variables);
+    });
+  }, []);
+  var nestedThemeContext = (0, _react2.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;")
+      colorClassName: /*#__PURE__*/(0, _css2.css)("label:euiColorMode-", _colorMode, ";color:", theme.colors.text, ";;label:colorClassName;"),
+      setGlobalCSSVariables: isGlobalTheme ? setThemeCSSVariables : setGlobalCSSVariables,
+      globalCSSVariables: isGlobalTheme ? themeCSSVariables : globalCSSVariables,
+      setNearestThemeCSSVariables: setThemeCSSVariables,
+      themeCSSVariables: themeCSSVariables
     };
-  }, [theme, isGlobalTheme, bodyColor, _colorMode]);
-  var renderedChildren = (0, _react.useMemo)(function () {
+  }, [theme, isGlobalTheme, bodyColor, _colorMode, setGlobalCSSVariables, globalCSSVariables, setThemeCSSVariables, themeCSSVariables]);
+  var renderedChildren = (0, _react2.useMemo)(function () {
     if (isGlobalTheme) {
       return children; // No wrapper
     }
@@ -113,26 +129,37 @@ var EuiThemeProvider = function EuiThemeProvider(_ref) {
     var props = _objectSpread(_objectSpread({}, rest), {}, {
       className: (0, _classnames.default)(className, nestedThemeContext.colorClassName)
     });
+    // Condition avoids rendering an empty Emotion selector if no
+    // theme-specific CSS variables have been set by child components
+    if (themeCSSVariables) {
+      props.css = _objectSpread({
+        label: 'euiCSSVariables'
+      }, themeCSSVariables);
+    }
     if (cloneElement) {
-      return /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
+      return (0, _emotion.cloneElementWithCss)(children, _objectSpread(_objectSpread({}, props), {}, {
         className: (0, _classnames.default)(children.props.className, props.className)
       }));
     } else {
-      return (0, _react2.jsx)("span", (0, _extends2.default)({}, props, {
+      return (0, _react.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, {
+  }, [isGlobalTheme, themeCSSVariables, nestedThemeContext, wrapperProps, children]);
+  return (0, _react.jsx)(_react2.default.Fragment, null, isGlobalTheme && themeCSSVariables && (0, _react.jsx)(_react.Global, {
+    styles: /*#__PURE__*/(0, _react.css)({
+      ':root': themeCSSVariables
+    }, ";label:EuiThemeProvider;")
+  }), (0, _react.jsx)(_context.EuiColorModeContext.Provider, {
     value: colorMode
-  }, (0, _react2.jsx)(_context.EuiSystemContext.Provider, {
+  }, (0, _react.jsx)(_context.EuiSystemContext.Provider, {
     value: system
-  }, (0, _react2.jsx)(_context.EuiModificationsContext.Provider, {
+  }, (0, _react.jsx)(_context.EuiModificationsContext.Provider, {
     value: modifications
-  }, (0, _react2.jsx)(_context.EuiThemeContext.Provider, {
+  }, (0, _react.jsx)(_context.EuiThemeContext.Provider, {
     value: theme
-  }, (0, _react2.jsx)(_context.EuiNestedThemeContext.Provider, {
+  }, (0, _react.jsx)(_context.EuiNestedThemeContext.Provider, {
     value: nestedThemeContext
-  }, (0, _react2.jsx)(_emotion.EuiEmotionThemeProvider, null, renderedChildren))))));
+  }, (0, _react.jsx)(_emotion2.EuiEmotionThemeProvider, null, renderedChildren)))))));
 };
 exports.EuiThemeProvider = EuiThemeProvider;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "88.1.0",
+  "version": "88.3.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "lib",
   "module": "es",
@@ -64,8 +64,8 @@
     "test-staged"
   ],
   "dependencies": {
-    "@hello-pangea/dnd": "^16.2.0",
-    "@types/lodash": "^4.14.194",
+    "@hello-pangea/dnd": "^16.3.0",
+    "@types/lodash": "^4.14.198",
     "@types/numeral": "^2.0.2",
     "@types/react-input-autosize": "^2.2.1",
     "@types/react-window": "^1.8.5",

package/src/components/datagrid/_data_grid.scss

@@ -49,12 +49,23 @@
 }
 
 // This is used to remove extra scrollbars on the body when fullscreen is enabled
+// and tweak any components that account for fixed headers
 .euiDataGrid__restrictBody {
   height: 100vh;
   overflow: hidden;
 
-  .euiHeader {
-    z-index: $euiZHeaderBelowDataGrid;
+  .euiHeader[data-fixed-header] {
+    // !important needed to override header inline styles
+    z-index: $euiZHeaderBelowDataGrid !important; // stylelint-disable-line declaration-no-important
+  }
+
+  .euiOverlayMask[data-relative-to-header='below'] {
+    top: 0;
+  }
+
+  .euiFlyout {
+    top: 0;
+    height: 100%;
   }
 }
 

package/src/components/index.scss

@@ -1,6 +1,5 @@
 // Components
 
-@import 'accordion/index';
 @import 'color_picker/index';
 @import 'combo_box/index';
 @import 'context_menu/index';
@@ -12,7 +11,6 @@
 @import 'form/index';
 @import 'markdown_editor/index';
 @import 'notification/index';
-@import 'panel/index';
 @import 'page/index'; // Page needs to come after Panel for cascade specificity
 @import 'tree_view/index';
 @import 'side_nav/index';

package/src/global_styling/mixins/_header.scss

@@ -1,6 +1,8 @@
 @import '../variables/header';
 
 @mixin euiHeaderAffordForFixed($headerHeight: $euiHeaderHeightCompensation) {
+  @warn 'This mixin will shortly be deprecated. Use the CSS variable var(--euiFixedHeadersOffset) instead, which updates dynamically based on the number of fixed headers on the page.';
+
   // The `@at-root #{&}` allows for grouping alongside another specific body class.
   // When not applied inside of another selector, it simply renders with the single class
   @at-root #{&}.euiBody--headerIsFixed {

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

@@ -18,17 +18,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _tabbable = require("tabbable");
-var _loading = require("../loading");
-var _resize_observer = require("../observer/resize_observer");
-var _text = require("../text");
-var _i18n = require("../i18n");
 var _services = require("../../services");
-var _button = require("../button");
+var _loading = require("../loading");
+var _accordion_trigger = require("./accordion_trigger");
+var _accordion_children = require("./accordion_children");
 var _accordion = require("./accordion.styles");
-var _global_styling = require("../../global_styling");
 var _react2 = require("@emotion/react");
-var _excluded = ["children", "buttonContent", "className", "id", "element", "buttonClassName", "buttonContentClassName", "extraAction", "paddingSize", "initialIsOpen", "arrowDisplay", "forceState", "isLoading", "isLoadingMessage", "isDisabled", "buttonProps", "buttonElement", "arrowProps", "theme"];
+var _excluded = ["children", "className", "id", "element", "buttonElement", "buttonProps", "buttonClassName", "buttonContentClassName", "buttonContent", "arrowDisplay", "arrowProps", "extraAction", "paddingSize", "borders", "initialIsOpen", "forceState", "isLoading", "isLoadingMessage", "isDisabled", "theme"];
 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 _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); }; }
@@ -51,18 +47,9 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "childContent", null);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "childWrapper", null);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "tabbableChildren", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
       isOpen: _this.props.forceState ? _this.props.forceState === 'open' : _this.props.initialIsOpen
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setChildContentHeight", function () {
-      requestAnimationFrame(function () {
-        var height = _this.childContent && _this.isOpen ? _this.childContent.clientHeight : 0;
-        _this.childWrapper && _this.childWrapper.setAttribute('style', (0, _global_styling.logicalCSS)('height', "".concat(height, "px")));
-      });
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onToggle", function () {
       var forceState = _this.props.forceState;
       if (forceState) {
@@ -75,57 +62,11 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
           };
         }, function () {
           var _this$props$onToggle2, _this$props2;
-          if (_this.state.isOpen && _this.childWrapper) {
-            _this.childWrapper.focus();
-          }
           (_this$props$onToggle2 = (_this$props2 = _this.props).onToggle) === null || _this$props$onToggle2 === void 0 ? void 0 : _this$props$onToggle2.call(_this$props2, _this.state.isOpen);
         });
       }
     });
-    // When accordions are closed, tabbable children should not be present in the tab order
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "preventTabbing", function () {
-      if (_this.childContent) {
-        // Re-check for children on every close - content can change dynamically
-        _this.tabbableChildren = (0, _tabbable.tabbable)(_this.childContent);
-        _this.tabbableChildren.forEach(function (element) {
-          // If the element has an existing `tabIndex` set, make sure we can restore it
-          var originalTabIndex = element.getAttribute('tabIndex');
-          if (originalTabIndex) {
-            element.setAttribute('data-original-tabindex', originalTabIndex);
-          }
-          element.setAttribute('tabIndex', '-1');
-        });
-      }
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableTabbing", function () {
-      // If no tabbable children were set, we don't need to re-enable anything
-      if (_this.tabbableChildren) {
-        _this.tabbableChildren.forEach(function (element) {
-          var originalTabIndex = element.getAttribute('data-original-tabindex');
-          if (originalTabIndex) {
-            // If the element originally had an existing `tabIndex` set, restore it
-            element.setAttribute('tabIndex', originalTabIndex);
-            element.removeAttribute('data-original-tabindex');
-          } else {
-            // If not, remove the tabIndex property
-            element.removeAttribute('tabIndex');
-          }
-        });
-        // Cleanup - unset the list of children
-        _this.tabbableChildren = null;
-      }
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setChildContentRef", function (node) {
-      _this.childContent = node;
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "generatedId", (0, _services.htmlIdGenerator)()());
-    // Storing resize/observer refs as an instance variable is a performance optimization
-    // and also resolves https://github.com/elastic/eui/issues/5903
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resizeRef", function () {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "observerRef", function (ref) {
-      _this.setChildContentRef(ref);
-      _this.resizeRef(ref);
-    });
     return _this;
   }
   (0, _createClass2.default)(EuiAccordionClass, [{
@@ -133,164 +74,66 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
     get: function get() {
       return this.props.forceState ? this.props.forceState === 'open' : this.state.isOpen;
     }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.setChildContentHeight();
-      if (!this.isOpen) this.preventTabbing();
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps, prevState) {
-      this.setChildContentHeight();
-      if (prevProps.forceState === 'open' && this.props.forceState === 'closed' || prevState.isOpen === true && this.state.isOpen === false) {
-        this.preventTabbing();
-      }
-      if (prevProps.forceState === 'closed' && this.props.forceState === 'open' || prevState.isOpen === false && this.state.isOpen === true) {
-        this.enableTabbing();
-      }
-    }
   }, {
     key: "render",
     value: function render() {
-      var _buttonProps$id,
-        _this2 = this;
+      var _buttonProps$id;
       var _this$props3 = this.props,
         children = _this$props3.children,
-        buttonContent = _this$props3.buttonContent,
         className = _this$props3.className,
         id = _this$props3.id,
         _this$props3$element = _this$props3.element,
         Element = _this$props3$element === void 0 ? 'div' : _this$props3$element,
+        buttonElement = _this$props3.buttonElement,
+        buttonProps = _this$props3.buttonProps,
         buttonClassName = _this$props3.buttonClassName,
         buttonContentClassName = _this$props3.buttonContentClassName,
+        buttonContent = _this$props3.buttonContent,
+        arrowDisplay = _this$props3.arrowDisplay,
+        arrowProps = _this$props3.arrowProps,
         extraAction = _this$props3.extraAction,
         paddingSize = _this$props3.paddingSize,
+        borders = _this$props3.borders,
         initialIsOpen = _this$props3.initialIsOpen,
-        arrowDisplay = _this$props3.arrowDisplay,
         forceState = _this$props3.forceState,
         isLoading = _this$props3.isLoading,
         isLoadingMessage = _this$props3.isLoadingMessage,
         isDisabled = _this$props3.isDisabled,
-        buttonProps = _this$props3.buttonProps,
-        _this$props3$buttonEl = _this$props3.buttonElement,
-        _ButtonElement = _this$props3$buttonEl === void 0 ? 'button' : _this$props3$buttonEl,
-        arrowProps = _this$props3.arrowProps,
         theme = _this$props3.theme,
         rest = (0, _objectWithoutProperties2.default)(_this$props3, _excluded);
-
-      // Force button element to be a legend if the element is a fieldset
-      var ButtonElement = Element === 'fieldset' ? 'legend' : _ButtonElement;
-      var buttonElementIsFocusable = ButtonElement === 'button';
-
-      // Force visibility of arrow button if button element is not focusable
-      var _arrowDisplay = arrowDisplay === 'none' && !buttonElementIsFocusable ? 'left' : arrowDisplay;
       var classes = (0, _classnames.default)('euiAccordion', {
         'euiAccordion-isOpen': this.isOpen
       }, className);
-      var childrenClasses = (0, _classnames.default)('euiAccordion__children', {
-        'euiAccordion__children-isLoading': isLoading
-      });
-      var buttonClasses = (0, _classnames.default)('euiAccordion__button', buttonClassName, buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.className);
-      var buttonContentClasses = (0, _classnames.default)('euiAccordion__buttonContent', buttonContentClassName);
-      var iconButtonClasses = (0, _classnames.default)('euiAccordion__iconButton', {
-        'euiAccordion__iconButton-isOpen': this.isOpen,
-        'euiAccordion__iconButton--right': _arrowDisplay === 'right'
-      }, arrowProps === null || arrowProps === void 0 ? void 0 : arrowProps.className);
-
-      // Emotion styles
-      var buttonStyles = (0, _accordion.euiAccordionButtonStyles)(theme);
-      var cssButtonStyles = [buttonStyles.euiAccordion__button, isDisabled && buttonStyles.disabled, buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.css];
-      var childrenStyles = (0, _accordion.euiAccordionChildrenStyles)(theme);
-      var cssChildrenStyles = [childrenStyles.euiAccordion__children, isLoading && childrenStyles.isLoading, paddingSize && paddingSize !== 'none' && childrenStyles[paddingSize]];
-      var childWrapperStyles = (0, _accordion.euiAccordionChildWrapperStyles)(theme);
-      var cssChildWrapperStyles = [childWrapperStyles.euiAccordion__childWrapper, this.isOpen && childWrapperStyles.isOpen];
-      var iconButtonStyles = (0, _accordion.euiAccordionIconButtonStyles)(theme);
-      var cssIconButtonStyles = [iconButtonStyles.euiAccordion__iconButton, this.isOpen && iconButtonStyles.isOpen, _arrowDisplay === 'right' && iconButtonStyles.arrowRight, arrowProps === null || arrowProps === void 0 ? void 0 : arrowProps.css];
-      var optionalActionStyles = (0, _accordion.euiAccordionOptionalActionStyles)();
-      var cssOptionalActionStyles = [optionalActionStyles.euiAccordion__optionalAction];
-      var spinnerStyles = (0, _accordion.euiAccordionSpinnerStyles)(theme);
-      var cssSpinnerStyles = [spinnerStyles.euiAccordion__spinner];
-      var triggerWrapperStyles = (0, _accordion.euiAccordionTriggerWrapperStyles)();
-      var cssTriggerWrapperStyles = [triggerWrapperStyles.euiAccordion__triggerWrapper];
-      var iconButton;
+      var styles = (0, _accordion.euiAccordionStyles)(theme);
+      var cssStyles = [styles.euiAccordion, borders !== 'none' && styles.borders.borders, borders !== 'none' && styles.borders[borders]];
       var buttonId = (_buttonProps$id = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.id) !== null && _buttonProps$id !== void 0 ? _buttonProps$id : this.generatedId;
-      if (_arrowDisplay !== 'none') {
-        iconButton = (0, _react2.jsx)(_button.EuiButtonIcon, (0, _extends2.default)({
-          color: "text"
-        }, arrowProps, {
-          className: iconButtonClasses,
-          css: cssIconButtonStyles,
-          iconType: "arrowRight",
-          onClick: this.onToggle,
-          "aria-controls": id,
-          "aria-expanded": this.isOpen,
-          "aria-labelledby": buttonId,
-          tabIndex: buttonElementIsFocusable ? -1 : 0,
-          isDisabled: isDisabled
-        }));
-      }
-      var optionalAction = null;
-      if (isLoading || extraAction) {
-        optionalAction = (0, _react2.jsx)("div", {
-          className: "euiAccordion__optionalAction",
-          css: cssOptionalActionStyles
-        }, isLoading ? (0, _react2.jsx)(_loading.EuiLoadingSpinner, null) : extraAction);
-      }
-      var childrenContent;
-      if (isLoading && isLoadingMessage) {
-        childrenContent = (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_loading.EuiLoadingSpinner, {
-          className: "euiAccordion__spinner",
-          css: cssSpinnerStyles
-        }), (0, _react2.jsx)(_text.EuiText, {
-          size: "s"
-        }, (0, _react2.jsx)("p", null, isLoadingMessage !== true ? isLoadingMessage : (0, _react2.jsx)(_i18n.EuiI18n, {
-          token: "euiAccordion.isLoading",
-          default: "Loading"
-        }))));
-      } else {
-        childrenContent = children;
-      }
-      var button = (0, _react2.jsx)(ButtonElement, (0, _extends2.default)({}, buttonProps, {
-        id: buttonId,
-        className: buttonClasses,
-        css: cssButtonStyles,
-        "aria-controls": id
-        // `aria-expanded` is only a valid attribute on interactive controls - axe-core throws a violation otherwise
-        ,
-        "aria-expanded": ButtonElement === 'button' ? this.isOpen : undefined,
-        onClick: isDisabled ? undefined : this.onToggle,
-        type: ButtonElement === 'button' ? 'button' : undefined,
-        disabled: ButtonElement === 'button' ? isDisabled : undefined
-      }), (0, _react2.jsx)("span", {
-        className: buttonContentClasses
-      }, buttonContent));
       return (0, _react2.jsx)(Element, (0, _extends2.default)({
-        className: classes
-      }, rest), (0, _react2.jsx)("div", {
-        className: "euiAccordion__triggerWrapper",
-        css: cssTriggerWrapperStyles
-      }, _arrowDisplay === 'left' && iconButton, button, optionalAction, _arrowDisplay === 'right' && iconButton), (0, _react2.jsx)("div", {
-        className: "euiAccordion__childWrapper",
-        css: cssChildWrapperStyles,
-        ref: function ref(node) {
-          _this2.childWrapper = node;
-        },
-        tabIndex: -1,
-        role: "region",
+        className: classes,
+        css: cssStyles
+      }, rest), (0, _react2.jsx)(_accordion_trigger.EuiAccordionTrigger, {
+        ariaControlsId: id,
+        buttonId: buttonId
+        // Force button element to be a legend if the element is a fieldset
+        ,
+        buttonElement: Element === 'fieldset' ? 'legend' : buttonElement,
+        buttonClassName: buttonClassName,
+        buttonContent: buttonContent,
+        buttonContentClassName: buttonContentClassName,
+        buttonProps: buttonProps,
+        arrowProps: arrowProps,
+        arrowDisplay: arrowDisplay,
+        isDisabled: isDisabled,
+        isOpen: this.isOpen,
+        onToggle: this.onToggle,
+        extraAction: isLoading ? (0, _react2.jsx)(_loading.EuiLoadingSpinner, null) : extraAction
+      }), (0, _react2.jsx)(_accordion_children.EuiAccordionChildren, {
+        id: id,
         "aria-labelledby": buttonId,
-        id: id
-      }, (0, _react2.jsx)(_resize_observer.EuiResizeObserver, {
-        onResize: this.setChildContentHeight
-      }, function (resizeRef) {
-        _this2.resizeRef = resizeRef;
-        return (0, _react2.jsx)("div", {
-          ref: _this2.observerRef
-        }, (0, _react2.jsx)("div", {
-          className: childrenClasses,
-          css: cssChildrenStyles
-        }, childrenContent));
-      })));
+        paddingSize: paddingSize,
+        isLoading: isLoading,
+        isLoadingMessage: isLoadingMessage,
+        isOpen: this.isOpen
+      }, children));
     }
   }]);
   return EuiAccordionClass;
@@ -298,6 +141,7 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
 exports.EuiAccordionClass = EuiAccordionClass;
 (0, _defineProperty2.default)(EuiAccordionClass, "defaultProps", {
   initialIsOpen: false,
+  borders: 'none',
   paddingSize: 'none',
   arrowDisplay: 'left',
   isLoading: false,
@@ -322,13 +166,17 @@ EuiAccordionClass.propTypes = {
        */
   buttonClassName: _propTypes.default.string,
   /**
-       * Apply more props to the triggering button
+       * Apply more props to the triggering button.
+       *
+       * Includes optional `paddingSize` prop which allows sizes of `s`, `m`, or `l`.
+       * Note: Padding will not be present on the side closest to the accordion arrow.
        */
   buttonProps: _propTypes.default.shape({
     className: _propTypes.default.string,
     "aria-label": _propTypes.default.string,
     "data-test-subj": _propTypes.default.string,
-    css: _propTypes.default.any
+    css: _propTypes.default.any,
+    paddingSize: _propTypes.default.oneOf(["s", "m", "l"])
   }),
   /**
        * Class that will apply to the trigger content for the accordion.
@@ -367,6 +215,10 @@ EuiAccordionClass.propTypes = {
        * Placement of the arrow indicator, or 'none' to hide it.
        */
   arrowDisplay: _propTypes.default.oneOf(["left", "right", "none"]),
+  /**
+       * Optional border styling. Defaults to 'none'.
+       */
+  borders: _propTypes.default.oneOf(["horizontal", "all", "none"]),
   /**
        * Control the opening of accordion via prop
        */