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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/lib/cjs/components/ImageUploadField/ImageUploadField.test.js +14 -47
  2. package/lib/cjs/components/TreeView/TreeView.js +11 -99
  3. package/lib/cjs/components/TreeView/TreeView.stories.js +10 -23
  4. package/lib/cjs/components/TreeView/TreeView.styles.js +2 -22
  5. package/lib/cjs/components/TreeView/TreeView.test.js +11 -91
  6. package/lib/cjs/components/TreeView/TreeViewItem.js +14 -112
  7. package/lib/cjs/components/TreeView/TreeViewRow.js +5 -20
  8. package/lib/cjs/components/TreeView/TreeViewSection.js +16 -164
  9. package/lib/cjs/hooks/useImageUploadState/useImageUploadState.js +6 -9
  10. package/lib/cjs/hooks/useModalState/useModalState.js +9 -0
  11. package/lib/cjs/utils/testUtils/testWrapper.js +2 -3
  12. package/lib/components/ImageUploadField/ImageUploadField.test.js +14 -47
  13. package/lib/components/TreeView/TreeView.js +12 -100
  14. package/lib/components/TreeView/TreeView.stories.js +10 -23
  15. package/lib/components/TreeView/TreeView.styles.js +2 -22
  16. package/lib/components/TreeView/TreeView.test.js +12 -92
  17. package/lib/components/TreeView/TreeViewItem.js +14 -111
  18. package/lib/components/TreeView/TreeViewRow.js +5 -20
  19. package/lib/components/TreeView/TreeViewSection.js +16 -161
  20. package/lib/hooks/useImageUploadState/useImageUploadState.js +6 -9
  21. package/lib/hooks/useModalState/useModalState.js +10 -0
  22. package/lib/utils/testUtils/testWrapper.js +2 -3
  23. package/package.json +1 -1
  24. package/lib/cjs/components/TreeView/TreeViewKeyboardDelegate.js +0 -200
  25. package/lib/cjs/components/TreeView/TreeViewKeyboardDelegate.test.js +0 -511
  26. package/lib/cjs/components/TreeView/TreeViewWrapper.js +0 -40
  27. package/lib/cjs/hooks/useImageUploadState/index.d.ts +0 -1
  28. package/lib/cjs/hooks/useImageUploadState/useImageUploadState.d.ts +0 -28
  29. package/lib/cjs/hooks/useModalState/index.d.ts +0 -1
  30. package/lib/cjs/hooks/useModalState/useModalState.d.ts +0 -21
  31. package/lib/cjs/hooks/useModalState/useModalState.test.d.ts +0 -1
  32. package/lib/cjs/utils/testUtils/setupTests.d.ts +0 -4
  33. package/lib/cjs/utils/testUtils/testAxe.d.ts +0 -2
  34. package/lib/cjs/utils/testUtils/testTheme.d.ts +0 -21
  35. package/lib/cjs/utils/testUtils/testWrapper.d.ts +0 -5
  36. package/lib/components/TreeView/TreeViewKeyboardDelegate.js +0 -176
  37. package/lib/components/TreeView/TreeViewKeyboardDelegate.test.js +0 -496
  38. package/lib/components/TreeView/TreeViewWrapper.js +0 -31
@@ -8,68 +8,21 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
8
8
  _Object$defineProperty(exports, "__esModule", {
9
9
  value: true
10
10
  });
11
- exports.onKeyDownItem = exports["default"] = void 0;
11
+ exports["default"] = void 0;
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
13
13
  var _react = _interopRequireWildcard(require("react"));
14
14
  var _FileIcon = _interopRequireDefault(require("@pingux/mdi-react/FileIcon"));
15
- var _focus = require("@react-aria/focus");
16
15
  var _listbox = require("@react-aria/listbox");
17
- var _utils = require("@react-aria/utils");
18
16
  var _propTypes = _interopRequireDefault(require("prop-types"));
19
17
  var _TreeViewContext = require("../../context/TreeViewContext");
20
- var _hooks = require("../../hooks");
21
18
  var _index = require("../../index");
22
- var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate");
23
19
  var _TreeViewRow = _interopRequireDefault(require("./TreeViewRow"));
24
- var _TreeViewSection = require("./TreeViewSection");
25
20
  var _react2 = require("@emotion/react");
26
21
  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); }
27
22
  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; }
28
- var onKeyDownItem = function onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength) {
29
- switch (e.which) {
30
- case 32:
31
- _TreeViewKeyboardDelegate.itemPressHandlers.onSpacePress(e, tree, key, isSelected);
32
- break;
33
- case 38:
34
- _TreeViewKeyboardDelegate.itemPressHandlers.onUpPress(e, key, refArray, flatKeyArray);
35
- e.preventDefault();
36
- e.stopPropagation();
37
- break;
38
- case 40:
39
- _TreeViewKeyboardDelegate.itemPressHandlers.onDownPress(e, key, refArray, flatKeyArray);
40
- e.preventDefault();
41
- e.stopPropagation();
42
- break;
43
- case 37:
44
- case 39:
45
- _TreeViewKeyboardDelegate.itemPressHandlers.onRightLeftItemPress(e);
46
- break;
47
- case 33:
48
- _TreeViewKeyboardDelegate.itemPressHandlers.onPageUpPress(e, key, flatKeyArray, refArray, pageLength);
49
- break;
50
- case 34:
51
- _TreeViewKeyboardDelegate.itemPressHandlers.onPageDownPress(e, key, flatKeyArray, refArray, pageLength);
52
- break;
53
- case 36:
54
- _TreeViewKeyboardDelegate.itemPressHandlers.onHomePress(key, flatKeyArray, refArray);
55
- e.preventDefault();
56
- e.stopPropagation();
57
- break;
58
- case 35:
59
- _TreeViewKeyboardDelegate.itemPressHandlers.onEndPress(key, flatKeyArray, refArray);
60
- e.preventDefault();
61
- e.stopPropagation();
62
- break;
63
- default:
64
- break;
65
- }
66
- };
67
- exports.onKeyDownItem = onKeyDownItem;
68
23
  var TreeViewItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
69
24
  var item = props.item,
70
25
  title = props.title,
71
- focusManager = props.focusManager,
72
- onKeyDown = props.onKeyDown,
73
26
  level = props.level,
74
27
  position = props.position,
75
28
  setSize = props.setSize;
@@ -79,16 +32,8 @@ var TreeViewItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
79
32
  (0, _react.useImperativeHandle)(ref, function () {
80
33
  return treeItemRef.current;
81
34
  });
82
-
83
- /* istanbul ignore next */
84
35
  var _useTreeViewContext = (0, _TreeViewContext.useTreeViewContext)(),
85
- state = _useTreeViewContext.state,
86
- tree = _useTreeViewContext.tree,
87
- refArray = _useTreeViewContext.refArray,
88
- setRefs = _useTreeViewContext.setRefs,
89
- flatKeyArray = _useTreeViewContext.flatKeyArray,
90
- pageLength = _useTreeViewContext.pageLength,
91
- setLastFocusedItem = _useTreeViewContext.setLastFocusedItem;
36
+ state = _useTreeViewContext.state;
92
37
  var _useOption = (0, _listbox.useOption)({
93
38
  key: key
94
39
  }, state, treeItemRef),
@@ -96,65 +41,24 @@ var TreeViewItem = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
96
41
  isSelected = _useOption.isSelected,
97
42
  isDisabled = _useOption.isDisabled;
98
43
  var isExpanded = state.expandedKeys.has(key);
99
- var onKeyDownFunction = function onKeyDownFunction(e) {
100
- /* istanbul ignore next */
101
- onKeyDownItem(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength);
102
- if (onKeyDown) {
103
- onKeyDown(e, key);
104
- }
105
- };
106
-
107
- // ignoring from tests, but this is actually being unit tested
108
- /* istanbul ignore next */
109
- var removeRefFromArray = function removeRefFromArray() {
110
- setRefs(function (prev) {
111
- return (0, _TreeViewSection.removeRefFromArrayHelper)(prev, key);
112
- });
113
- };
114
- var addRefToArray = function addRefToArray() {
115
- setRefs(function (prev) {
116
- return (0, _TreeViewSection.addRefToArrayHelper)(prev, key, treeItemRef);
117
- });
118
- };
119
-
120
- // adds and removes refs on mount and dismount
121
- /* istanbul ignore next */
122
- (0, _react.useEffect)(function () {
123
- // this runs on mount
124
- addRefToArray();
125
- return function () {
126
- // this runs on cleanup
127
- removeRefFromArray(key, refArray);
128
- };
129
- }, []);
130
- var _useFocusRing = (0, _focus.useFocusRing)(),
131
- isFocusVisible = _useFocusRing.isFocusVisible,
132
- focusProps = _useFocusRing.focusProps;
133
- var mergedProps = (0, _utils.mergeProps)(focusProps, optionProps, {
134
- onFocus: function onFocus() {
135
- return setLastFocusedItem(key);
136
- }
137
- });
138
- var _useStatusClasses = (0, _hooks.useStatusClasses)('', {
139
- isFocused: isFocusVisible
140
- }),
141
- classNames = _useStatusClasses.classNames;
142
44
  return (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
143
45
  as: "li",
144
46
  isRow: true,
145
47
  ref: treeItemRef,
146
- "aria-disabled": isDisabled
147
- }, mergedProps, {
148
- role: "treeitem",
149
- variant: "treeView.wrapper",
150
- className: classNames,
151
- "aria-selected": isSelected,
48
+ "aria-disabled": isDisabled,
152
49
  "aria-level": level,
153
50
  "aria-posinset": position + 1,
154
- "aria-setsize": setSize,
155
- onKeyDown: function onKeyDown(e) {
156
- return onKeyDownFunction(e);
157
- }
51
+ "aria-setsize": setSize
52
+ }, optionProps, {
53
+ role: "treeitem",
54
+ sx: {
55
+ width: '100%',
56
+ ml: '36px',
57
+ ':not(:last-child)': {
58
+ pb: 'sm'
59
+ }
60
+ },
61
+ "aria-selected": isSelected
158
62
  }), (0, _react2.jsx)(_TreeViewRow["default"], {
159
63
  item: item,
160
64
  title: title,
@@ -168,10 +72,8 @@ TreeViewItem.propTypes = {
168
72
  item: _propTypes["default"].shape({
169
73
  key: _propTypes["default"].string
170
74
  }),
171
- focusManager: _propTypes["default"].shape({}),
172
75
  name: _propTypes["default"].string,
173
76
  title: _propTypes["default"].string,
174
- onKeyDown: _propTypes["default"].func,
175
77
  level: _propTypes["default"].number,
176
78
  position: _propTypes["default"].number,
177
79
  setSize: _propTypes["default"].number
@@ -30,7 +30,7 @@ var _TreeViewContext = require("../../context/TreeViewContext");
30
30
  var _hooks = require("../../hooks");
31
31
  var _index = require("../../index");
32
32
  var _react2 = require("@emotion/react");
33
- var _excluded = ["title", "mainIcon", "lastIcon", "item", "items", "isExpanded", "isSelected", "isDisabled", "isParentFocused", "iconButtonProps"];
33
+ var _excluded = ["title", "mainIcon", "lastIcon", "item", "items", "isExpanded", "isSelected", "isDisabled", "iconButtonProps"];
34
34
  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); }
35
35
  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; }
36
36
  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,7 +46,6 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
46
46
  isExpanded = props.isExpanded,
47
47
  isSelected = props.isSelected,
48
48
  isDisabled = props.isDisabled,
49
- isParentFocused = props.isParentFocused,
50
49
  iconButtonProps = props.iconButtonProps,
51
50
  others = (0, _objectWithoutProperties2["default"])(props, _excluded);
52
51
  var treeRowRef = (0, _react.useRef)();
@@ -85,19 +84,13 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
85
84
  }),
86
85
  classNames = _useStatusClasses.classNames;
87
86
  var mergedProps = (0, _utils.mergeProps)(hoverProps, pressProps, others);
88
-
89
- // console.log(`ROW: ${key} has parent focus: ${isParentFocused}`)
90
-
91
87
  return (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
92
88
  ref: treeRowRef,
93
89
  isRow: true,
94
90
  alignItems: "center",
95
91
  gap: "xs",
96
92
  sx: {
97
- flexGrow: 1,
98
- '& :focus': {
99
- border: 'none'
100
- }
93
+ flexGrow: 1
101
94
  },
102
95
  className: classNames,
103
96
  key: "".concat(key, " box")
@@ -110,22 +103,15 @@ var TreeViewRow = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
110
103
  size: 25,
111
104
  title: "".concat(title, " expand or collapse button")
112
105
  },
113
- buttonProps: _objectSpread(_objectSpread({
106
+ buttonProps: {
114
107
  'aria-label': "".concat(title, " expand or collapse button")
115
- }, isParentFocused && {
116
- tabIndex: 0
117
- }), !isParentFocused && {
118
- tabIndex: -1
119
- })
108
+ }
120
109
  }), (0, _react2.jsx)(_index.Box, {
121
110
  isRow: true,
122
111
  className: classNames,
123
112
  alignItems: "center",
124
113
  gap: "xs",
125
- variant: "treeView.treeRow",
126
- sx: !items && {
127
- ml: '36px'
128
- }
114
+ variant: "treeView.treeRow"
129
115
  }, (0, _react2.jsx)(_index.Icon, {
130
116
  color: "focus",
131
117
  icon: mainIcon,
@@ -146,7 +132,6 @@ TreeViewRow.propTypes = {
146
132
  isSelected: _propTypes["default"].bool,
147
133
  isDisabled: _propTypes["default"].bool,
148
134
  isExpanded: _propTypes["default"].bool,
149
- isParentFocused: _propTypes["default"].bool,
150
135
  title: _propTypes["default"].string,
151
136
  items: _propTypes["default"].arrayOf(_propTypes["default"].shape({})),
152
137
  iconButtonProps: _propTypes["default"].shape({
@@ -8,114 +8,25 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
8
8
  _Object$defineProperty(exports, "__esModule", {
9
9
  value: true
10
10
  });
11
- exports.removeRefFromArrayHelper = exports.onKeyDownSection = exports["default"] = exports.addRefToArrayHelper = void 0;
11
+ exports["default"] = void 0;
12
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
13
- var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
14
- var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
15
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
16
13
  var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
17
14
  var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
18
15
  var _react = _interopRequireWildcard(require("react"));
19
- var _focus = require("@react-aria/focus");
20
16
  var _listbox = require("@react-aria/listbox");
21
- var _utils = require("@react-aria/utils");
22
17
  var _propTypes = _interopRequireDefault(require("prop-types"));
23
18
  var _TreeViewContext = require("../../context/TreeViewContext");
24
- var _hooks = require("../../hooks");
25
19
  var _index2 = require("../../index");
26
20
  var _TreeView = require("./TreeView");
27
- var _TreeViewKeyboardDelegate = require("./TreeViewKeyboardDelegate");
28
21
  var _TreeViewRow = _interopRequireDefault(require("./TreeViewRow"));
29
22
  var _react2 = require("@emotion/react");
30
23
  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); }
31
24
  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; }
32
- var onKeyDownSection = function onKeyDownSection(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength, isFocused) {
33
- switch (e.which) {
34
- case 9:
35
- if (isFocused) {
36
- _TreeViewKeyboardDelegate.sectionPressHandlers.onTabPress(e, refArray, focusManager, true, key);
37
- }
38
- break;
39
- case 13:
40
- _TreeViewKeyboardDelegate.sectionPressHandlers.onEnterPress(e, state, key);
41
- break;
42
- case 32:
43
- _TreeViewKeyboardDelegate.sectionPressHandlers.onSpacePress(e, tree, key, isSelected);
44
- break;
45
- case 33:
46
- _TreeViewKeyboardDelegate.sectionPressHandlers.onPageUpPress(e, key, flatKeyArray, refArray, pageLength);
47
- break;
48
- case 34:
49
- _TreeViewKeyboardDelegate.sectionPressHandlers.onPageDownPress(e, key, flatKeyArray, refArray, pageLength);
50
- break;
51
- case 36:
52
- _TreeViewKeyboardDelegate.sectionPressHandlers.onHomePress(key, flatKeyArray, refArray);
53
- e.preventDefault();
54
- e.stopPropagation();
55
- break;
56
- case 35:
57
- _TreeViewKeyboardDelegate.sectionPressHandlers.onEndPress(key, flatKeyArray, refArray);
58
- e.preventDefault();
59
- e.stopPropagation();
60
- break;
61
- case 37:
62
- _TreeViewKeyboardDelegate.sectionPressHandlers.onLeftPress(e, focusManager, state, key, isExpanded, refArray);
63
- break;
64
- case 38:
65
- _TreeViewKeyboardDelegate.sectionPressHandlers.onUpPress(e, key, refArray, flatKeyArray);
66
- e.preventDefault();
67
- e.stopPropagation();
68
- break;
69
- case 39:
70
- if (isFocused) {
71
- _TreeViewKeyboardDelegate.sectionPressHandlers.onRightPress(e, focusManager, state, key, isExpanded, refArray);
72
- }
73
- break;
74
- case 40:
75
- _TreeViewKeyboardDelegate.sectionPressHandlers.onDownPress(e, key, refArray, flatKeyArray);
76
- e.preventDefault();
77
- e.stopPropagation();
78
- break;
79
- default:
80
- /* istanbul ignore next */
81
- break;
82
- }
83
- };
84
- exports.onKeyDownSection = onKeyDownSection;
85
- var removeRefFromArrayHelper = function removeRefFromArrayHelper(prevState, keyToRemove) {
86
- if ((0, _some["default"])(prevState).call(prevState, function (item) {
87
- return item.key === keyToRemove;
88
- })) {
89
- var _context;
90
- var newArray = (0, _concat["default"])(_context = []).call(_context, (0, _filter["default"])(prevState).call(prevState, function (_item) {
91
- return _item.key !== keyToRemove;
92
- }));
93
- return newArray;
94
- }
95
- return prevState;
96
- };
97
- exports.removeRefFromArrayHelper = removeRefFromArrayHelper;
98
- var addRefToArrayHelper = function addRefToArrayHelper(prevState, keyToAdd, refToAdd) {
99
- if (!(0, _some["default"])(prevState).call(prevState, function (i) {
100
- return i.key === keyToAdd;
101
- })) {
102
- var _context2;
103
- var thisObj = {
104
- key: keyToAdd,
105
- thisRef: refToAdd
106
- };
107
- return (0, _concat["default"])(_context2 = []).call(_context2, prevState, [thisObj]);
108
- }
109
- return prevState;
110
- };
111
- exports.addRefToArrayHelper = addRefToArrayHelper;
112
25
  var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
113
- var _context3;
26
+ var _context;
114
27
  var item = props.item,
115
28
  items = props.items,
116
29
  title = props.title,
117
- focusManager = props.focusManager,
118
- onKeyDown = props.onKeyDown,
119
30
  level = props.level,
120
31
  position = props.position,
121
32
  setSize = props.setSize;
@@ -126,107 +37,51 @@ var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
126
37
  return treeSectionRef.current;
127
38
  });
128
39
  var _useTreeViewContext = (0, _TreeViewContext.useTreeViewContext)(),
129
- state = _useTreeViewContext.state,
130
- tree = _useTreeViewContext.tree,
131
- refArray = _useTreeViewContext.refArray,
132
- setRefs = _useTreeViewContext.setRefs,
133
- flatKeyArray = _useTreeViewContext.flatKeyArray,
134
- pageLength = _useTreeViewContext.pageLength,
135
- setLastFocusedItem = _useTreeViewContext.setLastFocusedItem,
136
- lastFocusedItem = _useTreeViewContext.lastFocusedItem;
40
+ state = _useTreeViewContext.state;
137
41
  var _useOption = (0, _listbox.useOption)({
138
42
  key: key
139
43
  }, state, treeSectionRef),
140
44
  optionProps = _useOption.optionProps,
141
45
  isDisabled = _useOption.isDisabled,
142
46
  isSelected = _useOption.isSelected;
143
- var _useFocusRing = (0, _focus.useFocusRing)(),
144
- focusProps = _useFocusRing.focusProps,
145
- isFocused = _useFocusRing.isFocused;
146
- var _useFocusRing2 = (0, _focus.useFocusRing)({
147
- within: true
148
- }),
149
- focusPropsWithin = _useFocusRing2.focusProps,
150
- isFocusedWithin = _useFocusRing2.isFocused;
151
47
  var isExpanded = state.expandedKeys.has(key);
152
- var onKeyDownFunction = function onKeyDownFunction(e) {
153
- onKeyDownSection(e, state, key, tree, isSelected, isExpanded, focusManager, flatKeyArray, refArray, pageLength, isFocused);
154
- if (onKeyDown) {
155
- onKeyDown(e, key);
156
- }
157
- };
158
- var addRefToArray = function addRefToArray(thisKey, thisRef) {
159
- setRefs(function (prev) {
160
- return addRefToArrayHelper(prev, thisKey, thisRef);
161
- });
162
- };
163
- var removeRefFromArray = function removeRefFromArray() {
164
- setRefs(function (prev) {
165
- return removeRefFromArrayHelper(prev, key);
166
- });
167
- };
168
-
169
- // adds and removes refs on mount and dismount
170
- (0, _react.useEffect)(function () {
171
- // this runs on mount
172
- addRefToArray(key, treeSectionRef);
173
- return function () {
174
- // this runs on cleanup
175
- removeRefFromArray(key, refArray);
176
- };
177
- }, []);
178
- var mergedProps = (0, _utils.mergeProps)(focusPropsWithin, focusProps, optionProps, {
179
- onFocus: function onFocus() {
180
- return setLastFocusedItem(key);
181
- }
182
- });
183
- var _useStatusClasses = (0, _hooks.useStatusClasses)('', {
184
- isFocused: isFocused
185
- }),
186
- classNames = _useStatusClasses.classNames;
187
48
  return (0, _react2.jsx)(_index2.Box, (0, _extends2["default"])({
188
49
  ref: treeSectionRef,
189
50
  as: "li",
51
+ sx: {
52
+ ':not(:last-child)': {
53
+ pb: 'sm'
54
+ }
55
+ },
190
56
  "aria-expanded": isExpanded,
191
- "aria-disabled": isDisabled
192
- }, mergedProps, {
193
- role: "treeitem",
194
- variant: "treeView.wrapper",
195
- className: classNames,
196
- "aria-selected": isSelected,
57
+ "aria-disabled": isDisabled,
197
58
  "aria-level": level,
198
59
  "aria-setsize": setSize,
199
- "aria-posinset": position + 1,
200
- onKeyDown: function onKeyDown(e) {
201
- return onKeyDownFunction(e);
202
- },
203
- tabIndex: lastFocusedItem === key ? 0 : -1
60
+ "aria-posinset": position + 1
61
+ }, optionProps, {
62
+ role: "treeitem",
63
+ "aria-selected": isSelected
204
64
  }), (0, _react2.jsx)(_TreeViewRow["default"], {
205
65
  item: item,
206
66
  title: title,
207
67
  items: items,
208
68
  isExpanded: isExpanded,
209
69
  isSelected: isSelected,
210
- isDisabled: isDisabled,
211
- isParentFocused: isFocusedWithin
70
+ isDisabled: isDisabled
212
71
  }), isExpanded && (0, _react2.jsx)(_index2.Box, {
213
72
  as: "ul",
214
73
  role: "group",
215
74
  key: "".concat(item.key, " ul"),
216
75
  sx: {
217
- pl: 'md',
218
- '& :focus': {
219
- border: 'none'
220
- }
76
+ pl: 'md'
221
77
  }
222
- }, (0, _map["default"])(_context3 = (0, _from["default"])(items)).call(_context3, function (_item, _index) {
78
+ }, (0, _map["default"])(_context = (0, _from["default"])(items)).call(_context, function (_item, _index) {
223
79
  var _item$value$items;
224
80
  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, {
225
81
  item: _item,
226
82
  items: _item.children,
227
83
  title: _item.value.title,
228
84
  key: _item.value.title,
229
- focusManager: focusManager,
230
85
  level: level + 1,
231
86
  position: _index,
232
87
  setSize: items.length
@@ -234,7 +89,6 @@ var TreeViewSection = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
234
89
  item: _item,
235
90
  title: _item.value.title,
236
91
  key: _item.value.title,
237
- focusManager: focusManager,
238
92
  level: level + 1,
239
93
  position: _index,
240
94
  setSize: items.length
@@ -247,8 +101,6 @@ TreeViewSection.propTypes = {
247
101
  key: _propTypes["default"].string
248
102
  }),
249
103
  title: _propTypes["default"].string,
250
- focusManager: _propTypes["default"].shape({}),
251
- onKeyDown: _propTypes["default"].func,
252
104
  level: _propTypes["default"].number,
253
105
  position: _propTypes["default"].number,
254
106
  setSize: _propTypes["default"].number
@@ -43,15 +43,11 @@ var useImageUploadState = function useImageUploadState(inputRef) {
43
43
  if (previewImage && previewImage !== defaultPreviewImage) {
44
44
  setIsMenuOpen(true);
45
45
  } else {
46
- var _inputRef$current;
47
- (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.click();
46
+ inputRef.current.click();
48
47
  }
49
48
  }, [defaultPreviewImage, previewImage, inputRef]);
50
49
  var handleInputChange = (0, _react.useCallback)(function (event) {
51
50
  var _event$target;
52
- if (!event.target.files) {
53
- return;
54
- }
55
51
  var eventFileType = (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.files[0]) === null || _event$target === void 0 || (_event$target = _event$target.type) === null || _event$target === void 0 ? void 0 : _event$target.split('/')[0];
56
52
  if (fileTypes !== null && fileTypes !== void 0 && (0, _includes["default"])(fileTypes).call(fileTypes, eventFileType)) {
57
53
  if (onChange && typeof onChange === 'function') {
@@ -64,8 +60,9 @@ var useImageUploadState = function useImageUploadState(inputRef) {
64
60
  var _event$target2;
65
61
  setIsImageType(true);
66
62
  var reader = new FileReader();
67
- reader.onload = function () {
68
- setPreviewImage(reader.result);
63
+ reader.onload = function (_ref) {
64
+ var result = _ref.target.result;
65
+ setPreviewImage(result);
69
66
  };
70
67
  reader.readAsDataURL((_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.files[0]);
71
68
  } else {
@@ -87,8 +84,8 @@ var useImageUploadState = function useImageUploadState(inputRef) {
87
84
  return setPreviewImage(defaultPreviewImage);
88
85
  }, [defaultPreviewImage]);
89
86
  var showFileDialog = (0, _react.useCallback)(function () {
90
- var _inputRef$current2;
91
- return inputRef === null || inputRef === void 0 || (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.click();
87
+ var _inputRef$current;
88
+ return inputRef === null || inputRef === void 0 || (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.click();
92
89
  }, [inputRef]);
93
90
  var handleLabelClick = (0, _react.useCallback)(function (e) {
94
91
  e.preventDefault();
@@ -6,6 +6,15 @@ _Object$defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports["default"] = void 0;
8
8
  var _reactStately = require("react-stately");
9
+ /**
10
+ * Returns state-related data and functions for use with a Modal component.
11
+ * @param {Object} [props] Properties provided to the state
12
+ * @param {Boolean} [props.isDefaultOpen] Whether the modal is open by default (uncontrolled).
13
+ * @param {Boolean} [props.isOpen] Whether the modal is currently open (controlled).
14
+ * @param {Function} [props.onOpenChange] Handler that is called when the open state changes.
15
+ * `(isOpen: boolean) => void`
16
+ * @returns {Object} `{ isOpen: Boolean, open: Function, close: Function, toggle: Function }`
17
+ */
9
18
  var useModalState = function useModalState() {
10
19
  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
11
20
  var isDefaultOpen = props.isDefaultOpen,
@@ -43,7 +43,7 @@ var _ref = process.env.NODE_ENV === "production" ? {
43
43
  } : {
44
44
  name: "zxbwtf-GlobalTestStyles",
45
45
  styles: ".is-disabled{opacity:0.5;pointer-events:none;};label:GlobalTestStyles;",
46
- map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy90ZXN0VXRpbHMvdGVzdFdyYXBwZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVTIiwiZmlsZSI6Ii4uLy4uLy4uLy4uL3NyYy91dGlscy90ZXN0VXRpbHMvdGVzdFdyYXBwZXIudHN4Iiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFJlYWN0LCB7IFJlYWN0Tm9kZSB9IGZyb20gJ3JlYWN0JztcbmltcG9ydCB7IGNzcywgR2xvYmFsIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuaW1wb3J0IHsgcmVuZGVyLCBSZW5kZXJPcHRpb25zIH0gZnJvbSAnQHRlc3RpbmctbGlicmFyeS9yZWFjdCc7XG5pbXBvcnQgeyBUaGVtZVByb3ZpZGVyIH0gZnJvbSAndGhlbWUtdWknO1xuXG5pbXBvcnQgdGhlbWUgZnJvbSAnLi4vLi4vc3R5bGVzL3RoZW1lJztcblxuY29uc3QgR2xvYmFsVGVzdFN0eWxlczogUmVhY3QuRkMgPSAoKSA9PiAoXG4gIDxHbG9iYWxcbiAgICBzdHlsZXM9e1xuICAgICAgY3NzYFxuICAgICAgICAuaXMtZGlzYWJsZWQge1xuICAgICAgICAgIG9wYWNpdHk6IDAuNTtcbiAgICAgICAgICBwb2ludGVyLWV2ZW50czogbm9uZTtcbiAgICAgICAgfVxuICAgICAgYFxuICAgIH1cbiAgLz5cbik7XG5cbi8qKlxuICogVE9ETzogQ2hhbmdlIEplc3QgY29uZmlnIHNvIHRoaXMgZG9lc24ndCBoYXZlIHRvIGJlIGltcG9ydGVkIHJlbGF0aXZlbHkuLi5cbiAqIGh0dHBzOi8vdGVzdGluZy1saWJyYXJ5LmNvbS9kb2NzL3JlYWN0LXRlc3RpbmctbGlicmFyeS9zZXR1cC8jY29uZmlndXJpbmctamVzdC13aXRoLXRlc3QtdXRpbHNcbiAqXG4gKiBVc2UgdGhpcyB3cmFwcGVyIHdoZW4gdGVzdGluZyB0aGUgdGhlbWUgb3V0cHV0IGZvclxuICogYSBjb21wb25lbnQgdXNpbmcgLnRvSGF2ZVN0eWxlIG9yIC50b0hhdmVTdHlsZVJ1bGVcbiAqXG4gKiBTZWUgQnV0dG9uLnRlc3QuanMgYXMgYW4gZXhhbXBsZSBmb3IgaG93IHRvIGFwcGx5IGNvbmRpdGlvbmFsIGNsYXNzZXMgYW5kIHRoZW4gdGVzdGluZyB0aGF0XG4gKiB0aG9zZSBjbGFzc2VzIGhhdmUgdGhlIGFwcHJvcHJpYXRlIHN0eWxlcyB0aWVkIHRvIHRoZW0gaW4gdGhlIHRoZW1lLlxuICovXG5cbmludGVyZmFjZSBXcmFwcGVyUHJvcHMge1xuICBjaGlsZHJlbjogUmVhY3ROb2RlO1xufVxuXG5jb25zdCBXcmFwcGVyOiBSZWFjdC5GQzxXcmFwcGVyUHJvcHM+ID0gKHsgY2hpbGRyZW4gfSkgPT4gKFxuICA8VGhlbWVQcm92aWRlciB0aGVtZT17dGhlbWV9PlxuICAgIDxHbG9iYWxUZXN0U3R5bGVzIC8+XG4gICAge2NoaWxkcmVufVxuICA8L1RoZW1lUHJvdmlkZXI+XG4pO1xuXG5jb25zdCBjdXN0b21SZW5kZXIgPSAodWk6IFJlYWN0LlJlYWN0RWxlbWVudCwgb3B0aW9ucz86IFJlbmRlck9wdGlvbnMpID0+IHJlbmRlcih1aSxcbiAgeyB3cmFwcGVyOiBXcmFwcGVyIGFzIFJlYWN0LkZDLCAuLi5vcHRpb25zIH0sXG4pO1xuXG4vLyByZS1leHBvcnQgZXZlcnl0aGluZyAtXG5leHBvcnQgKiBmcm9tICdAdGVzdGluZy1saWJyYXJ5L3JlYWN0JztcblxuLy8gb3ZlcnJpZGUgcmVuZGVyIG1ldGhvZFxuZXhwb3J0IHsgY3VzdG9tUmVuZGVyIGFzIHJlbmRlciB9O1xuIl19 */",
46
+ map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy90ZXN0VXRpbHMvdGVzdFdyYXBwZXIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBVVMiLCJmaWxlIjoiLi4vLi4vLi4vLi4vc3JjL3V0aWxzL3Rlc3RVdGlscy90ZXN0V3JhcHBlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBjc3MsIEdsb2JhbCB9IGZyb20gJ0BlbW90aW9uL3JlYWN0JztcbmltcG9ydCB7IHJlbmRlciB9IGZyb20gJ0B0ZXN0aW5nLWxpYnJhcnkvcmVhY3QnO1xuaW1wb3J0IHsgVGhlbWVQcm92aWRlciB9IGZyb20gJ3RoZW1lLXVpJztcblxuaW1wb3J0IHRoZW1lIGZyb20gJy4uLy4uL3N0eWxlcy90aGVtZSc7XG5cbmNvbnN0IEdsb2JhbFRlc3RTdHlsZXMgPSAoKSA9PiAoXG4gIDxHbG9iYWxcbiAgICBzdHlsZXM9e1xuICAgICAgY3NzYFxuICAgICAgICAuaXMtZGlzYWJsZWQge1xuICAgICAgICAgIG9wYWNpdHk6IDAuNTtcbiAgICAgICAgICBwb2ludGVyLWV2ZW50czogbm9uZTtcbiAgICAgICAgfVxuICAgICAgYFxuICAgIH1cbiAgLz5cbik7XG5cbi8qKlxuICogVE9ETzogQ2hhbmdlIEplc3QgY29uZmlnIHNvIHRoaXMgZG9lc24ndCBoYXZlIHRvIGJlIGltcG9ydGVkIHJlbGF0aXZlbHkuLi5cbiAqIGh0dHBzOi8vdGVzdGluZy1saWJyYXJ5LmNvbS9kb2NzL3JlYWN0LXRlc3RpbmctbGlicmFyeS9zZXR1cC8jY29uZmlndXJpbmctamVzdC13aXRoLXRlc3QtdXRpbHNcbiAqXG4gKiBVc2UgdGhpcyB3cmFwcGVyIHdoZW4gdGVzdGluZyB0aGUgdGhlbWUgb3V0cHV0IGZvclxuICogYSBjb21wb25lbnQgdXNpbmcgLnRvSGF2ZVN0eWxlIG9yIC50b0hhdmVTdHlsZVJ1bGVcbiAqXG4gKiBTZWUgQnV0dG9uLnRlc3QuanMgYXMgYW4gZXhhbXBsZSBmb3IgaG93IHRvIGFwcGx5IGNvbmRpdGlvbmFsIGNsYXNzZXMgYW5kIHRoZW4gdGVzdGluZyB0aGF0XG4gKiB0aG9zZSBjbGFzc2VzIGhhdmUgdGhlIGFwcHJvcHJpYXRlIHN0eWxlcyB0aWVkIHRvIHRoZW0gaW4gdGhlIHRoZW1lLlxuICovXG5jb25zdCBXcmFwcGVyID0gKHsgY2hpbGRyZW4gfSkgPT4ge1xuICByZXR1cm4gKFxuICAgIDxUaGVtZVByb3ZpZGVyIHRoZW1lPXt0aGVtZX0+XG4gICAgICA8R2xvYmFsVGVzdFN0eWxlcyAvPlxuICAgICAge2NoaWxkcmVufVxuICAgIDwvVGhlbWVQcm92aWRlcj5cbiAgKTtcbn07XG5cbmNvbnN0IGN1c3RvbVJlbmRlciA9ICh1aSwgb3B0aW9ucykgPT4gcmVuZGVyKHVpLCB7IHdyYXBwZXI6IFdyYXBwZXIsIC4uLm9wdGlvbnMgfSk7XG5cbi8vIHJlLWV4cG9ydCBldmVyeXRoaW5nXG5leHBvcnQgKiBmcm9tICdAdGVzdGluZy1saWJyYXJ5L3JlYWN0JztcblxuLy8gb3ZlcnJpZGUgcmVuZGVyIG1ldGhvZFxuZXhwb3J0IHsgY3VzdG9tUmVuZGVyIGFzIHJlbmRlciB9O1xuIl19 */",
47
47
  toString: _EMOTION_STRINGIFIED_CSS_ERROR__
48
48
  };
49
49
  var GlobalTestStyles = function GlobalTestStyles() {
@@ -62,7 +62,6 @@ var GlobalTestStyles = function GlobalTestStyles() {
62
62
  * See Button.test.js as an example for how to apply conditional classes and then testing that
63
63
  * those classes have the appropriate styles tied to them in the theme.
64
64
  */
65
-
66
65
  var Wrapper = function Wrapper(_ref2) {
67
66
  var children = _ref2.children;
68
67
  return (0, _react2.jsx)(_themeUi.ThemeProvider, {
@@ -75,7 +74,7 @@ var customRender = function customRender(ui, options) {
75
74
  }, options));
76
75
  };
77
76
 
78
- // re-export everything -
77
+ // re-export everything
79
78
 
80
79
  // override render method
81
80
  exports.render = customRender;