@gv-tech/ui-native 2.23.2 → 2.24.0

package/src/hover-card.tsx

@@ -8,7 +8,7 @@ export const HoverCard = HoverCardPrimitive.Root;
 export const HoverCardTrigger = HoverCardPrimitive.Trigger;
 
 export const HoverCardContent = React.forwardRef<
-  React.ElementRef<typeof HoverCardPrimitive.Content>,
+  React.ComponentRef<typeof HoverCardPrimitive.Content>,
   HoverCardContentBaseProps
 >(({ className, children, ...props }, ref) => {
   return (

package/src/index.ts

@@ -158,7 +158,8 @@ export {
 } from './dropdown-menu';
 
 // Form
-export { Form } from './form';
+export { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useFormField } from './form';
+export type { FormControlProps, FormDescriptionProps, FormItemProps, FormLabelProps, FormMessageProps } from './form';
 
 // Hover Card
 export { HoverCard, HoverCardContent, HoverCardTrigger } from './hover-card';

package/src/input.tsx

@@ -6,7 +6,7 @@ import { cn } from './lib/utils';
 
 export interface InputProps extends React.ComponentPropsWithoutRef<typeof TextInput>, InputBaseProps {}
 
-const Input = React.forwardRef<React.ElementRef<typeof TextInput>, InputProps>(
+const Input = React.forwardRef<React.ComponentRef<typeof TextInput>, InputProps>(
   ({ className, placeholderClassName, ...props }, ref) => {
     return (
       <TextInput

package/src/label.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 import { cn } from './lib/utils';
 
 const Label = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Text>,
+  React.ComponentRef<typeof LabelPrimitive.Text>,
   React.ComponentPropsWithoutRef<typeof LabelPrimitive.Text>
 >(({ className, onPress, onLongPress, onPressIn, onPressOut, ...props }, ref) => (
   <LabelPrimitive.Root

package/src/menubar.tsx

@@ -20,7 +20,7 @@ import { wrapTextChildren } from './lib/render-native';
 import { cn } from './lib/utils';
 import { Text } from './text';
 
-export const Menubar = React.forwardRef<React.ElementRef<typeof MenubarPrimitive.Root>, MenubarBaseProps>(
+export const Menubar = React.forwardRef<React.ComponentRef<typeof MenubarPrimitive.Root>, MenubarBaseProps>(
   ({ className, children, value: valueProp, onValueChange: onValueChangeProp, ...props }, ref) => {
     const [localValue, setLocalValue] = React.useState<string | undefined>(valueProp || '');
     const value = valueProp !== undefined ? valueProp : localValue;
@@ -58,7 +58,7 @@ export const MenubarRadioGroup = MenubarPrimitive.RadioGroup;
 export const MenubarSub = MenubarPrimitive.Sub;
 
 const MenubarOverlay = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.Overlay>,
+  React.ComponentRef<typeof MenubarPrimitive.Overlay>,
   React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Overlay>
 >(({ className, ...props }, ref) => {
   return (
@@ -74,7 +74,7 @@ const MenubarOverlay = React.forwardRef<
 MenubarOverlay.displayName = 'MenubarOverlay';
 
 export const MenubarTrigger = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.Trigger>,
+  React.ComponentRef<typeof MenubarPrimitive.Trigger>,
   MenubarTriggerBaseProps
 >(({ className, children, ...props }, ref) => {
   return (
@@ -86,14 +86,14 @@ export const MenubarTrigger = React.forwardRef<
       )}
       {...props}
     >
-      {wrapTextChildren(children, Text)}
+      {wrapTextChildren(children as React.ReactNode, Text)}
     </MenubarPrimitive.Trigger>
   );
 });
 MenubarTrigger.displayName = 'MenubarTrigger';
 
 export const MenubarContent = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.Content>,
+  React.ComponentRef<typeof MenubarPrimitive.Content>,
   MenubarContentBaseProps
 >(({ className, children, ...props }, ref) => {
   return (
@@ -114,7 +114,7 @@ export const MenubarContent = React.forwardRef<
 });
 MenubarContent.displayName = 'MenubarContent';
 
-export const MenubarItem = React.forwardRef<React.ElementRef<typeof MenubarPrimitive.Item>, MenubarItemBaseProps>(
+export const MenubarItem = React.forwardRef<React.ComponentRef<typeof MenubarPrimitive.Item>, MenubarItemBaseProps>(
   ({ className, children, inset, ...props }, ref) => {
     return (
       <MenubarPrimitive.Item
@@ -126,7 +126,7 @@ export const MenubarItem = React.forwardRef<React.ElementRef<typeof MenubarPrimi
         )}
         {...props}
       >
-        {wrapTextChildren(children, Text)}
+        {wrapTextChildren(children as React.ReactNode, Text)}
       </MenubarPrimitive.Item>
     );
   },
@@ -134,7 +134,7 @@ export const MenubarItem = React.forwardRef<React.ElementRef<typeof MenubarPrimi
 MenubarItem.displayName = 'MenubarItem';
 
 export const MenubarCheckboxItem = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.CheckboxItem>,
+  React.ComponentRef<typeof MenubarPrimitive.CheckboxItem>,
   MenubarCheckboxItemBaseProps
 >(({ className, children, checked, onCheckedChange, ...props }, ref) => {
   return (
@@ -153,14 +153,14 @@ export const MenubarCheckboxItem = React.forwardRef<
           <Check size={14} className="text-foreground" />
         </MenubarPrimitive.ItemIndicator>
       </View>
-      {wrapTextChildren(children, Text)}
+      {wrapTextChildren(children as React.ReactNode, Text)}
     </MenubarPrimitive.CheckboxItem>
   );
 });
 MenubarCheckboxItem.displayName = 'MenubarCheckboxItem';
 
 export const MenubarRadioItem = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.RadioItem>,
+  React.ComponentRef<typeof MenubarPrimitive.RadioItem>,
   MenubarRadioItemBaseProps
 >(({ className, children, value, ...props }, ref) => {
   return (
@@ -178,13 +178,13 @@ export const MenubarRadioItem = React.forwardRef<
           <Circle size={8} className="text-foreground fill-current" />
         </MenubarPrimitive.ItemIndicator>
       </View>
-      {wrapTextChildren(children, Text)}
+      {wrapTextChildren(children as React.ReactNode, Text)}
     </MenubarPrimitive.RadioItem>
   );
 });
 MenubarRadioItem.displayName = 'MenubarRadioItem';
 
-export const MenubarLabel = React.forwardRef<React.ElementRef<typeof MenubarPrimitive.Label>, MenubarLabelBaseProps>(
+export const MenubarLabel = React.forwardRef<React.ComponentRef<typeof MenubarPrimitive.Label>, MenubarLabelBaseProps>(
   ({ className, children, inset, ...props }, ref) => {
     return (
       <MenubarPrimitive.Label
@@ -192,7 +192,7 @@ export const MenubarLabel = React.forwardRef<React.ElementRef<typeof MenubarPrim
         className={cn('text-foreground px-2 py-1.5 text-sm font-semibold', inset && 'pl-8', className)}
         {...props}
       >
-        {wrapTextChildren(children, Text)}
+        {wrapTextChildren(children as React.ReactNode, Text)}
       </MenubarPrimitive.Label>
     );
   },
@@ -200,7 +200,7 @@ export const MenubarLabel = React.forwardRef<React.ElementRef<typeof MenubarPrim
 MenubarLabel.displayName = 'MenubarLabel';
 
 export const MenubarSeparator = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.Separator>,
+  React.ComponentRef<typeof MenubarPrimitive.Separator>,
   MenubarSeparatorBaseProps
 >(({ className, ...props }, ref) => {
   return <MenubarPrimitive.Separator ref={ref} className={cn('bg-border -mx-1 my-1 h-px', className)} {...props} />;
@@ -217,7 +217,7 @@ export const MenubarShortcut = ({ className, children, ...props }: MenubarShortc
 MenubarShortcut.displayName = 'MenubarShortcut';
 
 export const MenubarSubTrigger = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.SubTrigger>,
+  React.ComponentRef<typeof MenubarPrimitive.SubTrigger>,
   MenubarSubTriggerBaseProps
 >(({ className, children, inset, ...props }, ref) => {
   return (
@@ -230,7 +230,7 @@ export const MenubarSubTrigger = React.forwardRef<
       )}
       {...props}
     >
-      <View className="flex flex-row items-center gap-1.5">{wrapTextChildren(children, Text)}</View>
+      <View className="flex flex-row items-center gap-1.5">{wrapTextChildren(children as React.ReactNode, Text)}</View>
       <ChevronRight size={14} className="text-foreground ml-auto" />
     </MenubarPrimitive.SubTrigger>
   );
@@ -238,7 +238,7 @@ export const MenubarSubTrigger = React.forwardRef<
 MenubarSubTrigger.displayName = 'MenubarSubTrigger';
 
 export const MenubarSubContent = React.forwardRef<
-  React.ElementRef<typeof MenubarPrimitive.SubContent>,
+  React.ComponentRef<typeof MenubarPrimitive.SubContent>,
   MenubarSubContentBaseProps
 >(({ className, children, ...props }, ref) => {
   return (

package/src/navigation-menu.tsx

@@ -16,7 +16,7 @@ import Animated, { FadeIn, FadeOut } from 'react-native-reanimated';
 import { cn } from './lib/utils';
 
 export const NavigationMenu = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Root>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Root>,
   NavigationMenuBaseProps
 >(
   (
@@ -41,7 +41,7 @@ export const NavigationMenu = React.forwardRef<
 NavigationMenu.displayName = 'NavigationMenu';
 
 export const NavigationMenuList = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.List>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.List>,
   NavigationMenuListBaseProps
 >(({ className, children, ...props }, ref) => {
   return (
@@ -57,7 +57,7 @@ export const NavigationMenuList = React.forwardRef<
 NavigationMenuList.displayName = 'NavigationMenuList';
 
 export const NavigationMenuItem = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Item>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Item>,
   NavigationMenuItemBaseProps
 >(({ className, children, value, ...props }, ref) => {
   return (
@@ -69,7 +69,7 @@ export const NavigationMenuItem = React.forwardRef<
 NavigationMenuItem.displayName = 'NavigationMenuItem';
 
 export const NavigationMenuTrigger = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Trigger>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Trigger>,
   NavigationMenuTriggerBaseProps
 >(({ className, children, disabled, ...props }, ref) => {
   return (
@@ -93,7 +93,7 @@ export const NavigationMenuTrigger = React.forwardRef<
 NavigationMenuTrigger.displayName = 'NavigationMenuTrigger';
 
 export const NavigationMenuContent = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Content>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Content>,
   NavigationMenuContentBaseProps
 >(({ className, children, forceMount, ...props }, ref) => {
   return (
@@ -113,7 +113,7 @@ export const NavigationMenuContent = React.forwardRef<
 NavigationMenuContent.displayName = 'NavigationMenuContent';
 
 export const NavigationMenuLink = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Link>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Link>,
   NavigationMenuLinkBaseProps & { onPress?: () => void }
 >(({ className, children, active, onSelect, onPress, href, ...props }, ref) => {
   const handlePress = (e: GestureResponderEvent) => {
@@ -144,7 +144,7 @@ export const NavigationMenuLink = React.forwardRef<
 NavigationMenuLink.displayName = 'NavigationMenuLink';
 
 export const NavigationMenuViewport = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Viewport>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Viewport>,
   NavigationMenuViewportBaseProps
 >(({ className, forceMount, ...props }, ref) => {
   return (
@@ -163,7 +163,7 @@ export const NavigationMenuViewport = React.forwardRef<
 NavigationMenuViewport.displayName = 'NavigationMenuViewport';
 
 export const NavigationMenuIndicator = React.forwardRef<
-  React.ElementRef<typeof NavigationMenuPrimitive.Indicator>,
+  React.ComponentRef<typeof NavigationMenuPrimitive.Indicator>,
   NavigationMenuIndicatorBaseProps
 >(({ className, forceMount, ...props }, ref) => {
   return (

package/src/popover.tsx

@@ -18,7 +18,7 @@ const PopoverContext = React.createContext<{
 });
 
 const Popover = React.forwardRef<
-  React.ElementRef<typeof View>,
+  React.ComponentRef<typeof View>,
   React.ComponentPropsWithoutRef<typeof View> & PopoverBaseProps
 >(({ children, open, onOpenChange, ...props }, ref) => {
   const [internalOpen, setInternalOpen] = React.useState(false);
@@ -37,7 +37,7 @@ const Popover = React.forwardRef<
 Popover.displayName = 'Popover';
 
 const PopoverTrigger = React.forwardRef<
-  React.ElementRef<typeof Pressable>,
+  React.ComponentRef<typeof Pressable>,
   React.ComponentPropsWithoutRef<typeof Pressable> & PopoverTriggerBaseProps
 >(({ children, ...props }, ref) => {
   const { setOpen } = React.useContext(PopoverContext);
@@ -51,13 +51,13 @@ const PopoverTrigger = React.forwardRef<
 PopoverTrigger.displayName = 'PopoverTrigger';
 
 const PopoverAnchor = React.forwardRef<
-  React.ElementRef<typeof View>,
+  React.ComponentRef<typeof View>,
   React.ComponentPropsWithoutRef<typeof View> & PopoverAnchorBaseProps
 >(({ ...props }, ref) => <View ref={ref} {...props} />);
 PopoverAnchor.displayName = 'PopoverAnchor';
 
 const PopoverContent = React.forwardRef<
-  React.ElementRef<typeof View>,
+  React.ComponentRef<typeof View>,
   React.ComponentPropsWithoutRef<typeof View> & PopoverContentBaseProps
 >(({ className, children, ...props }, ref) => {
   const { open, setOpen } = React.useContext(PopoverContext);

package/src/progress.tsx

@@ -5,7 +5,7 @@ import { View } from 'react-native';
 import { cn } from './lib/utils';
 
 const Progress = React.forwardRef<
-  React.ElementRef<typeof View>,
+  React.ComponentRef<typeof View>,
   React.ComponentPropsWithoutRef<typeof View> & ProgressBaseProps
 >(({ className, value, ...props }, ref) => (
   <View

package/src/radio-group.tsx

@@ -8,7 +8,7 @@ import { cn } from './lib/utils';
 export interface RadioGroupProps
   extends React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>, RadioGroupBaseProps {}
 
-const RadioGroup = React.forwardRef<React.ElementRef<typeof RadioGroupPrimitive.Root>, RadioGroupProps>(
+const RadioGroup = React.forwardRef<React.ComponentRef<typeof RadioGroupPrimitive.Root>, RadioGroupProps>(
   ({ className, ...props }, ref) => {
     return <RadioGroupPrimitive.Root className={cn('web:grid gap-2', className)} {...props} ref={ref} />;
   },
@@ -18,7 +18,7 @@ RadioGroup.displayName = RadioGroupPrimitive.Root?.displayName || 'RadioGroup';
 export interface RadioGroupItemProps
   extends Omit<React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>, 'disabled'>, RadioGroupItemBaseProps {}
 
-const RadioGroupItem = React.forwardRef<React.ElementRef<typeof RadioGroupPrimitive.Item>, RadioGroupItemProps>(
+const RadioGroupItem = React.forwardRef<React.ComponentRef<typeof RadioGroupPrimitive.Item>, RadioGroupItemProps>(
   ({ className, ...props }, ref) => {
     return (
       <RadioGroupPrimitive.Item

package/src/search.tsx

@@ -34,7 +34,7 @@ export function Search({ children, open: customOpen, onOpenChange }: SearchProps
 export interface SearchTriggerProps
   extends Omit<React.ComponentPropsWithoutRef<typeof Button>, 'variant'>, SearchTriggerBaseProps {}
 
-export const SearchTrigger = React.forwardRef<React.ElementRef<typeof Button>, SearchTriggerProps>(
+export const SearchTrigger = React.forwardRef<React.ComponentRef<typeof Button>, SearchTriggerProps>(
   ({ className, placeholder, variant = 'default', responsive = false, ...props }, ref) => {
     const defaultPlaceholder = variant === 'compact' ? 'Search...' : 'Search docs...';
     const activePlaceholder = placeholder || defaultPlaceholder;

package/src/select.tsx

@@ -43,7 +43,7 @@ export interface SelectTriggerProps
     Omit<React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>, 'children' | 'disabled'>,
     SelectTriggerBaseProps {}
 
-const SelectTrigger = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Trigger>, SelectTriggerProps>(
+const SelectTrigger = React.forwardRef<React.ComponentRef<typeof SelectPrimitive.Trigger>, SelectTriggerProps>(
   ({ className, children, ...props }, ref) => (
     <SelectPrimitive.Trigger
       ref={ref}
@@ -65,7 +65,7 @@ export interface SelectScrollUpButtonProps
   extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>, SelectScrollUpButtonBaseProps {}
 
 const SelectScrollUpButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+  React.ComponentRef<typeof SelectPrimitive.ScrollUpButton>,
   SelectScrollUpButtonProps
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollUpButton
@@ -85,7 +85,7 @@ export interface SelectScrollDownButtonProps
   extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>, SelectScrollDownButtonBaseProps {}
 
 const SelectScrollDownButton = React.forwardRef<
-  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+  React.ComponentRef<typeof SelectPrimitive.ScrollDownButton>,
   SelectScrollDownButtonProps
 >(({ className, ...props }, ref) => (
   <SelectPrimitive.ScrollDownButton
@@ -109,7 +109,7 @@ export interface SelectContentProps
   overlayStyle?: ViewStyle;
 }
 
-const SelectContent = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Content>, SelectContentProps>(
+const SelectContent = React.forwardRef<React.ComponentRef<typeof SelectPrimitive.Content>, SelectContentProps>(
   ({ className, children, position = 'popper', portalHost, overlayClassName, overlayStyle, ...props }, ref) => {
     const { open } = SelectPrimitive.useRootContext();
 
@@ -151,7 +151,7 @@ SelectContent.displayName = SelectPrimitive.Content?.displayName || 'SelectConte
 export interface SelectLabelProps
   extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>, SelectLabelBaseProps {}
 
-const SelectLabel = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Label>, SelectLabelProps>(
+const SelectLabel = React.forwardRef<React.ComponentRef<typeof SelectPrimitive.Label>, SelectLabelProps>(
   ({ className, ...props }, ref) => (
     <SelectPrimitive.Label
       ref={ref}
@@ -169,7 +169,7 @@ export interface SelectItemProps
   label?: string;
 }
 
-const SelectItem = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Item>, SelectItemProps>(
+const SelectItem = React.forwardRef<React.ComponentRef<typeof SelectPrimitive.Item>, SelectItemProps>(
   ({ className, children, label, ...props }, ref) => {
     const itemLabel = label || (typeof children === 'string' ? children : '');
     return (
@@ -204,7 +204,7 @@ SelectItem.displayName = SelectPrimitive.Item?.displayName || 'SelectItem';
 export interface SelectSeparatorProps
   extends React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>, SelectSeparatorBaseProps {}
 
-const SelectSeparator = React.forwardRef<React.ElementRef<typeof SelectPrimitive.Separator>, SelectSeparatorProps>(
+const SelectSeparator = React.forwardRef<React.ComponentRef<typeof SelectPrimitive.Separator>, SelectSeparatorProps>(
   ({ className, ...props }, ref) => (
     <SelectPrimitive.Separator
       ref={ref}

package/src/separator.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 import { cn } from './lib/utils';
 
 const Separator = React.forwardRef<
-  React.ElementRef<typeof SeparatorPrimitive.Root>,
+  React.ComponentRef<typeof SeparatorPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
 >(({ className, orientation = 'horizontal', decorative = true, ...props }, ref) => (
   <SeparatorPrimitive.Root

package/src/sheet.tsx

@@ -16,7 +16,7 @@ const SheetClose = DialogPrimitive.Close;
 
 const SheetPortal = DialogPrimitive.Portal;
 
-export type SheetOverlayRef = React.ElementRef<typeof DialogPrimitive.Overlay>;
+export type SheetOverlayRef = React.ComponentRef<typeof DialogPrimitive.Overlay>;
 export type SheetOverlayProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>;
 const SheetOverlay: React.ForwardRefExoticComponent<SheetOverlayProps & React.RefAttributes<SheetOverlayRef>> =
   React.forwardRef<SheetOverlayRef, SheetOverlayProps>(({ className, ...props }, ref) => {
@@ -37,7 +37,7 @@ const SheetOverlay: React.ForwardRefExoticComponent<SheetOverlayProps & React.Re
   });
 SheetOverlay.displayName = DialogPrimitive.Overlay?.displayName || 'SheetOverlay';
 
-export type SheetContentRef = React.ElementRef<typeof DialogPrimitive.Content>;
+export type SheetContentRef = React.ComponentRef<typeof DialogPrimitive.Content>;
 export type SheetContentProps = DialogContentProps & {
   side?: 'top' | 'right' | 'bottom' | 'left';
   overlayClassName?: string;
@@ -99,7 +99,7 @@ const SheetFooter = ({ className, ...props }: React.ComponentPropsWithoutRef<typ
 );
 SheetFooter.displayName = 'SheetFooter';
 
-export type SheetTitleRef = React.ElementRef<typeof DialogPrimitive.Title>;
+export type SheetTitleRef = React.ComponentRef<typeof DialogPrimitive.Title>;
 export type SheetTitleProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>;
 const SheetTitle: React.ForwardRefExoticComponent<SheetTitleProps & React.RefAttributes<SheetTitleRef>> =
   React.forwardRef<SheetTitleRef, SheetTitleProps>(({ className, ...props }, ref) => (
@@ -107,7 +107,7 @@ const SheetTitle: React.ForwardRefExoticComponent<SheetTitleProps & React.RefAtt
   ));
 SheetTitle.displayName = DialogPrimitive.Title?.displayName || 'SheetTitle';
 
-export type SheetDescriptionRef = React.ElementRef<typeof DialogPrimitive.Description>;
+export type SheetDescriptionRef = React.ComponentRef<typeof DialogPrimitive.Description>;
 export type SheetDescriptionProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>;
 const SheetDescription: React.ForwardRefExoticComponent<
   SheetDescriptionProps & React.RefAttributes<SheetDescriptionRef>

package/src/switch.tsx

@@ -9,7 +9,7 @@ export interface SwitchProps
     Omit<React.ComponentPropsWithoutRef<typeof SwitchPrimitive.Root>, 'checked' | 'onCheckedChange'>,
     SwitchBaseProps {}
 
-const Switch = React.forwardRef<React.ElementRef<typeof SwitchPrimitive.Root>, SwitchProps>(
+const Switch = React.forwardRef<React.ComponentRef<typeof SwitchPrimitive.Root>, SwitchProps>(
   ({ className, checked, onCheckedChange, ...props }, ref) => (
     <SwitchPrimitive.Root
       className={cn(

package/src/table.tsx

@@ -4,31 +4,31 @@ import { View } from 'react-native';
 import { cn } from './lib/utils';
 import { Text } from './text';
 
-const Table = React.forwardRef<React.ElementRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
+const Table = React.forwardRef<React.ComponentRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
   ({ className, ...props }, ref) => (
     <View ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
   ),
 );
 Table.displayName = 'Table';
 
-const TableHeader = React.forwardRef<React.ElementRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
+const TableHeader = React.forwardRef<React.ComponentRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
   ({ className, ...props }, ref) => <View ref={ref} className={cn('border-border border-b', className)} {...props} />,
 );
 TableHeader.displayName = 'TableHeader';
 
-const TableBody = React.forwardRef<React.ElementRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
+const TableBody = React.forwardRef<React.ComponentRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
   ({ className, ...props }, ref) => <View ref={ref} className={cn('flex-1', className)} {...props} />,
 );
 TableBody.displayName = 'TableBody';
 
-const TableFooter = React.forwardRef<React.ElementRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
+const TableFooter = React.forwardRef<React.ComponentRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
   ({ className, ...props }, ref) => (
     <View ref={ref} className={cn('bg-muted/50 font-medium [&>tr]:last:border-b-0', className)} {...props} />
   ),
 );
 TableFooter.displayName = 'TableFooter';
 
-const TableRow = React.forwardRef<React.ElementRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
+const TableRow = React.forwardRef<React.ComponentRef<typeof View>, React.ComponentPropsWithoutRef<typeof View>>(
   ({ className, ...props }, ref) => (
     <View
       ref={ref}
@@ -42,7 +42,7 @@ const TableRow = React.forwardRef<React.ElementRef<typeof View>, React.Component
 );
 TableRow.displayName = 'TableRow';
 
-const TableHead = React.forwardRef<React.ElementRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
+const TableHead = React.forwardRef<React.ComponentRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
   ({ className, ...props }, ref) => (
     <Text
       ref={ref}
@@ -56,14 +56,14 @@ const TableHead = React.forwardRef<React.ElementRef<typeof Text>, React.Componen
 );
 TableHead.displayName = 'TableHead';
 
-const TableCell = React.forwardRef<React.ElementRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
+const TableCell = React.forwardRef<React.ComponentRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
   ({ className, ...props }, ref) => (
     <Text ref={ref} className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)} {...props} />
   ),
 );
 TableCell.displayName = 'TableCell';
 
-const TableCaption = React.forwardRef<React.ElementRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
+const TableCaption = React.forwardRef<React.ComponentRef<typeof Text>, React.ComponentPropsWithoutRef<typeof Text>>(
   ({ className, ...props }, ref) => (
     <Text ref={ref} className={cn('text-muted-foreground mt-4 text-sm', className)} {...props} />
   ),

package/src/tabs.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { cn } from './lib/utils';
 import { TextClassContext } from './text';
 
-const Tabs = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Root>, TabsProps>((props, ref) => (
+const Tabs = React.forwardRef<React.ComponentRef<typeof TabsPrimitive.Root>, TabsProps>((props, ref) => (
   <TabsPrimitive.Root ref={ref} {...props} />
 ));
 Tabs.displayName = 'Tabs';
@@ -20,7 +20,7 @@ export interface TabsTriggerProps
 export interface TabsContentProps
   extends React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>, TabsContentBaseProps {}
 
-const TabsList = React.forwardRef<React.ElementRef<typeof TabsPrimitive.List>, TabsListProps>(
+const TabsList = React.forwardRef<React.ComponentRef<typeof TabsPrimitive.List>, TabsListProps>(
   ({ className, ...props }, ref) => (
     <TabsPrimitive.List
       ref={ref}
@@ -34,7 +34,7 @@ const TabsList = React.forwardRef<React.ElementRef<typeof TabsPrimitive.List>, T
 );
 TabsList.displayName = TabsPrimitive.List?.displayName || 'TabsList';
 
-const TabsTrigger = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Trigger>, TabsTriggerProps>(
+const TabsTrigger = React.forwardRef<React.ComponentRef<typeof TabsPrimitive.Trigger>, TabsTriggerProps>(
   ({ className, ...props }, ref) => {
     const { value } = TabsPrimitive.useRootContext();
     return (
@@ -60,7 +60,7 @@ const TabsTrigger = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Trigg
 );
 TabsTrigger.displayName = TabsPrimitive.Trigger?.displayName || 'TabsTrigger';
 
-const TabsContent = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Content>, TabsContentProps>(
+const TabsContent = React.forwardRef<React.ComponentRef<typeof TabsPrimitive.Content>, TabsContentProps>(
   ({ className, ...props }, ref) => (
     <TabsPrimitive.Content
       ref={ref}

package/src/text.tsx

@@ -29,7 +29,7 @@ const textVariants = cva('text-foreground', {
 export interface TextProps
   extends React.ComponentPropsWithoutRef<typeof RNText>, VariantProps<typeof textVariants>, TextBaseProps {}
 
-const Text = React.forwardRef<React.ElementRef<typeof RNText>, TextProps>(
+const Text = React.forwardRef<React.ComponentRef<typeof RNText>, TextProps>(
   ({ className, variant = 'body', children, ...props }, ref) => {
     return (
       <RNText ref={ref} className={cn(textVariants({ variant, className }))} {...props}>

package/src/textarea.tsx

@@ -5,7 +5,7 @@ import { cn } from './lib/utils';
 
 export type TextareaProps = React.ComponentPropsWithoutRef<typeof TextInput>;
 
-const Textarea = React.forwardRef<React.ElementRef<typeof TextInput>, TextareaProps>(
+const Textarea = React.forwardRef<React.ComponentRef<typeof TextInput>, TextareaProps>(
   ({ className, placeholderClassName, ...props }, ref) => {
     return (
       <TextInput

package/src/toast.tsx

@@ -11,7 +11,7 @@ const ToastProvider = ({ children }: { children: React.ReactNode }) => <>{childr
 const ToastViewport = () => null;
 
 const Toast = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitive.Root>,
+  React.ComponentRef<typeof ToastPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitive.Root> & { variant?: 'default' | 'destructive' }
 >(({ className, variant = 'default', ...props }, ref) => {
   return (
@@ -33,7 +33,7 @@ const Toast = React.forwardRef<
 Toast.displayName = ToastPrimitive.Root?.displayName || 'Toast';
 
 const ToastTitle = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitive.Title>,
+  React.ComponentRef<typeof ToastPrimitive.Title>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <ToastPrimitive.Title ref={ref} className={cn('text-foreground text-sm font-semibold', className)} {...props} />
@@ -41,7 +41,7 @@ const ToastTitle = React.forwardRef<
 ToastTitle.displayName = ToastPrimitive.Title?.displayName || 'ToastTitle';
 
 const ToastDescription = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitive.Description>,
+  React.ComponentRef<typeof ToastPrimitive.Description>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitive.Description>
 >(({ className, ...props }, ref) => (
   <ToastPrimitive.Description
@@ -53,7 +53,7 @@ const ToastDescription = React.forwardRef<
 ToastDescription.displayName = ToastPrimitive.Description?.displayName || 'ToastDescription';
 
 const ToastClose = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitive.Close>,
+  React.ComponentRef<typeof ToastPrimitive.Close>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitive.Close>
 >(({ className, ...props }, ref) => (
   <ToastPrimitive.Close
@@ -70,7 +70,7 @@ const ToastClose = React.forwardRef<
 ToastClose.displayName = ToastPrimitive.Close?.displayName || 'ToastClose';
 
 const ToastAction = React.forwardRef<
-  React.ElementRef<typeof ToastPrimitive.Action>,
+  React.ComponentRef<typeof ToastPrimitive.Action>,
   React.ComponentPropsWithoutRef<typeof ToastPrimitive.Action>
 >(({ className, ...props }, ref) => (
   <ToastPrimitive.Action

package/src/toggle-group.tsx

@@ -17,7 +17,7 @@ export interface ToggleGroupProps
     Omit<React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root>, 'value' | 'onValueChange' | 'type'>,
     ToggleGroupBaseProps {}
 
-const ToggleGroup = React.forwardRef<React.ElementRef<typeof ToggleGroupPrimitive.Root>, ToggleGroupProps>(
+const ToggleGroup = React.forwardRef<React.ComponentRef<typeof ToggleGroupPrimitive.Root>, ToggleGroupProps>(
   ({ className, variant, size, children, type, value, onValueChange, ...props }, ref) => (
     <ToggleGroupPrimitive.Root
       ref={ref}
@@ -41,7 +41,7 @@ export interface ToggleGroupItemProps
     Omit<React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Item>, 'children' | 'disabled'>,
     ToggleGroupItemBaseProps {}
 
-const ToggleGroupItem = React.forwardRef<React.ElementRef<typeof ToggleGroupPrimitive.Item>, ToggleGroupItemProps>(
+const ToggleGroupItem = React.forwardRef<React.ComponentRef<typeof ToggleGroupPrimitive.Item>, ToggleGroupItemProps>(
   ({ className, children, variant, size, value, ...props }, ref) => {
     const context = React.useContext(ToggleGroupContext);
 

package/src/toggle.tsx

@@ -10,7 +10,7 @@ export interface ToggleProps
     Omit<React.ComponentPropsWithoutRef<typeof TogglePrimitive.Root>, 'pressed' | 'onPressedChange' | 'children'>,
     ToggleBaseProps {}
 
-const Toggle = React.forwardRef<React.ElementRef<typeof TogglePrimitive.Root>, ToggleProps>(
+const Toggle = React.forwardRef<React.ComponentRef<typeof TogglePrimitive.Root>, ToggleProps>(
   ({ className, variant, size, ...props }, ref) => (
     <TextClassContext.Provider
       value={cn(