@elastic/eui 92.2.1 → 93.1.0

package/optimize/es/components/tour/tour_step.js

@@ -1,9 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["anchorPosition", "anchor", "children", "className", "css", "closePopover", "content", "isStepOpen", "minWidth", "maxWidth", "onFinish", "step", "stepsTotal", "style", "subtitle", "title", "decoration", "footerAction", "panelProps"];
+var _excluded = ["anchorPosition", "anchor", "children", "className", "css", "closePopover", "content", "isStepOpen", "minWidth", "maxWidth", "onFinish", "step", "stepsTotal", "subtitle", "title", "decoration", "footerAction", "panelProps", "panelClassName"];
 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; }
 /*
@@ -14,17 +13,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * Side Public License, v 1.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useMemo, useCallback } from 'react';
 import classNames from 'classnames';
+import { logicalStyles } from '../../global_styling';
 import { EuiBeacon } from '../beacon';
-import { EuiButtonEmpty } from '../button';
-import { EuiFlexGroup, EuiFlexItem } from '../flex';
-import { EuiI18n } from '../i18n';
-import { EuiPopover, EuiPopoverFooter, EuiPopoverTitle, EuiWrappingPopover } from '../popover';
-import { EuiTitle } from '../title';
-import { EuiTourStepIndicator } from './tour_step_indicator';
+import { EuiPopover, EuiWrappingPopover } from '../popover';
 import { useGeneratedHtmlId, findElementBySelectorOrRef, useEuiTheme } from '../../services';
-import { euiTourStyles, euiTourBeaconStyles, euiTourFooterStyles, euiTourHeaderStyles } from './tour.styles';
+import { EuiTourHeader } from './_tour_header';
+import { EuiTourFooter } from './_tour_footer';
+import { euiTourStyles, euiTourBeaconStyles } from './tour.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 export var EuiTourStep = function EuiTourStep(_ref) {
   var _ref$anchorPosition = _ref.anchorPosition,
@@ -46,17 +43,17 @@ export var EuiTourStep = function EuiTourStep(_ref) {
     _ref$step = _ref.step,
     step = _ref$step === void 0 ? 1 : _ref$step,
     stepsTotal = _ref.stepsTotal,
-    style = _ref.style,
     subtitle = _ref.subtitle,
     title = _ref.title,
     _ref$decoration = _ref.decoration,
     decoration = _ref$decoration === void 0 ? 'beacon' : _ref$decoration,
     footerAction = _ref.footerAction,
     panelProps = _ref.panelProps,
+    panelClassName = _ref.panelClassName,
     rest = _objectWithoutProperties(_ref, _excluded);
   var titleId = useGeneratedHtmlId();
   if (step === 0) {
-    console.warn('EuiTourStep `step` should 1-based indexing. Please update to eliminate 0 indexes.');
+    console.warn('EuiTourStep `step` should use 1-based indexing. Please update to eliminate 0 indexes.');
   }
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,11 +63,10 @@ export var EuiTourStep = function EuiTourStep(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     popoverPosition = _useState4[0],
     setPopoverPosition = _useState4[1];
-  var onPositionChange = function onPositionChange(position) {
+  var onPositionChange = useCallback(function (position) {
     setPopoverPosition(position);
-  };
+  }, []);
   useEffect(function () {
-    var timeout;
     if (anchor) {
       // Wait until next tick to find anchor node in case it's not already
       // in DOM requestAnimationFrame isn't used here because we don't need to
@@ -78,124 +74,60 @@ export var EuiTourStep = function EuiTourStep(_ref) {
       // needs to go through a react DOM rerender which may take more than
       // 1 frame (16ms) of time.
       // TODO: It would be ideal to have some kind of intersection observer here instead
-      timeout = window.setTimeout(function () {
+      var timeout = window.setTimeout(function () {
         setAnchorNode(findElementBySelectorOrRef(anchor));
       });
+      return function () {
+        return window.clearTimeout(timeout);
+      };
     }
-    return function () {
-      timeout && window.clearTimeout(timeout);
-    };
   }, [anchor]);
-  var classes = classNames('euiTour', className);
+  var anchorClasses = classNames('euiTourAnchor', className);
+  var popoverClasses = classNames('euiTour', panelClassName);
   var euiTheme = useEuiTheme();
   var tourStyles = euiTourStyles(euiTheme);
-  var headerStyles = euiTourHeaderStyles(euiTheme);
-  var footerStyles = euiTourFooterStyles(euiTheme);
   var beaconStyles = euiTourBeaconStyles(euiTheme);
   var beaconCss = [beaconStyles.euiTourBeacon, isStepOpen && beaconStyles.isOpen, popoverPosition && beaconStyles[popoverPosition]];
-  var finishButtonProps = {
-    color: 'text',
-    flush: 'right',
-    size: 'xs'
-  };
-  var optionalFooterAction = Array.isArray(footerAction) ? ___EmotionJSX(EuiFlexGroup, {
-    gutterSize: "s",
-    alignItems: "center",
-    justifyContent: "flexEnd",
-    responsive: false,
-    wrap: true
-  }, footerAction.map(function (action, index) {
-    return ___EmotionJSX(EuiFlexItem, {
-      key: index,
-      grow: false
-    }, action);
-  })) : ___EmotionJSX(EuiFlexItem, {
-    grow: false
-  }, footerAction);
-  var footer = ___EmotionJSX(EuiFlexGroup, {
-    responsive: false,
-    justifyContent: stepsTotal > 1 ? 'spaceBetween' : 'flexEnd',
-    alignItems: "center"
-  }, stepsTotal > 1 && ___EmotionJSX(EuiFlexItem, {
-    grow: false
-  }, ___EmotionJSX("ul", {
-    className: "euiTourFooter__stepList"
-  }, _toConsumableArray(Array(stepsTotal).keys()).map(function (_, i) {
-    var status = 'complete';
-    if (step === i + 1) {
-      status = 'active';
-    } else if (step <= i) {
-      status = 'incomplete';
-    }
-    return ___EmotionJSX(EuiTourStepIndicator, {
-      key: i,
-      number: i + 1,
-      status: status
-    });
-  }))), footerAction ? optionalFooterAction : ___EmotionJSX(EuiFlexItem, {
-    grow: false
-  }, ___EmotionJSX(EuiI18n, {
-    tokens: ['euiTourStep.endTour', 'euiTourStep.skipTour', 'euiTourStep.closeTour'],
-    defaults: ['End tour', 'Skip tour', 'Close tour']
-  }, function (_ref2) {
-    var _ref3 = _slicedToArray(_ref2, 3),
-      endTour = _ref3[0],
-      skipTour = _ref3[1],
-      closeTour = _ref3[2];
-    var content = closeTour;
-    if (stepsTotal > 1) {
-      content = stepsTotal === step ? endTour : skipTour;
-    }
-    return ___EmotionJSX(EuiButtonEmpty, _extends({
-      onClick: onFinish
-    }, finishButtonProps), content);
-  })));
   var hasBeacon = decoration === 'beacon';
-  var popoverProps = _objectSpread({
+  var widthStyles = useMemo(function () {
+    return logicalStyles({
+      minWidth: minWidth,
+      maxWidth: maxWidth
+    });
+  }, [minWidth, maxWidth]);
+  var noAnchor = !anchor && children;
+  var PopoverComponent = noAnchor ? EuiPopover : EuiWrappingPopover;
+  var button = noAnchor ? children : anchorNode;
+  return button ? ___EmotionJSX(PopoverComponent, _extends({
+    button: button,
+    className: anchorClasses,
     anchorPosition: anchorPosition,
     closePopover: closePopover,
     isOpen: isStepOpen,
     ownFocus: false,
-    panelClassName: classes,
-    panelStyle: style,
+    panelClassName: popoverClasses,
     panelProps: _objectSpread(_objectSpread({}, panelProps), {}, {
       css: [tourStyles.euiTour, css, panelProps === null || panelProps === void 0 ? void 0 : panelProps.css]
     }),
     offset: hasBeacon ? 10 : 0,
-    'aria-labelledby': titleId,
+    "aria-labelledby": titleId,
     arrowChildren: hasBeacon && ___EmotionJSX(EuiBeacon, {
       css: beaconCss,
       className: "euiTour__beacon"
     }),
     onPositionChange: onPositionChange
-  }, rest);
-  var layout = ___EmotionJSX("div", {
-    style: {
-      minWidth: minWidth,
-      maxWidth: maxWidth
-    }
-  }, ___EmotionJSX(EuiPopoverTitle, {
-    css: headerStyles.euiTourHeader,
-    className: "euiTourHeader",
-    id: titleId
-  }, subtitle && ___EmotionJSX(EuiTitle, {
-    css: headerStyles.euiTourHeader__subtitle,
-    size: "xxxs"
-  }, ___EmotionJSX("h2", null, subtitle)), ___EmotionJSX(EuiTitle, {
-    css: headerStyles.euiTourHeader__title,
-    size: "xxs"
-  }, subtitle ? ___EmotionJSX("h3", null, title) : ___EmotionJSX("h2", null, title))), ___EmotionJSX("div", {
+  }, rest), ___EmotionJSX("div", {
+    style: widthStyles
+  }, ___EmotionJSX(EuiTourHeader, {
+    id: titleId,
+    title: title,
+    subtitle: subtitle
+  }), ___EmotionJSX("div", {
     className: "euiTour__content"
-  }, content), ___EmotionJSX(EuiPopoverFooter, {
-    css: footerStyles.euiTourFooter,
-    className: "euiTourFooter"
-  }, footer));
-  if (!anchor && children) {
-    return ___EmotionJSX(EuiPopover, _extends({
-      button: children
-    }, popoverProps), layout);
-  }
-  return anchorNode ? ___EmotionJSX(EuiWrappingPopover, _extends({
-    button: anchorNode
-  }, popoverProps), layout) : null;
+  }, content), ___EmotionJSX(EuiTourFooter, {
+    footerAction: footerAction,
+    step: step,
+    stepsTotal: stepsTotal,
+    onFinish: onFinish
+  }))) : null;
 };

package/optimize/es/components/tree_view/_tree_view_item.js

@@ -0,0 +1,66 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["id", "label", "className", "children", "display", "icon", "hasArrow", "isActive", "isExpanded", "buttonRef", "wrapperProps"];
+/*
+ * 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, { memo } from 'react';
+import classNames from 'classnames';
+import { useEuiTheme } from '../../services';
+import { EuiIcon } from '../icon';
+import { euiTreeViewItemStyles } from './_tree_view_item.styles';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+export var EuiTreeViewItem = /*#__PURE__*/memo(function (_ref) {
+  var id = _ref.id,
+    label = _ref.label,
+    className = _ref.className,
+    children = _ref.children,
+    _ref$display = _ref.display,
+    display = _ref$display === void 0 ? 'default' : _ref$display,
+    icon = _ref.icon,
+    hasArrow = _ref.hasArrow,
+    isActive = _ref.isActive,
+    isExpanded = _ref.isExpanded,
+    buttonRef = _ref.buttonRef,
+    wrapperProps = _ref.wrapperProps,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var euiTheme = useEuiTheme();
+  var styles = euiTreeViewItemStyles(euiTheme);
+  var wrapperClasses = classNames('euiTreeView__node', {
+    'euiTreeView__node--expanded': isExpanded
+  }, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.className);
+  var wrapperStyles = [styles.li.euiTreeView__node, styles.li[display], isExpanded && styles.li.expanded];
+  var buttonClasses = classNames('euiTreeView__nodeInner', className, {
+    'euiTreeView__node--active': isActive
+  });
+  var buttonStyles = [styles.button.euiTreeView__nodeInner, styles.button[display]];
+  var iconStyles = [styles.icon.euiTreeView__iconWrapper, styles.icon[display]];
+  return ___EmotionJSX("li", _extends({}, wrapperProps, {
+    css: wrapperStyles,
+    className: wrapperClasses
+  }), ___EmotionJSX("button", _extends({
+    id: id,
+    css: buttonStyles,
+    className: buttonClasses,
+    "aria-expanded": isExpanded,
+    ref: buttonRef
+  }, rest), hasArrow && (!!children ? ___EmotionJSX(EuiIcon, {
+    className: "euiTreeView__expansionArrow",
+    size: display === 'compressed' ? 's' : 'm',
+    type: isExpanded ? 'arrowDown' : 'arrowRight'
+  }) : ___EmotionJSX("span", {
+    css: iconStyles,
+    className: "euiTreeView__arrowPlaceholder"
+  })), icon && ___EmotionJSX("span", {
+    css: iconStyles,
+    className: "euiTreeView__iconWrapper"
+  }, icon), ___EmotionJSX("span", {
+    className: "euiTreeView__nodeLabel eui-textTruncate"
+  }, label)), children);
+});
+EuiTreeViewItem.displayName = 'EuiTreeViewItem';

package/optimize/es/components/tree_view/_tree_view_item.styles.js

@@ -0,0 +1,38 @@
+/*
+ * 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 { css } from '@emotion/react';
+import { transparentize } from '../../services';
+import { euiFocusRing, logicalCSS, mathWithUnits } from '../../global_styling';
+export var euiTreeViewItemStyles = function euiTreeViewItemStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var defaultSize = euiTheme.size.xl;
+  var compressedSize = euiTheme.size.l;
+  return {
+    li: {
+      euiTreeView__node: /*#__PURE__*/css(";label:euiTreeView__node;"),
+      default: /*#__PURE__*/css(logicalCSS('max-height', defaultSize), " line-height:", defaultSize, ";;label:default;"),
+      compressed: /*#__PURE__*/css(logicalCSS('max-height', compressedSize), " line-height:", compressedSize, ";;label:compressed;"),
+      expanded: /*#__PURE__*/css(logicalCSS('max-height', '100vh'), ";;label:expanded;")
+    },
+    button: {
+      euiTreeView__nodeInner: /*#__PURE__*/css(logicalCSS('width', '100%'), " ", logicalCSS('padding-left', euiTheme.size.s), " ", logicalCSS('padding-right', euiTheme.size.xxs), " display:flex;align-items:center;&:focus{", euiFocusRing(euiThemeContext, 'inset'), ";}&:hover,&:active,&:focus{background-color:", transparentize(euiTheme.colors.text, euiTheme.focus.transparency), ";};label:euiTreeView__nodeInner;"),
+      default: /*#__PURE__*/css(logicalCSS('height', defaultSize), " gap:", euiTheme.size.s, ";border-radius:", euiTheme.border.radius.medium, ";;label:default;"),
+      compressed: /*#__PURE__*/css(logicalCSS('height', compressedSize), " gap:", euiTheme.size.xs, ";border-radius:", euiTheme.border.radius.small, ";;label:compressed;")
+    },
+    icon: {
+      euiTreeView__iconWrapper: /*#__PURE__*/css("flex-shrink:0;line-height:0;&>*{", logicalCSS('max-width', '100%'), ";}&>.euiToken{", logicalCSS('max-height', '100%'), " ", logicalCSS('height', 'auto'), " svg{", logicalCSS('width', '100%'), ";}};label:euiTreeView__iconWrapper;"),
+      default: /*#__PURE__*/css(logicalCSS('width', mathWithUnits(defaultSize, function (x) {
+        return x / 2;
+      })), ";;label:default;"),
+      compressed: /*#__PURE__*/css(logicalCSS('width', mathWithUnits(compressedSize, function (x) {
+        return x / 2;
+      })), ";;label:compressed;")
+    }
+  };
+};

package/optimize/es/components/tree_view/tree_view.a11y.js

@@ -61,12 +61,12 @@ describe('EuiTreeView', function () {
   describe('Automated accessibility check', function () {
     it('has zero violations on first render', function () {
       cy.mount(___EmotionJSX(TreeView, null));
-      cy.get('div.euiTreeView__wrapper').should('exist');
+      cy.get('ul.euiTreeView').should('exist');
       cy.checkAxe();
     });
     it('has zero violations with a nested child expanded', function () {
       cy.mount(___EmotionJSX(TreeView, null));
-      cy.get('div.euiTreeView__wrapper').should('exist');
+      cy.get('ul.euiTreeView').should('exist');
       cy.get('button#item_b').realClick();
       cy.get('button#item_b').should('have.attr', 'aria-expanded', 'true');
       cy.get('li.euiTreeView__node').contains('A Cloud').should('exist');

package/optimize/es/components/tree_view/tree_view.js

@@ -8,7 +8,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["children", "className", "items", "display", "expandByDefault", "showExpansionArrows"];
+var _excluded = ["children", "className", "items", "display", "expandByDefault", "showExpansionArrows", "theme"];
 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; } }
 /*
@@ -21,35 +21,27 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import React, { Component, createContext } from 'react';
 import classNames from 'classnames';
+import { withEuiTheme, keys, htmlIdGenerator } from '../../services';
 import { EuiI18n } from '../i18n';
-import { EuiIcon } from '../icon';
 import { EuiScreenReaderOnly } from '../accessibility';
-import { EuiText } from '../text';
-import { keys, htmlIdGenerator } from '../../services';
-import { EuiInnerText } from '../inner_text';
+import { EuiTreeViewItem } from './_tree_view_item';
+import { euiTreeViewStyles } from './tree_view.styles';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var EuiTreeViewContext = /*#__PURE__*/createContext('');
-function hasAriaLabel(x) {
-  return x.hasOwnProperty('aria-label');
-}
 function getTreeId(propId) {
   var contextId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   var idGenerator = arguments.length > 2 ? arguments[2] : undefined;
   return propId !== null && propId !== void 0 ? propId : contextId === '' ? idGenerator() : contextId;
 }
-var displayToClassNameMap = {
-  default: null,
-  compressed: 'euiTreeView--compressed'
-};
-export var EuiTreeView = /*#__PURE__*/function (_Component) {
-  _inherits(EuiTreeView, _Component);
-  var _super = _createSuper(EuiTreeView);
-  function EuiTreeView(props,
+export var EuiTreeViewClass = /*#__PURE__*/function (_Component) {
+  _inherits(EuiTreeViewClass, _Component);
+  var _super = _createSuper(EuiTreeViewClass);
+  function EuiTreeViewClass(props,
   // Without the optional ? typing, TS will throw errors on JSX component errors
   // @see https://github.com/facebook/react/issues/13944#issuecomment-1183693239
   context) {
     var _this;
-    _classCallCheck(this, EuiTreeView);
+    _classCallCheck(this, EuiTreeViewClass);
     // TODO: context in constructor has been deprecated.
     // We should likely convert this to a function component
     _this = _super.call(this, props, context);
@@ -171,7 +163,7 @@ export var EuiTreeView = /*#__PURE__*/function (_Component) {
     };
     return _this;
   }
-  _createClass(EuiTreeView, [{
+  _createClass(EuiTreeViewClass, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       if (this.props.id !== prevProps.id) {
@@ -192,18 +184,16 @@ export var EuiTreeView = /*#__PURE__*/function (_Component) {
         display = _this$props$display === void 0 ? 'default' : _this$props$display,
         expandByDefault = _this$props.expandByDefault,
         showExpansionArrows = _this$props.showExpansionArrows,
+        theme = _this$props.theme,
         rest = _objectWithoutProperties(_this$props, _excluded);
+      var styles = euiTreeViewStyles(theme);
+      var cssStyles = [styles.euiTreeView, styles[display]];
 
       // Computed classNames
-      var classes = classNames('euiTreeView', display ? displayToClassNameMap[display] : null, {
-        'euiTreeView--withArrows': showExpansionArrows
-      }, className);
+      var classes = classNames('euiTreeView', className);
       var instructionsId = "".concat(this.state.treeID, "--instruction");
       return ___EmotionJSX(EuiTreeViewContext.Provider, {
         value: this.state.treeID
-      }, ___EmotionJSX(EuiText, {
-        size: display === 'compressed' ? 's' : 'm',
-        className: "euiTreeView__wrapper"
       }, !this.isNested && ___EmotionJSX(EuiI18n, {
         token: "euiTreeView.listNavigationInstructions",
         default: "You can quickly navigate this list using arrow keys."
@@ -212,78 +202,59 @@ export var EuiTreeView = /*#__PURE__*/function (_Component) {
           id: instructionsId
         }, listNavigationInstructions));
       }), ___EmotionJSX("ul", _extends({
+        css: cssStyles,
         className: classes,
         id: !this.isNested ? this.state.treeID : undefined,
-        "aria-describedby": !this.isNested ? instructionsId : undefined
+        "aria-describedby": !this.isNested ? instructionsId : undefined,
+        role: "list" // VoiceOver doesn't parse lists with `list-style: none` as the correct role - @see https://www.scottohara.me/blog/2019/01/12/lists-and-safari.html
       }, rest), items.map(function (node, index) {
         var buttonId = node.id;
         var wrappingId = _this2.treeIdGenerator(buttonId);
-        return ___EmotionJSX(EuiInnerText, {
-          key: node.id + index,
-          fallback: typeof node.label === 'string' ? node.label : ''
-        }, function (ref, innerText) {
-          return ___EmotionJSX(EuiI18n, {
-            key: node.id + index,
-            token: "euiTreeView.ariaLabel",
-            default: "{nodeLabel} child of {ariaLabel}",
-            values: {
-              nodeLabel: innerText,
-              ariaLabel: hasAriaLabel(rest) ? rest['aria-label'] : ''
-            }
-          }, function (ariaLabel) {
-            var label = hasAriaLabel(rest) ? {
-              'aria-label': ariaLabel
-            } : {
-              'aria-labelledby': "".concat(buttonId, " ").concat(rest['aria-labelledby'])
-            };
-            var nodeClasses = classNames('euiTreeView__node', display ? displayToClassNameMap[display] : null, {
-              'euiTreeView__node--expanded': _this2.isNodeOpen(node)
-            });
-            var nodeButtonClasses = classNames('euiTreeView__nodeInner', showExpansionArrows && node.children ? 'euiTreeView__nodeInner--withArrows' : null, _this2.state.activeItem === node.id ? 'euiTreeView__node--active' : null, node.className ? node.className : null);
-            return ___EmotionJSX(React.Fragment, null, ___EmotionJSX("li", {
-              className: nodeClasses
-            }, ___EmotionJSX("button", {
-              id: buttonId,
-              "aria-controls": wrappingId,
-              "aria-expanded": _this2.isNodeOpen(node),
-              ref: function ref(_ref3) {
-                return _this2.setButtonRef(_ref3, index);
-              },
-              "data-test-subj": "euiTreeViewButton-".concat(_this2.state.treeID),
-              onKeyDown: function onKeyDown(event) {
-                return _this2.onKeyDown(event, node);
-              },
-              onClick: function onClick() {
-                return _this2.handleNodeClick(node);
-              },
-              className: nodeButtonClasses
-            }, showExpansionArrows && node.children ? ___EmotionJSX(EuiIcon, {
-              className: "euiTreeView__expansionArrow",
-              size: display === 'compressed' ? 's' : 'm',
-              type: _this2.isNodeOpen(node) ? 'arrowDown' : 'arrowRight'
-            }) : null, node.icon && !node.useEmptyIcon ? ___EmotionJSX("span", {
-              className: "euiTreeView__iconWrapper"
-            }, _this2.isNodeOpen(node) && node.iconWhenExpanded ? node.iconWhenExpanded : node.icon) : null, node.useEmptyIcon && !node.icon ? ___EmotionJSX("span", {
-              className: "euiTreeView__iconPlaceholder"
-            }) : null, ___EmotionJSX("span", {
-              ref: ref,
-              className: "euiTreeView__nodeLabel"
-            }, node.label)), ___EmotionJSX("div", {
-              id: wrappingId,
-              onKeyDown: function onKeyDown(event) {
-                return _this2.onChildrenKeydown(event, index);
-              }
-            }, node.children && _this2.isNodeOpen(node) ? ___EmotionJSX(EuiTreeView, _extends({
-              items: node.children,
-              display: display,
-              showExpansionArrows: showExpansionArrows,
-              expandByDefault: _this2.state.expandChildNodes
-            }, label)) : null)));
-          });
-        });
-      }))));
+        var isNodeExpanded = node.children ? _this2.isNodeOpen(node) : undefined; // Determines the `aria-expanded` attribute
+
+        var icon = node.icon;
+        if (node.iconWhenExpanded && isNodeExpanded) {
+          icon = node.iconWhenExpanded;
+        } else if (!icon && node.useEmptyIcon) {
+          icon = ___EmotionJSX(React.Fragment, null); // Renders a placeholder
+        }
+
+        return ___EmotionJSX(EuiTreeViewItem, {
+          key: buttonId + index,
+          id: buttonId,
+          className: node.className,
+          buttonRef: function buttonRef(ref) {
+            return _this2.setButtonRef(ref, index);
+          },
+          "aria-controls": node.children ? wrappingId : undefined,
+          label: node.label,
+          icon: icon,
+          hasArrow: showExpansionArrows,
+          isExpanded: isNodeExpanded,
+          isActive: _this2.state.activeItem === node.id,
+          display: display,
+          "data-test-subj": "euiTreeViewButton-".concat(_this2.state.treeID),
+          onKeyDown: function onKeyDown(event) {
+            return _this2.onKeyDown(event, node);
+          },
+          onClick: function onClick() {
+            return _this2.handleNodeClick(node);
+          }
+        }, node.children && ___EmotionJSX("div", {
+          id: wrappingId,
+          onKeyDown: function onKeyDown(event) {
+            return _this2.onChildrenKeydown(event, index);
+          }
+        }, isNodeExpanded && ___EmotionJSX(EuiTreeView, {
+          items: node.children,
+          display: display,
+          showExpansionArrows: showExpansionArrows,
+          expandByDefault: _this2.state.expandChildNodes
+        })));
+      })));
     }
   }]);
-  return EuiTreeView;
+  return EuiTreeViewClass;
 }(Component);
-_defineProperty(EuiTreeView, "contextType", EuiTreeViewContext);
+_defineProperty(EuiTreeViewClass, "contextType", EuiTreeViewContext);
+export var EuiTreeView = withEuiTheme(EuiTreeViewClass);

package/optimize/es/components/tree_view/tree_view.styles.js

@@ -0,0 +1,18 @@
+/*
+ * 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 { css } from '@emotion/react';
+import { euiFontSize, logicalCSS } from '../../global_styling';
+export var euiTreeViewStyles = function euiTreeViewStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  return {
+    euiTreeView: /*#__PURE__*/css("margin:0;list-style-type:none;& &{", logicalCSS('padding-left', euiTheme.size.l), ";};label:euiTreeView;"),
+    default: /*#__PURE__*/css("font-size:", euiFontSize(euiThemeContext, 'm').fontSize, ";;label:default;"),
+    compressed: /*#__PURE__*/css("font-size:", euiFontSize(euiThemeContext, 's').fontSize, ";;label:compressed;")
+  };
+};