@pingux/astro 2.32.0-alpha.8 → 2.32.0

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

@@ -30,7 +30,7 @@ var _TreeViewContext = require("../../context/TreeViewContext");
 var _hooks = require("../../hooks");
 var _index = require("../../index");
 var _react2 = require("@emotion/react");
-var _excluded = ["title", "mainIcon", "lastIcon", "item", "items", "isExpanded", "isSelected", "isDisabled", "iconButtonProps"];
+var _excluded = ["title", "mainIcon", "lastIcon", "item", "items", "isExpanded", "isSelected", "isDisabled", "isParentFocused", "iconButtonProps"];
 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 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; }
@@ -46,6 +46,7 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     isExpanded = props.isExpanded,
     isSelected = props.isSelected,
     isDisabled = props.isDisabled,
+    isParentFocused = props.isParentFocused,
     iconButtonProps = props.iconButtonProps,
     others = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var treeRowRef = (0, _react.useRef)();
@@ -84,13 +85,19 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }),
     classNames = _useStatusClasses.classNames;
   var mergedProps = (0, _utils.mergeProps)(hoverProps, pressProps, others);
+
+  // console.log(`ROW: ${key} has parent focus: ${isParentFocused}`)
+
   return (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
     ref: treeRowRef,
     isRow: true,
     alignItems: "center",
     gap: "xs",
     sx: {
-      flexGrow: 1
+      flexGrow: 1,
+      '& :focus': {
+        border: 'none'
+      }
     },
     className: classNames,
     key: "".concat(key, " box")
@@ -103,15 +110,22 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       size: 25,
       title: "".concat(title, " expand or collapse button")
     },
-    buttonProps: {
+    buttonProps: _objectSpread(_objectSpread({
       'aria-label': "".concat(title, " expand or collapse button")
-    }
+    }, isParentFocused && {
+      tabIndex: 0
+    }), !isParentFocused && {
+      tabIndex: -1
+    })
   }), (0, _react2.jsx)(_index.Box, {
     isRow: true,
     className: classNames,
     alignItems: "center",
     gap: "xs",
-    variant: "treeView.treeRow"
+    variant: "treeView.treeRow",
+    sx: !items && {
+      ml: '36px'
+    }
   }, (0, _react2.jsx)(_index.Icon, {
     color: "focus",
     icon: mainIcon,
@@ -132,6 +146,7 @@ TreeViewRow.propTypes = {
   isSelected: _propTypes["default"].bool,
   isDisabled: _propTypes["default"].bool,
   isExpanded: _propTypes["default"].bool,
+  isParentFocused: _propTypes["default"].bool,
   title: _propTypes["default"].string,
   items: _propTypes["default"].arrayOf(_propTypes["default"].shape({})),
   iconButtonProps: _propTypes["default"].shape({

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

@@ -8,25 +8,114 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.removeRefFromArrayHelper = exports.onKeyDownSection = exports["default"] = exports.addRefToArrayHelper = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
 var _react = _interopRequireWildcard(require("react"));
+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 _index2 = require("../../index");
 var _TreeView = require("./TreeView");
+var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate");
 var _TreeViewRow = _interopRequireDefault(require("./TreeViewRow"));
 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 onKeyDownSection = function onKeyDownSection(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength, isFocused) {
+  switch (e.which) {
+    case 9:
+      if (isFocused) {
+        _TreeViewKeyboardDelegate.sectionPressHandlers.onTabPress(e, refArray, focusManager, true, key);
+      }
+      break;
+    case 13:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onEnterPress(e, state, key);
+      break;
+    case 32:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onSpacePress(e, tree, key, isSelected);
+      break;
+    case 33:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onPageUpPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 34:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onPageDownPress(e, key, flatKeyArray, refArray, pageLength);
+      break;
+    case 36:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onHomePress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 35:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onEndPress(key, flatKeyArray, refArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 37:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onLeftPress(e, focusManager, state, key, isExpanded, refArray);
+      break;
+    case 38:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onUpPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    case 39:
+      if (isFocused) {
+        _TreeViewKeyboardDelegate.sectionPressHandlers.onRightPress(e, focusManager, state, key, isExpanded, refArray);
+      }
+      break;
+    case 40:
+      _TreeViewKeyboardDelegate.sectionPressHandlers.onDownPress(e, key, refArray, flatKeyArray);
+      e.preventDefault();
+      e.stopPropagation();
+      break;
+    default:
+      /* istanbul ignore next */
+      break;
+  }
+};
+exports.onKeyDownSection = onKeyDownSection;
+var removeRefFromArrayHelper = function removeRefFromArrayHelper(prevState, keyToRemove) {
+  if ((0, _some["default"])(prevState).call(prevState, function (item) {
+    return item.key === keyToRemove;
+  })) {
+    var _context;
+    var newArray = (0, _concat["default"])(_context = []).call(_context, (0, _filter["default"])(prevState).call(prevState, function (_item) {
+      return _item.key !== keyToRemove;
+    }));
+    return newArray;
+  }
+  return prevState;
+};
+exports.removeRefFromArrayHelper = removeRefFromArrayHelper;
+var addRefToArrayHelper = function addRefToArrayHelper(prevState, keyToAdd, refToAdd) {
+  if (!(0, _some["default"])(prevState).call(prevState, function (i) {
+    return i.key === keyToAdd;
+  })) {
+    var _context2;
+    var thisObj = {
+      key: keyToAdd,
+      thisRef: refToAdd
+    };
+    return (0, _concat["default"])(_context2 = []).call(_context2, prevState, [thisObj]);
+  }
+  return prevState;
+};
+exports.addRefToArrayHelper = addRefToArrayHelper;
 var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _context;
+  var _context3;
   var item = props.item,
     items = props.items,
     title = props.title,
+    focusManager = props.focusManager,
+    onKeyDown = props.onKeyDown,
     level = props.level,
     position = props.position,
     setSize = props.setSize;
@@ -37,51 +126,107 @@ var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     return treeSectionRef.current;
   });
   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,
+    lastFocusedItem = _useTreeViewContext.lastFocusedItem;
   var _useOption = (0, _listbox.useOption)({
       key: key
     }, state, treeSectionRef),
     optionProps = _useOption.optionProps,
     isDisabled = _useOption.isDisabled,
     isSelected = _useOption.isSelected;
+  var _useFocusRing = (0, _focus.useFocusRing)(),
+    focusProps = _useFocusRing.focusProps,
+    isFocused = _useFocusRing.isFocused;
+  var _useFocusRing2 = (0, _focus.useFocusRing)({
+      within: true
+    }),
+    focusPropsWithin = _useFocusRing2.focusProps,
+    isFocusedWithin = _useFocusRing2.isFocused;
   var isExpanded = state.expandedKeys.has(key);
+  var onKeyDownFunction = function onKeyDownFunction(e) {
+    onKeyDownSection(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength, isFocused);
+    if (onKeyDown) {
+      onKeyDown(e, key);
+    }
+  };
+  var addRefToArray = function addRefToArray(thisKey, thisRef) {
+    setRefs(function (prev) {
+      return addRefToArrayHelper(prev, thisKey, thisRef);
+    });
+  };
+  var removeRefFromArray = function removeRefFromArray() {
+    setRefs(function (prev) {
+      return removeRefFromArrayHelper(prev, key);
+    });
+  };
+
+  // adds and removes refs on mount and dismount
+  (0, _react.useEffect)(function () {
+    // this  runs on mount
+    addRefToArray(key, treeSectionRef);
+    return function () {
+      // this runs on cleanup
+      removeRefFromArray(key, refArray);
+    };
+  }, []);
+  var mergedProps = (0, _utils.mergeProps)(focusPropsWithin, focusProps, optionProps, {
+    onFocus: function onFocus() {
+      return setLastFocusedItem(key);
+    }
+  });
+  var _useStatusClasses = (0, _hooks.useStatusClasses)('', {
+      isFocused: isFocused
+    }),
+    classNames = _useStatusClasses.classNames;
   return (0, _react2.jsx)(_index2.Box, (0, _extends2["default"])({
     ref: treeSectionRef,
     as: "li",
-    sx: {
-      ':not(:last-child)': {
-        pb: 'sm'
-      }
-    },
     "aria-expanded": isExpanded,
-    "aria-disabled": isDisabled,
+    "aria-disabled": isDisabled
+  }, mergedProps, {
+    role: "treeitem",
+    variant: "treeView.wrapper",
+    className: classNames,
+    "aria-selected": isSelected,
     "aria-level": level,
     "aria-setsize": setSize,
-    "aria-posinset": position + 1
-  }, optionProps, {
-    role: "treeitem",
-    "aria-selected": isSelected
+    "aria-posinset": position + 1,
+    onKeyDown: function onKeyDown(e) {
+      return onKeyDownFunction(e);
+    },
+    tabIndex: lastFocusedItem === key ? 0 : -1
   }), (0, _react2.jsx)(_TreeViewRow["default"], {
     item: item,
     title: title,
     items: items,
     isExpanded: isExpanded,
     isSelected: isSelected,
-    isDisabled: isDisabled
+    isDisabled: isDisabled,
+    isParentFocused: isFocusedWithin
   }), isExpanded && (0, _react2.jsx)(_index2.Box, {
     as: "ul",
     role: "group",
     key: "".concat(item.key, " ul"),
     sx: {
-      pl: 'md'
+      pl: 'md',
+      '& :focus': {
+        border: 'none'
+      }
     }
-  }, (0, _map["default"])(_context = (0, _from["default"])(items)).call(_context, function (_item, _index) {
+  }, (0, _map["default"])(_context3 = (0, _from["default"])(items)).call(_context3, function (_item, _index) {
     var _item$value$items;
     return (0, _TreeView.SectionOrItemRender)(((_item$value$items = _item.value.items) === null || _item$value$items === void 0 ? void 0 : _item$value$items.length) > 0, (0, _react2.jsx)(TreeViewSection, {
       item: _item,
       items: _item.children,
       title: _item.value.title,
       key: _item.value.title,
+      focusManager: focusManager,
       level: level + 1,
       position: _index,
       setSize: items.length
@@ -89,6 +234,7 @@ var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
       item: _item,
       title: _item.value.title,
       key: _item.value.title,
+      focusManager: focusManager,
       level: level + 1,
       position: _index,
       setSize: items.length
@@ -101,6 +247,8 @@ TreeViewSection.propTypes = {
     key: _propTypes["default"].string
   }),
   title: _propTypes["default"].string,
+  focusManager: _propTypes["default"].shape({}),
+  onKeyDown: _propTypes["default"].func,
   level: _propTypes["default"].number,
   position: _propTypes["default"].number,
   setSize: _propTypes["default"].number

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

@@ -0,0 +1,40 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _react = _interopRequireDefault(require("react"));
+var _focus = require("@react-aria/focus");
+var _react2 = require("@emotion/react");
+var TreeViewWrapper = function TreeViewWrapper(props) {
+  var children = props.children;
+  var items = (0, _map["default"])(children).call(children, function (child) {
+    return {
+      item: child,
+      key: child.key
+    };
+  });
+  return (0, _react2.jsx)(_focus.FocusScope, {
+    restoreFocus: false,
+    contain: false
+  }, (0, _map["default"])(items).call(items, function (_ref) {
+    var item = _ref.item,
+      key = _ref.key;
+    return (0, _react2.jsx)(FocusableItem, {
+      key: key
+    }, item);
+  }));
+};
+var FocusableItem = function FocusableItem(props) {
+  var focusManager = (0, _focus.useFocusManager)();
+  var childWithFocusHandle = /*#__PURE__*/_react["default"].cloneElement(props.children, {
+    focusManager: focusManager
+  });
+  return childWithFocusHandle;
+};
+var _default = TreeViewWrapper;
+exports["default"] = _default;

package/lib/cjs/hooks/useField/index.d.ts

@@ -0,0 +1 @@
+export { default } from './useField';