diff --git a/packages/@react-spectrum/s2/src/ActionMenu.tsx b/packages/@react-spectrum/s2/src/ActionMenu.tsx
index 72f5f6ff85b..94a72825835 100644
--- a/packages/@react-spectrum/s2/src/ActionMenu.tsx
+++ b/packages/@react-spectrum/s2/src/ActionMenu.tsx
@@ -51,9 +51,10 @@ export const ActionMenuContext =
 /**
  * ActionMenu combines an ActionButton with a Menu for simple "more actions" use cases.
  */
-export const ActionMenu = /*#__PURE__*/ (forwardRef as forwardRefType)(function ActionMenu<
-  T extends object
->(props: ActionMenuProps<T>, ref: FocusableRef<HTMLButtonElement>) {
+export const ActionMenu = /*#__PURE__*/ (forwardRef as forwardRefType)(function ActionMenu<T>(
+  props: ActionMenuProps<T>,
+  ref: FocusableRef<HTMLButtonElement>
+) {
   let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/s2');
   [props, ref] = useSpectrumContextProps(props, ref, ActionMenuContext);
   let buttonProps = filterDOMProps(props, {labelable: true});
diff --git a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
index a4984f9d2b2..5316eb4fe78 100644
--- a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
+++ b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
@@ -140,9 +140,10 @@ const wrapper = style<BreadcrumbsStyleProps>(
 const InternalBreadcrumbsContext = createContext<Partial<BreadcrumbsProps<any>>>({});
 
 /** Breadcrumbs show hierarchy and navigational context for a user's location within an application. */
-export const Breadcrumbs = /*#__PURE__*/ (forwardRef as forwardRefType)(function Breadcrumbs<
-  T extends object
->(props: BreadcrumbsProps<T>, ref: DOMRef<HTMLOListElement>) {
+export const Breadcrumbs = /*#__PURE__*/ (forwardRef as forwardRefType)(function Breadcrumbs<T>(
+  props: BreadcrumbsProps<T>,
+  ref: DOMRef<HTMLOListElement>
+) {
   [props, ref] = useSpectrumContextProps(props, ref, BreadcrumbsContext);
   let domRef = useDOMRef(ref);
   let {
diff --git a/packages/@react-spectrum/s2/src/CardView.tsx b/packages/@react-spectrum/s2/src/CardView.tsx
index 161a4c55d86..0eb6675dd7a 100644
--- a/packages/@react-spectrum/s2/src/CardView.tsx
+++ b/packages/@react-spectrum/s2/src/CardView.tsx
@@ -234,9 +234,10 @@ export const CardViewContext =
 /**
  * A CardView displays a group of related objects, with support for selection and bulk actions.
  */
-export const CardView = /*#__PURE__*/ (forwardRef as forwardRefType)(function CardView<
-  T extends object
->(props: CardViewProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const CardView = /*#__PURE__*/ (forwardRef as forwardRefType)(function CardView<T>(
+  props: CardViewProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   [props, ref] = useSpectrumContextProps(props, ref, CardViewContext);
   let {
     children,
diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx
index 92d94d51453..0412a90ebe5 100644
--- a/packages/@react-spectrum/s2/src/ComboBox.tsx
+++ b/packages/@react-spectrum/s2/src/ComboBox.tsx
@@ -100,7 +100,7 @@ export interface ComboboxStyleProps {
    */
   size?: 'S' | 'M' | 'L' | 'XL';
 }
-export interface ComboBoxProps<T extends object>
+export interface ComboBoxProps<T>
   extends
     Omit<
       AriaComboBoxProps<T>,
@@ -379,9 +379,10 @@ let InternalComboboxContext = createContext<{size: 'S' | 'M' | 'L' | 'XL'}>({siz
 /**
  * ComboBox allow users to choose a single option from a collapsible list of options when space is limited.
  */
-export const ComboBox = /*#__PURE__*/ (forwardRef as forwardRefType)(function ComboBox<
-  T extends object
->(props: ComboBoxProps<T>, ref: Ref<TextFieldRef>) {
+export const ComboBox = /*#__PURE__*/ (forwardRef as forwardRefType)(function ComboBox<T>(
+  props: ComboBoxProps<T>,
+  ref: Ref<TextFieldRef>
+) {
   [props, ref] = useSpectrumContextProps(props, ref, ComboBoxContext);
 
   let formContext = useContext(FormContext);
@@ -521,11 +522,11 @@ export function ComboBoxItem(props: ComboBoxItemProps): ReactNode {
   );
 }
 
-export interface ComboBoxSectionProps<T extends object> extends Omit<
+export interface ComboBoxSectionProps<T> extends Omit<
   ListBoxSectionProps<T>,
   'style' | 'className' | 'render' | keyof GlobalDOMAttributes
 > {}
-export function ComboBoxSection<T extends object>(props: ComboBoxSectionProps<T>): ReactNode {
+export function ComboBoxSection<T>(props: ComboBoxSectionProps<T>): ReactNode {
   let {size} = useContext(InternalComboboxContext);
   return (
     <>
diff --git a/packages/@react-spectrum/s2/src/ListBox.tsx b/packages/@react-spectrum/s2/src/ListBox.tsx
index 9be6184376e..5a352b7058a 100644
--- a/packages/@react-spectrum/s2/src/ListBox.tsx
+++ b/packages/@react-spectrum/s2/src/ListBox.tsx
@@ -18,7 +18,7 @@ import {
 } from 'react-aria-components/ListBox';
 import {ReactNode} from 'react';
 
-export function ListBox<T extends object>({children, ...props}: ListBoxProps<T>): ReactNode {
+export function ListBox<T>({children, ...props}: ListBoxProps<T>): ReactNode {
   return <AriaListBox {...props}>{children}</AriaListBox>;
 }
 
diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index 90337eddb24..05284dd2a93 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -208,9 +208,10 @@ const listView = style<GridListRenderProps & {isQuiet?: boolean}>({
 /**
  * A ListView displays a list of interactive items, and allows a user to navigate, select, or perform an action.
  */
-export const ListView = /*#__PURE__*/ (forwardRef as forwardRefType)(function ListView<
-  T extends object
->(props: ListViewProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const ListView = /*#__PURE__*/ (forwardRef as forwardRefType)(function ListView<T>(
+  props: ListViewProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   [props, ref] = useSpectrumContextProps(props, ref, ListViewContext);
   let {
     children,
diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx
index 0d865dc0fd5..c2e46a7803b 100644
--- a/packages/@react-spectrum/s2/src/Menu.tsx
+++ b/packages/@react-spectrum/s2/src/Menu.tsx
@@ -422,7 +422,7 @@ let wrappingDiv = style({
 /**
  * Menus display a list of actions or options that a user can choose.
  */
-export const Menu = /*#__PURE__*/ (forwardRef as forwardRefType)(function Menu<T extends object>(
+export const Menu = /*#__PURE__*/ (forwardRef as forwardRefType)(function Menu<T>(
   props: MenuProps<T>,
   ref: DOMRef<HTMLDivElement>
 ) {
@@ -509,12 +509,12 @@ export function Divider(props: SeparatorProps): ReactNode {
   );
 }
 
-export interface MenuSectionProps<T extends object> extends Omit<
+export interface MenuSectionProps<T> extends Omit<
   AriaMenuSectionProps<T>,
   'style' | 'className' | 'render' | keyof GlobalDOMAttributes
 > {}
 
-export function MenuSection<T extends object>(props: MenuSectionProps<T>): ReactNode {
+export function MenuSection<T>(props: MenuSectionProps<T>): ReactNode {
   // remember, context doesn't work if it's around Section nor inside
   let {size} = useContext(InternalMenuContext);
   return (
@@ -823,8 +823,8 @@ function UnavailableMenuItemTrigger(props: UnavailableMenuItemTriggerProps): JSX
 export {MenuTrigger, SubmenuTrigger, UnavailableMenuItemTrigger};
 
 // This is purely so that storybook generates the types for both Menu and MenuTrigger
-interface ICombined<T extends object> extends MenuProps<T>, Omit<MenuTriggerProps, 'children'> {}
+interface ICombined<T> extends MenuProps<T>, Omit<MenuTriggerProps, 'children'> {}
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function CombinedMenu<T extends object>(props: ICombined<T>): ReactNode {
+export function CombinedMenu<T>(props: ICombined<T>): ReactNode {
   return <div />;
 }
diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx
index 4e7dc1350ee..c81eb26a6fb 100644
--- a/packages/@react-spectrum/s2/src/Picker.tsx
+++ b/packages/@react-spectrum/s2/src/Picker.tsx
@@ -119,7 +119,7 @@ export interface PickerStyleProps {
 }
 
 type SelectionMode = 'single' | 'multiple';
-export interface PickerProps<T extends object, M extends SelectionMode = 'single'>
+export interface PickerProps<T, M extends SelectionMode = 'single'>
   extends
     Omit<
       AriaSelectProps<T, M>,
@@ -315,7 +315,7 @@ let InsideSelectValueContext = createContext(false);
  * Pickers allow users to choose a single option from a collapsible list of options when space is limited.
  */
 export const Picker = /*#__PURE__*/ (forwardRef as forwardRefType)(function Picker<
-  T extends object,
+  T,
   M extends SelectionMode = 'single'
 >(props: PickerProps<T, M>, ref: FocusableRef<HTMLButtonElement>) {
   let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-spectrum/s2');
@@ -565,7 +565,7 @@ let INTERACTIVE_ARIA_ROLES = new Set([
   'treeitem'
 ]);
 
-interface PickerButtonInnerProps<T extends object>
+interface PickerButtonInnerProps<T>
   extends
     PickerStyleProps,
     Omit<AriaSelectRenderProps, 'isRequired' | 'isFocused'>,
@@ -575,7 +575,7 @@ interface PickerButtonInnerProps<T extends object>
 }
 
 // Needs to be hidable component or otherwise the PressResponder throws a warning when rendered in the fake DOM and tries to register
-const PickerButton = createHideableComponent(function PickerButton<T extends object>(
+const PickerButton = createHideableComponent(function PickerButton<T>(
   props: PickerButtonInnerProps<T>
 ) {
   let {
@@ -875,11 +875,11 @@ function DefaultProvider({
   return <context.Provider value={value}>{children}</context.Provider>;
 }
 
-export interface PickerSectionProps<T extends object> extends Omit<
+export interface PickerSectionProps<T> extends Omit<
   ListBoxSectionProps<T>,
   'style' | 'className' | 'render' | keyof GlobalDOMAttributes
 > {}
-export function PickerSection<T extends object>(props: PickerSectionProps<T>): ReactNode {
+export function PickerSection<T>(props: PickerSectionProps<T>): ReactNode {
   let {size} = useContext(InternalPickerContext);
   return (
     <>
diff --git a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
index 6cc18eea904..b7c14812bc2 100644
--- a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
+++ b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
@@ -413,7 +413,7 @@ export function SelectBox(props: SelectBoxProps): ReactNode {
  * SelectBoxGroup allows users to select one or more options from a list.
  */
 export const SelectBoxGroup = /*#__PURE__*/ (forwardRef as forwardRefType)(function SelectBoxGroup<
-  T extends object
+  T
 >(props: SelectBoxGroupProps<T>, ref: DOMRef<HTMLDivElement>) {
   [props, ref] = useSpectrumContextProps(props, ref, SelectBoxGroupContext);
 
diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx
index 6ddd5b9e841..8a1ec353d2d 100644
--- a/packages/@react-spectrum/s2/src/TableView.tsx
+++ b/packages/@react-spectrum/s2/src/TableView.tsx
@@ -500,9 +500,10 @@ export interface TableBodyProps<T> extends Omit<
 /**
  * The body of a `<Table>`, containing the table rows.
  */
-export const TableBody = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableBody<
-  T extends object
->(props: TableBodyProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const TableBody = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableBody<T>(
+  props: TableBodyProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   let {items, renderEmptyState, children, dependencies = []} = props;
   let domRef = useDOMRef(ref);
   let {loadingState, onLoadMore} = useContext(InternalTableContext);
@@ -1066,9 +1067,10 @@ export interface TableHeaderProps<T> extends Omit<
 /**
  * A header within a `<Table>`, containing the table columns.
  */
-export const TableHeader = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableHeader<
-  T extends object
->({columns, dependencies, children}: TableHeaderProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const TableHeader = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableHeader<T>(
+  {columns, dependencies, children}: TableHeaderProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   let scale = useScale();
   let {selectionBehavior, selectionMode} = useTableOptions();
   let {isQuiet} = useContext(InternalTableContext);
@@ -1843,7 +1845,7 @@ export interface RowProps<T>
 /**
  * A row within a `<Table>`.
  */
-export const Row = /*#__PURE__*/ (forwardRef as forwardRefType)(function Row<T extends object>(
+export const Row = /*#__PURE__*/ (forwardRef as forwardRefType)(function Row<T>(
   {id, columns, children, dependencies = [], ...otherProps}: RowProps<T>,
   ref: DOMRef<HTMLDivElement>
 ) {
@@ -1905,9 +1907,10 @@ const FooterContext = createContext(false);
 /**
  * A footer within a `<Table>`, containing summary rows.
  */
-export const TableFooter = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableFooter<
-  T extends object
->(props: TableFooterProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const TableFooter = /*#__PURE__*/ (forwardRef as forwardRefType)(function TableFooter<T>(
+  props: TableFooterProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   let domRef = useDOMRef(ref);
 
   return (
diff --git a/packages/@react-spectrum/s2/src/Tabs.tsx b/packages/@react-spectrum/s2/src/Tabs.tsx
index 897475abc3d..71ef7138940 100644
--- a/packages/@react-spectrum/s2/src/Tabs.tsx
+++ b/packages/@react-spectrum/s2/src/Tabs.tsx
@@ -280,7 +280,7 @@ const tablistWrapper = style(
   getAllowedOverrides()
 );
 
-export function TabList<T extends object>(props: TabListProps<T>): ReactNode | null {
+export function TabList<T>(props: TabListProps<T>): ReactNode | null {
   let {showTabs, menuId, valueId, tabs, listRef, onSelectionChange, ariaLabel, ariaDescribedBy} =
     useContext(CollapseContext) ?? {};
   let {density, orientation, labelBehavior} = useContext(InternalTabsContext);
@@ -308,7 +308,7 @@ export function TabList<T extends object>(props: TabListProps<T>): ReactNode | n
   );
 }
 
-function TabListInner<T extends object>(props: TabListProps<T>) {
+function TabListInner<T>(props: TabListProps<T>) {
   let {
     tablistRef,
     orientation,
diff --git a/packages/@react-spectrum/s2/src/TabsPicker.tsx b/packages/@react-spectrum/s2/src/TabsPicker.tsx
index f9033785906..349e86bdb6a 100644
--- a/packages/@react-spectrum/s2/src/TabsPicker.tsx
+++ b/packages/@react-spectrum/s2/src/TabsPicker.tsx
@@ -41,7 +41,7 @@ import {useFormProps} from './Form';
 import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 export interface PickerStyleProps {}
-export interface PickerProps<T extends object>
+export interface PickerProps<T>
   extends
     Omit<AriaSelectProps<T>, 'children' | 'style' | 'className' | 'render' | 'placeholder'>,
     PickerStyleProps,
@@ -159,7 +159,7 @@ const iconCenterWrapper = style({
   }
 });
 let InsideSelectValueContext = createContext(false);
-function Picker<T extends object>(props: PickerProps<T>, ref: FocusableRef<HTMLButtonElement>) {
+function Picker<T>(props: PickerProps<T>, ref: FocusableRef<HTMLButtonElement>) {
   [props, ref] = useSpectrumContextProps(props, ref, PickerContext);
   let domRef = useFocusableRef(ref);
   props = useFormProps(props);
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index c1c9a3ad998..663fed686e6 100644
--- a/packages/@react-spectrum/s2/src/TagGroup.tsx
+++ b/packages/@react-spectrum/s2/src/TagGroup.tsx
@@ -123,9 +123,10 @@ export const TagGroupContext =
 const InternalTagGroupContext = createContext<TagGroupProps<any>>({});
 
 /** Tags allow users to categorize content. They can represent keywords or people, and are grouped to describe an item or a search request. */
-export const TagGroup = /*#__PURE__*/ (forwardRef as forwardRefType)(function TagGroup<
-  T extends object
->(props: TagGroupProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const TagGroup = /*#__PURE__*/ (forwardRef as forwardRefType)(function TagGroup<T>(
+  props: TagGroupProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   [props, ref] = useSpectrumContextProps(props, ref, TagGroupContext);
   props = useFormProps(props);
   let {onRemove} = props;
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index 18e11d145c9..e753f6cfeef 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -158,9 +158,10 @@ let InternalTreeViewContext = createContext<{selectionStyle?: 'highlight' | 'che
 /**
  * A tree view provides users with a way to navigate nested hierarchical information.
  */
-export const TreeView = /*#__PURE__*/ (forwardRef as forwardRefType)(function TreeView<
-  T extends object
->(props: TreeViewProps<T>, ref: DOMRef<HTMLDivElement>) {
+export const TreeView = /*#__PURE__*/ (forwardRef as forwardRefType)(function TreeView<T>(
+  props: TreeViewProps<T>,
+  ref: DOMRef<HTMLDivElement>
+) {
   let {children, selectionStyle = 'checkbox', UNSAFE_className, UNSAFE_style} = props;
   let scale = useScale();
 
diff --git a/packages/react-aria-components/src/Autocomplete.tsx b/packages/react-aria-components/src/Autocomplete.tsx
index d7276f8abb2..e8fadc0f6eb 100644
--- a/packages/react-aria-components/src/Autocomplete.tsx
+++ b/packages/react-aria-components/src/Autocomplete.tsx
@@ -73,7 +73,7 @@ export const FieldInputContext =
 /**
  * An autocomplete allows users to search or filter a list of suggestions.
  */
-export function Autocomplete<T extends object>(props: AutocompleteProps<T>): JSX.Element {
+export function Autocomplete<T>(props: AutocompleteProps<T>): JSX.Element {
   let ctx = useSlottedContext(AutocompleteContext, props.slot);
   props = mergeProps(ctx, props);
   let {filter, disableAutoFocusFirst} = props;
diff --git a/packages/react-aria-components/src/Breadcrumbs.tsx b/packages/react-aria-components/src/Breadcrumbs.tsx
index 7df168c6b15..2a48951259a 100644
--- a/packages/react-aria-components/src/Breadcrumbs.tsx
+++ b/packages/react-aria-components/src/Breadcrumbs.tsx
@@ -60,9 +60,10 @@ export const BreadcrumbsContext =
 /**
  * Breadcrumbs display a hierarchy of links to the current page or resource in an application.
  */
-export const Breadcrumbs = /*#__PURE__*/ (forwardRef as forwardRefType)(function Breadcrumbs<
-  T extends object
->(props: BreadcrumbsProps<T>, ref: ForwardedRef<HTMLOListElement>) {
+export const Breadcrumbs = /*#__PURE__*/ (forwardRef as forwardRefType)(function Breadcrumbs<T>(
+  props: BreadcrumbsProps<T>,
+  ref: ForwardedRef<HTMLOListElement>
+) {
   [props, ref] = useContextProps(props, ref, BreadcrumbsContext);
   let {CollectionRoot} = useContext(CollectionRendererContext);
   let {navProps} = useBreadcrumbs(props);
diff --git a/packages/react-aria-components/src/Collection.tsx b/packages/react-aria-components/src/Collection.tsx
index 777de219bc4..db29c05e2be 100644
--- a/packages/react-aria-components/src/Collection.tsx
+++ b/packages/react-aria-components/src/Collection.tsx
@@ -139,7 +139,7 @@ export const SectionContext = createContext<SectionContextValue | null>(null);
 /** @deprecated */
 export const Section = /*#__PURE__*/ createBranchComponent(
   'section',
-  <T extends object>(
+  <T extends any>(
     props: SectionProps<T>,
     ref: ForwardedRef<HTMLElement>,
     section: Node<T>
diff --git a/packages/react-aria-components/src/ComboBox.tsx b/packages/react-aria-components/src/ComboBox.tsx
index cb55bbfc669..1b2d1d8bf2b 100644
--- a/packages/react-aria-components/src/ComboBox.tsx
+++ b/packages/react-aria-components/src/ComboBox.tsx
@@ -87,7 +87,7 @@ export interface ComboBoxRenderProps {
   isReadOnly: boolean;
 }
 
-export interface ComboBoxProps<T extends object, M extends SelectionMode = 'single'>
+export interface ComboBoxProps<T, M extends SelectionMode = 'single'>
   extends
     Omit<
       AriaComboBoxProps<T, M>,
@@ -128,7 +128,7 @@ export const ComboBoxStateContext = createContext<ComboBoxState<any, SelectionMo
  * A combo box combines a text input with a listbox, allowing users to filter a list of options to items matching a query.
  */
 export const ComboBox = /*#__PURE__*/ createHideableComponent(function ComboBox<
-  T extends object,
+  T,
   M extends SelectionMode = 'single'
 >(props: ComboBoxProps<T, M>, ref: ForwardedRef<HTMLDivElement>) {
   [props, ref] = useContextProps(props, ref, ComboBoxContext);
@@ -167,17 +167,13 @@ export const ComboBox = /*#__PURE__*/ createHideableComponent(function ComboBox<
 // Contexts to clear inside the popover.
 const CLEAR_CONTEXTS = [LabelContext, ButtonContext, InputContext, GroupContext, TextContext];
 
-interface ComboBoxInnerProps<T extends object> {
+interface ComboBoxInnerProps<T> {
   props: ComboBoxProps<T, SelectionMode>;
   collection: Collection<Node<T>>;
   comboBoxRef: RefObject<HTMLDivElement | null>;
 }
 
-function ComboBoxInner<T extends object>({
-  props,
-  collection,
-  comboBoxRef: ref
-}: ComboBoxInnerProps<T>) {
+function ComboBoxInner<T>({props, collection, comboBoxRef: ref}: ComboBoxInnerProps<T>) {
   let {name, formValue = 'key', allowsCustomValue} = props;
   if (allowsCustomValue) {
     formValue = 'text';
@@ -357,7 +353,7 @@ export interface ComboBoxValueRenderProps<T> {
   state: ComboBoxState<T, 'single' | 'multiple'>;
 }
 
-export interface ComboBoxValueProps<T extends object>
+export interface ComboBoxValueProps<T>
   extends
     Omit<HTMLAttributes<HTMLElement>, keyof RenderProps<unknown>>,
     RenderProps<ComboBoxValueRenderProps<T>, 'div'> {
@@ -377,9 +373,10 @@ export const ComboBoxValueContext =
  * ComboBoxValue renders the selected values of a ComboBox, or a placeholder if no value is selected.
  * By default, the items are rendered as a comma separated list. Use the render function to customize this.
  */
-export const ComboBoxValue = /*#__PURE__*/ createHideableComponent(function ComboBoxValue<
-  T extends object
->(props: ComboBoxValueProps<T>, ref: ForwardedRef<HTMLDivElement>) {
+export const ComboBoxValue = /*#__PURE__*/ createHideableComponent(function ComboBoxValue<T>(
+  props: ComboBoxValueProps<T>,
+  ref: ForwardedRef<HTMLDivElement>
+) {
   [props, ref] = useContextProps(props, ref, ComboBoxValueContext);
   let state = useContext(ComboBoxStateContext)!;
   let formatter = useListFormatter();
diff --git a/packages/react-aria-components/src/GridList.tsx b/packages/react-aria-components/src/GridList.tsx
index 878f2b4afc5..82ad717302d 100644
--- a/packages/react-aria-components/src/GridList.tsx
+++ b/packages/react-aria-components/src/GridList.tsx
@@ -197,9 +197,10 @@ export const GridListContext =
  * A grid list displays a list of interactive items, with support for keyboard navigation,
  * single or multiple selection, and row actions.
  */
-export const GridList = /*#__PURE__*/ (forwardRef as forwardRefType)(function GridList<
-  T extends object
->(props: GridListProps<T>, ref: ForwardedRef<HTMLDivElement>) {
+export const GridList = /*#__PURE__*/ (forwardRef as forwardRefType)(function GridList<T>(
+  props: GridListProps<T>,
+  ref: ForwardedRef<HTMLDivElement>
+) {
   // Render the portal first so that we have the collection by the time we render the DOM in SSR.
   [props, ref] = useContextProps(props, ref, GridListContext);
 
@@ -210,17 +211,13 @@ export const GridList = /*#__PURE__*/ (forwardRef as forwardRefType)(function Gr
   );
 });
 
-interface GridListInnerProps<T extends object> {
+interface GridListInnerProps<T> {
   props: GridListProps<T> & SelectableCollectionContextValue<T>;
-  collection: ICollection<Node<object>>;
+  collection: ICollection<Node<any>>;
   gridListRef: RefObject<HTMLElement | null>;
 }
 
-function GridListInner<T extends object>({
-  props,
-  collection,
-  gridListRef: ref
-}: GridListInnerProps<T>) {
+function GridListInner<T>({props, collection, gridListRef: ref}: GridListInnerProps<T>) {
   [props, ref] = useContextProps(props, ref, SelectableCollectionContext);
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   let {shouldUseVirtualFocus, filter, disallowTypeAhead, ...DOMCollectionProps} = props;
@@ -472,7 +469,7 @@ export interface GridListItemProps<T = object>
  * A GridListItem represents an individual item in a GridList.
  */
 export const GridListItem = /*#__PURE__*/ createLeafComponent(ItemNode, function GridListItem<
-  T extends object
+  T
 >(props: GridListItemProps<T>, forwardedRef: ForwardedRef<HTMLDivElement>, item: Node<T>) {
   let state = useContext(ListStateContext)!;
   let {dragAndDropHooks, dragState, dropState} = useContext(DragAndDropContext);
@@ -839,7 +836,7 @@ export interface GridListSectionProps<T> extends SectionProps<T>, DOMRenderProps
  */
 export const GridListSection = /*#__PURE__*/ createBranchComponent(
   SectionNode,
-  <T extends object>(
+  <T extends any>(
     props: GridListSectionProps<T>,
     ref: ForwardedRef<HTMLDivElement>,
     item: Node<T>
diff --git a/packages/react-aria-components/src/ListBox.tsx b/packages/react-aria-components/src/ListBox.tsx
index 6fc5dead6a2..6eb600ca455 100644
--- a/packages/react-aria-components/src/ListBox.tsx
+++ b/packages/react-aria-components/src/ListBox.tsx
@@ -185,9 +185,10 @@ export const ListStateContext = createContext<ListState<any> | null>(null);
 /**
  * A listbox displays a list of options and allows a user to select one or more of them.
  */
-export const ListBox = /*#__PURE__*/ (forwardRef as forwardRefType)(function ListBox<
-  T extends object
->(props: ListBoxProps<T>, ref: ForwardedRef<HTMLDivElement>) {
+export const ListBox = /*#__PURE__*/ (forwardRef as forwardRefType)(function ListBox<T>(
+  props: ListBoxProps<T>,
+  ref: ForwardedRef<HTMLDivElement>
+) {
   [props, ref] = useContextProps(props, ref, ListBoxContext);
   let state = useContext(ListStateContext);
 
@@ -221,11 +222,7 @@ interface ListBoxInnerProps<T> {
   listBoxRef: RefObject<HTMLElement | null>;
 }
 
-function ListBoxInner<T extends object>({
-  state: inputState,
-  props,
-  listBoxRef
-}: ListBoxInnerProps<T>) {
+function ListBoxInner<T>({state: inputState, props, listBoxRef}: ListBoxInnerProps<T>) {
   [props, listBoxRef] = useContextProps(props, listBoxRef, SelectableCollectionContext);
   let {dragAndDropHooks, layout = 'stack', orientation = 'vertical', filter} = props;
   let state = UNSTABLE_useFilteredListState(inputState, filter);
@@ -430,7 +427,7 @@ export interface ListBoxSectionProps<T>
   className?: string;
 }
 
-function ListBoxSectionInner<T extends object>(
+function ListBoxSectionInner<T>(
   props: ListBoxSectionProps<T>,
   ref: ForwardedRef<HTMLElement>,
   section: Node<T>,
@@ -511,7 +508,7 @@ export interface ListBoxItemProps<T = object>
  * A ListBoxItem represents an individual option in a ListBox.
  */
 export const ListBoxItem = /*#__PURE__*/ createLeafComponent(ItemNode, function ListBoxItem<
-  T extends object
+  T
 >(props: ListBoxItemProps<T>, forwardedRef: ForwardedRef<HTMLDivElement>, item: Node<T>) {
   let ref = useObjectRef<any>(forwardedRef);
   let state = useContext(ListStateContext)!;
diff --git a/packages/react-aria-components/src/Menu.tsx b/packages/react-aria-components/src/Menu.tsx
index 0b9a4edddb1..854dc891908 100644
--- a/packages/react-aria-components/src/Menu.tsx
+++ b/packages/react-aria-components/src/Menu.tsx
@@ -79,10 +79,10 @@ import {
 } from '@react-types/shared';
 import {FocusScope} from 'react-aria/FocusScope';
 import {HeaderContext} from './Header';
-import {Collection as ICollection, Node} from '@react-types/shared';
 import {KeyboardContext} from './Keyboard';
 import {mergeProps} from 'react-aria/mergeProps';
 import {MultipleSelectionState} from 'react-stately/useMultipleSelectionState';
+import {Node} from '@react-types/shared';
 import {OverlayTriggerStateContext} from './Dialog';
 import {PopoverContext} from './Popover';
 import {PressResponder} from 'react-aria/private/interactions/PressResponder';
@@ -284,7 +284,7 @@ export interface MenuProps<T>
 /**
  * A menu displays a list of actions or options that a user can choose.
  */
-export const Menu = /*#__PURE__*/ (forwardRef as forwardRefType)(function Menu<T extends object>(
+export const Menu = /*#__PURE__*/ (forwardRef as forwardRefType)(function Menu<T>(
   props: MenuProps<T>,
   ref: ForwardedRef<HTMLDivElement>
 ) {
@@ -305,11 +305,11 @@ interface MenuInnerProps<T> {
     filter?: SelectableCollectionContextValue<object>['filter'];
     shouldUseVirtualFocus?: boolean;
   };
-  collection: BaseCollection<object>;
+  collection: BaseCollection<any>;
   menuRef: RefObject<HTMLElement | null>;
 }
 
-function MenuInner<T extends object>({props, collection, menuRef: ref}: MenuInnerProps<T>) {
+function MenuInner<T>({props, collection, menuRef: ref}: MenuInnerProps<T>) {
   [props, ref] = useContextProps(props, ref, SelectableCollectionContext);
   let {filter, ...autocompleteMenuProps} = props;
   let filteredCollection = useMemo(
@@ -318,7 +318,7 @@ function MenuInner<T extends object>({props, collection, menuRef: ref}: MenuInne
   );
   let state = useTreeState({
     ...props,
-    collection: filteredCollection as ICollection<Node<object>>,
+    collection: filteredCollection,
     children: undefined
   });
   let triggerState = useContext(RootMenuTriggerStateContext);
@@ -436,7 +436,7 @@ class GroupSelectionManager extends SelectionManager {
   }
 }
 
-function MenuSectionInner<T extends object>(
+function MenuSectionInner<T>(
   props: MenuSectionProps<T>,
   ref: ForwardedRef<HTMLElement>,
   section: Node<T>,
@@ -539,7 +539,7 @@ const MenuItemContext = createContext<ContextValue<MenuItemProps, HTMLDivElement
  * A MenuItem represents an individual action in a Menu.
  */
 export const MenuItem = /*#__PURE__*/ createLeafComponent(ItemNode, function MenuItem<
-  T extends object
+  T
 >(props: MenuItemProps<T>, forwardedRef: ForwardedRef<HTMLDivElement>, item: Node<T>) {
   [props, forwardedRef] = useContextProps(props, forwardedRef, MenuItemContext);
   let id = useSlottedContext(MenuItemContext)?.id as string;
diff --git a/packages/react-aria-components/src/Select.tsx b/packages/react-aria-components/src/Select.tsx
index 8eaec022cb7..ddb47c06479 100644
--- a/packages/react-aria-components/src/Select.tsx
+++ b/packages/react-aria-components/src/Select.tsx
@@ -93,7 +93,7 @@ export interface SelectRenderProps {
   isRequired: boolean;
 }
 
-export interface SelectProps<T extends object = {}, M extends SelectionMode = 'single'>
+export interface SelectProps<T, M extends SelectionMode = 'single'>
   extends
     Omit<
       AriaSelectProps<T, M>,
@@ -129,7 +129,7 @@ export const SelectStateContext = createContext<SelectState<unknown, SelectionMo
  * A select displays a collapsible list of options and allows a user to select one of them.
  */
 export const Select = /*#__PURE__*/ createHideableComponent(function Select<
-  T extends object = {},
+  T,
   M extends SelectionMode = 'single'
 >(props: SelectProps<T, M>, ref: ForwardedRef<HTMLDivElement>) {
   [props, ref] = useContextProps(props, ref, SelectContext);
@@ -160,13 +160,13 @@ export const Select = /*#__PURE__*/ createHideableComponent(function Select<
 // Contexts to clear inside the popover.
 const CLEAR_CONTEXTS = [LabelContext, ButtonContext, TextContext];
 
-interface SelectInnerProps<T extends object> {
+interface SelectInnerProps<T> {
   props: SelectProps<T, SelectionMode>;
   selectRef: ForwardedRef<HTMLDivElement>;
   collection: Collection<Node<T>>;
 }
 
-function SelectInner<T extends object>({props, selectRef: ref, collection}: SelectInnerProps<T>) {
+function SelectInner<T>({props, selectRef: ref, collection}: SelectInnerProps<T>) {
   let {validationBehavior: formValidationBehavior} = useSlottedContext(FormContext) || {};
   let validationBehavior = props.validationBehavior ?? formValidationBehavior ?? 'native';
   let state = useSelectState({
@@ -303,7 +303,7 @@ export interface SelectValueRenderProps<T> {
   state: SelectState<T, 'single' | 'multiple'>;
 }
 
-export interface SelectValueProps<T extends object>
+export interface SelectValueProps<T>
   extends
     Omit<HTMLAttributes<HTMLElement>, keyof RenderProps<unknown>>,
     RenderProps<SelectValueRenderProps<T>, 'span'> {
@@ -321,9 +321,10 @@ export const SelectValueContext =
  * SelectValue renders the current value of a Select, or a placeholder if no value is selected.
  * It is usually placed within the button element.
  */
-export const SelectValue = /*#__PURE__*/ createHideableComponent(function SelectValue<
-  T extends object
->(props: SelectValueProps<T>, ref: ForwardedRef<HTMLSpanElement>) {
+export const SelectValue = /*#__PURE__*/ createHideableComponent(function SelectValue<T>(
+  props: SelectValueProps<T>,
+  ref: ForwardedRef<HTMLSpanElement>
+) {
   [props, ref] = useContextProps(props, ref, SelectValueContext);
   let state = useContext(SelectStateContext)! as SelectState<T, 'single' | 'multiple'>;
   let {placeholder} = useSlottedContext(SelectContext)!;
diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx
index e020e0369ba..c5b9aff9fa0 100644
--- a/packages/react-aria-components/src/Table.tsx
+++ b/packages/react-aria-components/src/Table.tsx
@@ -974,7 +974,7 @@ let THeadElementType = forwardRef(function THeadElementType(
  */
 export const TableHeader = /*#__PURE__*/ createBranchComponent(
   TableHeaderNode,
-  <T extends object>(
+  <T extends any>(
     props: TableHeaderProps<T>,
     ref: ForwardedRef<HTMLTableSectionElement | HTMLDivElement>
   ) => {
@@ -1449,7 +1449,7 @@ let TableBodyElementType = forwardRef(function TableBodyElementType(
  */
 export const TableBody = /*#__PURE__*/ createBranchComponent(
   TableBodyNode,
-  <T extends object>(
+  <T extends any>(
     props: TableBodyProps<T>,
     ref: ForwardedRef<HTMLTableSectionElement | HTMLDivElement>,
     node: Node<T>
@@ -1554,7 +1554,7 @@ let TableFooterElementType = forwardRef(function TableFooterElementType(
  */
 export const TableFooter = /*#__PURE__*/ createBranchComponent(
   TableFooterNode,
-  <T extends object>(
+  <T extends any>(
     props: TableFooterProps<T>,
     ref: ForwardedRef<HTMLTableSectionElement | HTMLDivElement>,
     node: Node<T>
@@ -1683,7 +1683,7 @@ let TableRowElementType = forwardRef(function TableRowElementType(
  */
 export const Row = /*#__PURE__*/ createBranchComponent(
   TableRowNode,
-  <T extends object>(
+  <T extends any>(
     props: RowProps<T>,
     forwardedRef: ForwardedRef<HTMLTableRowElement | HTMLDivElement>,
     item: GridNode<T>
diff --git a/packages/react-aria-components/src/Tabs.tsx b/packages/react-aria-components/src/Tabs.tsx
index ba5a44454a5..626a67b4fe9 100644
--- a/packages/react-aria-components/src/Tabs.tsx
+++ b/packages/react-aria-components/src/Tabs.tsx
@@ -226,7 +226,7 @@ export interface TabPanelRenderProps {
 }
 
 export const TabsContext = createContext<ContextValue<TabsProps, HTMLDivElement>>(null);
-export const TabListStateContext = createContext<TabListState<object> | null>(null);
+export const TabListStateContext = createContext<TabListState<any> | null>(null);
 
 /**
  * Tabs organize content into multiple sections and allow users to navigate between them.
@@ -304,9 +304,10 @@ function TabsInner({props, tabsRef: ref, collection}: TabsInnerProps) {
  * A TabList is used within Tabs to group tabs that a user can switch between.
  * The ids of the items within the <TabList> must match up with a corresponding item inside the <TabPanels>.
  */
-export const TabList = /*#__PURE__*/ (forwardRef as forwardRefType)(function TabList<
-  T extends object
->(props: TabListProps<T>, ref: ForwardedRef<HTMLDivElement>): JSX.Element {
+export const TabList = /*#__PURE__*/ (forwardRef as forwardRefType)(function TabList<T>(
+  props: TabListProps<T>,
+  ref: ForwardedRef<HTMLDivElement>
+): JSX.Element {
   let state = useContext(TabListStateContext);
   return state ? <TabListInner props={props} forwardedRef={ref} /> : <Collection {...props} />;
 });
@@ -316,7 +317,7 @@ interface TabListInnerProps<T> {
   forwardedRef: ForwardedRef<HTMLDivElement>;
 }
 
-function TabListInner<T extends object>({props, forwardedRef: ref}: TabListInnerProps<T>) {
+function TabListInner<T>({props, forwardedRef: ref}: TabListInnerProps<T>) {
   let state = useContext(TabListStateContext)!;
   let {CollectionRoot} = useContext(CollectionRendererContext);
   let {orientation = 'horizontal', keyboardActivation = 'automatic'} =
@@ -440,7 +441,7 @@ export interface TabPanelsProps<T>
 /**
  * Groups multiple `<TabPanel>` elements, and provides CSS variables for animated transitions.
  */
-export const TabPanels = /*#__PURE__*/ createHideableComponent(function TabPanels<T extends object>(
+export const TabPanels = /*#__PURE__*/ createHideableComponent(function TabPanels<T>(
   props: TabPanelsProps<T>,
   forwardedRef: ForwardedRef<HTMLDivElement>
 ) {
diff --git a/packages/react-aria-components/src/TagGroup.tsx b/packages/react-aria-components/src/TagGroup.tsx
index 675090527a3..31b384fd6a0 100644
--- a/packages/react-aria-components/src/TagGroup.tsx
+++ b/packages/react-aria-components/src/TagGroup.tsx
@@ -150,11 +150,7 @@ interface TagGroupInnerProps<T> {
   collection: any;
 }
 
-function TagGroupInner<T extends object>({
-  props,
-  forwardedRef: ref,
-  collection
-}: TagGroupInnerProps<T>) {
+function TagGroupInner<T>({props, forwardedRef: ref, collection}: TagGroupInnerProps<T>) {
   let tagListRef = useRef<HTMLElement>(null);
   // Extract the user provided id so it doesn't clash with the collection id provided by Autocomplete
   let {id, ...otherProps} = props;
@@ -218,9 +214,10 @@ function TagGroupInner<T extends object>({
 /**
  * A tag list is a container for tags within a TagGroup.
  */
-export const TagList = /*#__PURE__*/ (forwardRef as forwardRefType)(function TagList<
-  T extends object
->(props: TagListProps<T>, ref: ForwardedRef<HTMLDivElement>): JSX.Element {
+export const TagList = /*#__PURE__*/ (forwardRef as forwardRefType)(function TagList<T>(
+  props: TagListProps<T>,
+  ref: ForwardedRef<HTMLDivElement>
+): JSX.Element {
   let state = useContext(ListStateContext);
   return state ? <TagListInner props={props} forwardedRef={ref} /> : <Collection {...props} />;
 });
@@ -230,7 +227,7 @@ interface TagListInnerProps<T> {
   forwardedRef: ForwardedRef<HTMLDivElement>;
 }
 
-function TagListInner<T extends object>({props, forwardedRef}: TagListInnerProps<T>) {
+function TagListInner<T>({props, forwardedRef}: TagListInnerProps<T>) {
   let state = useContext(ListStateContext)!;
   let {CollectionRoot} = useContext(CollectionRendererContext);
   let [gridProps, ref] = useContextProps({}, forwardedRef, TagListContext);
diff --git a/packages/react-aria-components/src/Tree.tsx b/packages/react-aria-components/src/Tree.tsx
index f9eefd6a968..c96ecea2fcc 100644
--- a/packages/react-aria-components/src/Tree.tsx
+++ b/packages/react-aria-components/src/Tree.tsx
@@ -349,7 +349,7 @@ export const TreeStateContext = createContext<TreeState<any> | null>(null);
  * A tree provides users with a way to navigate nested hierarchical information, with support for keyboard navigation
  * and selection.
  */
-export const Tree = /*#__PURE__*/ (forwardRef as forwardRefType)(function Tree<T extends object>(
+export const Tree = /*#__PURE__*/ (forwardRef as forwardRefType)(function Tree<T>(
   props: TreeProps<T>,
   ref: ForwardedRef<HTMLDivElement>
 ) {
@@ -376,13 +376,13 @@ const EXPANSION_KEYS = {
   }
 };
 
-interface TreeInnerProps<T extends object> {
+interface TreeInnerProps<T> {
   props: TreeProps<T>;
   collection: TreeCollection<T>;
   treeRef: RefObject<HTMLDivElement | null>;
 }
 
-function TreeInner<T extends object>({props, collection, treeRef: ref}: TreeInnerProps<T>) {
+function TreeInner<T>({props, collection, treeRef: ref}: TreeInnerProps<T>) {
   const {dragAndDropHooks} = props;
   let {direction} = useLocale();
   let collator = useCollator({usage: 'search', sensitivity: 'base'});
@@ -738,7 +738,7 @@ class TreeItemNode extends CollectionNode<any> {
  */
 export const TreeItem = /*#__PURE__*/ createBranchComponent(
   TreeItemNode,
-  <T extends object>(props: TreeItemProps<T>, ref: ForwardedRef<HTMLDivElement>, item: Node<T>) => {
+  <T extends any>(props: TreeItemProps<T>, ref: ForwardedRef<HTMLDivElement>, item: Node<T>) => {
     let state = useContext(TreeStateContext)!;
     ref = useObjectRef<HTMLDivElement>(ref);
     let {dragAndDropHooks, dragState, dropState} = useContext(DragAndDropContext)!;
@@ -1039,7 +1039,7 @@ export interface TreeLoadMoreItemProps
 }
 
 export const TreeLoadMoreItem = createLeafComponent(LoaderNode, function TreeLoadingSentinel<
-  T extends object
+  T
 >(props: TreeLoadMoreItemProps, ref: ForwardedRef<HTMLDivElement>, item: Node<T>) {
   let {isVirtualized} = useContext(CollectionRendererContext);
   let state = useContext(TreeStateContext)!;
@@ -1218,7 +1218,7 @@ export interface GridListSectionProps<T>
  */
 export const TreeSection = /*#__PURE__*/ createBranchComponent(
   SectionNode,
-  <T extends object>(
+  <T extends any>(
     props: GridListSectionProps<T>,
     ref: ForwardedRef<HTMLDivElement>,
     item: Node<T>
diff --git a/packages/react-aria-components/stories/Autocomplete.stories.tsx b/packages/react-aria-components/stories/Autocomplete.stories.tsx
index 7ae8ed4da95..74141650ca0 100644
--- a/packages/react-aria-components/stories/Autocomplete.stories.tsx
+++ b/packages/react-aria-components/stories/Autocomplete.stories.tsx
@@ -949,7 +949,10 @@ export const AutocompleteMenuInPopoverDialogTrigger: MenuStory = {
                   Please select an option below.
                 </Text>
               </SearchField>
-              <Menu className={styles.menu} items={dynamicAutocompleteSubdialog} {...args}>
+              <Menu<MenuNode>
+                {...args}
+                className={styles.menu}
+                items={dynamicAutocompleteSubdialog}>
                 {item => dynamicRenderFuncSections(item)}
               </Menu>
             </div>
@@ -1298,7 +1301,7 @@ function AutocompleteNodeFiltering(args) {
             Please select an option below.
           </Text>
         </SearchField>
-        <Menu className={styles.menu} items={dynamicAutocompleteSubdialog} {...args}>
+        <Menu<MenuNode> {...args} className={styles.menu} items={dynamicAutocompleteSubdialog}>
           {item => dynamicRenderFuncSections(item)}
         </Menu>
       </div>
diff --git a/packages/react-aria-components/stories/ListBox.stories.tsx b/packages/react-aria-components/stories/ListBox.stories.tsx
index 7363b4613dd..35c1bed91cf 100644
--- a/packages/react-aria-components/stories/ListBox.stories.tsx
+++ b/packages/react-aria-components/stories/ListBox.stories.tsx
@@ -123,6 +123,16 @@ export const ListBoxComplex: ListBoxStory = () => (
   </ListBox>
 );
 
+export const ListBoxDynamicStrings: ListBoxStory = args => (
+  <ListBox
+    className={styles.menu}
+    {...args}
+    aria-label="test listbox"
+    items={['Foo', 'Bar', 'Baz']}>
+    {item => <MyListBoxItem>{item}</MyListBoxItem>}
+  </ListBox>
+);
+
 interface Album {
   id: number;
   image: string;
diff --git a/packages/react-aria-components/stories/Tree.stories.tsx b/packages/react-aria-components/stories/Tree.stories.tsx
index b5412dac868..ac045363e5b 100644
--- a/packages/react-aria-components/stories/Tree.stories.tsx
+++ b/packages/react-aria-components/stories/Tree.stories.tsx
@@ -184,7 +184,7 @@ const StaticTreeItemNoActions = (props: StaticTreeItemProps) => {
   );
 };
 
-export function TreeExampleStaticRender<T extends object>(props: TreeProps<T>) {
+export function TreeExampleStaticRender<T>(props: TreeProps<T>) {
   return (
     <Tree
       className={styles.tree}
@@ -239,7 +239,7 @@ export function TreeExampleStaticRender<T extends object>(props: TreeProps<T>) {
   );
 }
 
-const TreeExampleStaticNoActionsRender = <T extends object>(args: TreeProps<T>): JSX.Element => (
+const TreeExampleStaticNoActionsRender = <T extends any>(args: TreeProps<T>): JSX.Element => (
   <Tree
     className={styles.tree}
     {...args}
@@ -686,7 +686,7 @@ let defaultExpandedKeys = new Set([
   'reports-1AB'
 ]);
 
-const TreeExampleDynamicRender = <T extends object>(args: TreeProps<T>): JSX.Element => {
+const TreeExampleDynamicRender = <T extends any>(args: TreeProps<T>): JSX.Element => {
   let treeData = useTreeData<any>({
     initialItems: (args.items as any) ?? rows,
     getKey: item => item.id,
@@ -712,7 +712,7 @@ const TreeExampleDynamicRender = <T extends object>(args: TreeProps<T>): JSX.Ele
   );
 };
 
-const TreeSectionExampleDynamicRender = <T extends object>(args: TreeProps<T>): JSX.Element => {
+const TreeSectionExampleDynamicRender = <T extends any>(args: TreeProps<T>): JSX.Element => {
   let treeData = useTreeData<any>({
     initialItems: (args.items as any) ?? rowsWithSections,
     getKey: item => item.id,
@@ -770,7 +770,7 @@ export const WithActions: StoryObj<typeof TreeExampleDynamicRender> = {
   name: 'Tree with actions'
 };
 
-const WithLinksRender = <T extends object>(args: TreeProps<T>): JSX.Element => {
+const WithLinksRender = <T extends any>(args: TreeProps<T>): JSX.Element => {
   let treeData = useTreeData<any>({
     initialItems: rows,
     getKey: item => item.id,
@@ -812,9 +812,7 @@ function renderEmptyLoader({isLoading}) {
   return isLoading ? 'Root level loading spinner' : 'Nothing in tree';
 }
 
-const EmptyTreeStatic = <T extends object>(
-  args: TreeProps<T> & {isLoading: boolean}
-): JSX.Element => (
+const EmptyTreeStatic = <T extends any>(args: TreeProps<T> & {isLoading: boolean}): JSX.Element => (
   <Tree
     {...args}
     className={styles.tree}
@@ -843,7 +841,7 @@ export const EmptyTreeStaticStory: StoryObj<typeof EmptyTreeStatic> = {
   name: 'Empty/Loading Tree rendered with TreeLoader collection element'
 };
 
-function LoadingStoryDepOnCollection<T extends object>(
+function LoadingStoryDepOnCollection<T extends any>(
   props: TreeProps<T> & {isLoading: boolean}
 ): JSX.Element {
   let {isLoading, ...args} = props;
@@ -892,9 +890,7 @@ export const LoadingStoryDepOnCollectionStory: StoryObj<typeof LoadingStoryDepOn
   }
 };
 
-function LoadingStoryDepOnTop<T extends object>(
-  args: TreeProps<T> & {isLoading: boolean}
-): JSX.Element {
+function LoadingStoryDepOnTop<T>(args: TreeProps<T> & {isLoading: boolean}): JSX.Element {
   let treeData = useTreeData<any>({
     initialItems: rows,
     getKey: item => item.id,
@@ -1019,9 +1015,7 @@ const DynamicTreeItemWithButtonLoader = (props: DynamicTreeItemProps) => {
   );
 };
 
-function ButtonLoadingIndicator<T extends object>(
-  args: TreeProps<T> & {isLoading: boolean}
-): JSX.Element {
+function ButtonLoadingIndicator<T>(args: TreeProps<T> & {isLoading: boolean}): JSX.Element {
   let treeData = useTreeData<any>({
     initialItems: rows,
     getKey: item => item.id,
@@ -1065,7 +1059,7 @@ export const ButtonLoadingIndicatorStory: StoryObj<typeof ButtonLoadingIndicator
   }
 };
 
-function VirtualizedTreeRender<T extends object>(args: TreeProps<T>): JSX.Element {
+function VirtualizedTreeRender<T>(args: TreeProps<T>): JSX.Element {
   return (
     <Virtualizer layout={ListLayout} layoutOptions={{rowHeight: 30}}>
       <TreeExampleDynamicRender {...args} />
@@ -1377,7 +1371,7 @@ dependencies={[isRootLoading]}>
 }} */
 }
 
-function TreeDragAndDropExample<T extends object>(
+function TreeDragAndDropExample<T>(
   args: TreeProps<T> & {
     shouldAcceptItemDrop: 'folders' | 'all';
     dropFunction: 'onMove' | 'onInsert' | 'onRootDrop';
@@ -1777,7 +1771,7 @@ function generateTreeData(): Array<ITreeItem> {
 
 const treeData = generateTreeData();
 
-function HugeVirtualizedTreeRender<T extends object>(args: TreeProps<T>): JSX.Element {
+function HugeVirtualizedTreeRender<T>(args: TreeProps<T>): JSX.Element {
   let [expandedKeys, setExpandedKeys] = useState(new Set<Key>());
   let expandAll = () => {
     setExpandedKeys(itemKeys);
diff --git a/packages/react-aria-components/test/ListBox.test.js b/packages/react-aria-components/test/ListBox.test.js
index 060ec96a1c4..80ee2845f7e 100644
--- a/packages/react-aria-components/test/ListBox.test.js
+++ b/packages/react-aria-components/test/ListBox.test.js
@@ -454,6 +454,62 @@ describe('ListBox', () => {
     expect(items).toHaveLength(2);
   });
 
+  it('should support dynamic collection with non-object entries', () => {
+    let {getAllByRole, rerender} = render(
+      <ListBox aria-label="Test" items={['Foo', 'Bar', 'Baz']}>
+        {item => <ListBoxItem>{item}</ListBoxItem>}
+      </ListBox>
+    );
+
+    let items = getAllByRole('option');
+    expect(items).toHaveLength(3);
+    expect(items[0].textContent).toBe('Foo');
+    expect(items[1].textContent).toBe('Bar');
+    expect(items[2].textContent).toBe('Baz');
+
+    rerender(
+      <ListBox aria-label="Test" items={['Foo', 'Baz']}>
+        {item => <ListBoxItem>{item}</ListBoxItem>}
+      </ListBox>
+    );
+
+    items = getAllByRole('option');
+    expect(items).toHaveLength(2);
+    expect(items[0].textContent).toBe('Foo');
+    expect(items[1].textContent).toBe('Baz');
+  });
+
+  it('should update collection if render function changes', () => {
+    let objects = [{name: 'Foo'}, {name: 'Bar'}, {name: 'Baz'}];
+    let {getAllByRole, rerender} = render(
+      <ListBox aria-label="Test" items={objects}>
+        {item => <ListBoxItem id={item.name}>{item.name}</ListBoxItem>}
+      </ListBox>
+    );
+
+    let items = getAllByRole('option');
+    expect(items).toHaveLength(3);
+    expect(items[0].textContent).toBe('Foo');
+    expect(items[1].textContent).toBe('Bar');
+    expect(items[2].textContent).toBe('Baz');
+
+    rerender(
+      <ListBox aria-label="Test" items={objects}>
+        {item => (
+          <ListBoxItem id={item.name} textValue="Updated">
+            Updated: {item.name}
+          </ListBoxItem>
+        )}
+      </ListBox>
+    );
+
+    items = getAllByRole('option');
+    expect(items).toHaveLength(3);
+    expect(items[0].textContent).toBe('Updated: Foo');
+    expect(items[1].textContent).toBe('Updated: Bar');
+    expect(items[2].textContent).toBe('Updated: Baz');
+  });
+
   it('should support autoFocus', () => {
     let {getByRole} = renderListbox({autoFocus: true});
     let listbox = getByRole('listbox');
diff --git a/packages/react-aria/src/collections/CollectionBuilder.tsx b/packages/react-aria/src/collections/CollectionBuilder.tsx
index d702aaa600d..97b62595233 100644
--- a/packages/react-aria/src/collections/CollectionBuilder.tsx
+++ b/packages/react-aria/src/collections/CollectionBuilder.tsx
@@ -36,7 +36,7 @@ import {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-externa
 const ShallowRenderContext = createContext(false);
 const CollectionDocumentContext = createContext<Document<any, BaseCollection<any>> | null>(null);
 
-export interface CollectionBuilderProps<C extends BaseCollection<object>> {
+export interface CollectionBuilderProps<C extends BaseCollection<any>> {
   content: ReactNode;
   children: (collection: C) => ReactNode;
   createCollection?: () => C;
@@ -45,7 +45,7 @@ export interface CollectionBuilderProps<C extends BaseCollection<object>> {
 /**
  * Builds a `Collection` from the children provided to the `content` prop, and passes it to the child render prop function.
  */
-export function CollectionBuilder<C extends BaseCollection<object>>(
+export function CollectionBuilder<C extends BaseCollection<any>>(
   props: CollectionBuilderProps<C>
 ): ReactElement {
   // If a document was provided above us, we're already in a hidden tree. Just render the content.
@@ -197,11 +197,11 @@ function useSSRCollectionNode<T extends Element>(
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function createLeafComponent<T extends object, P extends object, E extends Element>(
+export function createLeafComponent<T, P extends object, E extends Element>(
   CollectionNodeClass: CollectionNodeClass<any> | string,
   render: (props: P, ref: ForwardedRef<E>) => ReactElement | null
 ): (props: P & React.RefAttributes<E>) => ReactElement | null;
-export function createLeafComponent<T extends object, P extends object, E extends Element>(
+export function createLeafComponent<T, P extends object, E extends Element>(
   CollectionNodeClass: CollectionNodeClass<any> | string,
   render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement | null
 ): (props: P & React.RefAttributes<E>) => ReactElement | null;
@@ -239,11 +239,7 @@ export function createLeafComponent<P extends object, E extends Element>(
   return Result;
 }
 
-export function createBranchComponent<
-  T extends object,
-  P extends {children?: any},
-  E extends Element
->(
+export function createBranchComponent<T, P extends {children?: any}, E extends Element>(
   CollectionNodeClass: CollectionNodeClass<any> | string,
   render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement | null,
   useChildren: (props: P) => ReactNode = useCollectionChildren
@@ -262,7 +258,7 @@ export function createBranchComponent<
   return Result;
 }
 
-function useCollectionChildren<T extends object>(options: CachedChildrenOptions<T>) {
+function useCollectionChildren<T>(options: CachedChildrenOptions<T>) {
   return useCachedChildren({...options, addIdAndValue: true});
 }
 
@@ -271,7 +267,7 @@ export interface CollectionProps<T> extends CachedChildrenOptions<T> {}
 const CollectionContext = createContext<CachedChildrenOptions<unknown> | null>(null);
 
 /** A Collection renders a list of items, automatically managing caching and keys. */
-export function Collection<T extends object>(props: CollectionProps<T>): JSX.Element {
+export function Collection<T>(props: CollectionProps<T>): JSX.Element {
   let ctx = useContext(CollectionContext)!;
   let dependencies = (ctx?.dependencies || []).concat(props.dependencies);
   let idScope = props.idScope ?? ctx?.idScope;
diff --git a/packages/react-aria/src/collections/useCachedChildren.ts b/packages/react-aria/src/collections/useCachedChildren.ts
index 521d2479ad2..789b30b0df2 100644
--- a/packages/react-aria/src/collections/useCachedChildren.ts
+++ b/packages/react-aria/src/collections/useCachedChildren.ts
@@ -30,32 +30,45 @@ export interface CachedChildrenOptions<T> {
  * Maps over a list of items and renders React elements for them. Each rendered item is
  * cached based on object identity, and React keys are generated from the `key` or `id` property.
  */
-export function useCachedChildren<T extends object>(props: CachedChildrenOptions<T>): ReactNode {
+export function useCachedChildren<T>(props: CachedChildrenOptions<T>): ReactNode {
   let {children, items, idScope, addIdAndValue, dependencies = []} = props;
 
-  // Invalidate the cache whenever the parent value changes.
+  // In development, invalidate when the children function updates (e.g. HMR).
+  let childrenString = useMemo(
+    () =>
+      process.env.NODE_ENV !== 'production' && typeof children === 'function'
+        ? children.toString()
+        : undefined,
+    [children]
+  );
+
+  // Invalidate the cache whenever dependencies change.
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  let cache = useMemo(() => new WeakMap(), dependencies);
+  let cache = useMemo(() => new WeakMap(), [...dependencies, childrenString]);
+
   return useMemo(() => {
     if (items && typeof children === 'function') {
       let res: ReactElement[] = [];
       for (let item of items) {
-        let rendered = cache.get(item);
+        let cacheKey = isWeakKey(item) ? item : null;
+        let rendered = cacheKey ? cache.get(cacheKey) : null;
         if (!rendered) {
           rendered = children(item);
           // @ts-ignore
-          let key = rendered.props.id ?? item.key ?? item.id;
-
-          if (key == null) {
-            throw new Error('Could not determine key for item');
-          }
-
+          let id = rendered.props.id ?? item.key ?? item.id;
           if (idScope != null && rendered.props.id == null) {
-            key = idScope + ':' + key;
+            id = idScope + ':' + id;
           }
+
+          // If no id is inferred from data, use the index as the React key.
+          // An id will be generated by the collection document.
+          let key = id ?? res.length;
+
           // Note: only works if wrapped Item passes through id...
-          rendered = cloneElement(rendered, addIdAndValue ? {key, id: key, value: item} : {key});
-          cache.set(item, rendered);
+          rendered = cloneElement(rendered, addIdAndValue ? {key, id, value: item} : {key});
+          if (cacheKey) {
+            cache.set(cacheKey, rendered);
+          }
         }
         res.push(rendered);
       }
@@ -65,3 +78,15 @@ export function useCachedChildren<T extends object>(props: CachedChildrenOptions
     }
   }, [children, items, cache, idScope, addIdAndValue]);
 }
+
+function isWeakKey(value: any): value is WeakKey {
+  switch (typeof value) {
+    case 'object':
+      return value != null;
+    case 'function':
+    case 'symbol':
+      return true;
+    default:
+      return false;
+  }
+}
diff --git a/packages/react-aria/stories/dnd/DroppableGrid.tsx b/packages/react-aria/stories/dnd/DroppableGrid.tsx
index 5359aa2ccc6..f160e397b34 100644
--- a/packages/react-aria/stories/dnd/DroppableGrid.tsx
+++ b/packages/react-aria/stories/dnd/DroppableGrid.tsx
@@ -14,7 +14,7 @@ import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 
 import dndStyles from './dnd.css';
 import dropIndicatorStyles from '@adobe/spectrum-css-temp/components/dropindicator/vars.css';
-import {DroppableCollectionDropEvent} from '@react-types/shared';
+import {DroppableCollectionDropEvent, Node} from '@react-types/shared';
 import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
 import {GridCollection} from 'react-stately/private/grid/GridCollection';
@@ -132,22 +132,25 @@ const DroppableGrid = React.forwardRef(function (props: any, ref) {
       () =>
         new GridCollection<object>({
           columnCount: 1,
-          items: [...state.collection].map(item => ({
-            ...item,
-            childNodes: [
-              {
-                key: `cell-${item.key}`,
-                type: 'cell',
-                index: 0,
-                value: null,
-                level: 0,
-                rendered: null,
-                textValue: item.textValue,
-                hasChildNodes: false,
-                childNodes: []
-              }
-            ]
-          }))
+          items: [...state.collection].map(
+            item =>
+              ({
+                ...item,
+                childNodes: [
+                  {
+                    key: `cell-${item.key}`,
+                    type: 'cell',
+                    index: 0,
+                    value: null,
+                    level: 0,
+                    rendered: null,
+                    textValue: item.textValue,
+                    hasChildNodes: false,
+                    childNodes: []
+                  }
+                ]
+              }) as Node<any>
+          )
         }),
       [state.collection]
     )
diff --git a/packages/react-aria/stories/dnd/Reorderable.tsx b/packages/react-aria/stories/dnd/Reorderable.tsx
index ec72d291516..b42c91efe68 100644
--- a/packages/react-aria/stories/dnd/Reorderable.tsx
+++ b/packages/react-aria/stories/dnd/Reorderable.tsx
@@ -20,7 +20,7 @@ import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
 import {GridCollection} from 'react-stately/private/grid/GridCollection';
 import {Item} from 'react-stately/Item';
-import {ItemDropTarget, Key} from '@react-types/shared';
+import {ItemDropTarget, Key, Node} from '@react-types/shared';
 import {ListDropTargetDelegate} from '../../src/dnd/ListDropTargetDelegate';
 import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
 import {mergeProps} from '../../src/utils/mergeProps';
@@ -85,22 +85,25 @@ function ReorderableGrid(props) {
       () =>
         new GridCollection<object>({
           columnCount: 1,
-          items: [...state.collection].map(item => ({
-            ...item,
-            childNodes: [
-              {
-                key: `cell-${item.key}`,
-                type: 'cell',
-                index: 0,
-                value: null,
-                level: 0,
-                rendered: null,
-                textValue: item.textValue,
-                hasChildNodes: false,
-                childNodes: []
-              }
-            ]
-          }))
+          items: [...state.collection].map(
+            item =>
+              ({
+                ...item,
+                childNodes: [
+                  {
+                    key: `cell-${item.key}`,
+                    type: 'cell',
+                    index: 0,
+                    value: null,
+                    level: 0,
+                    rendered: null,
+                    textValue: item.textValue,
+                    hasChildNodes: false,
+                    childNodes: []
+                  }
+                ]
+              }) as Node<any>
+          )
         }),
       [state.collection]
     )
diff --git a/packages/react-aria/stories/dnd/VirtualizedListBox.tsx b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx
index dae6a86429b..82b47b01a73 100644
--- a/packages/react-aria/stories/dnd/VirtualizedListBox.tsx
+++ b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx
@@ -104,7 +104,7 @@ export function VirtualizedListBoxExample(props: any): JSX.Element {
 }
 
 const Context = React.createContext<{
-  state: ListState<object>;
+  state: ListState<any>;
   dropState: DroppableCollectionState;
 } | null>(null);
 const acceptedTypes = ['item', 'folder'];
diff --git a/packages/react-stately/src/collections/useCollection.ts b/packages/react-stately/src/collections/useCollection.ts
index 532f75028dc..78bd0ac7843 100644
--- a/packages/react-stately/src/collections/useCollection.ts
+++ b/packages/react-stately/src/collections/useCollection.ts
@@ -27,11 +27,12 @@ interface CollectionOptions<T, C extends Collection<Node<T>>> extends Omit<
 
 type CollectionFactory<T, C extends Collection<Node<T>>> = (node: Iterable<Node<T>>) => C;
 
-export function useCollection<
-  T extends object,
-  C extends Collection<Node<T>> = Collection<Node<T>>
->(props: CollectionOptions<T, C>, factory: CollectionFactory<T, C>, context?: unknown): C {
-  let builder = useMemo(() => new CollectionBuilder<T>(), []);
+export function useCollection<T, C extends Collection<Node<T>> = Collection<Node<T>>>(
+  props: CollectionOptions<T, C>,
+  factory: CollectionFactory<T, C>,
+  context?: unknown
+): C {
+  let builder = useMemo(() => new CollectionBuilder<any>(), []);
   let {children, items, collection} = props;
   let result = useMemo(() => {
     if (collection) {
diff --git a/packages/react-stately/src/combobox/useComboBoxState.ts b/packages/react-stately/src/combobox/useComboBoxState.ts
index fe81a917b66..1958b0dace0 100644
--- a/packages/react-stately/src/combobox/useComboBoxState.ts
+++ b/packages/react-stately/src/combobox/useComboBoxState.ts
@@ -178,7 +178,7 @@ export interface ComboBoxStateOptions<T, M extends SelectionMode = 'single'>
  * of items from props and manages the option selection state of the combo box. In addition, it tracks the input value,
  * focus state, and other properties of the combo box.
  */
-export function useComboBoxState<T extends object, M extends SelectionMode = 'single'>(
+export function useComboBoxState<T, M extends SelectionMode = 'single'>(
   props: ComboBoxStateOptions<T, M>
 ): ComboBoxState<T, M> {
   let {
@@ -627,7 +627,7 @@ export function useComboBoxState<T extends object, M extends SelectionMode = 'si
   };
 }
 
-function filterCollection<T extends object>(
+function filterCollection<T>(
   collection: Collection<Node<T>>,
   inputValue: string,
   filter: FilterFn
diff --git a/packages/react-stately/src/list/useListState.ts b/packages/react-stately/src/list/useListState.ts
index 416e5ba67ce..bdf1dfcaeff 100644
--- a/packages/react-stately/src/list/useListState.ts
+++ b/packages/react-stately/src/list/useListState.ts
@@ -47,7 +47,7 @@ export interface ListState<T> {
  * Provides state management for list-like components. Handles building a collection
  * of items from props, and manages multiple selection state.
  */
-export function useListState<T extends object>(props: ListProps<T>): ListState<T> {
+export function useListState<T>(props: ListProps<T>): ListState<T> {
   let {filter, layoutDelegate} = props;
 
   let selectionState = useMultipleSelectionState(props);
@@ -85,7 +85,7 @@ export function useListState<T extends object>(props: ListProps<T>): ListState<T
 /**
  * Filters a collection using the provided filter function and returns a new ListState.
  */
-export function UNSTABLE_useFilteredListState<T extends object>(
+export function UNSTABLE_useFilteredListState<T>(
   state: ListState<T>,
   filterFn: ((nodeValue: string, node: Node<T>) => boolean) | null | undefined
 ): ListState<T> {
diff --git a/packages/react-stately/src/select/useSelectState.ts b/packages/react-stately/src/select/useSelectState.ts
index 4f673789704..b06f57c5981 100644
--- a/packages/react-stately/src/select/useSelectState.ts
+++ b/packages/react-stately/src/select/useSelectState.ts
@@ -140,7 +140,7 @@ export interface SelectState<T, M extends SelectionMode = 'single'>
  * of items from props, handles the open state for the popup menu, and manages
  * multiple selection state.
  */
-export function useSelectState<T extends object, M extends SelectionMode = 'single'>(
+export function useSelectState<T, M extends SelectionMode = 'single'>(
   props: SelectStateOptions<T, M>
 ): SelectState<T, M> {
   let {selectionMode = 'single' as M, shouldCloseOnSelect = selectionMode === 'single'} = props;
diff --git a/packages/react-stately/src/tree/useTreeState.ts b/packages/react-stately/src/tree/useTreeState.ts
index 144232af62c..f8bd1642917 100644
--- a/packages/react-stately/src/tree/useTreeState.ts
+++ b/packages/react-stately/src/tree/useTreeState.ts
@@ -54,7 +54,7 @@ export interface TreeState<T> {
  * Provides state management for tree-like components. Handles building a collection
  * of items from props, item expanded state, and manages multiple selection state.
  */
-export function useTreeState<T extends object>(props: TreeProps<T>): TreeState<T> {
+export function useTreeState<T>(props: TreeProps<T>): TreeState<T> {
   let {onExpandedChange} = props;
 
   let [expandedKeys, setExpandedKeys] = useControlledState(
diff --git a/packages/react-stately/stories/tree/useTreeState.stories.tsx b/packages/react-stately/stories/tree/useTreeState.stories.tsx
index a401384ddd2..29078d288fb 100644
--- a/packages/react-stately/stories/tree/useTreeState.stories.tsx
+++ b/packages/react-stately/stories/tree/useTreeState.stories.tsx
@@ -72,7 +72,7 @@ function Tree(props) {
   );
 }
 
-function TreeNodes({nodes, state}: {nodes: Collection<Node<object>>; state: any}) {
+function TreeNodes({nodes, state}: {nodes: Collection<Node<any>>; state: any}) {
   return Array.from(nodes).map(node => <TreeItem node={node} key={node.key} state={state} />);
 }
 
diff --git a/starters/docs/src/Breadcrumbs.tsx b/starters/docs/src/Breadcrumbs.tsx
index e1b8e4b740d..c987bd195e3 100644
--- a/starters/docs/src/Breadcrumbs.tsx
+++ b/starters/docs/src/Breadcrumbs.tsx
@@ -10,7 +10,7 @@ import {
 import {ChevronRight} from 'lucide-react';
 import './Breadcrumbs.css';
 
-export function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>) {
+export function Breadcrumbs<T>(props: BreadcrumbsProps<T>) {
   return <RACBreadcrumbs {...props} />;
 }
 
diff --git a/starters/docs/src/ComboBox.tsx b/starters/docs/src/ComboBox.tsx
index d7d19ec2777..e0ec8c027a6 100644
--- a/starters/docs/src/ComboBox.tsx
+++ b/starters/docs/src/ComboBox.tsx
@@ -14,7 +14,7 @@ import {Popover} from './Popover';
 import {ChevronDown} from 'lucide-react';
 import './ComboBox.css';
 
-export interface ComboBoxProps<T extends object, M extends 'single' | 'multiple'> extends Omit<
+export interface ComboBoxProps<T, M extends 'single' | 'multiple'> extends Omit<
   AriaComboBoxProps<T, M>,
   'children'
 > {
@@ -25,7 +25,7 @@ export interface ComboBoxProps<T extends object, M extends 'single' | 'multiple'
   placeholder?: string;
 }
 
-export function ComboBox<T extends object, M extends 'single' | 'multiple' = 'single'>({
+export function ComboBox<T, M extends 'single' | 'multiple' = 'single'>({
   label,
   description,
   errorMessage,
@@ -52,7 +52,7 @@ export function ComboBox<T extends object, M extends 'single' | 'multiple' = 'si
   );
 }
 
-export function ComboBoxListBox<T extends object>(props: ListBoxProps<T>) {
+export function ComboBoxListBox<T>(props: ListBoxProps<T>) {
   return <DropdownListBox {...props} />;
 }
 
diff --git a/starters/docs/src/CommandPalette.tsx b/starters/docs/src/CommandPalette.tsx
index d06e9fd6e60..158d413b31b 100644
--- a/starters/docs/src/CommandPalette.tsx
+++ b/starters/docs/src/CommandPalette.tsx
@@ -12,13 +12,13 @@ import {Modal} from './Modal';
 import {useEffect} from 'react';
 import './CommandPalette.css';
 
-export interface CommandPaletteProps<T extends object>
+export interface CommandPaletteProps<T>
   extends Omit<AriaAutocompleteProps, 'children'>, AriaMenuProps<T> {
   isOpen: boolean;
   onOpenChange: (isOpen?: boolean) => void;
 }
 
-export function CommandPalette<T extends object>(props: CommandPaletteProps<T>) {
+export function CommandPalette<T>(props: CommandPaletteProps<T>) {
   let {isOpen, onOpenChange} = props;
   let {contains} = useFilter({sensitivity: 'base'});
 
diff --git a/starters/docs/src/GridList.tsx b/starters/docs/src/GridList.tsx
index 41e1510503b..4c33d1425af 100644
--- a/starters/docs/src/GridList.tsx
+++ b/starters/docs/src/GridList.tsx
@@ -16,11 +16,7 @@ import {GripVertical} from 'lucide-react';
 import {ProgressCircle} from './ProgressCircle';
 import './GridList.css';
 
-export function GridList<T extends object>({
-  children,
-  layout = 'grid',
-  ...props
-}: GridListProps<T>) {
+export function GridList<T>({children, layout = 'grid', ...props}: GridListProps<T>) {
   return (
     <AriaGridList {...props} layout={layout}>
       {children}
diff --git a/starters/docs/src/ListBox.tsx b/starters/docs/src/ListBox.tsx
index f31c9ba0b04..8e0045867cb 100644
--- a/starters/docs/src/ListBox.tsx
+++ b/starters/docs/src/ListBox.tsx
@@ -16,7 +16,7 @@ import {Text} from './Content';
 import {ProgressCircle} from './ProgressCircle';
 import './ListBox.css';
 
-export function ListBox<T extends object>({children, ...props}: ListBoxProps<T>) {
+export function ListBox<T>({children, ...props}: ListBoxProps<T>) {
   return <AriaListBox {...props}>{children}</AriaListBox>;
 }
 
@@ -32,7 +32,7 @@ export function ListBoxItem(props: ListBoxItemProps) {
   );
 }
 
-export function ListBoxSection<T extends object>(props: ListBoxSectionProps<T>) {
+export function ListBoxSection<T>(props: ListBoxSectionProps<T>) {
   return <AriaListBoxSection {...props} />;
 }
 
@@ -44,7 +44,7 @@ export function ListBoxLoadMoreItem(props: ListBoxLoadMoreItemProps) {
   );
 }
 
-export function DropdownListBox<T extends object>(props: ListBoxProps<T>) {
+export function DropdownListBox<T>(props: ListBoxProps<T>) {
   return <AriaListBox {...props} className="dropdown-listbox" />;
 }
 
diff --git a/starters/docs/src/Menu.tsx b/starters/docs/src/Menu.tsx
index bf6793d4768..9a2684a2b27 100644
--- a/starters/docs/src/Menu.tsx
+++ b/starters/docs/src/Menu.tsx
@@ -33,7 +33,7 @@ export function MenuTrigger(props: MenuTriggerProps) {
   );
 }
 
-export function Menu<T extends object>(props: MenuProps<T>) {
+export function Menu<T>(props: MenuProps<T>) {
   return <AriaMenu {...props}>{props.children}</AriaMenu>;
 }
 
@@ -58,7 +58,7 @@ export function MenuItem(props: Omit<MenuItemProps, 'children'> & {children?: Re
   );
 }
 
-export function MenuSection<T extends object>(props: MenuSectionProps<T>) {
+export function MenuSection<T>(props: MenuSectionProps<T>) {
   return <AriaMenuSection {...props} />;
 }
 
diff --git a/starters/docs/src/Select.tsx b/starters/docs/src/Select.tsx
index 7e864737a61..4966636d0ca 100644
--- a/starters/docs/src/Select.tsx
+++ b/starters/docs/src/Select.tsx
@@ -14,7 +14,7 @@ import {Popover} from './Popover';
 import {Label, FieldError, Description} from './Form';
 import './Select.css';
 
-export interface SelectProps<T extends object, M extends 'single' | 'multiple'> extends Omit<
+export interface SelectProps<T, M extends 'single' | 'multiple'> extends Omit<
   AriaSelectProps<T, M>,
   'children'
 > {
@@ -25,7 +25,7 @@ export interface SelectProps<T extends object, M extends 'single' | 'multiple'>
   children: React.ReactNode | ((item: T) => React.ReactNode);
 }
 
-export function Select<T extends object, M extends 'single' | 'multiple' = 'single'>({
+export function Select<T, M extends 'single' | 'multiple' = 'single'>({
   label,
   description,
   errorMessage,
@@ -49,7 +49,7 @@ export function Select<T extends object, M extends 'single' | 'multiple' = 'sing
   );
 }
 
-export function SelectListBox<T extends object>(props: ListBoxProps<T>) {
+export function SelectListBox<T>(props: ListBoxProps<T>) {
   return <DropdownListBox {...props} />;
 }
 
diff --git a/starters/docs/src/Table.tsx b/starters/docs/src/Table.tsx
index 7d9b683ca81..f586b21b7fa 100644
--- a/starters/docs/src/Table.tsx
+++ b/starters/docs/src/Table.tsx
@@ -56,11 +56,7 @@ export function Column(props: Omit<ColumnProps, 'children'> & {children?: React.
   );
 }
 
-export function TableHeader<T extends object>({
-  columns,
-  children,
-  ...otherProps
-}: TableHeaderProps<T>) {
+export function TableHeader<T>({columns, children, ...otherProps}: TableHeaderProps<T>) {
   let {selectionBehavior, selectionMode, allowsDragging} = useTableOptions();
 
   return (
@@ -88,7 +84,7 @@ export function TableHeader<T extends object>({
   );
 }
 
-export function Row<T extends object>({id, columns, children, ...otherProps}: RowProps<T>) {
+export function Row<T>({id, columns, children, ...otherProps}: RowProps<T>) {
   let {selectionBehavior, allowsDragging} = useTableOptions();
 
   return (
@@ -110,11 +106,11 @@ export function Row<T extends object>({id, columns, children, ...otherProps}: Ro
   );
 }
 
-export function TableBody<T extends object>(props: TableBodyProps<T>) {
+export function TableBody<T>(props: TableBodyProps<T>) {
   return <AriaTableBody {...props} />;
 }
 
-export function TableFooter<T extends object>(props: TableFooterProps<T>) {
+export function TableFooter<T>(props: TableFooterProps<T>) {
   return <AriaTableFooter {...props} />;
 }
 
diff --git a/starters/docs/src/Tabs.tsx b/starters/docs/src/Tabs.tsx
index 1cb6d2c9446..5361a124b04 100644
--- a/starters/docs/src/Tabs.tsx
+++ b/starters/docs/src/Tabs.tsx
@@ -19,7 +19,7 @@ export function Tabs(props: TabsProps) {
   return <RACTabs {...props} />;
 }
 
-export function TabList<T extends object>(props: TabListProps<T>) {
+export function TabList<T>(props: TabListProps<T>) {
   return <RACTabList {...props} />;
 }
 
@@ -36,7 +36,7 @@ export function Tab(props: TabProps) {
   );
 }
 
-export function TabPanels<T extends object>(props: TabPanelsProps<T>) {
+export function TabPanels<T>(props: TabPanelsProps<T>) {
   return <RACTabPanels {...props} />;
 }
 
diff --git a/starters/docs/src/TagGroup.tsx b/starters/docs/src/TagGroup.tsx
index 5e87f175f04..8c137fecf9f 100644
--- a/starters/docs/src/TagGroup.tsx
+++ b/starters/docs/src/TagGroup.tsx
@@ -22,7 +22,7 @@ export interface TagGroupProps<T>
   errorMessage?: string;
 }
 
-export function TagGroup<T extends object>({
+export function TagGroup<T>({
   label,
   description,
   errorMessage,
diff --git a/starters/docs/src/Tree.tsx b/starters/docs/src/Tree.tsx
index c1579b07f0d..3928dfd5a4e 100644
--- a/starters/docs/src/Tree.tsx
+++ b/starters/docs/src/Tree.tsx
@@ -18,7 +18,7 @@ import {Checkbox} from './Checkbox';
 import {ProgressCircle} from './ProgressCircle';
 import './Tree.css';
 
-export function Tree<T extends object>(props: TreeProps<T>) {
+export function Tree<T>(props: TreeProps<T>) {
   return <AriaTree {...props} />;
 }
 
@@ -69,7 +69,7 @@ export function TreeLoadMoreItem(props: TreeLoadMoreItemProps) {
   );
 }
 
-export function TreeSection<T extends object>(props: React.ComponentProps<typeof AriaTreeSection>) {
+export function TreeSection(props: React.ComponentProps<typeof AriaTreeSection>) {
   return <AriaTreeSection {...props} />;
 }
 
diff --git a/starters/tailwind/src/Breadcrumbs.tsx b/starters/tailwind/src/Breadcrumbs.tsx
index a6985c9e4d2..5272d9485d0 100644
--- a/starters/tailwind/src/Breadcrumbs.tsx
+++ b/starters/tailwind/src/Breadcrumbs.tsx
@@ -12,7 +12,7 @@ import {twMerge} from 'tailwind-merge';
 import {Link} from './Link';
 import {composeTailwindRenderProps} from './utils';
 
-export function Breadcrumbs<T extends object>(props: BreadcrumbsProps<T>) {
+export function Breadcrumbs<T>(props: BreadcrumbsProps<T>) {
   return <AriaBreadcrumbs {...props} className={twMerge('flex gap-1', props.className)} />;
 }
 
diff --git a/starters/tailwind/src/ComboBox.tsx b/starters/tailwind/src/ComboBox.tsx
index d66600c392b..d482db9098c 100644
--- a/starters/tailwind/src/ComboBox.tsx
+++ b/starters/tailwind/src/ComboBox.tsx
@@ -15,7 +15,7 @@ import {Popover} from './Popover';
 import {composeTailwindRenderProps} from './utils';
 import {FieldButton} from './FieldButton';
 
-export interface ComboBoxProps<T extends object, M extends 'single' | 'multiple'> extends Omit<
+export interface ComboBoxProps<T, M extends 'single' | 'multiple'> extends Omit<
   AriaComboBoxProps<T, M>,
   'children'
 > {
@@ -26,7 +26,7 @@ export interface ComboBoxProps<T extends object, M extends 'single' | 'multiple'
   children: React.ReactNode | ((item: T) => React.ReactNode);
 }
 
-export function ComboBox<T extends object, M extends 'single' | 'multiple' = 'single'>({
+export function ComboBox<T, M extends 'single' | 'multiple' = 'single'>({
   label,
   description,
   errorMessage,
@@ -71,6 +71,6 @@ export function ComboBoxItem(props: ListBoxItemProps) {
   return <DropdownItem {...props} />;
 }
 
-export function ComboBoxSection<T extends object>(props: DropdownSectionProps<T>) {
+export function ComboBoxSection<T>(props: DropdownSectionProps<T>) {
   return <DropdownSection {...props} />;
 }
diff --git a/starters/tailwind/src/CommandPalette.tsx b/starters/tailwind/src/CommandPalette.tsx
index 2244d5fa3fa..daa7cff8e79 100644
--- a/starters/tailwind/src/CommandPalette.tsx
+++ b/starters/tailwind/src/CommandPalette.tsx
@@ -11,13 +11,13 @@ import {SearchField} from './SearchField';
 import {Modal} from './Modal';
 import React, {useEffect} from 'react';
 
-export interface CommandPaletteProps<T extends object>
+export interface CommandPaletteProps<T>
   extends Omit<AriaAutocompleteProps, 'children'>, AriaMenuProps<T> {
   isOpen: boolean;
   onOpenChange: (isOpen?: boolean) => void;
 }
 
-export function CommandPalette<T extends object>(props: CommandPaletteProps<T>) {
+export function CommandPalette<T>(props: CommandPaletteProps<T>) {
   let {isOpen, onOpenChange} = props;
   let {contains} = useFilter({sensitivity: 'base'});
 
diff --git a/starters/tailwind/src/GridList.tsx b/starters/tailwind/src/GridList.tsx
index ef2326acc19..43bd0c5f05a 100644
--- a/starters/tailwind/src/GridList.tsx
+++ b/starters/tailwind/src/GridList.tsx
@@ -15,7 +15,7 @@ import {composeTailwindRenderProps, focusRing} from './utils';
 import {type HTMLAttributes} from 'react';
 import {twMerge} from 'tailwind-merge';
 
-export function GridList<T extends object>({children, ...props}: GridListProps<T>) {
+export function GridList<T>({children, ...props}: GridListProps<T>) {
   let isHorizontal =
     (props as {orientation?: 'horizontal' | 'vertical'}).orientation === 'horizontal';
   return (
diff --git a/starters/tailwind/src/ListBox.tsx b/starters/tailwind/src/ListBox.tsx
index de84d44517b..35591324b12 100644
--- a/starters/tailwind/src/ListBox.tsx
+++ b/starters/tailwind/src/ListBox.tsx
@@ -17,7 +17,7 @@ import {composeTailwindRenderProps, focusRing} from './utils';
 
 interface ListBoxProps<T> extends Omit<AriaListBoxProps<T>, 'layout' | 'orientation'> {}
 
-export function ListBox<T extends object>({children, ...props}: ListBoxProps<T>) {
+export function ListBox<T>({children, ...props}: ListBoxProps<T>) {
   return (
     <AriaListBox
       {...props}
@@ -107,7 +107,7 @@ export interface DropdownSectionProps<T> extends ListBoxSectionProps<T> {
   items?: any;
 }
 
-export function DropdownSection<T extends object>(props: DropdownSectionProps<T>) {
+export function DropdownSection<T>(props: DropdownSectionProps<T>) {
   return (
     <ListBoxSection className="first:-mt-[5px] after:content-[''] after:block after:h-[5px] last:after:hidden">
       <Header className="text-sm font-semibold text-neutral-500 dark:text-neutral-300 px-4 py-1 truncate sticky -top-[5px] -mt-px -mx-1 z-10 bg-neutral-100/60 dark:bg-neutral-700/60 backdrop-blur-md supports-[-moz-appearance:none]:bg-neutral-100 border-y border-y-neutral-200 dark:border-y-neutral-700 [&+*]:mt-1">
diff --git a/starters/tailwind/src/Menu.tsx b/starters/tailwind/src/Menu.tsx
index 5e2ae16d996..b4eab5e57fa 100644
--- a/starters/tailwind/src/Menu.tsx
+++ b/starters/tailwind/src/Menu.tsx
@@ -21,7 +21,7 @@ import {composeRenderProps} from 'react-aria-components/composeRenderProps';
 import {dropdownItemStyles} from './ListBox';
 import {Popover, type PopoverProps} from './Popover';
 
-export function Menu<T extends object>(props: MenuProps<T>) {
+export function Menu<T>(props: MenuProps<T>) {
   return (
     <AriaMenu
       {...props}
@@ -66,7 +66,7 @@ export interface MenuSectionProps<T> extends AriaMenuSectionProps<T> {
   items?: any;
 }
 
-export function MenuSection<T extends object>(props: MenuSectionProps<T>) {
+export function MenuSection<T>(props: MenuSectionProps<T>) {
   return (
     <AriaMenuSection
       {...props}
diff --git a/starters/tailwind/src/Select.tsx b/starters/tailwind/src/Select.tsx
index 2b9526cb7ca..fbdfeb39057 100644
--- a/starters/tailwind/src/Select.tsx
+++ b/starters/tailwind/src/Select.tsx
@@ -28,7 +28,7 @@ const styles = tv({
   }
 });
 
-export interface SelectProps<T extends object, M extends 'single' | 'multiple'> extends Omit<
+export interface SelectProps<T, M extends 'single' | 'multiple'> extends Omit<
   AriaSelectProps<T, M>,
   'children'
 > {
@@ -39,7 +39,7 @@ export interface SelectProps<T extends object, M extends 'single' | 'multiple'>
   children: React.ReactNode | ((item: T) => React.ReactNode);
 }
 
-export function Select<T extends object, M extends 'single' | 'multiple' = 'single'>({
+export function Select<T, M extends 'single' | 'multiple' = 'single'>({
   label,
   description,
   errorMessage,
@@ -81,6 +81,6 @@ export function SelectItem(props: ListBoxItemProps) {
   return <DropdownItem {...props} />;
 }
 
-export function SelectSection<T extends object>(props: DropdownSectionProps<T>) {
+export function SelectSection<T>(props: DropdownSectionProps<T>) {
   return <DropdownSection {...props} />;
 }
diff --git a/starters/tailwind/src/Table.tsx b/starters/tailwind/src/Table.tsx
index a38b4d4094a..fe3e140db3d 100644
--- a/starters/tailwind/src/Table.tsx
+++ b/starters/tailwind/src/Table.tsx
@@ -92,7 +92,7 @@ export function Column(props: ColumnProps) {
   );
 }
 
-export function TableHeader<T extends object>(props: TableHeaderProps<T>) {
+export function TableHeader<T>(props: TableHeaderProps<T>) {
   let {selectionBehavior, selectionMode, allowsDragging} = useTableOptions();
 
   return (
@@ -117,11 +117,11 @@ export function TableHeader<T extends object>(props: TableHeaderProps<T>) {
   );
 }
 
-export function TableBody<T extends object>(props: TableBodyProps<T>) {
+export function TableBody<T>(props: TableBodyProps<T>) {
   return <AriaTableBody {...props} className="empty:italic empty:text-center empty:text-sm" />;
 }
 
-export function TableFooter<T extends object>(props: TableFooterProps<T>) {
+export function TableFooter<T>(props: TableFooterProps<T>) {
   return <AriaTableFooter {...props} className="bg-neutral-200 dark:bg-neutral-700 font-bold" />;
 }
 
@@ -130,7 +130,7 @@ const rowStyles = tv({
   base: 'group/row relative cursor-default select-none -outline-offset-2 text-neutral-900 disabled:text-neutral-300 dark:text-neutral-200 dark:disabled:text-neutral-600 text-sm hover:bg-neutral-100 pressed:bg-neutral-100 dark:hover:bg-neutral-800 dark:pressed:bg-neutral-800 selected:bg-blue-100 selected:hover:bg-blue-200 selected:pressed:bg-blue-200 dark:selected:bg-blue-700/30 dark:selected:hover:bg-blue-700/40 dark:selected:pressed:bg-blue-700/40 last:rounded-b-lg'
 });
 
-export function Row<T extends object>({id, columns, children, ...otherProps}: RowProps<T>) {
+export function Row<T>({id, columns, children, ...otherProps}: RowProps<T>) {
   let {selectionBehavior, allowsDragging} = useTableOptions();
 
   return (
diff --git a/starters/tailwind/src/Tabs.tsx b/starters/tailwind/src/Tabs.tsx
index 4514cdd3129..966d1738f62 100644
--- a/starters/tailwind/src/Tabs.tsx
+++ b/starters/tailwind/src/Tabs.tsx
@@ -49,7 +49,7 @@ const tabListStyles = tv({
   }
 });
 
-export function TabList<T extends object>(props: TabListProps<T>) {
+export function TabList<T>(props: TabListProps<T>) {
   return (
     <RACTabList
       {...props}
@@ -87,7 +87,7 @@ export function Tab(props: TabProps) {
   );
 }
 
-export function TabPanels<T extends object>(props: TabPanelsProps<T>) {
+export function TabPanels<T>(props: TabPanelsProps<T>) {
   return (
     <RACTabPanels
       {...props}
diff --git a/starters/tailwind/src/TagGroup.tsx b/starters/tailwind/src/TagGroup.tsx
index 1fb7e605f97..8a9557b190b 100644
--- a/starters/tailwind/src/TagGroup.tsx
+++ b/starters/tailwind/src/TagGroup.tsx
@@ -71,7 +71,7 @@ export interface TagProps extends AriaTagProps {
   color?: Color;
 }
 
-export function TagGroup<T extends object>({
+export function TagGroup<T>({
   label,
   description,
   errorMessage,
diff --git a/starters/tailwind/src/Tree.tsx b/starters/tailwind/src/Tree.tsx
index 36685781f74..9a824087788 100644
--- a/starters/tailwind/src/Tree.tsx
+++ b/starters/tailwind/src/Tree.tsx
@@ -28,7 +28,7 @@ const itemStyles = tv({
   }
 });
 
-export function Tree<T extends object>({children, ...props}: TreeProps<T>) {
+export function Tree<T>({children, ...props}: TreeProps<T>) {
   return (
     <AriaTree
       {...props}