Merge branch 'main' into fix-some-number-validation

Author: snowystinger

.storybook-s2/docs/Release Notes.mdx

@@ -4,6 +4,16 @@ export default MDXLayout;
 
 # Release Notes
 
+## v0.11.0
+
+### New Components
+* [SelectBoxGroup](?path=/docs/selectboxgroup-alpha--docs)
+
+### Updates
+* [ComboBox](?path=/docs/combobox--docs): Fix empty state rendering when no items match the current query
+* [Picker](?path=/docs/picker--docs): Fix erroneous dropdown outline when opening the Picker via click  
+* [Tabs](?path=/docs/tabs--docs): Support collapse behavior on Tabs when customizing the layout
+
 ## v0.10.0
 
 ### Font update

packages/@adobe/react-spectrum/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/react-spectrum",
-  "version": "3.43.0",
+  "version": "3.44.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -41,68 +41,68 @@
   },
   "dependencies": {
     "@internationalized/string": "^3.2.7",
-    "@react-aria/collections": "3.0.0-rc.4",
-    "@react-aria/i18n": "^3.12.11",
+    "@react-aria/collections": "3.0.0-rc.5",
+    "@react-aria/i18n": "^3.12.12",
     "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.30.0",
-    "@react-aria/visually-hidden": "^3.8.26",
-    "@react-spectrum/accordion": "^3.0.9",
-    "@react-spectrum/actionbar": "^3.6.10",
-    "@react-spectrum/actiongroup": "^3.11.0",
-    "@react-spectrum/avatar": "^3.0.24",
-    "@react-spectrum/badge": "^3.1.26",
-    "@react-spectrum/breadcrumbs": "^3.9.20",
-    "@react-spectrum/button": "^3.17.0",
-    "@react-spectrum/buttongroup": "^3.6.24",
-    "@react-spectrum/calendar": "^3.7.4",
-    "@react-spectrum/checkbox": "^3.10.0",
-    "@react-spectrum/color": "^3.1.0",
-    "@react-spectrum/combobox": "^3.16.0",
-    "@react-spectrum/contextualhelp": "^3.6.24",
-    "@react-spectrum/datepicker": "^3.14.4",
-    "@react-spectrum/dialog": "^3.9.0",
-    "@react-spectrum/divider": "^3.5.25",
-    "@react-spectrum/dnd": "^3.5.8",
-    "@react-spectrum/dropzone": "^3.0.14",
-    "@react-spectrum/filetrigger": "^3.0.14",
-    "@react-spectrum/form": "^3.7.17",
-    "@react-spectrum/icon": "^3.8.7",
-    "@react-spectrum/illustratedmessage": "^3.5.12",
-    "@react-spectrum/image": "^3.6.0",
-    "@react-spectrum/inlinealert": "^3.2.18",
-    "@react-spectrum/labeledvalue": "^3.2.5",
-    "@react-spectrum/layout": "^3.6.17",
-    "@react-spectrum/link": "^3.6.20",
-    "@react-spectrum/list": "^3.10.4",
-    "@react-spectrum/listbox": "^3.15.4",
-    "@react-spectrum/menu": "^3.22.4",
-    "@react-spectrum/meter": "^3.5.12",
-    "@react-spectrum/numberfield": "^3.10.0",
-    "@react-spectrum/overlays": "^5.8.0",
-    "@react-spectrum/picker": "^3.16.0",
-    "@react-spectrum/progress": "^3.7.18",
-    "@react-spectrum/provider": "^3.10.8",
-    "@react-spectrum/radio": "^3.7.19",
-    "@react-spectrum/searchfield": "^3.8.19",
-    "@react-spectrum/slider": "^3.8.0",
-    "@react-spectrum/statuslight": "^3.5.24",
-    "@react-spectrum/switch": "^3.6.4",
-    "@react-spectrum/table": "^3.17.4",
-    "@react-spectrum/tabs": "^3.8.23",
-    "@react-spectrum/tag": "^3.3.3",
-    "@react-spectrum/text": "^3.5.18",
-    "@react-spectrum/textfield": "^3.14.0",
-    "@react-spectrum/theme-dark": "^3.5.20",
-    "@react-spectrum/theme-default": "^3.5.20",
-    "@react-spectrum/theme-light": "^3.4.20",
-    "@react-spectrum/toast": "^3.1.0",
-    "@react-spectrum/tooltip": "^3.7.8",
-    "@react-spectrum/tree": "^3.1.4",
-    "@react-spectrum/view": "^3.6.21",
-    "@react-spectrum/well": "^3.4.25",
-    "@react-stately/collections": "^3.12.6",
-    "@react-stately/data": "^3.13.2",
-    "@react-types/shared": "^3.31.0",
+    "@react-aria/utils": "^3.30.1",
+    "@react-aria/visually-hidden": "^3.8.27",
+    "@react-spectrum/accordion": "^3.0.10",
+    "@react-spectrum/actionbar": "^3.6.11",
+    "@react-spectrum/actiongroup": "^3.11.1",
+    "@react-spectrum/avatar": "^3.0.25",
+    "@react-spectrum/badge": "^3.1.27",
+    "@react-spectrum/breadcrumbs": "^3.9.21",
+    "@react-spectrum/button": "^3.17.1",
+    "@react-spectrum/buttongroup": "^3.6.25",
+    "@react-spectrum/calendar": "^3.7.5",
+    "@react-spectrum/checkbox": "^3.10.1",
+    "@react-spectrum/color": "^3.1.1",
+    "@react-spectrum/combobox": "^3.16.1",
+    "@react-spectrum/contextualhelp": "^3.6.25",
+    "@react-spectrum/datepicker": "^3.14.5",
+    "@react-spectrum/dialog": "^3.9.1",
+    "@react-spectrum/divider": "^3.5.26",
+    "@react-spectrum/dnd": "^3.6.0",
+    "@react-spectrum/dropzone": "^3.0.15",
+    "@react-spectrum/filetrigger": "^3.0.15",
+    "@react-spectrum/form": "^3.7.18",
+    "@react-spectrum/icon": "^3.8.8",
+    "@react-spectrum/illustratedmessage": "^3.5.13",
+    "@react-spectrum/image": "^3.6.1",
+    "@react-spectrum/inlinealert": "^3.2.19",
+    "@react-spectrum/labeledvalue": "^3.2.6",
+    "@react-spectrum/layout": "^3.6.18",
+    "@react-spectrum/link": "^3.6.21",
+    "@react-spectrum/list": "^3.10.5",
+    "@react-spectrum/listbox": "^3.15.5",
+    "@react-spectrum/menu": "^3.22.5",
+    "@react-spectrum/meter": "^3.5.13",
+    "@react-spectrum/numberfield": "^3.10.1",
+    "@react-spectrum/overlays": "^5.8.1",
+    "@react-spectrum/picker": "^3.16.1",
+    "@react-spectrum/progress": "^3.7.19",
+    "@react-spectrum/provider": "^3.10.9",
+    "@react-spectrum/radio": "^3.7.20",
+    "@react-spectrum/searchfield": "^3.8.20",
+    "@react-spectrum/slider": "^3.8.1",
+    "@react-spectrum/statuslight": "^3.5.25",
+    "@react-spectrum/switch": "^3.6.5",
+    "@react-spectrum/table": "^3.17.5",
+    "@react-spectrum/tabs": "^3.8.24",
+    "@react-spectrum/tag": "^3.3.4",
+    "@react-spectrum/text": "^3.5.19",
+    "@react-spectrum/textfield": "^3.14.1",
+    "@react-spectrum/theme-dark": "^3.5.21",
+    "@react-spectrum/theme-default": "^3.5.21",
+    "@react-spectrum/theme-light": "^3.4.21",
+    "@react-spectrum/toast": "^3.1.1",
+    "@react-spectrum/tooltip": "^3.7.9",
+    "@react-spectrum/tree": "^3.1.5",
+    "@react-spectrum/view": "^3.6.22",
+    "@react-spectrum/well": "^3.4.26",
+    "@react-stately/collections": "^3.12.7",
+    "@react-stately/data": "^3.14.0",
+    "@react-types/shared": "^3.32.0",
     "client-only": "^0.0.1"
   },
   "publishConfig": {

packages/@internationalized/date/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internationalized/date",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "description": "Internationalized calendar, date, and time manipulation utilities",
   "license": "Apache-2.0",
   "main": "dist/main.js",

packages/@internationalized/number/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internationalized/number",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "description": "Internationalized number formatting and parsing utilities",
   "license": "Apache-2.0",
   "main": "dist/main.js",

packages/@react-aria/actiongroup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/actiongroup",
-  "version": "3.7.19",
+  "version": "3.7.20",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -26,13 +26,13 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.0",
-    "@react-aria/i18n": "^3.12.11",
-    "@react-aria/interactions": "^3.25.4",
-    "@react-aria/utils": "^3.30.0",
-    "@react-stately/list": "^3.12.4",
-    "@react-types/actiongroup": "^3.4.19",
-    "@react-types/shared": "^3.31.0",
+    "@react-aria/focus": "^3.21.1",
+    "@react-aria/i18n": "^3.12.12",
+    "@react-aria/interactions": "^3.25.5",
+    "@react-aria/utils": "^3.30.1",
+    "@react-stately/list": "^3.13.0",
+    "@react-types/actiongroup": "^3.4.20",
+    "@react-types/shared": "^3.32.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {

packages/@react-aria/autocomplete/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/autocomplete",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-rc.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -26,19 +26,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/combobox": "^3.13.0",
-    "@react-aria/focus": "^3.21.0",
-    "@react-aria/i18n": "^3.12.11",
-    "@react-aria/interactions": "^3.25.4",
-    "@react-aria/listbox": "^3.14.7",
-    "@react-aria/searchfield": "^3.8.7",
-    "@react-aria/textfield": "^3.18.0",
-    "@react-aria/utils": "^3.30.0",
+    "@react-aria/combobox": "^3.13.1",
+    "@react-aria/focus": "^3.21.1",
+    "@react-aria/i18n": "^3.12.12",
+    "@react-aria/interactions": "^3.25.5",
+    "@react-aria/listbox": "^3.14.8",
+    "@react-aria/searchfield": "^3.8.8",
+    "@react-aria/textfield": "^3.18.1",
+    "@react-aria/utils": "^3.30.1",
     "@react-stately/autocomplete": "3.0.0-beta.3",
-    "@react-stately/combobox": "^3.11.0",
-    "@react-types/autocomplete": "3.0.0-alpha.33",
-    "@react-types/button": "^3.13.0",
-    "@react-types/shared": "^3.31.0",
+    "@react-stately/combobox": "^3.11.1",
+    "@react-types/autocomplete": "3.0.0-alpha.34",
+    "@react-types/button": "^3.14.0",
+    "@react-types/shared": "^3.32.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {

packages/@react-aria/autocomplete/src/index.ts

@@ -14,4 +14,4 @@ export {useAutocomplete} from './useAutocomplete';
 
 export type {AriaSearchAutocompleteOptions, SearchAutocompleteAria} from './useSearchAutocomplete';
 export type {AriaSearchAutocompleteProps} from '@react-types/autocomplete';
-export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions} from './useAutocomplete';
+export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from './useAutocomplete';

packages/@react-aria/autocomplete/src/useAutocomplete.ts

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaLabelingProps, BaseEvent, DOMProps, FocusableElement, Node, RefObject} from '@react-types/shared';
+import {AriaLabelingProps, BaseEvent, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, RefObject, ValueBase} from '@react-types/shared';
 import {AriaTextFieldProps} from '@react-aria/textfield';
 import {AutocompleteProps, AutocompleteState} from '@react-stately/autocomplete';
 import {CLEAR_FOCUS_EVENT, FOCUS_EVENT, getActiveElement, getOwnerDocument, isAndroid, isCtrlKeyPressed, isIOS, mergeProps, mergeRefs, useEffectEvent, useEvent, useLabels, useObjectRef, useSlotId} from '@react-aria/utils';
@@ -28,6 +28,12 @@ export interface CollectionOptions extends DOMProps, AriaLabelingProps {
   disallowTypeAhead: boolean
 }
 
+export interface InputProps<T = FocusableElement> extends DOMProps,
+  FocusEvents<T>,
+  KeyboardEvents,
+  Pick<ValueBase<string>, 'onChange' | 'value'>,
+  Pick<AriaTextFieldProps, 'enterKeyHint' | 'aria-controls' | 'aria-autocomplete' | 'aria-activedescendant' | 'spellCheck' | 'autoCorrect' | 'autoComplete'> {}
+
 export interface AriaAutocompleteProps<T> extends AutocompleteProps {
   /**
    * An optional filter function used to determine if a option should be included in the autocomplete list.
@@ -57,8 +63,8 @@ export interface AriaAutocompleteOptions<T> extends Omit<AriaAutocompleteProps<T
 }
 
 export interface AutocompleteAria<T> {
-  /** Props for the autocomplete textfield/searchfield element. These should be passed to the textfield/searchfield aria hooks respectively. */
-  textFieldProps: AriaTextFieldProps<FocusableElement>,
+  /** Props for the autocomplete input element. These should be passed to the input's aria hooks (e.g. useTextField/useSearchField/etc) respectively. */
+  inputProps: InputProps,
   /** Props for the collection, to be passed to collection's respective aria hook (e.g. useMenu). */
   collectionProps: CollectionOptions,
   /** Ref to attach to the wrapped collection. */
@@ -368,7 +374,7 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
 
   // Only apply the autocomplete specific behaviors if the collection component wrapped by it is actually
   // being filtered/allows filtering by the Autocomplete.
-  let textFieldProps = {
+  let inputProps = {
     value: state.inputValue,
     onChange
   } as AriaTextFieldProps<FocusableElement>;
@@ -381,8 +387,8 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
   };
 
   if (collectionId) {
-    textFieldProps = {
-      ...textFieldProps,
+    inputProps = {
+      ...inputProps,
       ...(shouldUseVirtualFocus && virtualFocusProps),
       enterKeyHint: 'go',
       'aria-controls': collectionId,
@@ -397,7 +403,7 @@ export function useAutocomplete<T>(props: AriaAutocompleteOptions<T>, state: Aut
   }
 
   return {
-    textFieldProps,
+    inputProps,
     collectionProps: mergeProps(collectionProps, {
       shouldUseVirtualFocus,
       disallowTypeAhead: true

packages/@react-aria/breadcrumbs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/breadcrumbs",
-  "version": "3.5.27",
+  "version": "3.5.28",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -26,11 +26,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.11",
-    "@react-aria/link": "^3.8.4",
-    "@react-aria/utils": "^3.30.0",
-    "@react-types/breadcrumbs": "^3.7.15",
-    "@react-types/shared": "^3.31.0",
+    "@react-aria/i18n": "^3.12.12",
+    "@react-aria/link": "^3.8.5",
+    "@react-aria/utils": "^3.30.1",
+    "@react-types/breadcrumbs": "^3.7.16",
+    "@react-types/shared": "^3.32.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {

packages/@react-aria/button/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/button",
-  "version": "3.14.0",
+  "version": "3.14.1",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -26,12 +26,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.25.4",
-    "@react-aria/toolbar": "3.0.0-beta.19",
-    "@react-aria/utils": "^3.30.0",
-    "@react-stately/toggle": "^3.9.0",
-    "@react-types/button": "^3.13.0",
-    "@react-types/shared": "^3.31.0",
+    "@react-aria/interactions": "^3.25.5",
+    "@react-aria/toolbar": "3.0.0-beta.20",
+    "@react-aria/utils": "^3.30.1",
+    "@react-stately/toggle": "^3.9.1",
+    "@react-types/button": "^3.14.0",
+    "@react-types/shared": "^3.32.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {