@elastic/eui 92.2.1 → 93.1.0

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

@@ -6,24 +6,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiTourStep = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _global_styling = require("../../global_styling");
 var _beacon = require("../beacon");
-var _button = require("../button");
-var _flex = require("../flex");
-var _i18n = require("../i18n");
 var _popover = require("../popover");
-var _title = require("../title");
-var _tour_step_indicator = require("./tour_step_indicator");
 var _services = require("../../services");
+var _tour_header = require("./_tour_header");
+var _tour_footer = require("./_tour_footer");
 var _tour = require("./tour.styles");
 var _react2 = require("@emotion/react");
-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"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -55,17 +52,17 @@ 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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var titleId = (0, _services.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 = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -75,11 +72,10 @@ var EuiTourStep = function EuiTourStep(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     popoverPosition = _useState4[0],
     setPopoverPosition = _useState4[1];
-  var onPositionChange = function onPositionChange(position) {
+  var onPositionChange = (0, _react.useCallback)(function (position) {
     setPopoverPosition(position);
-  };
+  }, []);
   (0, _react.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
@@ -87,125 +83,61 @@ 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((0, _services.findElementBySelectorOrRef)(anchor));
       });
+      return function () {
+        return window.clearTimeout(timeout);
+      };
     }
-    return function () {
-      timeout && window.clearTimeout(timeout);
-    };
   }, [anchor]);
-  var classes = (0, _classnames.default)('euiTour', className);
+  var anchorClasses = (0, _classnames.default)('euiTourAnchor', className);
+  var popoverClasses = (0, _classnames.default)('euiTour', panelClassName);
   var euiTheme = (0, _services.useEuiTheme)();
   var tourStyles = (0, _tour.euiTourStyles)(euiTheme);
-  var headerStyles = (0, _tour.euiTourHeaderStyles)(euiTheme);
-  var footerStyles = (0, _tour.euiTourFooterStyles)(euiTheme);
   var beaconStyles = (0, _tour.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) ? (0, _react2.jsx)(_flex.EuiFlexGroup, {
-    gutterSize: "s",
-    alignItems: "center",
-    justifyContent: "flexEnd",
-    responsive: false,
-    wrap: true
-  }, footerAction.map(function (action, index) {
-    return (0, _react2.jsx)(_flex.EuiFlexItem, {
-      key: index,
-      grow: false
-    }, action);
-  })) : (0, _react2.jsx)(_flex.EuiFlexItem, {
-    grow: false
-  }, footerAction);
-  var footer = (0, _react2.jsx)(_flex.EuiFlexGroup, {
-    responsive: false,
-    justifyContent: stepsTotal > 1 ? 'spaceBetween' : 'flexEnd',
-    alignItems: "center"
-  }, stepsTotal > 1 && (0, _react2.jsx)(_flex.EuiFlexItem, {
-    grow: false
-  }, (0, _react2.jsx)("ul", {
-    className: "euiTourFooter__stepList"
-  }, (0, _toConsumableArray2.default)(Array(stepsTotal).keys()).map(function (_, i) {
-    var status = 'complete';
-    if (step === i + 1) {
-      status = 'active';
-    } else if (step <= i) {
-      status = 'incomplete';
-    }
-    return (0, _react2.jsx)(_tour_step_indicator.EuiTourStepIndicator, {
-      key: i,
-      number: i + 1,
-      status: status
-    });
-  }))), footerAction ? optionalFooterAction : (0, _react2.jsx)(_flex.EuiFlexItem, {
-    grow: false
-  }, (0, _react2.jsx)(_i18n.EuiI18n, {
-    tokens: ['euiTourStep.endTour', 'euiTourStep.skipTour', 'euiTourStep.closeTour'],
-    defaults: ['End tour', 'Skip tour', 'Close tour']
-  }, function (_ref2) {
-    var _ref3 = (0, _slicedToArray2.default)(_ref2, 3),
-      endTour = _ref3[0],
-      skipTour = _ref3[1],
-      closeTour = _ref3[2];
-    var content = closeTour;
-    if (stepsTotal > 1) {
-      content = stepsTotal === step ? endTour : skipTour;
-    }
-    return (0, _react2.jsx)(_button.EuiButtonEmpty, (0, _extends2.default)({
-      onClick: onFinish
-    }, finishButtonProps), content);
-  })));
   var hasBeacon = decoration === 'beacon';
-  var popoverProps = _objectSpread({
+  var widthStyles = (0, _react.useMemo)(function () {
+    return (0, _global_styling.logicalStyles)({
+      minWidth: minWidth,
+      maxWidth: maxWidth
+    });
+  }, [minWidth, maxWidth]);
+  var noAnchor = !anchor && children;
+  var PopoverComponent = noAnchor ? _popover.EuiPopover : _popover.EuiWrappingPopover;
+  var button = noAnchor ? children : anchorNode;
+  return button ? (0, _react2.jsx)(PopoverComponent, (0, _extends2.default)({
+    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 && (0, _react2.jsx)(_beacon.EuiBeacon, {
       css: beaconCss,
       className: "euiTour__beacon"
     }),
     onPositionChange: onPositionChange
-  }, rest);
-  var layout = (0, _react2.jsx)("div", {
-    style: {
-      minWidth: minWidth,
-      maxWidth: maxWidth
-    }
-  }, (0, _react2.jsx)(_popover.EuiPopoverTitle, {
-    css: headerStyles.euiTourHeader,
-    className: "euiTourHeader",
-    id: titleId
-  }, subtitle && (0, _react2.jsx)(_title.EuiTitle, {
-    css: headerStyles.euiTourHeader__subtitle,
-    size: "xxxs"
-  }, (0, _react2.jsx)("h2", null, subtitle)), (0, _react2.jsx)(_title.EuiTitle, {
-    css: headerStyles.euiTourHeader__title,
-    size: "xxs"
-  }, subtitle ? (0, _react2.jsx)("h3", null, title) : (0, _react2.jsx)("h2", null, title))), (0, _react2.jsx)("div", {
+  }, rest), (0, _react2.jsx)("div", {
+    style: widthStyles
+  }, (0, _react2.jsx)(_tour_header.EuiTourHeader, {
+    id: titleId,
+    title: title,
+    subtitle: subtitle
+  }), (0, _react2.jsx)("div", {
     className: "euiTour__content"
-  }, content), (0, _react2.jsx)(_popover.EuiPopoverFooter, {
-    css: footerStyles.euiTourFooter,
-    className: "euiTourFooter"
-  }, footer));
-  if (!anchor && children) {
-    return (0, _react2.jsx)(_popover.EuiPopover, (0, _extends2.default)({
-      button: children
-    }, popoverProps), layout);
-  }
-  return anchorNode ? (0, _react2.jsx)(_popover.EuiWrappingPopover, (0, _extends2.default)({
-    button: anchorNode
-  }, popoverProps), layout) : null;
+  }, content), (0, _react2.jsx)(_tour_footer.EuiTourFooter, {
+    footerAction: footerAction,
+    step: step,
+    stepsTotal: stepsTotal,
+    onFinish: onFinish
+  }))) : null;
 };
 exports.EuiTourStep = EuiTourStep;

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

@@ -0,0 +1,76 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EuiTreeViewItem = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _services = require("../../services");
+var _icon = require("../icon");
+var _tree_view_item = require("./_tree_view_item.styles");
+var _react2 = require("@emotion/react");
+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.
+ */
+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; }
+var EuiTreeViewItem = /*#__PURE__*/(0, _react.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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var euiTheme = (0, _services.useEuiTheme)();
+  var styles = (0, _tree_view_item.euiTreeViewItemStyles)(euiTheme);
+  var wrapperClasses = (0, _classnames.default)('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 = (0, _classnames.default)('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 (0, _react2.jsx)("li", (0, _extends2.default)({}, wrapperProps, {
+    css: wrapperStyles,
+    className: wrapperClasses
+  }), (0, _react2.jsx)("button", (0, _extends2.default)({
+    id: id,
+    css: buttonStyles,
+    className: buttonClasses,
+    "aria-expanded": isExpanded,
+    ref: buttonRef
+  }, rest), hasArrow && (!!children ? (0, _react2.jsx)(_icon.EuiIcon, {
+    className: "euiTreeView__expansionArrow",
+    size: display === 'compressed' ? 's' : 'm',
+    type: isExpanded ? 'arrowDown' : 'arrowRight'
+  }) : (0, _react2.jsx)("span", {
+    css: iconStyles,
+    className: "euiTreeView__arrowPlaceholder"
+  })), icon && (0, _react2.jsx)("span", {
+    css: iconStyles,
+    className: "euiTreeView__iconWrapper"
+  }, icon), (0, _react2.jsx)("span", {
+    className: "euiTreeView__nodeLabel eui-textTruncate"
+  }, label)), children);
+});
+exports.EuiTreeViewItem = EuiTreeViewItem;
+EuiTreeViewItem.displayName = 'EuiTreeViewItem';

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

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

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

@@ -64,12 +64,12 @@ describe('EuiTreeView', function () {
   describe('Automated accessibility check', function () {
     it('has zero violations on first render', function () {
       cy.mount((0, _react2.jsx)(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((0, _react2.jsx)(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/lib/components/tree_view/tree_view.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EuiTreeView = void 0;
+exports.EuiTreeViewClass = exports.EuiTreeView = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -18,14 +18,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 _services = require("../../services");
 var _i18n = require("../i18n");
-var _icon = require("../icon");
 var _accessibility = require("../accessibility");
-var _text = require("../text");
-var _services = require("../../services");
-var _inner_text = require("../inner_text");
+var _tree_view_item = require("./_tree_view_item");
+var _tree_view = require("./tree_view.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["children", "className", "items", "display", "expandByDefault", "showExpansionArrows"];
+var _excluded = ["children", "className", "items", "display", "expandByDefault", "showExpansionArrows", "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); }; }
@@ -37,27 +36,20 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
                                                                                                                                                                                                                                                                                                                                            * Side Public License, v 1.
                                                                                                                                                                                                                                                                                                                                            */
 var EuiTreeViewContext = /*#__PURE__*/(0, _react.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'
-};
-var EuiTreeView = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(EuiTreeView, _Component);
-  var _super = _createSuper(EuiTreeView);
-  function EuiTreeView(props,
+var EuiTreeViewClass = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(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;
-    (0, _classCallCheck2.default)(this, EuiTreeView);
+    (0, _classCallCheck2.default)(this, EuiTreeViewClass);
     // TODO: context in constructor has been deprecated.
     // We should likely convert this to a function component
     _this = _super.call(this, props, context);
@@ -179,7 +171,7 @@ var EuiTreeView = /*#__PURE__*/function (_Component) {
     };
     return _this;
   }
-  (0, _createClass2.default)(EuiTreeView, [{
+  (0, _createClass2.default)(EuiTreeViewClass, [{
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       if (this.props.id !== prevProps.id) {
@@ -200,18 +192,16 @@ 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 = (0, _objectWithoutProperties2.default)(_this$props, _excluded);
+      var styles = (0, _tree_view.euiTreeViewStyles)(theme);
+      var cssStyles = [styles.euiTreeView, styles[display]];
 
       // Computed classNames
-      var classes = (0, _classnames.default)('euiTreeView', display ? displayToClassNameMap[display] : null, {
-        'euiTreeView--withArrows': showExpansionArrows
-      }, className);
+      var classes = (0, _classnames.default)('euiTreeView', className);
       var instructionsId = "".concat(this.state.treeID, "--instruction");
       return (0, _react2.jsx)(EuiTreeViewContext.Provider, {
         value: this.state.treeID
-      }, (0, _react2.jsx)(_text.EuiText, {
-        size: display === 'compressed' ? 's' : 'm',
-        className: "euiTreeView__wrapper"
       }, !this.isNested && (0, _react2.jsx)(_i18n.EuiI18n, {
         token: "euiTreeView.listNavigationInstructions",
         default: "You can quickly navigate this list using arrow keys."
@@ -220,79 +210,61 @@ var EuiTreeView = /*#__PURE__*/function (_Component) {
           id: instructionsId
         }, listNavigationInstructions));
       }), (0, _react2.jsx)("ul", (0, _extends2.default)({
+        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 (0, _react2.jsx)(_inner_text.EuiInnerText, {
-          key: node.id + index,
-          fallback: typeof node.label === 'string' ? node.label : ''
-        }, function (ref, innerText) {
-          return (0, _react2.jsx)(_i18n.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 = (0, _classnames.default)('euiTreeView__node', display ? displayToClassNameMap[display] : null, {
-              'euiTreeView__node--expanded': _this2.isNodeOpen(node)
-            });
-            var nodeButtonClasses = (0, _classnames.default)('euiTreeView__nodeInner', showExpansionArrows && node.children ? 'euiTreeView__nodeInner--withArrows' : null, _this2.state.activeItem === node.id ? 'euiTreeView__node--active' : null, node.className ? node.className : null);
-            return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)("li", {
-              className: nodeClasses
-            }, (0, _react2.jsx)("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 ? (0, _react2.jsx)(_icon.EuiIcon, {
-              className: "euiTreeView__expansionArrow",
-              size: display === 'compressed' ? 's' : 'm',
-              type: _this2.isNodeOpen(node) ? 'arrowDown' : 'arrowRight'
-            }) : null, node.icon && !node.useEmptyIcon ? (0, _react2.jsx)("span", {
-              className: "euiTreeView__iconWrapper"
-            }, _this2.isNodeOpen(node) && node.iconWhenExpanded ? node.iconWhenExpanded : node.icon) : null, node.useEmptyIcon && !node.icon ? (0, _react2.jsx)("span", {
-              className: "euiTreeView__iconPlaceholder"
-            }) : null, (0, _react2.jsx)("span", {
-              ref: ref,
-              className: "euiTreeView__nodeLabel"
-            }, node.label)), (0, _react2.jsx)("div", {
-              id: wrappingId,
-              onKeyDown: function onKeyDown(event) {
-                return _this2.onChildrenKeydown(event, index);
-              }
-            }, node.children && _this2.isNodeOpen(node) ? (0, _react2.jsx)(EuiTreeView, (0, _extends2.default)({
-              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 = (0, _react2.jsx)(_react.default.Fragment, null); // Renders a placeholder
+        }
+
+        return (0, _react2.jsx)(_tree_view_item.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 && (0, _react2.jsx)("div", {
+          id: wrappingId,
+          onKeyDown: function onKeyDown(event) {
+            return _this2.onChildrenKeydown(event, index);
+          }
+        }, isNodeExpanded && (0, _react2.jsx)(EuiTreeView, {
+          items: node.children,
+          display: display,
+          showExpansionArrows: showExpansionArrows,
+          expandByDefault: _this2.state.expandChildNodes
+        })));
+      })));
     }
   }]);
-  return EuiTreeView;
+  return EuiTreeViewClass;
 }(_react.Component);
-exports.EuiTreeView = EuiTreeView;
-(0, _defineProperty2.default)(EuiTreeView, "contextType", EuiTreeViewContext);
+exports.EuiTreeViewClass = EuiTreeViewClass;
+(0, _defineProperty2.default)(EuiTreeViewClass, "contextType", EuiTreeViewContext);
+var EuiTreeView = (0, _services.withEuiTheme)(EuiTreeViewClass);
+exports.EuiTreeView = EuiTreeView;

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

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.euiTreeViewStyles = void 0;
+var _react = require("@emotion/react");
+var _global_styling = require("../../global_styling");
+/*
+ * 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 euiTreeViewStyles = function euiTreeViewStyles(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  return {
+    euiTreeView: /*#__PURE__*/(0, _react.css)("margin:0;list-style-type:none;& &{", (0, _global_styling.logicalCSS)('padding-left', euiTheme.size.l), ";};label:euiTreeView;"),
+    default: /*#__PURE__*/(0, _react.css)("font-size:", (0, _global_styling.euiFontSize)(euiThemeContext, 'm').fontSize, ";;label:default;"),
+    compressed: /*#__PURE__*/(0, _react.css)("font-size:", (0, _global_styling.euiFontSize)(euiThemeContext, 's').fontSize, ";;label:compressed;")
+  };
+};
+exports.euiTreeViewStyles = euiTreeViewStyles;