@pingux/astro 1.28.2-alpha.2 → 1.29.0-alpha.0

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 (79) hide show
  1. package/lib/cjs/components/ArrayField/ArrayField.js +21 -22
  2. package/lib/cjs/components/ArrayField/ArrayField.stories.js +48 -26
  3. package/lib/cjs/components/CheckboxField/CheckboxField.js +11 -39
  4. package/lib/cjs/components/CheckboxField/CheckboxField.stories.js +24 -32
  5. package/lib/cjs/components/ColorField/ColorField.js +27 -20
  6. package/lib/cjs/components/ColorField/ColorField.stories.js +28 -8
  7. package/lib/cjs/components/ComboBox/ComboBoxInput.js +31 -39
  8. package/lib/cjs/components/ComboBoxField/ComboBoxField.js +30 -55
  9. package/lib/cjs/components/ComboBoxField/ComboBoxField.stories.js +65 -45
  10. package/lib/cjs/components/FileInputField/FileInputField.js +33 -27
  11. package/lib/cjs/components/FileInputField/FileInputField.stories.js +27 -7
  12. package/lib/cjs/components/FileInputField/FileSelect.js +41 -10
  13. package/lib/cjs/components/ImageUploadField/ImageUploadField.js +35 -15
  14. package/lib/cjs/components/ImageUploadField/ImageUploadField.stories.js +34 -14
  15. package/lib/cjs/components/LinkSelectField/LinkSelectField.js +18 -20
  16. package/lib/cjs/components/LinkSelectField/LinkSelectField.stories.js +71 -53
  17. package/lib/cjs/components/MultivaluesField/MultivaluesField.js +21 -12
  18. package/lib/cjs/components/MultivaluesField/MultivaluesField.stories.js +26 -6
  19. package/lib/cjs/components/NumberField/NumberField.js +15 -13
  20. package/lib/cjs/components/NumberField/NumberField.stories.js +25 -5
  21. package/lib/cjs/components/PasswordField/PasswordField.js +15 -27
  22. package/lib/cjs/components/PasswordField/PasswordField.stories.js +6 -4
  23. package/lib/cjs/components/RadioGroupField/RadioGroupField.js +17 -34
  24. package/lib/cjs/components/RadioGroupField/RadioGroupField.stories.js +25 -30
  25. package/lib/cjs/components/SearchField/SearchField.js +36 -55
  26. package/lib/cjs/components/SearchField/SearchField.stories.js +35 -24
  27. package/lib/cjs/components/SelectField/SelectField.js +27 -7
  28. package/lib/cjs/components/SelectField/SelectField.stories.js +73 -53
  29. package/lib/cjs/components/SelectFieldBase/SelectFieldBase.js +37 -25
  30. package/lib/cjs/components/SwitchField/SwitchField.js +43 -62
  31. package/lib/cjs/components/SwitchField/SwitchField.stories.js +26 -26
  32. package/lib/cjs/components/TextAreaField/TextAreaField.js +16 -20
  33. package/lib/cjs/components/TextAreaField/TextAreaField.stories.js +29 -11
  34. package/lib/cjs/components/TextField/TextField.js +11 -15
  35. package/lib/cjs/components/TextField/TextField.stories.js +30 -10
  36. package/lib/cjs/hooks/useField/useField.js +9 -21
  37. package/lib/cjs/recipes/LogoTabs.stories.js +50 -47
  38. package/lib/cjs/utils/devUtils/props/ariaAttributes.js +116 -0
  39. package/lib/cjs/utils/devUtils/props/ariaAttributes.test.js +65 -0
  40. package/lib/components/ArrayField/ArrayField.js +16 -14
  41. package/lib/components/ArrayField/ArrayField.stories.js +17 -3
  42. package/lib/components/CheckboxField/CheckboxField.js +6 -32
  43. package/lib/components/CheckboxField/CheckboxField.stories.js +17 -32
  44. package/lib/components/ColorField/ColorField.js +22 -16
  45. package/lib/components/ColorField/ColorField.stories.js +18 -3
  46. package/lib/components/ComboBox/ComboBoxInput.js +24 -32
  47. package/lib/components/ComboBoxField/ComboBoxField.js +25 -51
  48. package/lib/components/ComboBoxField/ComboBoxField.stories.js +17 -3
  49. package/lib/components/FileInputField/FileInputField.js +29 -24
  50. package/lib/components/FileInputField/FileInputField.stories.js +18 -3
  51. package/lib/components/FileInputField/FileSelect.js +32 -10
  52. package/lib/components/ImageUploadField/ImageUploadField.js +23 -8
  53. package/lib/components/ImageUploadField/ImageUploadField.stories.js +18 -3
  54. package/lib/components/LinkSelectField/LinkSelectField.js +12 -11
  55. package/lib/components/LinkSelectField/LinkSelectField.stories.js +17 -4
  56. package/lib/components/MultivaluesField/MultivaluesField.js +16 -9
  57. package/lib/components/MultivaluesField/MultivaluesField.stories.js +18 -3
  58. package/lib/components/NumberField/NumberField.js +5 -4
  59. package/lib/components/NumberField/NumberField.stories.js +17 -2
  60. package/lib/components/PasswordField/PasswordField.js +5 -11
  61. package/lib/components/PasswordField/PasswordField.stories.js +4 -3
  62. package/lib/components/RadioGroupField/RadioGroupField.js +12 -28
  63. package/lib/components/RadioGroupField/RadioGroupField.stories.js +17 -27
  64. package/lib/components/SearchField/SearchField.js +28 -48
  65. package/lib/components/SearchField/SearchField.stories.js +20 -14
  66. package/lib/components/SelectField/SelectField.js +18 -3
  67. package/lib/components/SelectField/SelectField.stories.js +18 -4
  68. package/lib/components/SelectFieldBase/SelectFieldBase.js +33 -25
  69. package/lib/components/SwitchField/SwitchField.js +40 -57
  70. package/lib/components/SwitchField/SwitchField.stories.js +18 -23
  71. package/lib/components/TextAreaField/TextAreaField.js +7 -9
  72. package/lib/components/TextAreaField/TextAreaField.stories.js +19 -5
  73. package/lib/components/TextField/TextField.js +4 -6
  74. package/lib/components/TextField/TextField.stories.js +19 -4
  75. package/lib/hooks/useField/useField.js +6 -16
  76. package/lib/recipes/LogoTabs.stories.js +50 -48
  77. package/lib/utils/devUtils/props/ariaAttributes.js +85 -0
  78. package/lib/utils/devUtils/props/ariaAttributes.test.js +50 -0
  79. package/package.json +1 -1
@@ -2,13 +2,25 @@
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
4
4
 
5
- var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
5
+ var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
6
+
7
+ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
6
8
 
7
9
  var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
8
10
 
9
- var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
11
+ var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
10
12
 
11
- var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
13
+ var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
14
+
15
+ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
16
+
17
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
18
+
19
+ var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
20
+
21
+ var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
22
+
23
+ var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
12
24
 
13
25
  _Object$defineProperty(exports, "__esModule", {
14
26
  value: true
@@ -22,9 +34,13 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
22
34
 
23
35
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
24
36
 
37
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
38
+
25
39
  var _react = _interopRequireWildcard(require("react"));
26
40
 
27
- var _index = require("../../index");
41
+ var _ = require("../../");
42
+
43
+ var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
28
44
 
29
45
  var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
30
46
 
@@ -34,9 +50,13 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
34
50
 
35
51
  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
52
 
53
+ 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; }
54
+
55
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(source), !0)).call(_context4, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context5 = ownKeys(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
56
+
37
57
  var _default = {
38
58
  title: 'Form/ColorField',
39
- component: _index.ColorField,
59
+ component: _.ColorField,
40
60
  parameters: {
41
61
  docs: {
42
62
  source: {
@@ -44,7 +64,7 @@ var _default = {
44
64
  }
45
65
  }
46
66
  },
47
- argTypes: {
67
+ argTypes: _objectSpread({
48
68
  value: {
49
69
  control: {
50
70
  type: 'text'
@@ -99,7 +119,7 @@ var _default = {
99
119
  type: 'none'
100
120
  }
101
121
  }
102
- }
122
+ }, _ariaAttributes.ariaAttributeBaseArgTypes)
103
123
  };
104
124
  exports["default"] = _default;
105
125
 
@@ -121,7 +141,7 @@ var Default = function Default(args) {
121
141
  }, []);
122
142
  return (// Application must be wrapped in an OverlayProvider so that it can be hidden from screen
123
143
  // readers when an overlay opens.
124
- (0, _react2.jsx)(_index.OverlayProvider, null, (0, _react2.jsx)(_index.ColorField, (0, _extends2["default"])({
144
+ (0, _react2.jsx)(_.OverlayProvider, null, (0, _react2.jsx)(_.ColorField, (0, _extends2["default"])({
125
145
  value: color
126
146
  }, args, {
127
147
  onChange: handleChange
@@ -50,19 +50,19 @@ var _interactions = require("@react-aria/interactions");
50
50
 
51
51
  var _MenuDownIcon = _interopRequireDefault(require("mdi-react/MenuDownIcon"));
52
52
 
53
- var _index = require("../../index");
53
+ var _ = require("../../");
54
54
 
55
- var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
56
-
57
- var _loadingStates = _interopRequireDefault(require("../../utils/devUtils/constants/loadingStates"));
55
+ var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
58
56
 
59
57
  var _hooks = require("../../hooks");
60
58
 
61
- var _Loader = _interopRequireDefault(require("../Loader"));
59
+ var _loadingStates = _interopRequireDefault(require("../../utils/devUtils/constants/loadingStates"));
60
+
61
+ var _statuses = _interopRequireDefault(require("../../utils/devUtils/constants/statuses"));
62
62
 
63
63
  var _react2 = require("@emotion/react");
64
64
 
65
- var _excluded = ["controlProps", "containerProps", "hasAutoFocus", "helperText", "isDisabled", "isReadOnly", "isOpen", "label", "labelProps", "loadingState", "status", "style", "inputWrapperRef", "inputRef", "inputProps", "triggerRef", "triggerProps", "menuTrigger", "onInputChange", "onLoadMore", "onOpenChange", "onSelectionChange", "wrapperProps"];
65
+ var _excluded = ["controlProps", "containerProps", "hasAutoFocus", "isDisabled", "isReadOnly", "isOpen", "loadingState", "style", "inputWrapperRef", "inputRef", "inputProps", "triggerRef", "triggerProps", "menuTrigger", "onInputChange", "onLoadMore", "onOpenChange", "onSelectionChange", "wrapperProps"];
66
66
 
67
67
  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); }
68
68
 
@@ -76,14 +76,10 @@ var ComboBoxInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
76
76
  var controlProps = props.controlProps,
77
77
  containerProps = props.containerProps,
78
78
  hasAutoFocus = props.hasAutoFocus,
79
- helperText = props.helperText,
80
79
  isDisabled = props.isDisabled,
81
80
  isReadOnly = props.isReadOnly,
82
81
  isOpen = props.isOpen,
83
- label = props.label,
84
- labelProps = props.labelProps,
85
82
  loadingState = props.loadingState,
86
- status = props.status,
87
83
  style = props.style,
88
84
  inputWrapperRef = props.inputWrapperRef,
89
85
  inputRef = props.inputRef,
@@ -98,14 +94,10 @@ var ComboBoxInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
98
94
  wrapperProps = props.wrapperProps,
99
95
  others = (0, _objectWithoutProperties2["default"])(props, _excluded);
100
96
 
101
- var textFieldProps = _objectSpread(_objectSpread(_objectSpread({}, others), {}, {
102
- helperText: helperText,
97
+ var textFieldProps = _objectSpread(_objectSpread(_objectSpread({
103
98
  isDisabled: isDisabled,
104
- isReadOnly: isReadOnly,
105
- label: label,
106
- labelProps: labelProps,
107
- status: status
108
- }, controlProps), inputProps);
99
+ isReadOnly: isReadOnly
100
+ }, controlProps), inputProps), others);
109
101
 
110
102
  var _useHover = (0, _interactions.useHover)({}),
111
103
  hoverProps = _useHover.hoverProps,
@@ -147,22 +139,22 @@ var ComboBoxInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
147
139
  }, [isLoading, showLoading, inputValue]); // END - minimum delay time for loading indicator = 500ms
148
140
 
149
141
  (0, _hooks.usePropWarning)(props, 'disabled', 'isDisabled');
150
- var button = (0, _react2.jsx)(_index.Box, {
142
+ var button = (0, _react2.jsx)(_.Box, {
151
143
  isRow: true,
152
144
  variant: "boxes.inputInContainerSlot"
153
145
  }, // Render loader after delay if filtering or loading
154
- showLoading && (isOpen || menuTrigger === 'manual' || loadingState === _loadingStates["default"].LOADING) && (0, _react2.jsx)(_Loader["default"], {
146
+ showLoading && (isOpen || menuTrigger === 'manual' || loadingState === _loadingStates["default"].LOADING) && (0, _react2.jsx)(_.Loader, {
155
147
  variant: "loader.withinInput"
156
148
  }), (0, _react2.jsx)(_interactions.PressResponder, {
157
149
  preventFocusOnPress: true,
158
150
  isPressed: isOpen
159
- }, (0, _react2.jsx)(_index.Button, (0, _extends2["default"])({
151
+ }, (0, _react2.jsx)(_.Button, (0, _extends2["default"])({
160
152
  variant: "comboBox"
161
153
  }, triggerProps, {
162
154
  ref: triggerRef,
163
155
  isDisabled: isDisabled || isReadOnly,
164
156
  tabIndex: -1
165
- }), (0, _react2.jsx)(_index.Icon, {
157
+ }), (0, _react2.jsx)(_.Icon, {
166
158
  icon: _MenuDownIcon["default"],
167
159
  sx: isOpen ? {
168
160
  transform: 'rotate(180deg)'
@@ -174,12 +166,12 @@ var ComboBoxInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
174
166
  focusClass: "is-focused",
175
167
  focusRingClass: "focus-ring",
176
168
  autoFocus: hasAutoFocus
177
- }, (0, _react2.jsx)(_index.Box, (0, _extends2["default"])({
169
+ }, (0, _react2.jsx)(_.Box, (0, _extends2["default"])({
178
170
  ref: ref,
179
171
  isRow: true,
180
172
  style: style,
181
173
  variant: "forms.comboBox.container"
182
- }, hoverProps, wrapperProps), (0, _react2.jsx)(_index.TextField, (0, _extends2["default"])({}, containerProps, textFieldProps, {
174
+ }, hoverProps, wrapperProps), (0, _react2.jsx)(_.TextField, (0, _extends2["default"])({}, containerProps, textFieldProps, {
183
175
  controlProps: _objectSpread({
184
176
  variant: 'forms.comboBox.input'
185
177
  }, controlProps),
@@ -195,32 +187,32 @@ var ComboBoxInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
195
187
  }
196
188
  }))));
197
189
  });
198
- ComboBoxInput.propTypes = {
199
- controlProps: _propTypes["default"].shape({}),
190
+ ComboBoxInput.propTypes = _objectSpread({
200
191
  containerProps: _propTypes["default"].shape({}),
201
- wrapperProps: _propTypes["default"].shape({}),
202
- isDisabled: _propTypes["default"].bool,
203
- isReadOnly: _propTypes["default"].bool,
192
+ controlProps: _propTypes["default"].shape({}),
193
+ hasAutoFocus: _propTypes["default"].bool,
194
+ helperText: _propTypes["default"].node,
204
195
  inputProps: _propTypes["default"].shape({
205
196
  value: _propTypes["default"].string
206
197
  }),
198
+ inputRef: _propTypes["default"].shape({}),
199
+ inputWrapperRef: _propTypes["default"].shape({}),
200
+ isDisabled: _propTypes["default"].bool,
201
+ isOpen: _propTypes["default"].bool,
202
+ isReadOnly: _propTypes["default"].bool,
207
203
  label: _propTypes["default"].node,
208
204
  labelProps: _propTypes["default"].shape({}),
209
205
  loadingState: _propTypes["default"].oneOf((0, _values["default"])(_loadingStates["default"])),
210
- inputWrapperRef: _propTypes["default"].shape({}),
211
- inputRef: _propTypes["default"].shape({}),
212
- triggerProps: _propTypes["default"].shape({}),
213
- triggerRef: _propTypes["default"].shape({}),
214
206
  menuTrigger: _propTypes["default"].oneOf(['focus', 'input', 'manual']),
215
- hasAutoFocus: _propTypes["default"].bool,
216
- style: _propTypes["default"].shape({}),
217
- isOpen: _propTypes["default"].bool,
218
- helperText: _propTypes["default"].node,
219
- status: _propTypes["default"].oneOf((0, _values["default"])(_statuses["default"])),
220
207
  onInputChange: _propTypes["default"].func,
221
208
  onLoadMore: _propTypes["default"].func,
222
209
  onOpenChange: _propTypes["default"].func,
223
- onSelectionChange: _propTypes["default"].func
224
- };
210
+ onSelectionChange: _propTypes["default"].func,
211
+ status: _propTypes["default"].oneOf((0, _values["default"])(_statuses["default"])),
212
+ style: _propTypes["default"].shape({}),
213
+ triggerProps: _propTypes["default"].shape({}),
214
+ triggerRef: _propTypes["default"].shape({}),
215
+ wrapperProps: _propTypes["default"].shape({})
216
+ }, _ariaAttributes.ariaAttributesBasePropTypes);
225
217
  var _default = ComboBoxInput;
226
218
  exports["default"] = _default;
@@ -34,45 +34,48 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
34
34
 
35
35
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
36
36
 
37
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
37
+ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
38
38
 
39
39
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
40
40
 
41
- var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
41
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
42
42
 
43
43
  var _react = _interopRequireWildcard(require("react"));
44
44
 
45
- var _propTypes = _interopRequireDefault(require("prop-types"));
46
-
47
- var _overlays = require("@react-aria/overlays");
48
-
49
45
  var _combobox = require("@react-aria/combobox");
50
46
 
51
- var _combobox2 = require("@react-stately/combobox");
47
+ var _utils = require("@react-aria/utils");
48
+
49
+ var _focus = require("@react-aria/focus");
52
50
 
53
51
  var _i18n = require("@react-aria/i18n");
54
52
 
55
- var _utils = require("@react-aria/utils");
53
+ var _overlays = require("@react-aria/overlays");
56
54
 
57
- var _focus = require("@react-aria/focus");
55
+ var _combobox2 = require("@react-stately/combobox");
58
56
 
59
- var _isIterable = require("../../utils/devUtils/props/isIterable");
57
+ var _propTypes = _interopRequireDefault(require("prop-types"));
58
+
59
+ var _ariaAttributes = require("../../utils/devUtils/props/ariaAttributes");
60
+
61
+ var _ComboBox = _interopRequireDefault(require("../ComboBox"));
60
62
 
61
63
  var _hooks = require("../../hooks");
62
64
 
65
+ var _isIterable = require("../../utils/devUtils/props/isIterable");
66
+
63
67
  var _loadingStates = _interopRequireDefault(require("../../utils/devUtils/constants/loadingStates"));
64
68
 
65
- var _ComboBox = _interopRequireDefault(require("../ComboBox"));
69
+ var _ListBox = _interopRequireDefault(require("../ListBox"));
66
70
 
67
71
  var _PopoverContainer = _interopRequireDefault(require("../PopoverContainer"));
68
72
 
69
- var _ListBox = _interopRequireDefault(require("../ListBox"));
70
-
71
73
  var _ScrollBox = _interopRequireDefault(require("../ScrollBox"));
72
74
 
73
75
  var _react2 = require("@emotion/react");
74
76
 
75
- var _excluded = ["shouldFocusOnHover", "shouldSelectOnPressUp"];
77
+ var _excluded = ["hasAutoFocus", "hasAddOption", "hasCustomValue", "hasNoEmptySelection", "selectedKey", "onSelectionChange", "defaultItems", "items", "loadingState", "onLoadMore", "inputValue", "menuTrigger", "isNotFlippable", "direction", "scrollBoxProps", "controlProps", "defaultFilter"],
78
+ _excluded2 = ["shouldFocusOnHover", "shouldSelectOnPressUp"];
76
79
 
77
80
  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); }
78
81
 
@@ -92,70 +95,42 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
92
95
  * Props not specified are passed along to the underlying `TextField` component.
93
96
  */
94
97
  var ComboBoxField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
95
- var children = props.children,
96
- isRequired = props.isRequired,
97
- isDisabled = props.isDisabled,
98
- isReadOnly = props.isReadOnly,
99
- placeholder = props.placeholder,
100
- label = props.label,
101
- id = props.id,
102
- hasAutoFocus = props.hasAutoFocus,
103
- onFocus = props.onFocus,
104
- onBlur = props.onBlur,
105
- onFocusChange = props.onFocusChange,
106
- onKeyDown = props.onKeyDown,
107
- onKeyUp = props.onKeyUp,
98
+ var hasAutoFocus = props.hasAutoFocus,
108
99
  hasAddOption = props.hasAddOption,
109
100
  hasCustomValue = props.hasCustomValue,
110
101
  hasNoEmptySelection = props.hasNoEmptySelection,
111
- defaultSelectedKey = props.defaultSelectedKey,
112
102
  selectedKey = props.selectedKey,
113
103
  onSelectionChange = props.onSelectionChange,
114
104
  initialDefaultItems = props.defaultItems,
115
105
  initialItems = props.items,
116
- onOpenChange = props.onOpenChange,
117
106
  loadingState = props.loadingState,
118
107
  onLoadMore = props.onLoadMore,
119
- defaultInputValue = props.defaultInputValue,
120
- onInputChange = props.onInputChange,
121
108
  inputValue = props.inputValue,
122
- disabledKeys = props.disabledKeys,
123
109
  menuTrigger = props.menuTrigger,
124
110
  isNotFlippable = props.isNotFlippable,
125
111
  direction = props.direction,
126
112
  scrollBoxProps = props.scrollBoxProps,
127
113
  controlProps = props.controlProps,
128
- defaultFilter = props.defaultFilter;
129
- var comboBoxOptions = {
130
- children: children,
131
- isRequired: isRequired,
132
- isDisabled: isDisabled,
133
- isReadOnly: isReadOnly,
134
- placeholder: placeholder,
135
- label: label,
136
- id: id,
114
+ defaultFilter = props.defaultFilter,
115
+ others = (0, _objectWithoutProperties2["default"])(props, _excluded);
116
+
117
+ var _getAriaAttributeProp = (0, _ariaAttributes.getAriaAttributeProps)(others),
118
+ nonAriaProps = _getAriaAttributeProp.nonAriaProps;
119
+
120
+ var comboBoxOptions = _objectSpread({
137
121
  autoFocus: hasAutoFocus,
138
- onFocus: onFocus,
139
- onBlur: onBlur,
140
- onFocusChange: onFocusChange,
141
- onKeyDown: onKeyDown,
142
- onKeyUp: onKeyUp,
143
122
  allowsCustomValue: hasAddOption || hasCustomValue,
144
123
  disallowEmptySelection: hasNoEmptySelection,
145
- defaultSelectedKey: defaultSelectedKey,
146
124
  selectedKey: selectedKey,
147
125
  onSelectionChange: onSelectionChange,
148
- onOpenChange: onOpenChange,
149
126
  loadingState: loadingState,
150
127
  onLoadMore: onLoadMore,
151
- defaultInputValue: defaultInputValue,
152
- onInputChange: onInputChange,
153
128
  inputValue: inputValue,
154
- disabledKeys: disabledKeys,
155
129
  menuTrigger: menuTrigger,
156
130
  shouldFlip: !isNotFlippable,
157
131
  direction: direction
158
- };
132
+ }, nonAriaProps);
133
+
159
134
  var popoverRef = (0, _react.useRef)();
160
135
  var buttonRef = (0, _react.useRef)();
161
136
  var listBoxRef = (0, _react.useRef)();
@@ -226,7 +201,7 @@ var ComboBoxField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
226
201
 
227
202
  var shouldFocusOnHover = listBoxProps.shouldFocusOnHover,
228
203
  shouldSelectOnPressUp = listBoxProps.shouldSelectOnPressUp,
229
- otherListBoxProps = (0, _objectWithoutProperties2["default"])(listBoxProps, _excluded);
204
+ otherListBoxProps = (0, _objectWithoutProperties2["default"])(listBoxProps, _excluded2);
230
205
 
231
206
  var _useOverlayPosition = (0, _overlays.useOverlayPosition)({
232
207
  targetRef: inputWrapperRef,
@@ -317,7 +292,7 @@ var ComboBoxField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
317
292
  isNonModal: true
318
293
  }, listbox));
319
294
  });
320
- ComboBoxField.propTypes = {
295
+ ComboBoxField.propTypes = _objectSpread({
321
296
  /* Whether or not adding new options to the list is enabled. */
322
297
  hasAddOption: _propTypes["default"].bool,
323
298
 
@@ -470,7 +445,7 @@ ComboBoxField.propTypes = {
470
445
  controlProps: _propTypes["default"].shape({
471
446
  onClick: _propTypes["default"].func
472
447
  })
473
- };
448
+ }, _ariaAttributes.ariaAttributesBasePropTypes);
474
449
  ComboBoxField.defaultProps = {
475
450
  menuTrigger: 'focus',
476
451
  direction: 'bottom',