@elastic/eui 89.1.0 → 90.0.1

package/es/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_group.js

@@ -0,0 +1,79 @@
+var _excluded = ["className", "header", "items", "isSubItem", "isSelected", "children"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/*
+ * 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.
+ */
+
+import React from 'react';
+import PropTypes from "prop-types";
+import classNames from 'classnames';
+import { useEuiTheme, useGeneratedHtmlId } from '../../../services';
+import { EuiCollapsibleNavSubItems } from './collapsible_nav_item';
+import { euiCollapsibleNavItemVariables } from './collapsible_nav_item.styles';
+import { EuiCollapsibleNavLink } from './collapsible_nav_link';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+/**
+ * Internal nav group. Should look the same as an open accordion,
+ * but not be toggle-able to close.
+ *
+ * Yes, I know this is the 3rd component in EUI named EuiCollapsibleNavGroup :|
+ * I'm waiting for serverless's design architecture to settle before untangling
+ * this pasghetti
+ */
+export var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
+  var className = _ref.className,
+    header = _ref.header,
+    items = _ref.items,
+    isSubItem = _ref.isSubItem,
+    isSelected = _ref.isSelected,
+    _children = _ref.children,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var classes = classNames('euiCollapsibleNavGroup', className);
+  var euiTheme = useEuiTheme();
+  var sharedStyles = euiCollapsibleNavItemVariables(euiTheme);
+  var cssStyles = !isSubItem ? {
+    css: {
+      margin: sharedStyles.padding,
+      label: 'euiCollapsibleNavGroup-isTopItem'
+    }
+  } : undefined; // Prevents Emotion from generating a selector if no styles need to be applied
+
+  var labelledById = useGeneratedHtmlId();
+  return ___EmotionJSX("div", _extends({
+    className: classes
+  }, cssStyles, rest), ___EmotionJSX(EuiCollapsibleNavLink, {
+    id: labelledById,
+    isSelected: isSelected,
+    isSubItem: isSubItem,
+    isInteractive: false
+  }, header), ___EmotionJSX(EuiCollapsibleNavSubItems, {
+    items: items,
+    isSubItem: isSubItem,
+    className: "euiCollapsibleNavGroup__children",
+    role: "group",
+    "aria-labelledby": labelledById
+  }));
+};
+EuiCollapsibleNavGroup.propTypes = {
+  className: PropTypes.string,
+  "aria-label": PropTypes.string,
+  "data-test-subj": PropTypes.string,
+  css: PropTypes.any,
+  /**
+       * Highlights whether an item is currently selected, e.g.
+       * if the user is on the same page as the nav link
+       */
+  isSelected: PropTypes.bool,
+  /**
+     * Determines whether the item should render as a top-level nav item
+     * or a nested nav subitem. Set internally by EUI
+     */
+  isSubItem: PropTypes.bool,
+  header: PropTypes.node.isRequired
+};

package/es/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_item.js

@@ -1,4 +1,4 @@
-var _excluded = ["isSubItem", "title", "titleElement", "icon", "iconProps", "items", "accordionProps", "children"],
+var _excluded = ["isSubItem", "title", "titleElement", "icon", "iconProps", "href", "linkProps", "items", "isCollapsible", "accordionProps", "children"],
   _excluded2 = ["renderItem", "className"],
   _excluded3 = ["items", "isSubItem", "isGroup", "className"],
   _excluded4 = ["className"];
@@ -21,6 +21,7 @@ import { EuiIcon } from '../../icon';
 import { EuiCollapsibleNavContext } from '../context';
 import { EuiCollapsedNavItem } from './collapsed';
 import { EuiCollapsibleNavAccordion } from './collapsible_nav_accordion';
+import { EuiCollapsibleNavGroup } from './collapsible_nav_group';
 import { EuiCollapsibleNavLink } from './collapsible_nav_link';
 import { euiCollapsibleNavItemTitleStyles, euiCollapsibleNavSubItemsStyles } from './collapsible_nav_item.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -30,13 +31,16 @@ import { jsx as ___EmotionJSX } from "@emotion/react";
  * determine whether to render an accordion or a link
  */
 var EuiCollapsibleNavItemDisplay = function EuiCollapsibleNavItemDisplay(_ref) {
-  var _props$linkProps;
   var isSubItem = _ref.isSubItem,
     title = _ref.title,
     titleElement = _ref.titleElement,
     icon = _ref.icon,
     iconProps = _ref.iconProps,
+    href = _ref.href,
+    linkProps = _ref.linkProps,
     items = _ref.items,
+    _ref$isCollapsible = _ref.isCollapsible,
+    isCollapsible = _ref$isCollapsible === void 0 ? true : _ref$isCollapsible,
     accordionProps = _ref.accordionProps,
     children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
@@ -46,21 +50,32 @@ var EuiCollapsibleNavItemDisplay = function EuiCollapsibleNavItemDisplay(_ref) {
     icon: icon,
     iconProps: iconProps
   });
-  var isAccordion = items && items.length > 0;
-  if (isAccordion) {
-    return ___EmotionJSX(EuiCollapsibleNavAccordion, _extends({
-      buttonContent: headerContent,
-      items: items,
-      accordionProps: accordionProps
-    }, props, {
-      isSubItem: isSubItem
-    }));
+  if (items) {
+    if (isCollapsible) {
+      return ___EmotionJSX(EuiCollapsibleNavAccordion, _extends({
+        buttonContent: headerContent,
+        items: items,
+        accordionProps: accordionProps
+      }, props, {
+        isSubItem: isSubItem
+      }));
+    } else {
+      return ___EmotionJSX(EuiCollapsibleNavGroup, _extends({
+        header: headerContent,
+        items: items
+      }, props, {
+        isSubItem: isSubItem
+      }));
+    }
   }
-  return ___EmotionJSX(EuiCollapsibleNavLink, _extends({}, props, {
+  return ___EmotionJSX(EuiCollapsibleNavLink, _extends({
+    href: href,
+    linkProps: linkProps
+  }, props, {
     // EuiLink ExclusiveUnion type shenanigans
     isSubItem: isSubItem,
     isNotAccordion: true,
-    isInteractive: !!(props.href || props.onClick || (_props$linkProps = props.linkProps) !== null && _props$linkProps !== void 0 && _props$linkProps.onClick)
+    isInteractive: !!(href || props.onClick || linkProps !== null && linkProps !== void 0 && linkProps.onClick)
   }), headerContent);
 };
 
@@ -68,6 +83,15 @@ var EuiCollapsibleNavItemDisplay = function EuiCollapsibleNavItemDisplay(_ref) {
  * Internal subcomponent for title display
  */
 EuiCollapsibleNavItemDisplay.propTypes = {
+  className: PropTypes.string,
+  "aria-label": PropTypes.string,
+  "data-test-subj": PropTypes.string,
+  css: PropTypes.any,
+  /**
+       * Highlights whether an item is currently selected, e.g.
+       * if the user is on the same page as the nav link
+       */
+  isSelected: PropTypes.bool,
   /**
      * Required text to render as the nav item title
      */
@@ -86,40 +110,42 @@ EuiCollapsibleNavItemDisplay.propTypes = {
      * Optional props to pass to the title icon
      */
   iconProps: PropTypes.any,
-  className: PropTypes.string,
-  "aria-label": PropTypes.string,
-  "data-test-subj": PropTypes.string,
-  css: PropTypes.any,
   /**
-       * The nav item link.
-       * If not included, and no `onClick` is specified, the nav item
-       * will render as an non-interactive `<span>`.
-       */
+         * The nav item link.
+         *
+         * If not included, and no `onClick` is specified, the nav item
+         * will render as an non-interactive `<span>`.
+         *
+         * Should not be used together with `items`, as the title will
+         * trigger the accordion collapse/expand action instead of a link.
+         */
   href: PropTypes.string,
   /**
-       * When passed, an `EuiAccordion` with nested child item links will be rendered.
-       *
-       * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
-       * subitem content, pass an object with a `renderItem` callback.
-       */
+         * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
+         */
+  linkProps: PropTypes.any,
+  /**
+         * Will render either an accordion or group of nested child item links.
+         *
+         * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
+         * subitem content, pass an object with a `renderItem` callback.
+         */
   items: PropTypes.arrayOf(PropTypes.shape({
     renderItem: PropTypes.func
   }).isRequired),
   /**
-       * If `items` is specified, use this prop to pass any prop that `EuiAccordion`
-       * accepts, including props that control the toggled state of the accordion
-       * (e.g. `initialIsOpen`, `forceState`)
-       */
-  accordionProps: PropTypes.any,
-  /**
-       * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
-       */
-  linkProps: PropTypes.any,
+         * If set to false, will (visually) render an always-open accordion that cannot
+         * be toggled closed. Ignored if `items` is not passed.
+         *
+         * @default true
+         */
+  isCollapsible: PropTypes.bool,
   /**
-       * Highlights whether an item is currently selected, e.g.
-       * if the user is on the same page as the nav link
-       */
-  isSelected: PropTypes.bool,
+         * If `items` is specified, and `isCollapsible` is not set to false, you may
+         * use this prop to pass any prop that `EuiAccordion` accepts, including props
+         * that control the toggled state of the accordion (e.g. `initialIsOpen`, `forceState`)
+         */
+  accordionProps: PropTypes.any,
   /**
      * Determines whether the item should render as a top-level nav item
      * or a nested nav subitem. Set internally by EUI
@@ -166,6 +192,15 @@ export var EuiCollapsibleNavSubItem = function EuiCollapsibleNavSubItem(_ref3) {
  * Used by both `EuiCollapsibleNavGroup` and `EuiCollapsibleNavAccordion`
  */
 EuiCollapsibleNavSubItem.propTypes = {
+  className: PropTypes.string,
+  "aria-label": PropTypes.string,
+  "data-test-subj": PropTypes.string,
+  css: PropTypes.any,
+  /**
+       * Highlights whether an item is currently selected, e.g.
+       * if the user is on the same page as the nav link
+       */
+  isSelected: PropTypes.bool,
   /**
      * Required text to render as the nav item title
      */
@@ -184,38 +219,40 @@ EuiCollapsibleNavSubItem.propTypes = {
      * Optional props to pass to the title icon
      */
   iconProps: PropTypes.any,
-  className: PropTypes.string,
-  "aria-label": PropTypes.string,
-  "data-test-subj": PropTypes.string,
-  css: PropTypes.any,
   /**
-       * The nav item link.
-       * If not included, and no `onClick` is specified, the nav item
-       * will render as an non-interactive `<span>`.
-       */
+         * The nav item link.
+         *
+         * If not included, and no `onClick` is specified, the nav item
+         * will render as an non-interactive `<span>`.
+         *
+         * Should not be used together with `items`, as the title will
+         * trigger the accordion collapse/expand action instead of a link.
+         */
   href: PropTypes.string,
   /**
-       * When passed, an `EuiAccordion` with nested child item links will be rendered.
-       *
-       * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
-       * subitem content, pass an object with a `renderItem` callback.
-       */
-  items: PropTypes.arrayOf(PropTypes.any.isRequired),
+         * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
+         */
+  linkProps: PropTypes.any,
   /**
-       * If `items` is specified, use this prop to pass any prop that `EuiAccordion`
-       * accepts, including props that control the toggled state of the accordion
-       * (e.g. `initialIsOpen`, `forceState`)
-       */
-  accordionProps: PropTypes.any,
+         * Will render either an accordion or group of nested child item links.
+         *
+         * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
+         * subitem content, pass an object with a `renderItem` callback.
+         */
+  items: PropTypes.arrayOf(PropTypes.any.isRequired),
   /**
-       * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
-       */
-  linkProps: PropTypes.any,
+         * If set to false, will (visually) render an always-open accordion that cannot
+         * be toggled closed. Ignored if `items` is not passed.
+         *
+         * @default true
+         */
+  isCollapsible: PropTypes.bool,
   /**
-       * Highlights whether an item is currently selected, e.g.
-       * if the user is on the same page as the nav link
-       */
-  isSelected: PropTypes.bool,
+         * If `items` is specified, and `isCollapsible` is not set to false, you may
+         * use this prop to pass any prop that `EuiAccordion` accepts, including props
+         * that control the toggled state of the accordion (e.g. `initialIsOpen`, `forceState`)
+         */
+  accordionProps: PropTypes.any,
   renderItem: PropTypes.func
 };
 export var EuiCollapsibleNavSubItems = function EuiCollapsibleNavSubItems(_ref4) {
@@ -263,6 +300,15 @@ EuiCollapsibleNavSubItems.propTypes = {
      */
   isSubItem: PropTypes.bool,
   items: PropTypes.arrayOf(PropTypes.shape({
+    className: PropTypes.string,
+    "aria-label": PropTypes.string,
+    "data-test-subj": PropTypes.string,
+    css: PropTypes.any,
+    /**
+         * Highlights whether an item is currently selected, e.g.
+         * if the user is on the same page as the nav link
+         */
+    isSelected: PropTypes.bool,
     /**
        * Required text to render as the nav item title
        */
@@ -281,38 +327,40 @@ EuiCollapsibleNavSubItems.propTypes = {
        * Optional props to pass to the title icon
        */
     iconProps: PropTypes.any,
-    className: PropTypes.string,
-    "aria-label": PropTypes.string,
-    "data-test-subj": PropTypes.string,
-    css: PropTypes.any,
     /**
-         * The nav item link.
-         * If not included, and no `onClick` is specified, the nav item
-         * will render as an non-interactive `<span>`.
-         */
+           * The nav item link.
+           *
+           * If not included, and no `onClick` is specified, the nav item
+           * will render as an non-interactive `<span>`.
+           *
+           * Should not be used together with `items`, as the title will
+           * trigger the accordion collapse/expand action instead of a link.
+           */
     href: PropTypes.string,
     /**
-         * When passed, an `EuiAccordion` with nested child item links will be rendered.
-         *
-         * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
-         * subitem content, pass an object with a `renderItem` callback.
-         */
-    items: PropTypes.arrayOf(PropTypes.any.isRequired),
+           * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
+           */
+    linkProps: PropTypes.any,
     /**
-         * If `items` is specified, use this prop to pass any prop that `EuiAccordion`
-         * accepts, including props that control the toggled state of the accordion
-         * (e.g. `initialIsOpen`, `forceState`)
-         */
-    accordionProps: PropTypes.any,
+           * Will render either an accordion or group of nested child item links.
+           *
+           * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
+           * subitem content, pass an object with a `renderItem` callback.
+           */
+    items: PropTypes.arrayOf(PropTypes.any.isRequired),
     /**
-         * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
-         */
-    linkProps: PropTypes.any,
+           * If set to false, will (visually) render an always-open accordion that cannot
+           * be toggled closed. Ignored if `items` is not passed.
+           *
+           * @default true
+           */
+    isCollapsible: PropTypes.bool,
     /**
-         * Highlights whether an item is currently selected, e.g.
-         * if the user is on the same page as the nav link
-         */
-    isSelected: PropTypes.bool,
+           * If `items` is specified, and `isCollapsible` is not set to false, you may
+           * use this prop to pass any prop that `EuiAccordion` accepts, including props
+           * that control the toggled state of the accordion (e.g. `initialIsOpen`, `forceState`)
+           */
+    accordionProps: PropTypes.any,
     renderItem: PropTypes.func
   }).isRequired).isRequired,
   isGroup: PropTypes.bool
@@ -333,6 +381,15 @@ export var EuiCollapsibleNavItem = function EuiCollapsibleNavItem(_ref5) {
   }));
 };
 EuiCollapsibleNavItem.propTypes = {
+  className: PropTypes.string,
+  "aria-label": PropTypes.string,
+  "data-test-subj": PropTypes.string,
+  css: PropTypes.any,
+  /**
+       * Highlights whether an item is currently selected, e.g.
+       * if the user is on the same page as the nav link
+       */
+  isSelected: PropTypes.bool,
   /**
      * Required text to render as the nav item title
      */
@@ -351,38 +408,40 @@ EuiCollapsibleNavItem.propTypes = {
      * Optional props to pass to the title icon
      */
   iconProps: PropTypes.any,
-  className: PropTypes.string,
-  "aria-label": PropTypes.string,
-  "data-test-subj": PropTypes.string,
-  css: PropTypes.any,
   /**
-       * The nav item link.
-       * If not included, and no `onClick` is specified, the nav item
-       * will render as an non-interactive `<span>`.
-       */
+         * The nav item link.
+         *
+         * If not included, and no `onClick` is specified, the nav item
+         * will render as an non-interactive `<span>`.
+         *
+         * Should not be used together with `items`, as the title will
+         * trigger the accordion collapse/expand action instead of a link.
+         */
   href: PropTypes.string,
   /**
-       * When passed, an `EuiAccordion` with nested child item links will be rendered.
-       *
-       * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
-       * subitem content, pass an object with a `renderItem` callback.
-       */
+         * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
+         */
+  linkProps: PropTypes.any,
+  /**
+         * Will render either an accordion or group of nested child item links.
+         *
+         * Accepts any #EuiCollapsibleNavItemProps. Or, to render completely custom
+         * subitem content, pass an object with a `renderItem` callback.
+         */
   items: PropTypes.arrayOf(PropTypes.shape({
     renderItem: PropTypes.func
   }).isRequired),
   /**
-       * If `items` is specified, use this prop to pass any prop that `EuiAccordion`
-       * accepts, including props that control the toggled state of the accordion
-       * (e.g. `initialIsOpen`, `forceState`)
-       */
-  accordionProps: PropTypes.any,
-  /**
-       * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
-       */
-  linkProps: PropTypes.any,
+         * If set to false, will (visually) render an always-open accordion that cannot
+         * be toggled closed. Ignored if `items` is not passed.
+         *
+         * @default true
+         */
+  isCollapsible: PropTypes.bool,
   /**
-       * Highlights whether an item is currently selected, e.g.
-       * if the user is on the same page as the nav link
-       */
-  isSelected: PropTypes.bool
+         * If `items` is specified, and `isCollapsible` is not set to false, you may
+         * use this prop to pass any prop that `EuiAccordion` accepts, including props
+         * that control the toggled state of the accordion (e.g. `initialIsOpen`, `forceState`)
+         */
+  accordionProps: PropTypes.any
 };

package/es/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_link.js

@@ -67,16 +67,6 @@ EuiCollapsibleNavLink.propTypes = {
   "aria-label": PropTypes.string,
   "data-test-subj": PropTypes.string,
   css: PropTypes.any,
-  /**
-       * The nav item link.
-       * If not included, and no `onClick` is specified, the nav item
-       * will render as an non-interactive `<span>`.
-       */
-  href: PropTypes.string,
-  /**
-       * If a `href` is specified, use this prop to pass any prop that `EuiLink` accepts
-       */
-  linkProps: PropTypes.any,
   /**
        * Highlights whether an item is currently selected, e.g.
        * if the user is on the same page as the nav link

package/es/components/collapsible_nav_beta/context.js

@@ -10,5 +10,6 @@ import { createContext } from 'react';
 export var EuiCollapsibleNavContext = /*#__PURE__*/createContext({
   isCollapsed: false,
   isPush: true,
+  isOverlayOpen: false,
   side: 'left'
 });

package/es/components/combo_box/combo_box.js

@@ -730,7 +730,7 @@ EuiComboBox.propTypes = {
   /**
      * By default, EuiComboBox will truncate option labels at the end of
      * the string. You can use pass in a custom truncation configuration that
-     * accepts any prop that [EuiTextTruncate](/#/utilities/text-truncate) prop
+     * accepts any [EuiTextTruncate](/#/utilities/text-truncation) prop,
      * except for `text` and `children`.
      *
      * Note: when searching, custom truncation props are ignored. The highlighted search

package/es/components/comment_list/comment_event.js

@@ -6,13 +6,13 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import PropTypes from "prop-types";
-import { useEuiTheme } from '../../services';
 import classNames from 'classnames';
+import { useEuiTheme } from '../../services';
 import { EuiPanel } from '../panel';
 import { EuiAvatar } from '../avatar';
-import { euiCommentEventStyles, euiCommentEventHeaderStyles, euiCommentEventBodyStyles } from './comment_event.styles';
+import { euiCommentEventBorderColors, euiCommentEventStyles, euiCommentEventHeaderStyles, euiCommentEventBodyStyles } from './comment_event.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiCommentEvent = function EuiCommentEvent(_ref) {
   var children = _ref.children,
@@ -26,6 +26,9 @@ export var EuiCommentEvent = function EuiCommentEvent(_ref) {
     eventColor = _ref.eventColor;
   var classes = classNames('euiCommentEvent', className);
 
+  /**
+   * Branching logic
+   */
   // the username is required so we only check if other elements are define
   var hasEventElements = eventIcon || timestamp || event || actions;
   var isTypeRegular = children && hasEventElements;
@@ -38,27 +41,36 @@ export var EuiCommentEvent = function EuiCommentEvent(_ref) {
   } else {
     type = 'custom';
   }
+  if (isTypeRegular && !eventColor) {
+    eventColor = 'subdued';
+  }
+  if (isTypeUpdate && !eventColor) {
+    eventColor = 'transparent';
+  }
+  var showEventBorders = isTypeRegular;
+  var panelProps = useMemo(function () {
+    return {
+      color: type === 'custom' ? 'transparent' : eventColor,
+      paddingSize: type === 'custom' ? 'none' : 's',
+      borderRadius: type === 'regular' ? 'none' : 'm',
+      hasShadow: false // `plain` color needs this
+    };
+  }, [type, eventColor]);
+  var isFigure = isTypeRegular;
+  var Element = isFigure ? 'figure' : 'div';
+  var HeaderElement = isFigure ? 'figcaption' : 'div';
+
+  /**
+   * Styles
+   */
   var euiTheme = useEuiTheme();
+  var borderStyles = euiCommentEventBorderColors(euiTheme);
   var styles = euiCommentEventStyles(euiTheme);
-  var cssStyles = [styles.euiCommentEvent, styles[type]];
+  var cssStyles = [styles.euiCommentEvent, showEventBorders && styles.border, showEventBorders && borderStyles[eventColor]];
   var headerStyles = euiCommentEventHeaderStyles(euiTheme);
-  var cssHeaderStyles = [headerStyles.euiCommentEvent__header, eventColor && headerStyles.hasEventColor, isTypeRegular && headerStyles.regular];
+  var cssHeaderStyles = [headerStyles.euiCommentEvent__header, showEventBorders && headerStyles.border, showEventBorders && borderStyles[eventColor]];
   var bodyStyles = euiCommentEventBodyStyles(euiTheme);
   var cssBodyStyles = [bodyStyles.euiCommentEvent__body, bodyStyles[type]];
-  var isFigure = isTypeRegular;
-  var Element = isFigure ? 'figure' : 'div';
-  var HeaderElement = isFigure ? 'figcaption' : 'div';
-
-  // The 'plain' color creates a shadow and adds a border radius that we don't want.
-  // So for these cases we use the transparent color instead.
-  var finalEventColor = eventColor === 'plain' ? 'transparent' : eventColor;
-  var panelProps = finalEventColor ? {
-    color: finalEventColor,
-    paddingSize: 's'
-  } : {
-    color: 'transparent',
-    paddingSize: 'none'
-  };
   return ___EmotionJSX(Element, {
     className: classes,
     css: cssStyles,