@pingux/astro 2.32.0-alpha.9 → 2.32.0

package/lib/cjs/components/TreeView/TreeView.js

@@ -20,6 +20,7 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactStately = require("react-stately");
@@ -30,8 +31,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _TreeViewContext = require("../../context/TreeViewContext");
 var _index = require("../../index");
 var _isIterable = require("../../utils/devUtils/props/isIterable");
+var _TreeViewWrapper = _interopRequireDefault(require("./TreeViewWrapper"));
 var _react2 = require("@emotion/react");
-var _excluded = ["tree", "disabledKeys", "onExpandedChange"]; // split out and exported for ease of use across components
+var _excluded = ["tree", "disabledKeys", "onExpandedChange", "onKeyDown", "pageLength"]; // split out and exported for ease of use across components
 // and to facilitate easier testing (eliminates redundant conditional renders)
 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; }
@@ -57,11 +59,23 @@ function useTreeViewLayout(state) {
   return layout;
 }
 var TreeView = /*#__PURE__*/(0, _react.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 = (0, _objectWithoutProperties2["default"])(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 = (0, _react.useState)(tree === null || tree === void 0 || (_tree$items$ = tree.items[0]) === null || _tree$items$ === void 0 ? void 0 : _tree$items$.key),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    lastFocusedItem = _useState2[0],
+    setLastFocusedItem = _useState2[1];
+  var level = 0;
   var treeViewRef = (0, _react.useRef)();
   var selectedKeys = tree.selectedKeys;
 
@@ -76,7 +90,66 @@ var TreeView = /*#__PURE__*/(0, _react.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 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2["default"])(_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 = (0, _react.useMemo)(function () {
+    return flattenNestedData(props.items);
+  }, [state.expandedKeys]);
   var ariaLabel = props['aria-label'];
   var listBoxOptions = {
     disabledKeys: disabledKeys,
@@ -90,7 +163,13 @@ var TreeView = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return (0, _react2.jsx)(_TreeViewContext.TreeViewContext.Provider, {
     value: {
       state: state,
-      tree: tree
+      tree: tree,
+      refArray: refArray,
+      setRefs: setRefs,
+      flatKeyArray: flatKeyArray,
+      pageLength: pageLength,
+      setLastFocusedItem: setLastFocusedItem,
+      lastFocusedItem: lastFocusedItem
     }
   }, (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
     as: "ul"
@@ -99,14 +178,17 @@ var TreeView = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     "aria-label": ariaLabel,
     role: "treegrid",
     sx: {
-      overflow: 'hidden'
+      overflow: 'hidden',
+      p: '5px',
+      border: 'none !important'
     }
-  }, others), (0, _map["default"])(_context = (0, _from["default"])(state.collection)).call(_context, function (item, index) {
+  }, others), (0, _react2.jsx)(_TreeViewWrapper["default"], null, (0, _map["default"])(_context = (0, _from["default"])(state.collection)).call(_context, function (item, index) {
     return SectionOrItemRender(item.props.items.length > 0, (0, _react2.jsx)(_index.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
@@ -114,17 +196,19 @@ var TreeView = /*#__PURE__*/(0, _react.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["default"].shape({
-    selectedKeys: _isIterable.isIterableProp
+    selectedKeys: _isIterable.isIterableProp,
+    items: _isIterable.isIterableProp
   }).isRequired,
   /** The currently disabled keys in the collection. */
   disabledKeys: _propTypes["default"].arrayOf(_propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].object])),
@@ -133,7 +217,11 @@ TreeView.propTypes = {
   /** The list of TreeView items. */
   items: _isIterable.isIterableProp,
   /** String that describes the treeview when using a screen reader. */
-  'aria-label': _propTypes["default"].string
+  'aria-label': _propTypes["default"].string,
+  /** Handler that is called when a key is pressed. */
+  onKeyDown: _propTypes["default"].func,
+  /** Number of items to move the focus when page up or page down is pressed */
+  pageLength: _propTypes["default"].number
 };
 var _default = TreeView;
 exports["default"] = _default;

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

@@ -29,36 +29,50 @@ var _default = {
 exports["default"] = _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'
 }];
 var Default = function Default(args) {
@@ -74,8 +88,7 @@ var Default = function Default(args) {
   return (0, _react2.jsx)(_index.TreeView, (0, _extends2["default"])({}, args, {
     items: tree.items,
     tree: tree,
-    "aria-label": "Example Tree",
-    disabledKeys: ['Single Item']
+    "aria-label": "Example Tree"
   }), function (section) {
     var _section$value;
     return (0, _react2.jsx)(_index.Item, {

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

@@ -10,7 +10,7 @@ var treeRow = {
   cursor: 'pointer',
   height: '31px',
   outline: 'none',
-  '&.is-selected, &.is-hovered, &.is-focused': {
+  '&.is-selected, &.is-hovered': {
     backgroundColor: 'active',
     '& span': {
       color: 'white'
@@ -24,9 +24,29 @@ 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'
+};
 var _default = {
-  treeRow: treeRow
+  treeRow: treeRow,
+  wrapper: wrapper
 };
 exports["default"] = _default;

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

@@ -4,9 +4,13 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _reactStately = require("react-stately");
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _index = require("../../index");
 var _testWrapper = require("../../utils/testUtils/testWrapper");
 var _TreeView = require("./TreeView");
+var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate.test");
+var _TreeViewSection = require("./TreeViewSection");
 var _ = _interopRequireDefault(require("."));
 var _react2 = require("@emotion/react");
 var testId = 'test-TreeView';
@@ -43,9 +47,12 @@ var data = [{
 }, {
   title: 'Single Item'
 }];
+var singleData = [{
+  title: 'Single Item'
+}];
 var TreeViewComponent = function TreeViewComponent(props) {
   var tree = (0, _reactStately.useTreeData)({
-    initialItems: data,
+    initialItems: props.data,
     getKey: function getKey(item) {
       return item.title;
     },
@@ -65,6 +72,9 @@ var TreeViewComponent = function TreeViewComponent(props) {
     });
   });
 };
+TreeViewComponent.propTypes = {
+  data: _propTypes["default"].arrayOf(_propTypes["default"].shape({}))
+};
 var offsetWidth;
 var offsetHeight;
 var scrollHeight;
@@ -98,16 +108,20 @@ test('TreeView component does load', function () {
   expect(element).toBeInTheDocument();
 });
 test('Can select an Item using the mouse', function () {
-  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, null));
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data
+  }));
   var element = _testWrapper.screen.queryByRole('treegrid');
   expect(element).toBeInTheDocument();
   var peopleElement = _testWrapper.screen.queryByText('Single Item');
   expect(peopleElement).not.toHaveClass('is-selected');
-  _testWrapper.fireEvent.click(peopleElement);
+  _userEvent["default"].click(peopleElement);
   expect(peopleElement).toHaveClass('is-selected');
 });
 test('Renders both Sections and Items', function () {
-  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, null));
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data
+  }));
   var peopleElement = _testWrapper.screen.getByText('Single Item');
   expect(peopleElement).toBeInTheDocument();
   var plantElement = _testWrapper.screen.getByText('Other');
@@ -116,7 +130,9 @@ test('Renders both Sections and Items', function () {
   expect(allListItems).toHaveLength(3);
 });
 test('Can expand an Item using the mouse', function () {
-  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, null));
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data
+  }));
 
   // The children of collapsed sections will not
   // be rendered by default.
@@ -125,47 +141,91 @@ test('Can expand an Item using the mouse', function () {
   // Clicking the dropdown icon, renders the children
   // of the collapsed section.
   var buttons = _testWrapper.screen.queryAllByRole('button');
-  _testWrapper.fireEvent.click(buttons[0]);
+  _userEvent["default"].click(buttons[0]);
   expect(_testWrapper.screen.queryByText(data[0].items[0].title)).toBeInTheDocument();
 });
 test('onExpandedChange change prop calls when used', function () {
   var onPress = jest.fn();
   (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data,
     onExpandedChange: onPress
   }));
   expect(onPress).not.toHaveBeenCalled();
   var buttons = _testWrapper.screen.queryAllByRole('button');
-  _testWrapper.fireEvent.click(buttons[0]);
+  _userEvent["default"].click(buttons[0]);
   expect(onPress).toHaveBeenCalled();
 });
 test('disabledKeys prop disables items in the tree -- rendering them unclickable', function () {
   (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data,
     disabledKeys: ['Single Item']
   }));
   var listItems = _testWrapper.screen.queryAllByRole('treeitem');
   var thisItem = listItems[2];
   expect(thisItem).not.toHaveClass('is-selected');
   expect(thisItem).toHaveAttribute('aria-disabled', 'true');
-  _testWrapper.fireEvent.mouseDown(thisItem);
-  _testWrapper.fireEvent.mouseUp(thisItem);
+  _userEvent["default"].click(thisItem);
   expect(thisItem).not.toHaveClass('is-selected');
   expect(thisItem).toHaveAttribute('aria-selected', 'false');
 });
 test('displays correct aria attributes', function () {
-  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, null));
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data
+  }));
   var listItems = _testWrapper.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 = _testWrapper.screen.queryAllByRole('button');
-  _testWrapper.fireEvent.click(buttons[1]);
+  _userEvent["default"].click(buttons[1]);
   var expandedItems = _testWrapper.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();
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data,
+    onKeyDown: callback
+  }));
+  var listItems = _testWrapper.screen.queryAllByRole('treeitem');
+  var thisItem = listItems[0];
+  _userEvent["default"].type(thisItem, '{arrowleft}');
+  expect(callback).toHaveBeenCalled();
+});
+test('onKeyDown calls passed in prop call back function', function () {
+  var callback = jest.fn();
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data,
+    onKeyDown: callback
+  }));
+  var listItems = _testWrapper.screen.queryAllByRole('treeitem');
+  var thisItem = listItems[2];
+  _userEvent["default"].type(thisItem, '{arrowleft}');
+  expect(callback).toHaveBeenCalled();
+});
+test('onKeyDown does not call passed in prop call back function', function () {
+  var callback = jest.fn();
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: data
+  }));
+  var listItems = _testWrapper.screen.queryAllByRole('treeitem');
+  var thisItem = listItems[2];
+  _userEvent["default"].type(thisItem, '{arrowleft}');
+  expect(callback).not.toHaveBeenCalled();
+});
+test('items still render if there is only one provided', function () {
+  var callback = jest.fn();
+  (0, _testWrapper.render)((0, _react2.jsx)(TreeViewComponent, {
+    data: singleData,
+    onKeyDown: callback
+  }));
+  var listItem = _testWrapper.screen.queryByText('Single Item');
+  expect(listItem).toBeInTheDocument();
+});
 var firstJSX = (0, _react2.jsx)("p", null, "first");
 var secondJSX = (0, _react2.jsx)("p", null, "second");
 test('Section or Item Render renders first item if condition is true', function () {
@@ -179,4 +239,24 @@ test('Section or Item Render renders second item if condition is false', functio
   var thisItem = _testWrapper.screen.getByText('second');
   expect(thisItem).toBeInTheDocument();
   expect(_testWrapper.screen.queryByText('first')).not.toBeInTheDocument();
+});
+test('Handler function removes ref from array', function () {
+  var newArray = (0, _TreeViewSection.removeRefFromArrayHelper)(_TreeViewKeyboardDelegate.refArray, 'test');
+  expect(newArray).toHaveLength(2);
+});
+test('Handler function does not remove ref from array', function () {
+  var newArray = (0, _TreeViewSection.removeRefFromArrayHelper)(_TreeViewKeyboardDelegate.refArray, 'anothertest');
+  expect(newArray).toHaveLength(3);
+});
+test('Handler function does add ref to array', function () {
+  var newArray = (0, _TreeViewSection.addRefToArrayHelper)(_TreeViewKeyboardDelegate.refArray, 'yetanothertest', {
+    current: 'currentlystilltesting'
+  });
+  expect(newArray).toHaveLength(4);
+});
+test('Handler function does not add ref to array', function () {
+  var newArray = (0, _TreeViewSection.addRefToArrayHelper)(_TreeViewKeyboardDelegate.refArray, 'test', {
+    current: 'currentlystilltesting'
+  });
+  expect(newArray).toHaveLength(3);
 });

package/lib/cjs/components/TreeView/TreeViewItem.js

@@ -8,21 +8,68 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.onKeyDownItem = exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _FileIcon = _interopRequireDefault(require("@pingux/mdi-react/FileIcon"));
+var _focus = require("@react-aria/focus");
 var _listbox = require("@react-aria/listbox");
+var _utils = require("@react-aria/utils");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _TreeViewContext = require("../../context/TreeViewContext");
+var _hooks = require("../../hooks");
 var _index = require("../../index");
+var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate");
 var _TreeViewRow = _interopRequireDefault(require("./TreeViewRow"));
+var _TreeViewSection = require("./TreeViewSection");
 var _react2 = require("@emotion/react");
 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 onKeyDownItem = function onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength) {
+  switch (e.which) {
+    case 32:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onSpacePress(e, tree, key, isSelected);
+      break;
+    case 38:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onUpPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 40:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onDownPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 37:
+    case 39:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onRightLeftItemPress(e);
+      break;
+    case 33:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onPageUpPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 34:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onPageDownPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 36:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onHomePress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 35:
+      _TreeViewKeyboardDelegate.itemPressHandlers.onEndPress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    default:
+      break;
+  }
+};
+exports.onKeyDownItem = onKeyDownItem;
 var TreeViewItem = /*#__PURE__*/(0, _react.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;
@@ -32,8 +79,16 @@ var TreeViewItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return treeItemRef.current;
   });
+
+  /* istanbul ignore next */
   var _useTreeViewContext = (0, _TreeViewContext.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 = (0, _listbox.useOption)({
       key: key
     }, state, treeItemRef),
@@ -41,24 +96,65 @@ var TreeViewItem = /*#__PURE__*/(0, _react.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 (0, _TreeViewSection.removeRefFromArrayHelper)(prev, key);
+    });
+  };
+  var addRefToArray = function addRefToArray() {
+    setRefs(function (prev) {
+      return (0, _TreeViewSection.addRefToArrayHelper)(prev, key, treeItemRef);
+    });
+  };
+
+  // adds and removes refs on mount and dismount
+  /* istanbul ignore next */
+  (0, _react.useEffect)(function () {
+    // this  runs on mount
+    addRefToArray();
+    return function () {
+      // this runs on cleanup
+      removeRefFromArray(key, refArray);
+    };
+  }, []);
+  var _useFocusRing = (0, _focus.useFocusRing)(),
+    isFocusVisible = _useFocusRing.isFocusVisible,
+    focusProps = _useFocusRing.focusProps;
+  var mergedProps = (0, _utils.mergeProps)(focusProps, optionProps, {
+    onFocus: function onFocus() {
+      return setLastFocusedItem(key);
+    }
+  });
+  var _useStatusClasses = (0, _hooks.useStatusClasses)('', {
+      isFocused: isFocusVisible
+    }),
+    classNames = _useStatusClasses.classNames;
   return (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
     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);
+    }
   }), (0, _react2.jsx)(_TreeViewRow["default"], {
     item: item,
     title: title,
@@ -72,8 +168,10 @@ TreeViewItem.propTypes = {
   item: _propTypes["default"].shape({
     key: _propTypes["default"].string
   }),
+  focusManager: _propTypes["default"].shape({}),
   name: _propTypes["default"].string,
   title: _propTypes["default"].string,
+  onKeyDown: _propTypes["default"].func,
   level: _propTypes["default"].number,
   position: _propTypes["default"].number,
   setSize: _propTypes["default"].number