@elastic/eui 88.1.0 → 88.2.0

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

@@ -0,0 +1,337 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["container"],
+  _excluded2 = ["font", "container"];
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+/*
+ * 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.
+ */
+/**
+ * This internal shared/base class contains the actual logic for truncating text
+ * (as well as a few handy utilities for checking whether truncation is possible
+ * or even necessary).
+ *
+ * How the underlying mechanism works: the full text is rendered, and then
+ * characters are removed one by one until the width of the text fits within
+ * the specified available width.
+ *
+ * Side note: The exception to this is the `truncateStartEndAtPosition` method,
+ * which works by building up from an empty string / by adding characters
+ * instead of removing them.
+ */
+var _TruncationUtils = /*#__PURE__*/_createClass(function _TruncationUtils(_ref) {
+  var _this = this;
+  var fullText = _ref.fullText,
+    ellipsis = _ref.ellipsis,
+    availableWidth = _ref.availableWidth;
+  _classCallCheck(this, _TruncationUtils);
+  _defineProperty(this, "fullText", void 0);
+  _defineProperty(this, "ellipsis", void 0);
+  _defineProperty(this, "availableWidth", void 0);
+  /**
+   * Early return checks
+   */
+  _defineProperty(this, "checkIfTruncationIsNeeded", function () {
+    _this.setTextToCheck(_this.fullText);
+    if (_this.availableWidth > _this.textWidth) {
+      return false;
+    }
+  });
+  _defineProperty(this, "checkSufficientEllipsisWidth", function (truncation) {
+    var textToCheck = truncation === 'startEnd' ? "".concat(_this.ellipsis, " ").concat(_this.ellipsis) // startEnd needs a little more space
+    : _this.ellipsis;
+    _this.setTextToCheck(textToCheck);
+    if (_this.textWidth >= _this.availableWidth * 0.9) {
+      console.error('The truncation ellipsis is larger than the available width. No text can be rendered.');
+      return false;
+    }
+  });
+  _defineProperty(this, "checkTruncationOffsetWidth", function (text) {
+    _this.setTextToCheck(text);
+    if (_this.textWidth > _this.availableWidth) {
+      console.error("The passed truncationOffset is too large for the available width. Truncating the offset instead.");
+      return false;
+    }
+  });
+  /**
+   * Truncation types logic. This is where the magic happens
+   */
+  _defineProperty(this, "truncateStart", function (truncationOffset) {
+    var truncatedText = _this.fullText;
+    var leadingText = '';
+    var combinedText = function combinedText() {
+      return "".concat(leadingText).concat(truncatedText);
+    };
+    if (truncationOffset) {
+      var _splitText$at = splitText(_this.fullText).at(truncationOffset);
+      var _splitText$at2 = _slicedToArray(_splitText$at, 2);
+      leadingText = _splitText$at2[0];
+      truncatedText = _splitText$at2[1];
+      var widthCheck = "".concat(leadingText).concat(_this.ellipsis);
+      if (_this.checkTruncationOffsetWidth(widthCheck) === false) {
+        truncatedText = leadingText;
+        leadingText = '';
+      }
+    }
+    leadingText += _this.ellipsis;
+    _this.setTextToCheck(combinedText());
+    while (_this.textWidth > _this.availableWidth) {
+      truncatedText = removeFirstCharacter(truncatedText);
+      _this.setTextToCheck(combinedText());
+    }
+    return combinedText();
+  });
+  _defineProperty(this, "truncateEnd", function (truncationOffset) {
+    var truncatedText = _this.fullText;
+    var trailingText = '';
+    var combinedText = function combinedText() {
+      return "".concat(truncatedText).concat(trailingText);
+    };
+    if (truncationOffset) {
+      var index = _this.fullText.length - truncationOffset;
+      var _splitText$at3 = splitText(_this.fullText).at(index);
+      var _splitText$at4 = _slicedToArray(_splitText$at3, 2);
+      truncatedText = _splitText$at4[0];
+      trailingText = _splitText$at4[1];
+      var widthCheck = "".concat(_this.ellipsis).concat(trailingText);
+      if (_this.checkTruncationOffsetWidth(widthCheck) === false) {
+        truncatedText = trailingText;
+        trailingText = '';
+      }
+    }
+    trailingText = _this.ellipsis + trailingText;
+    _this.setTextToCheck(combinedText());
+    while (_this.textWidth > _this.availableWidth) {
+      truncatedText = removeLastCharacter(truncatedText);
+      _this.setTextToCheck(combinedText());
+    }
+    return combinedText();
+  });
+  _defineProperty(this, "truncateStartEndAtPosition", function (truncationPosition) {
+    // If using a non-centered startEnd anchor position, we need to *build*
+    // the string from scratch instead of *removing* from the full text string,
+    // to make sure we don't go past the beginning or end of the text
+    var truncatedText = '';
+    _this.setTextToCheck(truncatedText);
+
+    // Ellipses are conditional - if the anchor is towards the beginning or end,
+    // it's possible they shouldn't render
+    var startingEllipsis = _this.ellipsis;
+    var endingEllipsis = _this.ellipsis;
+
+    // Split the text into two at the anchor position
+    var _splitText$at5 = splitText(_this.fullText).at(truncationPosition),
+      _splitText$at6 = _slicedToArray(_splitText$at5, 2),
+      firstPart = _splitText$at6[0],
+      secondPart = _splitText$at6[1];
+    var combinedText = function combinedText() {
+      return "".concat(startingEllipsis).concat(truncatedText).concat(endingEllipsis);
+    };
+    while (_this.textWidth <= _this.availableWidth) {
+      if (firstPart.length > 0) {
+        truncatedText = "".concat(getLastCharacter(firstPart)).concat(truncatedText);
+        firstPart = removeLastCharacter(firstPart);
+      } else {
+        startingEllipsis = '';
+      }
+      if (secondPart.length > 0) {
+        truncatedText = "".concat(truncatedText).concat(getFirstCharacter(secondPart));
+        secondPart = removeFirstCharacter(secondPart);
+      } else {
+        endingEllipsis = '';
+      }
+      _this.setTextToCheck(combinedText());
+    }
+
+    // Because this logic builds text outwards vs. removing inwards, the final
+    // text width ends up a little larger than the container, and we need to
+    // remove the last added character(s)
+    if (!startingEllipsis) {
+      truncatedText = removeLastCharacter(truncatedText);
+    } else if (!endingEllipsis) {
+      truncatedText = removeFirstCharacter(truncatedText);
+    } else {
+      truncatedText = removeFirstAndLastCharacters(truncatedText);
+    }
+    return combinedText();
+  });
+  _defineProperty(this, "truncateStartEndAtMiddle", function () {
+    var truncatedText = _this.fullText;
+    _this.setTextToCheck(truncatedText);
+    var combinedText = function combinedText() {
+      return "".concat(_this.ellipsis).concat(truncatedText).concat(_this.ellipsis);
+    };
+    while (_this.textWidth > _this.availableWidth) {
+      truncatedText = removeFirstAndLastCharacters(truncatedText);
+      _this.setTextToCheck(combinedText());
+    }
+    return combinedText();
+  });
+  _defineProperty(this, "truncateMiddle", function () {
+    var middlePosition = Math.floor(_this.fullText.length / 2);
+    var _splitText$at7 = splitText(_this.fullText).at(middlePosition),
+      _splitText$at8 = _slicedToArray(_splitText$at7, 2),
+      firstHalf = _splitText$at8[0],
+      secondHalf = _splitText$at8[1];
+    var trimfirstHalf;
+    var combinedText = function combinedText() {
+      return "".concat(firstHalf).concat(_this.ellipsis).concat(secondHalf);
+    };
+    _this.setTextToCheck(combinedText());
+    while (_this.textWidth > _this.availableWidth) {
+      trimfirstHalf = !trimfirstHalf;
+      if (trimfirstHalf) {
+        firstHalf = removeLastCharacter(firstHalf);
+      } else {
+        secondHalf = removeFirstCharacter(secondHalf);
+      }
+      _this.setTextToCheck(combinedText());
+    }
+    return combinedText();
+  });
+  this.fullText = fullText;
+  this.ellipsis = ellipsis;
+  this.availableWidth = availableWidth;
+}
+
+/**
+ * Internal measurement utils which will be overridden depending on the
+ * rendering approach used (e.g. DOM vs Canvas).
+ */);
+/**
+ * Creates a temporary vanilla JS DOM element for manipulating text and
+ * determining text width.
+ *
+ * Requires passing in a container element to which the temporary element
+ * will be appended. Any CSS/font styles that need to be accounted for should
+ * be automatically inherited from the container.
+ *
+ * NOTE: The consumer is responsible for calling the `cleanup()` method manually
+ * to remove the temporary DOM node once their usage of this utility is complete.
+ */
+
+export var TruncationUtilsWithDOM = /*#__PURE__*/function (_TruncationUtils2) {
+  _inherits(TruncationUtilsWithDOM, _TruncationUtils2);
+  var _super = _createSuper(TruncationUtilsWithDOM);
+  function TruncationUtilsWithDOM(_ref2) {
+    var _this2;
+    var container = _ref2.container,
+      rest = _objectWithoutProperties(_ref2, _excluded);
+    _classCallCheck(this, TruncationUtilsWithDOM);
+    _this2 = _super.call(this, rest);
+    _defineProperty(_assertThisInitialized(_this2), "container", void 0);
+    _defineProperty(_assertThisInitialized(_this2), "span", void 0);
+    _defineProperty(_assertThisInitialized(_this2), "setTextToCheck", function (text) {
+      _this2.span.textContent = text;
+    });
+    _defineProperty(_assertThisInitialized(_this2), "cleanup", function () {
+      _this2.container.removeChild(_this2.span);
+    });
+    _this2.container = container;
+    _this2.span = document.createElement('span');
+    _this2.span.style.position = 'absolute'; // Prevent page reflow/repaint for performance
+    _this2.span.style.whiteSpace = 'nowrap'; // EuiTextTruncate already sets this on the parent, but we'll set it here as well for consumers who use this util standalone
+    _this2.container.appendChild(_this2.span);
+    return _this2;
+  }
+  _createClass(TruncationUtilsWithDOM, [{
+    key: "textWidth",
+    get: function get() {
+      return this.span.offsetWidth;
+    }
+  }]);
+  return TruncationUtilsWithDOM;
+}(_TruncationUtils);
+
+/**
+ * Creates a temporary Canvas element for manipulating text & determining
+ * text width. This method is compatible with charts or other canvas-rendered
+ * frameworks, and requires no cleanup method.
+ *
+ * To accurately measure text, canvas rendering requires either a container to
+ * compute/derive font styles from, or a static font string (useful for usage
+ * outside the DOM). Particular care should be applied when fallback fonts are
+ * used, as more fallback fonts can lead to less precision.
+ *
+ * Please note that while canvas is more performant than DOM measurement, there
+ * are subpixel to single digit pixel differences between DOM and canvas
+ * measurement due to the different rendering engines used.
+ */
+export var TruncationUtilsWithCanvas = /*#__PURE__*/function (_TruncationUtils3) {
+  _inherits(TruncationUtilsWithCanvas, _TruncationUtils3);
+  var _super2 = _createSuper(TruncationUtilsWithCanvas);
+  function TruncationUtilsWithCanvas(_ref3) {
+    var _this3;
+    var font = _ref3.font,
+      container = _ref3.container,
+      rest = _objectWithoutProperties(_ref3, _excluded2);
+    _classCallCheck(this, TruncationUtilsWithCanvas);
+    _this3 = _super2.call(this, rest);
+    _defineProperty(_assertThisInitialized(_this3), "context", void 0);
+    _defineProperty(_assertThisInitialized(_this3), "currentText", '');
+    _defineProperty(_assertThisInitialized(_this3), "computeFontFromElement", function (element) {
+      var computedStyles = window.getComputedStyle(element);
+      return ['font-style', 'font-variant', 'font-weight', 'font-size', 'font-family'].map(function (prop) {
+        return computedStyles.getPropertyValue(prop);
+      }).join(' ').trim();
+    });
+    _defineProperty(_assertThisInitialized(_this3), "setTextToCheck", function (text) {
+      _this3.currentText = text;
+    });
+    _this3.context = document.createElement('canvas').getContext('2d');
+
+    // Set the canvas font to ensure text width calculations are correct
+    if (font) {
+      _this3.context.font = font;
+    } else if (container) {
+      _this3.context.font = _this3.computeFontFromElement(container);
+    }
+    return _this3;
+  }
+  _createClass(TruncationUtilsWithCanvas, [{
+    key: "textWidth",
+    get: function get() {
+      return this.context.measureText(this.currentText).width;
+    }
+  }]);
+  return TruncationUtilsWithCanvas;
+}(_TruncationUtils);
+
+/**
+ * DRY character/substring utils
+ */
+
+var removeLastCharacter = function removeLastCharacter(text) {
+  return text.substring(0, text.length - 1);
+};
+var getLastCharacter = function getLastCharacter(text) {
+  return text.substring(text.length - 1);
+};
+var removeFirstCharacter = function removeFirstCharacter(text) {
+  return text.substring(1);
+};
+var getFirstCharacter = function getFirstCharacter(text) {
+  return text.substring(0, 1);
+};
+var removeFirstAndLastCharacters = function removeFirstAndLastCharacters(text) {
+  return text.substring(1, text.length - 1);
+};
+var splitText = function splitText(text) {
+  return {
+    at: function at(index) {
+      return [text.substring(0, index), text.substring(index)];
+    }
+  };
+};

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

@@ -18,5 +18,7 @@ export var EuiNestedThemeContext = /*#__PURE__*/createContext({
   isGlobalTheme: true,
   hasDifferentColorFromGlobalTheme: false,
   bodyColor: '',
-  colorClassName: ''
+  colorClassName: '',
+  setGlobalCSSVariables: function setGlobalCSSVariables() {},
+  setNearestThemeCSSVariables: function setNearestThemeCSSVariables() {}
 });

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

@@ -7,6 +7,7 @@ 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"));
@@ -27,7 +28,8 @@ var _button = require("../button");
 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", "buttonContent", "className", "id", "element", "buttonClassName", "buttonContentClassName", "extraAction", "paddingSize", "borders", "initialIsOpen", "arrowDisplay", "forceState", "isLoading", "isLoadingMessage", "isDisabled", "buttonProps", "buttonElement", "arrowProps", "theme"],
+  _excluded2 = ["paddingSize", "className", "css"];
 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); }; }
@@ -165,18 +167,24 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
         buttonContentClassName = _this$props3.buttonContentClassName,
         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,
+        _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;
@@ -187,10 +195,12 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
       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, buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.className);
+      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,
@@ -199,7 +209,7 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
 
       // 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 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);
@@ -213,7 +223,7 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
       var triggerWrapperStyles = (0, _accordion.euiAccordionTriggerWrapperStyles)();
       var cssTriggerWrapperStyles = [triggerWrapperStyles.euiAccordion__triggerWrapper];
       var iconButton;
-      var buttonId = (_buttonProps$id = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.id) !== null && _buttonProps$id !== void 0 ? _buttonProps$id : this.generatedId;
+      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"
@@ -265,7 +275,8 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
         className: buttonContentClasses
       }, buttonContent));
       return (0, _react2.jsx)(Element, (0, _extends2.default)({
-        className: classes
+        className: classes,
+        css: cssStyles
       }, rest), (0, _react2.jsx)("div", {
         className: "euiAccordion__triggerWrapper",
         css: cssTriggerWrapperStyles
@@ -297,6 +308,7 @@ var EuiAccordionClass = /*#__PURE__*/function (_Component) {
 exports.EuiAccordionClass = EuiAccordionClass;
 (0, _defineProperty2.default)(EuiAccordionClass, "defaultProps", {
   initialIsOpen: false,
+  borders: 'none',
   paddingSize: 'none',
   arrowDisplay: 'left',
   isLoading: false,