@pingux/astro 2.32.0-alpha.1 → 2.32.0-alpha.11

package/lib/components/TreeView/TreeView.js

@@ -8,13 +8,14 @@ import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/obje
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["tree", "disabledKeys", "onExpandedChange"];
+var _excluded = ["tree", "disabledKeys", "onExpandedChange", "onKeyDown", "pageLength"];
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React, { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
+import React, { forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useTreeState } from 'react-stately';
 import { useCollator } from '@react-aria/i18n';
 import { useListBox } from '@react-aria/listbox';
@@ -23,6 +24,7 @@ import PropTypes from 'prop-types';
 import { TreeViewContext } from '../../context/TreeViewContext';
 import { Box, TreeViewItem, TreeViewSection } from '../../index';
 import { isIterableProp } from '../../utils/devUtils/props/isIterable';
+import TreeViewWrapper from './TreeViewWrapper';
 
 // split out and exported for ease of use across components
 // and to facilitate easier testing (eliminates redundant conditional renders)
@@ -46,11 +48,23 @@ export function useTreeViewLayout(state) {
   return layout;
 }
 var TreeView = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context;
+  var _tree$items$, _context;
   var tree = props.tree,
     disabledKeys = props.disabledKeys,
     onExpandedChange = props.onExpandedChange,
+    onKeyDown = props.onKeyDown,
+    _props$pageLength = props.pageLength,
+    pageLength = _props$pageLength === void 0 ? 5 : _props$pageLength,
     others = _objectWithoutProperties(props, _excluded);
+
+  // we are tracking the last focused item.
+  // this enables us to have focus jump back to the item, after focus
+  // leaves the tree, and then returns.
+  var _useState = useState(tree === null || tree === void 0 || (_tree$items$ = tree.items[0]) === null || _tree$items$ === void 0 ? void 0 : _tree$items$.key),
+    _useState2 = _slicedToArray(_useState, 2),
+    lastFocusedItem = _useState2[0],
+    setLastFocusedItem = _useState2[1];
+  var level = 0;
   var treeViewRef = useRef();
   var selectedKeys = tree.selectedKeys;
 
@@ -65,7 +79,66 @@ var TreeView = /*#__PURE__*/forwardRef(function (props, ref) {
     selectionMode: 'single',
     disallowEmptySelection: true
   }, others));
-  var level = 0;
+  var flattenNestedData = function flattenNestedData(_data) {
+    var returnArray = [];
+    var checkItemNesting = function checkItemNesting(item) {
+      var _item$value, _item$items;
+      if (((_item$value = item.value) === null || _item$value === void 0 || (_item$value = _item$value.items) === null || _item$value === void 0 ? void 0 : _item$value.length) > 0) {
+        return {
+          isTopLevel: true,
+          hasChildren: true
+        };
+      }
+      if (((_item$items = item.items) === null || _item$items === void 0 ? void 0 : _item$items.length) > 0) {
+        return {
+          isTopLevel: false,
+          hasChildren: true
+        };
+      }
+      return {
+        isTopLevel: false,
+        hasChildren: false
+      };
+    };
+    var checkSection = function checkSection(isRendered, hasItems) {
+      return isRendered && hasItems;
+    };
+    var loop = function loop(data) {
+      for (var i = 0; i < data.length; i += 1) {
+        var obj = {
+          key: data[i].key
+        };
+        returnArray.push(obj);
+        var _checkItemNesting = checkItemNesting(data[i]),
+          hasChildren = _checkItemNesting.hasChildren,
+          isTopLevel = _checkItemNesting.isTopLevel;
+        if (checkSection(state.expandedKeys.has(data[i].key), hasChildren) === true) {
+          if (isTopLevel) {
+            var _data$i$value;
+            loop((_data$i$value = data[i].value) === null || _data$i$value === void 0 ? void 0 : _data$i$value.items);
+          } else {
+            loop(data[i].items);
+          }
+        }
+      }
+    };
+    loop(_data);
+    return returnArray;
+  };
+
+  // list of value pairs of keys and refs
+  // does not need to be in order, because they are values pairs
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    refArray = _useState4[0],
+    setRefs = _useState4[1];
+
+  // creates a flattened list of keys for up/down keyboard use
+  // this DOES need to be in the same order as the HTML appears in the DOM.
+  // we are essentially turning all rendered items into a flat list, for up/down
+  var flatKeyArray = useMemo(function () {
+    return flattenNestedData(props.items);
+  }, [state.expandedKeys]);
   var ariaLabel = props['aria-label'];
   var listBoxOptions = {
     disabledKeys: disabledKeys,
@@ -79,7 +152,13 @@ var TreeView = /*#__PURE__*/forwardRef(function (props, ref) {
   return ___EmotionJSX(TreeViewContext.Provider, {
     value: {
       state: state,
-      tree: tree
+      tree: tree,
+      refArray: refArray,
+      setRefs: setRefs,
+      flatKeyArray: flatKeyArray,
+      pageLength: pageLength,
+      setLastFocusedItem: setLastFocusedItem,
+      lastFocusedItem: lastFocusedItem
     }
   }, ___EmotionJSX(Box, _extends({
     as: "ul"
@@ -88,14 +167,17 @@ var TreeView = /*#__PURE__*/forwardRef(function (props, ref) {
     "aria-label": ariaLabel,
     role: "treegrid",
     sx: {
-      overflow: 'hidden'
+      overflow: 'hidden',
+      p: '5px',
+      border: 'none !important'
     }
-  }, others), _mapInstanceProperty(_context = _Array$from(state.collection)).call(_context, function (item, index) {
+  }, others), ___EmotionJSX(TreeViewWrapper, null, _mapInstanceProperty(_context = _Array$from(state.collection)).call(_context, function (item, index) {
     return SectionOrItemRender(item.props.items.length > 0, ___EmotionJSX(TreeViewSection, {
       item: item,
       items: item.props.items,
       title: item.props.title,
       key: item.props.title,
+      onKeyDown: onKeyDown,
       level: level + 1,
       setSize: state.collection.size,
       position: index
@@ -103,17 +185,19 @@ var TreeView = /*#__PURE__*/forwardRef(function (props, ref) {
       item: item,
       title: item.value.value.title,
       key: item.value.value.title,
+      onKeyDown: onKeyDown,
       level: level + 1,
-      position: index,
-      setSize: state.collection.size
+      setSize: state.collection.size,
+      position: index
     }));
-  })));
+  }))));
 });
 TreeView.propTypes = {
   /** data object prop that is required to make the tree function
   this is returned from the useTreeData hook in React-Aria */
   tree: PropTypes.shape({
-    selectedKeys: isIterableProp
+    selectedKeys: isIterableProp,
+    items: isIterableProp
   }).isRequired,
   /** The currently disabled keys in the collection. */
   disabledKeys: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object])),
@@ -122,6 +206,10 @@ TreeView.propTypes = {
   /** The list of TreeView items. */
   items: isIterableProp,
   /** String that describes the treeview when using a screen reader. */
-  'aria-label': PropTypes.string
+  'aria-label': PropTypes.string,
+  /** Handler that is called when a key is pressed. */
+  onKeyDown: PropTypes.func,
+  /** Number of items to move the focus when page up or page down is pressed */
+  pageLength: PropTypes.number
 };
 export default TreeView;

package/lib/components/TreeView/TreeView.stories.js

@@ -20,36 +20,50 @@ export default {
 };
 var data = [{
   title: 'Policies',
+  key: 'Policies',
   items: [{
     title: 'Registration',
+    key: 'Registration',
     items: [{
-      title: 'Registration A'
+      title: 'Registration A',
+      key: 'Registration A'
     }, {
       title: 'Registration B',
+      key: 'Registration B',
       items: [{
-        title: 'Registration B1'
+        title: 'Registration B1',
+        key: 'Registration B1'
       }, {
-        title: 'Registration B2'
+        title: 'Registration B2',
+        key: 'Registration B2'
       }]
     }, {
-      title: 'Registration C'
+      title: 'Registration C',
+      key: 'Registration C'
     }, {
-      title: 'Registration D'
+      title: 'Registration D',
+      key: 'Registration D'
     }]
   }, {
     title: 'Authentication',
+    key: 'Authentication',
     items: [{
-      title: 'Authentication A'
+      title: 'Authentication A',
+      key: 'Authentication A'
     }, {
-      title: 'Authentication B'
+      title: 'Authentication B',
+      key: 'Authentication B'
     }]
   }]
 }, {
   title: 'Other',
+  key: 'Other',
   items: [{
-    title: 'Other A'
+    title: 'Other A',
+    key: 'Other A'
   }]
 }, {
+  key: 'Single Item',
   title: 'Single Item'
 }];
 export var Default = function Default(args) {
@@ -65,8 +79,7 @@ export var Default = function Default(args) {
   return ___EmotionJSX(TreeView, _extends({}, args, {
     items: tree.items,
     tree: tree,
-    "aria-label": "Example Tree",
-    disabledKeys: ['Single Item']
+    "aria-label": "Example Tree"
   }), function (section) {
     var _section$value;
     return ___EmotionJSX(Item, {

package/lib/components/TreeView/TreeView.styles.js

@@ -3,7 +3,7 @@ var treeRow = {
   cursor: 'pointer',
   height: '31px',
   outline: 'none',
-  '&.is-selected, &.is-hovered, &.is-focused': {
+  '&.is-selected, &.is-hovered': {
     backgroundColor: 'active',
     '& span': {
       color: 'white'
@@ -17,8 +17,28 @@ var treeRow = {
   },
   '&.is-expanded': {
     marginBottom: 'xs'
+  },
+  '& :focus': {
+    border: 'none'
   }
 };
+var wrapper = {
+  '&.is-focused': {
+    boxSizing: 'unset',
+    outline: '1px solid',
+    outlineColor: 'focus',
+    outlineOffset: '2px'
+  },
+  width: '100%',
+  ':not(:last-child)': {
+    mb: 'sm'
+  },
+  ':focus': {
+    border: 'none'
+  },
+  outline: 'none'
+};
 export default {
-  treeRow: treeRow
+  treeRow: treeRow,
+  wrapper: wrapper
 };

package/lib/components/TreeView/TreeView.test.js

@@ -1,9 +1,13 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
 import React from 'react';
 import { useTreeData } from 'react-stately';
+import userEvent from '@testing-library/user-event';
+import PropTypes from 'prop-types';
 import { Item } from '../../index';
-import { fireEvent, render, screen } from '../../utils/testUtils/testWrapper';
+import { render, screen } from '../../utils/testUtils/testWrapper';
 import { SectionOrItemRender } from './TreeView';
+import { refArray } from './TreeViewKeyboardDelegate.test';
+import { addRefToArrayHelper, removeRefFromArrayHelper } from './TreeViewSection';
 import TreeView from '.';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var testId = 'test-TreeView';
@@ -40,9 +44,12 @@ var data = [{
 }, {
   title: 'Single Item'
 }];
+var singleData = [{
+  title: 'Single Item'
+}];
 var TreeViewComponent = function TreeViewComponent(props) {
   var tree = useTreeData({
-    initialItems: data,
+    initialItems: props.data,
     getKey: function getKey(item) {
       return item.title;
     },
@@ -62,6 +69,9 @@ var TreeViewComponent = function TreeViewComponent(props) {
     });
   });
 };
+TreeViewComponent.propTypes = {
+  data: PropTypes.arrayOf(PropTypes.shape({}))
+};
 var offsetWidth;
 var offsetHeight;
 var scrollHeight;
@@ -95,16 +105,20 @@ test('TreeView component does load', function () {
   expect(element).toBeInTheDocument();
 });
 test('Can select an Item using the mouse', function () {
-  render(___EmotionJSX(TreeViewComponent, null));
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data
+  }));
   var element = screen.queryByRole('treegrid');
   expect(element).toBeInTheDocument();
   var peopleElement = screen.queryByText('Single Item');
   expect(peopleElement).not.toHaveClass('is-selected');
-  fireEvent.click(peopleElement);
+  userEvent.click(peopleElement);
   expect(peopleElement).toHaveClass('is-selected');
 });
 test('Renders both Sections and Items', function () {
-  render(___EmotionJSX(TreeViewComponent, null));
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data
+  }));
   var peopleElement = screen.getByText('Single Item');
   expect(peopleElement).toBeInTheDocument();
   var plantElement = screen.getByText('Other');
@@ -113,7 +127,9 @@ test('Renders both Sections and Items', function () {
   expect(allListItems).toHaveLength(3);
 });
 test('Can expand an Item using the mouse', function () {
-  render(___EmotionJSX(TreeViewComponent, null));
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data
+  }));
 
   // The children of collapsed sections will not
   // be rendered by default.
@@ -122,47 +138,91 @@ test('Can expand an Item using the mouse', function () {
   // Clicking the dropdown icon, renders the children
   // of the collapsed section.
   var buttons = screen.queryAllByRole('button');
-  fireEvent.click(buttons[0]);
+  userEvent.click(buttons[0]);
   expect(screen.queryByText(data[0].items[0].title)).toBeInTheDocument();
 });
 test('onExpandedChange change prop calls when used', function () {
   var onPress = jest.fn();
   render(___EmotionJSX(TreeViewComponent, {
+    data: data,
     onExpandedChange: onPress
   }));
   expect(onPress).not.toHaveBeenCalled();
   var buttons = screen.queryAllByRole('button');
-  fireEvent.click(buttons[0]);
+  userEvent.click(buttons[0]);
   expect(onPress).toHaveBeenCalled();
 });
 test('disabledKeys prop disables items in the tree -- rendering them unclickable', function () {
   render(___EmotionJSX(TreeViewComponent, {
+    data: data,
     disabledKeys: ['Single Item']
   }));
   var listItems = screen.queryAllByRole('treeitem');
   var thisItem = listItems[2];
   expect(thisItem).not.toHaveClass('is-selected');
   expect(thisItem).toHaveAttribute('aria-disabled', 'true');
-  fireEvent.mouseDown(thisItem);
-  fireEvent.mouseUp(thisItem);
+  userEvent.click(thisItem);
   expect(thisItem).not.toHaveClass('is-selected');
   expect(thisItem).toHaveAttribute('aria-selected', 'false');
 });
 test('displays correct aria attributes', function () {
-  render(___EmotionJSX(TreeViewComponent, null));
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data
+  }));
   var listItems = screen.getAllByRole('treeitem');
   var lastTreeItem = listItems[2];
   expect(lastTreeItem).toHaveAttribute('aria-level', '1');
   expect(lastTreeItem).toHaveAttribute('aria-posinset', '3');
   expect(lastTreeItem).toHaveAttribute('aria-setsize', '3');
   var buttons = screen.queryAllByRole('button');
-  fireEvent.click(buttons[1]);
+  userEvent.click(buttons[1]);
   var expandedItems = screen.getAllByRole('treeitem');
   var nestedItem = expandedItems[2];
   expect(nestedItem).toHaveAttribute('aria-level', '2');
   expect(nestedItem).toHaveAttribute('aria-posinset', '1');
   expect(nestedItem).toHaveAttribute('aria-setsize', '1');
 });
+test('onKeyDown calls passed in prop call back function', function () {
+  var callback = jest.fn();
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data,
+    onKeyDown: callback
+  }));
+  var listItems = screen.queryAllByRole('treeitem');
+  var thisItem = listItems[0];
+  userEvent.type(thisItem, '{arrowleft}');
+  expect(callback).toHaveBeenCalled();
+});
+test('onKeyDown calls passed in prop call back function', function () {
+  var callback = jest.fn();
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data,
+    onKeyDown: callback
+  }));
+  var listItems = screen.queryAllByRole('treeitem');
+  var thisItem = listItems[2];
+  userEvent.type(thisItem, '{arrowleft}');
+  expect(callback).toHaveBeenCalled();
+});
+test('onKeyDown does not call passed in prop call back function', function () {
+  var callback = jest.fn();
+  render(___EmotionJSX(TreeViewComponent, {
+    data: data
+  }));
+  var listItems = screen.queryAllByRole('treeitem');
+  var thisItem = listItems[2];
+  userEvent.type(thisItem, '{arrowleft}');
+  expect(callback).not.toHaveBeenCalled();
+});
+test('items still render if there is only one provided', function () {
+  var callback = jest.fn();
+  render(___EmotionJSX(TreeViewComponent, {
+    data: singleData,
+    onKeyDown: callback
+  }));
+  var listItem = screen.queryByText('Single Item');
+  expect(listItem).toBeInTheDocument();
+});
 var firstJSX = ___EmotionJSX("p", null, "first");
 var secondJSX = ___EmotionJSX("p", null, "second");
 test('Section or Item Render renders first item if condition is true', function () {
@@ -176,4 +236,24 @@ test('Section or Item Render renders second item if condition is false', functio
   var thisItem = screen.getByText('second');
   expect(thisItem).toBeInTheDocument();
   expect(screen.queryByText('first')).not.toBeInTheDocument();
+});
+test('Handler function removes ref from array', function () {
+  var newArray = removeRefFromArrayHelper(refArray, 'test');
+  expect(newArray).toHaveLength(2);
+});
+test('Handler function does not remove ref from array', function () {
+  var newArray = removeRefFromArrayHelper(refArray, 'anothertest');
+  expect(newArray).toHaveLength(3);
+});
+test('Handler function does add ref to array', function () {
+  var newArray = addRefToArrayHelper(refArray, 'yetanothertest', {
+    current: 'currentlystilltesting'
+  });
+  expect(newArray).toHaveLength(4);
+});
+test('Handler function does not add ref to array', function () {
+  var newArray = addRefToArrayHelper(refArray, 'test', {
+    current: 'currentlystilltesting'
+  });
+  expect(newArray).toHaveLength(3);
 });

package/lib/components/TreeView/TreeViewItem.js

@@ -1,15 +1,61 @@
 import _extends from "@babel/runtime-corejs3/helpers/esm/extends";
-import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
 import FileIcon from '@pingux/mdi-react/FileIcon';
+import { useFocusRing } from '@react-aria/focus';
 import { useOption } from '@react-aria/listbox';
+import { mergeProps } from '@react-aria/utils';
 import PropTypes from 'prop-types';
 import { useTreeViewContext } from '../../context/TreeViewContext';
+import { useStatusClasses } from '../../hooks';
 import { Box } from '../../index';
+import { itemPressHandlers } from './TreeViewKeyboardDelegate';
 import TreeViewRow from './TreeViewRow';
+import { addRefToArrayHelper, removeRefFromArrayHelper } from './TreeViewSection';
 import { jsx as ___EmotionJSX } from "@emotion/react";
+export var onKeyDownItem = function onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength) {
+  switch (e.which) {
+    case 32:
+      itemPressHandlers.onSpacePress(e, tree, key, isSelected);
+      break;
+    case 38:
+      itemPressHandlers.onUpPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 40:
+      itemPressHandlers.onDownPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 37:
+    case 39:
+      itemPressHandlers.onRightLeftItemPress(e);
+      break;
+    case 33:
+      itemPressHandlers.onPageUpPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 34:
+      itemPressHandlers.onPageDownPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 36:
+      itemPressHandlers.onHomePress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 35:
+      itemPressHandlers.onEndPress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    default:
+      break;
+  }
+};
 var TreeViewItem = /*#__PURE__*/forwardRef(function (props, ref) {
   var item = props.item,
     title = props.title,
+    focusManager = props.focusManager,
+    onKeyDown = props.onKeyDown,
     level = props.level,
     position = props.position,
     setSize = props.setSize;
@@ -19,8 +65,16 @@ var TreeViewItem = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return treeItemRef.current;
   });
+
+  /* istanbul ignore next */
   var _useTreeViewContext = useTreeViewContext(),
-    state = _useTreeViewContext.state;
+    state = _useTreeViewContext.state,
+    tree = _useTreeViewContext.tree,
+    refArray = _useTreeViewContext.refArray,
+    setRefs = _useTreeViewContext.setRefs,
+    flatKeyArray = _useTreeViewContext.flatKeyArray,
+    pageLength = _useTreeViewContext.pageLength,
+    setLastFocusedItem = _useTreeViewContext.setLastFocusedItem;
   var _useOption = useOption({
       key: key
     }, state, treeItemRef),
@@ -28,24 +82,65 @@ var TreeViewItem = /*#__PURE__*/forwardRef(function (props, ref) {
     isSelected = _useOption.isSelected,
     isDisabled = _useOption.isDisabled;
   var isExpanded = state.expandedKeys.has(key);
+  var onKeyDownFunction = function onKeyDownFunction(e) {
+    /* istanbul ignore next */
+    onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength);
+    if (onKeyDown) {
+      onKeyDown(e, key);
+    }
+  };
+
+  // ignoring from tests, but this is actually being unit tested
+  /* istanbul ignore next */
+  var removeRefFromArray = function removeRefFromArray() {
+    setRefs(function (prev) {
+      return removeRefFromArrayHelper(prev, key);
+    });
+  };
+  var addRefToArray = function addRefToArray() {
+    setRefs(function (prev) {
+      return addRefToArrayHelper(prev, key, treeItemRef);
+    });
+  };
+
+  // adds and removes refs on mount and dismount
+  /* istanbul ignore next */
+  useEffect(function () {
+    // this  runs on mount
+    addRefToArray();
+    return function () {
+      // this runs on cleanup
+      removeRefFromArray(key, refArray);
+    };
+  }, []);
+  var _useFocusRing = useFocusRing(),
+    isFocusVisible = _useFocusRing.isFocusVisible,
+    focusProps = _useFocusRing.focusProps;
+  var mergedProps = mergeProps(focusProps, optionProps, {
+    onFocus: function onFocus() {
+      return setLastFocusedItem(key);
+    }
+  });
+  var _useStatusClasses = useStatusClasses('', {
+      isFocused: isFocusVisible
+    }),
+    classNames = _useStatusClasses.classNames;
   return ___EmotionJSX(Box, _extends({
     as: "li",
     isRow: true,
     ref: treeItemRef,
-    "aria-disabled": isDisabled,
+    "aria-disabled": isDisabled
+  }, mergedProps, {
+    role: "treeitem",
+    variant: "treeView.wrapper",
+    className: classNames,
+    "aria-selected": isSelected,
     "aria-level": level,
     "aria-posinset": position + 1,
-    "aria-setsize": setSize
-  }, optionProps, {
-    role: "treeitem",
-    sx: {
-      width: '100%',
-      ml: '36px',
-      ':not(:last-child)': {
-        pb: 'sm'
-      }
-    },
-    "aria-selected": isSelected
+    "aria-setsize": setSize,
+    onKeyDown: function onKeyDown(e) {
+      return onKeyDownFunction(e);
+    }
   }), ___EmotionJSX(TreeViewRow, {
     item: item,
     title: title,
@@ -59,8 +154,10 @@ TreeViewItem.propTypes = {
   item: PropTypes.shape({
     key: PropTypes.string
   }),
+  focusManager: PropTypes.shape({}),
   name: PropTypes.string,
   title: PropTypes.string,
+  onKeyDown: PropTypes.func,
   level: PropTypes.number,
   position: PropTypes.number,
   setSize: PropTypes.number