@elastic/eui 88.1.0 → 88.3.0

package/optimize/es/services/theme/hooks.js

@@ -8,7 +8,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 
 import React, { forwardRef, useContext, useMemo } from 'react';
-import { EuiThemeContext, EuiModificationsContext, EuiColorModeContext, defaultComputedTheme } from './context';
+import { EuiThemeContext, EuiModificationsContext, EuiColorModeContext, defaultComputedTheme, EuiNestedThemeContext } from './context';
 import { emitEuiProviderWarning } from './warning';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var providerMessage = "`EuiProvider` is missing which can result in negative effects.\nWrap your component in `EuiProvider`: https://ela.st/euiprovider.";
@@ -63,4 +63,22 @@ export var RenderWithEuiTheme = function RenderWithEuiTheme(_ref) {
   var children = _ref.children;
   var theme = useEuiTheme();
   return children(theme);
+};
+
+/**
+ * Minor syntactical sugar hook for theme CSS variables.
+ * Primarily meant for internal EUI usage.
+ */
+export var useEuiThemeCSSVariables = function useEuiThemeCSSVariables() {
+  var _useContext = useContext(EuiNestedThemeContext),
+    setGlobalCSSVariables = _useContext.setGlobalCSSVariables,
+    globalCSSVariables = _useContext.globalCSSVariables,
+    setNearestThemeCSSVariables = _useContext.setNearestThemeCSSVariables,
+    themeCSSVariables = _useContext.themeCSSVariables;
+  return {
+    setGlobalCSSVariables: setGlobalCSSVariables,
+    globalCSSVariables: globalCSSVariables,
+    setNearestThemeCSSVariables: setNearestThemeCSSVariables,
+    themeCSSVariables: themeCSSVariables
+  };
 };

package/optimize/es/services/theme/index.js

@@ -7,7 +7,7 @@
  */
 
 export { EuiSystemContext, EuiThemeContext, EuiNestedThemeContext, EuiModificationsContext, EuiColorModeContext } from './context';
-export { useEuiTheme, withEuiTheme, RenderWithEuiTheme } from './hooks';
+export { useEuiTheme, withEuiTheme, RenderWithEuiTheme, useEuiThemeCSSVariables } from './hooks';
 export { EuiThemeProvider } from './provider';
 export { getEuiDevProviderWarning, setEuiDevProviderWarning } from './warning';
 export { buildTheme, computed, isInverseColorMode, getColorMode, getComputed, getOn, mergeDeep, setOn, Computed } from './utils';

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { css as _css } from "@emotion/react";
 var _excluded = ["cloneElement", "className"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -13,10 +14,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * Side Public License, v 1.
  */
 
-import React, { useContext, useEffect, useRef, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useRef, useMemo, useState, useCallback } from 'react';
 import classNames from 'classnames';
 import { css } from '@emotion/css';
+import { Global } from '@emotion/react';
 import isEqual from 'lodash/isEqual';
+import { cloneElementWithCss } from '../emotion';
 import { EuiSystemContext, EuiThemeContext, EuiNestedThemeContext, EuiModificationsContext, EuiColorModeContext } from './context';
 import { EuiEmotionThemeProvider } from './emotion';
 import { buildTheme, getColorMode, getComputed, mergeDeep } from './utils';
@@ -29,7 +32,9 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
     wrapperProps = _ref.wrapperProps;
   var _useContext = useContext(EuiNestedThemeContext),
     isGlobalTheme = _useContext.isGlobalTheme,
-    bodyColor = _useContext.bodyColor;
+    bodyColor = _useContext.bodyColor,
+    globalCSSVariables = _useContext.globalCSSVariables,
+    setGlobalCSSVariables = _useContext.setGlobalCSSVariables;
   var parentSystem = useContext(EuiSystemContext);
   var parentModifications = useContext(EuiModificationsContext);
   var parentColorMode = useContext(EuiColorModeContext);
@@ -84,15 +89,28 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
       setTheme(getComputed(system, buildTheme(modifications, "_".concat(system.key)), colorMode));
     }
   }, [colorMode, system, modifications]);
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    themeCSSVariables = _useState10[0],
+    _setThemeCSSVariables = _useState10[1];
+  var setThemeCSSVariables = useCallback(function (variables) {
+    return _setThemeCSSVariables(function (previous) {
+      return _objectSpread(_objectSpread({}, previous), variables);
+    });
+  }, []);
   var nestedThemeContext = 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__*/css("label:euiColorMode-", _colorMode, ";color:", theme.colors.text, ";;label:colorClassName;")
+      colorClassName: /*#__PURE__*/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]);
+  }, [theme, isGlobalTheme, bodyColor, _colorMode, setGlobalCSSVariables, globalCSSVariables, setThemeCSSVariables, themeCSSVariables]);
   var renderedChildren = useMemo(function () {
     if (isGlobalTheme) {
       return children; // No wrapper
@@ -105,8 +123,15 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
     var props = _objectSpread(_objectSpread({}, rest), {}, {
       className: classNames(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.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
+      return cloneElementWithCss(children, _objectSpread(_objectSpread({}, props), {}, {
         className: classNames(children.props.className, props.className)
       }));
     } else {
@@ -114,8 +139,12 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
         className: classNames('euiThemeProvider', props.className)
       }), children);
     }
-  }, [isGlobalTheme, nestedThemeContext, wrapperProps, children]);
-  return ___EmotionJSX(EuiColorModeContext.Provider, {
+  }, [isGlobalTheme, themeCSSVariables, nestedThemeContext, wrapperProps, children]);
+  return ___EmotionJSX(React.Fragment, null, isGlobalTheme && themeCSSVariables && ___EmotionJSX(Global, {
+    styles: /*#__PURE__*/_css({
+      ':root': themeCSSVariables
+    }, ";label:EuiThemeProvider;")
+  }), ___EmotionJSX(EuiColorModeContext.Provider, {
     value: colorMode
   }, ___EmotionJSX(EuiSystemContext.Provider, {
     value: system
@@ -125,5 +154,5 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
     value: theme
   }, ___EmotionJSX(EuiNestedThemeContext.Provider, {
     value: nestedThemeContext
-  }, ___EmotionJSX(EuiEmotionThemeProvider, null, renderedChildren))))));
+  }, ___EmotionJSX(EuiEmotionThemeProvider, null, renderedChildren)))))));
 };

package/optimize/lib/components/accordion/accordion.js

@@ -17,17 +17,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 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); }; }
@@ -50,18 +46,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) {
@@ -74,57 +61,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, [{
@@ -132,164 +73,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;
@@ -297,6 +140,7 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
 exports.EuiAccordionClass = EuiAccordionClass;
 (0, _defineProperty2.default)(EuiAccordionClass, "defaultProps", {
   initialIsOpen: false,
+  borders: 'none',
   paddingSize: 'none',
   arrowDisplay: 'left',
   isLoading: false,

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

@@ -3,104 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.euiAccordionTriggerWrapperStyles = exports.euiAccordionSpinnerStyles = exports.euiAccordionOptionalActionStyles = exports.euiAccordionIconButtonStyles = exports.euiAccordionChildrenStyles = exports.euiAccordionChildWrapperStyles = exports.euiAccordionButtonStyles = void 0;
+exports.euiAccordionStyles = 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 euiAccordionButtonStyles = function euiAccordionButtonStyles(euiThemeContext) {
-  var euiTheme = euiThemeContext.euiTheme;
-  return {
-    euiAccordion__button: /*#__PURE__*/(0, _react.css)((0, _global_styling.euiFontSize)(euiThemeContext, 's'), " align-items:center;display:flex;flex-grow:1;line-height:", euiTheme.size.l, ";", (0, _global_styling.logicalTextAlignCSS)('left'), " ", (0, _global_styling.logicalCSS)('width', '100%'), " &:hover,&:focus{cursor:pointer;text-decoration:underline;};label:euiAccordion__button;"),
-    // Triggering button needs separate `disabled` key because the element that renders may not support `:disabled`;
-    // Hover pseudo selector for specificity
-    disabled: /*#__PURE__*/(0, _react.css)("&,&:hover{cursor:not-allowed;color:", euiTheme.colors.disabledText, ";text-decoration:none;};label:disabled;")
-  };
-};
-exports.euiAccordionButtonStyles = euiAccordionButtonStyles;
-var _ref4 = process.env.NODE_ENV === "production" ? {
-  name: "1xvjonu-isLoading",
-  styles: "align-items:center;display:flex;label:isLoading;"
-} : {
-  name: "1xvjonu-isLoading",
-  styles: "align-items:center;display:flex;label:isLoading;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-var euiAccordionChildrenStyles = function euiAccordionChildrenStyles(_ref5) {
-  var euiTheme = _ref5.euiTheme;
-  return {
-    euiAccordion__children: /*#__PURE__*/(0, _react.css)(";label:euiAccordion__children;"),
-    isLoading: _ref4,
-    xs: /*#__PURE__*/(0, _react.css)("padding:", euiTheme.size.xs, ";;label:xs;"),
-    s: /*#__PURE__*/(0, _react.css)("padding:", euiTheme.size.s, ";;label:s;"),
-    m: /*#__PURE__*/(0, _react.css)("padding:", euiTheme.size.base, ";;label:m;"),
-    l: /*#__PURE__*/(0, _react.css)("padding:", euiTheme.size.l, ";;label:l;"),
-    xl: /*#__PURE__*/(0, _react.css)("padding:", euiTheme.size.xl, ";;label:xl;")
-  };
-};
-exports.euiAccordionChildrenStyles = euiAccordionChildrenStyles;
-var euiAccordionChildWrapperStyles = function euiAccordionChildWrapperStyles(_ref6) {
-  var euiTheme = _ref6.euiTheme;
-  return {
-    euiAccordion__childWrapper: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', 0), " opacity:0;overflow:hidden;transition:", _global_styling.logicals.height, " ", euiTheme.animation.normal, " ", euiTheme.animation.resistance, ",opacity ", euiTheme.animation.normal, " ", euiTheme.animation.resistance, ";visibility:hidden;&:focus{outline:none;};label:euiAccordion__childWrapper;"),
-    isOpen: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('height', 'auto'), " opacity:1;visibility:visible;;label:isOpen;")
-  };
-};
-exports.euiAccordionChildWrapperStyles = euiAccordionChildWrapperStyles;
-var _ref3 = process.env.NODE_ENV === "production" ? {
-  name: "1u3vcry-isOpen",
-  styles: "transform:rotate(\n      90deg\n    )!important;label:isOpen;"
-} : {
-  name: "1u3vcry-isOpen",
-  styles: "transform:rotate(\n      90deg\n    )!important;label:isOpen;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-var euiAccordionIconButtonStyles = function euiAccordionIconButtonStyles(_ref7) {
-  var euiTheme = _ref7.euiTheme;
-  return {
-    euiAccordion__iconButton: /*#__PURE__*/(0, _react.css)("flex-shrink:0;", (0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), " transform:rotate(\n      0deg\n    )!important;;label:euiAccordion__iconButton;"),
-    isOpen: _ref3,
-    arrowRight: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-left', euiTheme.size.xs), " ", (0, _global_styling.logicalCSS)('margin-right', 0), ";;label:arrowRight;")
-  };
-};
-exports.euiAccordionIconButtonStyles = euiAccordionIconButtonStyles;
-var _ref2 = process.env.NODE_ENV === "production" ? {
-  name: "iqfpv3-euiAccordion__optionalAction",
-  styles: "flex-shrink:0;label:euiAccordion__optionalAction;"
-} : {
-  name: "iqfpv3-euiAccordion__optionalAction",
-  styles: "flex-shrink:0;label:euiAccordion__optionalAction;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-var euiAccordionOptionalActionStyles = function euiAccordionOptionalActionStyles() {
-  return {
-    euiAccordion__optionalAction: _ref2
-  };
-};
-exports.euiAccordionOptionalActionStyles = euiAccordionOptionalActionStyles;
-var euiAccordionSpinnerStyles = function euiAccordionSpinnerStyles(_ref8) {
-  var euiTheme = _ref8.euiTheme;
-  return {
-    euiAccordion__spinner: /*#__PURE__*/(0, _react.css)((0, _global_styling.logicalCSS)('margin-right', euiTheme.size.xs), ";;label:euiAccordion__spinner;")
-  };
-};
-exports.euiAccordionSpinnerStyles = euiAccordionSpinnerStyles;
-var _ref = process.env.NODE_ENV === "production" ? {
-  name: "1r6c0fv-euiAccordion__triggerWrapper",
-  styles: "align-items:center;display:flex;label:euiAccordion__triggerWrapper;"
-} : {
-  name: "1r6c0fv-euiAccordion__triggerWrapper",
-  styles: "align-items:center;display:flex;label:euiAccordion__triggerWrapper;",
-  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
-};
-var euiAccordionTriggerWrapperStyles = function euiAccordionTriggerWrapperStyles() {
+/*
+ * 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 euiAccordionStyles = function euiAccordionStyles(_ref) {
+  var euiTheme = _ref.euiTheme;
   return {
-    euiAccordion__triggerWrapper: _ref
+    euiAccordion: /*#__PURE__*/(0, _react.css)(";label:euiAccordion;"),
+    // Borders
+    borders: {
+      // Prevent border repeats
+      borders: /*#__PURE__*/(0, _react.css)("&+[class*='euiAccordion-borders']{", (0, _global_styling.logicalCSS)('border-top', 'none'), ";};label:borders;"),
+      horizontal: /*#__PURE__*/(0, _react.css)("border-block:", euiTheme.border.thin, ";;label:horizontal;"),
+      all: /*#__PURE__*/(0, _react.css)("border:", euiTheme.border.thin, ";;label:all;")
+    }
   };
 };
-exports.euiAccordionTriggerWrapperStyles = euiAccordionTriggerWrapperStyles;
+exports.euiAccordionStyles = euiAccordionStyles;