@elastic/eui 88.2.0 → 88.3.0

package/optimize/lib/components/panel/split_panel/split_panel.styles.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.euiSplitPanelOuterStyles = exports.euiSplitPanelInnerStyles = void 0;
+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)."; } /*
+                                                                                                                                                                                                                                                                                           * 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 euiSplitPanelOuterStyles = {
+  euiSplitPanelOuter: /*#__PURE__*/(0, _react.css)("display:flex;", (0, _global_styling.logicalCSS)('min-width', 0), " overflow:hidden;;label:euiSplitPanelOuter;"),
+  column: process.env.NODE_ENV === "production" ? {
+    name: "ll8kmq-column",
+    styles: "flex-direction:column;label:column;"
+  } : {
+    name: "ll8kmq-column",
+    styles: "flex-direction:column;label:column;",
+    toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+  },
+  row: process.env.NODE_ENV === "production" ? {
+    name: "15mvjmo-row",
+    styles: "flex-direction:row;label:row;"
+  } : {
+    name: "15mvjmo-row",
+    styles: "flex-direction:row;label:row;",
+    toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+  }
+};
+exports.euiSplitPanelOuterStyles = euiSplitPanelOuterStyles;
+var euiSplitPanelInnerStyles = {
+  euiSplitPanelInner: process.env.NODE_ENV === "production" ? {
+    name: "1k62yu6-euiSplitPanelInner",
+    styles: "flex-basis:0%;transform:none!important;box-shadow:none!important;label:euiSplitPanelInner;"
+  } : {
+    name: "1k62yu6-euiSplitPanelInner",
+    styles: "flex-basis:0%;transform:none!important;box-shadow:none!important;label:euiSplitPanelInner;",
+    toString: _EMOTION_STRINGIFIED_CSS_ERROR__
+  }
+};
+exports.euiSplitPanelInnerStyles = euiSplitPanelInnerStyles;

package/optimize/lib/components/text_truncate/utils.js

@@ -52,7 +52,7 @@ var _TruncationUtils = /*#__PURE__*/(0, _createClass2.default)(function _Truncat
    */
   (0, _defineProperty2.default)(this, "checkIfTruncationIsNeeded", function () {
     _this.setTextToCheck(_this.fullText);
-    if (_this.availableWidth > _this.textWidth) {
+    if (_this.availableWidth >= _this.textWidth) {
       return false;
     }
   });

package/optimize/lib/components/toast/global_toast_list.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TOAST_FADE_OUT_MS = exports.SIDES = exports.EuiGlobalToastList = void 0;
+exports.TOAST_FADE_OUT_MS = exports.SIDES = exports.EuiGlobalToastList = exports.CLEAR_ALL_TOASTS_THRESHOLD_DEFAULT = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -18,8 +18,10 @@ var _time = require("../../services/time");
 var _global_toast_list_item = require("./global_toast_list_item");
 var _toast = require("./toast");
 var _global_toast_list = require("./global_toast_list.styles");
+var _button = require("../button");
+var _i18n = require("../i18n");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "toasts", "dismissToast", "toastLifeTimeMs", "side"],
+var _excluded = ["className", "toasts", "dismissToast", "toastLifeTimeMs", "onClearAllToasts", "side", "showClearAllButtonAt"],
   _excluded2 = ["text", "toastLifeTimeMs"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -40,14 +42,19 @@ var SIDES = (0, _common.keysOf)(sideToClassNameMap);
 exports.SIDES = SIDES;
 var TOAST_FADE_OUT_MS = 250;
 exports.TOAST_FADE_OUT_MS = TOAST_FADE_OUT_MS;
+var CLEAR_ALL_TOASTS_THRESHOLD_DEFAULT = 3;
+exports.CLEAR_ALL_TOASTS_THRESHOLD_DEFAULT = CLEAR_ALL_TOASTS_THRESHOLD_DEFAULT;
 var EuiGlobalToastList = function EuiGlobalToastList(_ref) {
   var className = _ref.className,
     _ref$toasts = _ref.toasts,
     toasts = _ref$toasts === void 0 ? [] : _ref$toasts,
     dismissToastProp = _ref.dismissToast,
     toastLifeTimeMs = _ref.toastLifeTimeMs,
+    onClearAllToasts = _ref.onClearAllToasts,
     _ref$side = _ref.side,
     side = _ref$side === void 0 ? 'right' : _ref$side,
+    _ref$showClearAllButt = _ref.showClearAllButtonAt,
+    showClearAllButtonAt = _ref$showClearAllButt === void 0 ? CLEAR_ALL_TOASTS_THRESHOLD_DEFAULT : _ref$showClearAllButt,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -120,7 +127,11 @@ var EuiGlobalToastList = function EuiGlobalToastList(_ref) {
     }
   };
   var onScroll = function onScroll() {
-    if (listElement.current) {
+    // Given that this method also gets invoked by the synthetic scroll that happens when a new toast gets added,
+    // we want to evaluate if the scroll bottom has been reached only when the user is interacting with the toast,
+    // this way we always retain the scroll position the user has set despite adding in new toasts.
+    // User interaction is determined through the handler registered for mouseEnter and mouseLeave events.
+    if (listElement.current && isUserInteracting.current) {
       isScrolledToBottom.current = listElement.current.scrollHeight - listElement.current.scrollTop === listElement.current.clientHeight;
     }
   };
@@ -234,6 +245,33 @@ var EuiGlobalToastList = function EuiGlobalToastList(_ref) {
       onBlur: onMouseLeave
     }, rest), text));
   });
+  if (showClearAllButtonAt && toasts.length >= showClearAllButtonAt) {
+    var dismissAllToasts = function dismissAllToasts() {
+      toasts.forEach(function (toast) {
+        return dismissToastProp(toast);
+      });
+      onClearAllToasts === null || onClearAllToasts === void 0 ? void 0 : onClearAllToasts();
+    };
+    renderedToasts.push((0, _react2.jsx)(_i18n.EuiI18n, {
+      key: "euiClearAllToasts",
+      tokens: ['euiGlobalToastList.clearAllToastsButtonAriaLabel', 'euiGlobalToastList.clearAllToastsButtonDisplayText'],
+      defaults: ['Clear all toast notifications', 'Clear all']
+    }, function (_ref2) {
+      var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+        clearAllToastsButtonAriaLabel = _ref3[0],
+        clearAllToastsButtonDisplayText = _ref3[1];
+      return (0, _react2.jsx)(_global_toast_list_item.EuiGlobalToastListItem, {
+        isDismissed: false
+      }, (0, _react2.jsx)(_button.EuiButton, {
+        fill: true,
+        color: "text",
+        onClick: dismissAllToasts,
+        css: [styles.euiGlobalToastListDismissButton, ";label:EuiGlobalToastList;"],
+        "aria-label": clearAllToastsButtonAriaLabel,
+        "data-test-subj": "euiClearAllToastsButton"
+      }, clearAllToastsButtonDisplayText));
+    }));
+  }
   var classes = (0, _classnames.default)('euiGlobalToastList', className);
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     "aria-live": "polite",

package/optimize/lib/components/toast/global_toast_list.styles.js

@@ -28,7 +28,8 @@ var euiGlobalToastListStyles = function euiGlobalToastListStyles(euiThemeContext
     euiGlobalToastList: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiScrollBarStyles)(euiThemeContext), " display:flex;flex-direction:column;align-items:stretch;position:fixed;z-index:", euiTheme.levels.toast, ";", (0, _global_styling.logicalCSS)('bottom', 0), " ", (0, _global_styling.logicalCSS)('width', "".concat(euiToastWidth, "px")), (0, _global_styling.logicalCSS)('max-height', '100vh'), (0, _global_styling.logicalCSSWithFallback)('overflow-y', 'auto'), "scrollbar-width:none;&::-webkit-scrollbar{", (0, _global_styling.logicalSizeCSS)(0, 0), ";}&:not(:empty){", (0, _global_styling.logicalCSS)('padding-left', euiTheme.size.base), " ", (0, _global_styling.logicalCSS)('padding-right', euiTheme.size.base), " ", (0, _global_styling.logicalCSS)('padding-vertical', euiTheme.size.base), ";}", (0, _global_styling.euiMaxBreakpoint)(euiThemeContext, 'm'), "{&:not(:empty){", (0, _global_styling.logicalCSS)('left', 0), " ", (0, _global_styling.logicalCSS)('width', '100%'), ";}};label:euiGlobalToastList;"),
     // Variants
     right: /*#__PURE__*/(0, _react.css)("&:not(:empty){", (0, _global_styling.logicalCSS)('right', 0), ";", (0, _global_styling.euiMinBreakpoint)(euiThemeContext, 'm'), "{", (0, _global_styling.logicalCSS)('padding-left', "".concat(euiTheme.base * 4, "px")), ";}};label:right;"),
-    left: /*#__PURE__*/(0, _react.css)("&:not(:empty){", (0, _global_styling.logicalCSS)('left', 0), ";", (0, _global_styling.euiMinBreakpoint)(euiThemeContext, 'm'), "{", (0, _global_styling.logicalCSS)('padding-right', "".concat(euiTheme.base * 4, "px")), ";}};label:left;")
+    left: /*#__PURE__*/(0, _react.css)("&:not(:empty){", (0, _global_styling.logicalCSS)('left', 0), ";", (0, _global_styling.euiMinBreakpoint)(euiThemeContext, 'm'), "{", (0, _global_styling.logicalCSS)('padding-right', "".concat(euiTheme.base * 4, "px")), ";}};label:left;"),
+    euiGlobalToastListDismissButton: /*#__PURE__*/(0, _react.css)("position:sticky;", (0, _global_styling.logicalCSS)('bottom', '0%'), ";;label:euiGlobalToastListDismissButton;")
   };
 };
 exports.euiGlobalToastListStyles = euiGlobalToastListStyles;
@@ -37,7 +38,7 @@ var euiGlobalToastListItemStyles = function euiGlobalToastListItemStyles(_ref) {
   var euiShowToast = (0, _react.keyframes)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  from {\n    transform: translateY(", ") scale(.9);\n    opacity: 0;\n  }\n\n  to {\n    transform: translateY(0) scale(1);\n    opacity: 1;\n  }\n"])), euiTheme.size.l);
   return {
     // Base
-    euiGlobalToastListItem: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-bottom', euiTheme.size.base), " animation:", euiTheme.animation.normal, " ", euiShowToast, " ", euiTheme.animation.resistance, ";opacity:1;&:first-child{", (0, _global_styling.logicalCSS)('margin-top', 'auto'), ";}&:last-child{", (0, _global_styling.logicalCSS)('margin-bottom', 0), ";};label:euiGlobalToastListItem;"),
+    euiGlobalToastListItem: /*#__PURE__*/(0, _react.css)("flex-shrink:0;", (0, _global_styling.logicalCSS)('margin-bottom', euiTheme.size.base), " animation:", euiTheme.animation.normal, " ", euiShowToast, " ", euiTheme.animation.resistance, ";opacity:1;&:first-child{", (0, _global_styling.logicalCSS)('margin-top', 'auto'), ";}&:last-child{", (0, _global_styling.logicalCSS)('margin-bottom', 0), ";};label:euiGlobalToastListItem;"),
     // States
     dismissed: /*#__PURE__*/(0, _react.css)("transition:opacity ", euiTheme.animation.normal, ";opacity:0;;label:dismissed;")
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elastic/eui",
   "description": "Elastic UI Component Library",
-  "version": "88.2.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/index.scss

@@ -11,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/test-env/components/accordion/accordion.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PADDING_SIZES = exports.EuiAccordionClass = exports.EuiAccordion = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -19,18 +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", "borders", "initialIsOpen", "arrowDisplay", "forceState", "isLoading", "isLoadingMessage", "isDisabled", "buttonProps", "buttonElement", "arrowProps", "theme"],
-  _excluded2 = ["paddingSize", "className", "css"];
+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); }; }
@@ -53,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) {
@@ -77,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, [{
@@ -135,173 +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);
-      var _ref = _buttonProps || {},
-        buttonPaddingSize = _ref.paddingSize,
-        buttonPropsClassName = _ref.className,
-        buttonPropsCss = _ref.css,
-        buttonProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
-
-      // 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 styles = (0, _accordion.euiAccordionStyles)(theme);
       var cssStyles = [styles.euiAccordion, borders !== 'none' && styles.borders.borders, borders !== 'none' && styles.borders[borders]];
-      var childrenClasses = (0, _classnames.default)('euiAccordion__children', {
-        'euiAccordion__children-isLoading': isLoading
-      });
-      var buttonClasses = (0, _classnames.default)('euiAccordion__button', buttonClassName, buttonPropsClassName);
-      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].concat((0, _toConsumableArray2.default)(buttonPaddingSize ? [buttonStyles[buttonPaddingSize], arrowDisplay === 'left' && buttonStyles.arrowLeft, arrowDisplay === 'right' && buttonStyles.arrowRight] : []), [buttonPropsCss]);
-      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 buttonId = (_buttonProps$id = 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));
+      var buttonId = (_buttonProps$id = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.id) !== null && _buttonProps$id !== void 0 ? _buttonProps$id : this.generatedId;
       return (0, _react2.jsx)(Element, (0, _extends2.default)({
         className: classes,
         css: cssStyles
-      }, 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",
+      }, 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;