@cdx-ui/components 0.0.1-beta.7 → 0.0.1-beta.70

package/src/components/Select/index.tsx

@@ -1,8 +1,16 @@
-import { forwardRef, type ReactNode } from 'react';
-import { Pressable, Text, type TextProps, View, type ViewProps } from 'react-native';
-import { ArrowDropDown } from '@cdx-ui/icons';
+import { forwardRef, useMemo, type ReactNode } from 'react';
+import { Text, type TextProps, View, type ViewProps } from 'react-native';
+import { KeyboardArrowDown, KeyboardArrowUp } from '@cdx-ui/icons';
 import {
-  createSelect,
+  SelectContent as SelectContentPrimitive,
+  SelectItem as SelectItemPrimitive,
+  SelectRoot as SelectRootPrimitive,
+  SelectTrigger as SelectTriggerPrimitive,
+  Slot,
+  dataAttributes,
+  mergeDataAttributes,
+  useSelectContext,
+  useSelectItemContext,
   type ISelectContentProps,
   type ISelectItemLabelProps,
   type ISelectItemProps,
@@ -10,9 +18,9 @@ import {
   type ISelectTriggerProps,
   type ISelectValueProps,
 } from '@cdx-ui/primitives';
-import { cn, useStyleContext, withStyleContext } from '@cdx-ui/utils';
+import { cn, ParentContext, useParentContext, useStyleContext } from '@cdx-ui/utils';
 import { Icon, IconProps } from '../Icon';
-import { SelectTriggerHost } from './SelectTriggerHost';
+import { positionToDataIcon, type IconSlotPosition } from '../../utils/positionToDataIcon';
 import {
   type SelectVariantProps,
   selectContentVariants,
@@ -25,22 +33,10 @@ import {
 
 const SCOPE = 'SELECT';
 
-const Root = withStyleContext(View, SCOPE);
-
 const useSelectStyleContext = () => useStyleContext(SCOPE) as SelectVariantProps;
 
-const SelectPrimitive = createSelect({
-  Root,
-  Trigger: SelectTriggerHost,
-  Value: Text,
-  Icon: View,
-  Content: View,
-  Item: Pressable,
-  ItemLabel: Text,
-});
-
 // =============================================================================
-// STYLED ROOT COMPONENT
+// STYLED ROOT
 // =============================================================================
 
 export interface SelectProps extends ViewProps, ISelectProps, SelectVariantProps {
@@ -49,16 +45,21 @@ export interface SelectProps extends ViewProps, ISelectProps, SelectVariantProps
 
 const SelectRoot = forwardRef<View, SelectProps>(
   ({ variant = 'outline', size = 'default', className, children, style, ...props }, ref) => {
+    const parent = useParentContext();
+    const ctx = useMemo(() => ({ ...parent, [SCOPE]: { variant, size } }), [parent, variant, size]);
+
     return (
-      <SelectPrimitive
-        ref={ref}
-        className={className}
-        style={style}
-        context={{ variant, size }}
-        {...props}
-      >
-        {children}
-      </SelectPrimitive>
+      <ParentContext.Provider value={ctx}>
+        <SelectRootPrimitive
+          ref={ref}
+          className={className}
+          style={style}
+          {...props}
+          {...mergeDataAttributes(props, dataAttributes({ slot: 'select' }))}
+        >
+          {children}
+        </SelectRootPrimitive>
+      </ParentContext.Provider>
     );
   },
 );
@@ -66,25 +67,57 @@ const SelectRoot = forwardRef<View, SelectProps>(
 SelectRoot.displayName = 'Select';
 
 // =============================================================================
-// STYLED TRIGGER COMPONENT
+// STYLED TRIGGER
 // =============================================================================
 
 export interface SelectTriggerProps extends ISelectTriggerProps {
+  /**
+   * Substitute the rendered trigger element with the single child. The child must
+   * be another Forge primitive (IconButton, Chip, Button) — anything whose
+   * underlying Pressable accepts Pressable-shaped handlers. When set, the
+   * auto-injected arrow indicator is skipped and `selectTriggerVariants` is not
+   * applied so the substituted component's own appearance wins.
+   *
+   * On web, `<label htmlFor>` association is preserved via a `focus()` bridge
+   * registered by the primitive.
+   *
+   * NOTE — `data-slot` overlap: the substituted component's own `data-slot`
+   * (e.g. `button`, `icon-button`, `chip`) may win on the merged element.
+   * Selectors that need guaranteed `select-trigger` access should wrap the
+   * trigger instead of relying on `data-slot`.
+   */
+  asChild?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
 const SelectTrigger = forwardRef<View, SelectTriggerProps>(
-  ({ className, children, style, ...props }, ref) => {
+  ({ asChild, className, children, style, ...props }, ref) => {
+    const { open } = useSelectContext();
     const { variant, size } = useSelectStyleContext();
 
-    const computedClassName = cn(selectTriggerVariants({ variant, size }), className);
+    const computedClassName = asChild
+      ? className
+      : cn(selectTriggerVariants({ variant, size }), className);
 
     return (
-      <SelectPrimitive.Trigger ref={ref} className={computedClassName} style={style} {...props}>
-        {children}
-        <SelectIcon as={ArrowDropDown} />
-      </SelectPrimitive.Trigger>
+      <SelectTriggerPrimitive
+        ref={ref}
+        asChild={asChild}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(props, dataAttributes({ slot: 'select-trigger' }))}
+      >
+        {asChild ? (
+          children
+        ) : (
+          <>
+            {children}
+            <SelectIcon as={open ? KeyboardArrowUp : KeyboardArrowDown} />
+          </>
+        )}
+      </SelectTriggerPrimitive>
     );
   },
 );
@@ -92,53 +125,115 @@ const SelectTrigger = forwardRef<View, SelectTriggerProps>(
 SelectTrigger.displayName = 'Select.Trigger';
 
 // =============================================================================
-// STYLED VALUE COMPONENT
+// STYLED VALUE (styled-only)
 // =============================================================================
 
 export interface SelectValueProps extends TextProps, ISelectValueProps {
+  asChild?: boolean;
   className?: string;
 }
 
-const SelectValue = forwardRef<Text, SelectValueProps>(({ className, style, ...props }, ref) => {
-  const { size } = useSelectStyleContext();
+const SelectValue = forwardRef<Text, SelectValueProps>(
+  ({ asChild, className, style, placeholder, children, ...props }, ref) => {
+    const { size } = useSelectStyleContext();
+    const { value, items, invalid } = useSelectContext();
 
-  const computedClassName = cn(selectValueVariants({ size }), className);
+    const hasValue = value !== undefined && value !== '';
+    const showPlaceholder = !hasValue;
+    const displayText = hasValue ? items.find((item) => item.value === value)?.label : placeholder;
 
-  return <SelectPrimitive.Value ref={ref} className={computedClassName} style={style} {...props} />;
-});
+    const computedClassName = cn(selectValueVariants({ size }), className);
+    const Comp = asChild ? Slot : Text;
+
+    return (
+      <Comp
+        ref={ref}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(
+          props,
+          dataAttributes({
+            slot: 'select-value',
+            placeholder: showPlaceholder,
+            invalid,
+          }),
+        )}
+      >
+        {children ?? displayText}
+      </Comp>
+    );
+  },
+);
 
 SelectValue.displayName = 'Select.Value';
 
 // =============================================================================
-// STYLED ICON COMPONENT
+// STYLED ICON (styled-only, reads context for state=open / invalid)
 // =============================================================================
 
-export interface SelectIconProps extends Omit<IconProps, 'children'> {}
+export interface SelectIconProps extends Omit<IconProps, 'children' | 'as'> {
+  asChild?: boolean;
+  /**
+   * Forge icon component to render. Required unless `asChild` is set, in which
+   * case the consumer's substituted element is rendered instead.
+   */
+  as?: IconProps['as'];
+  /**
+   * Position hint that emits `data-icon="inline-start"` or `data-icon="inline-end"`.
+   * CVA uses this attribute to apply leading/trailing padding logically (RTL-aware).
+   * Omit to apply the symmetric baseline gap.
+   */
+  position?: IconSlotPosition;
+}
 
-const SelectIcon = ({ className, style, ...props }: SelectIconProps) => {
+const SelectIcon = ({ asChild, className, style, as, position, ...props }: SelectIconProps) => {
   const { size } = useSelectStyleContext();
+  const { invalid } = useSelectContext();
 
   const computedClassName = cn(selectIconVariants({ size }), className);
 
-  return <Icon className={computedClassName} style={style} {...props} />;
+  const slotData = mergeDataAttributes(
+    props,
+    dataAttributes({ slot: 'select-icon', invalid }),
+    positionToDataIcon(position),
+  );
+
+  if (asChild) {
+    return <Slot className={computedClassName} style={style} {...props} {...slotData} />;
+  }
+
+  if (!as) {
+    return null;
+  }
+
+  return <Icon as={as} className={computedClassName} style={style} {...props} {...slotData} />;
 };
 
 SelectIcon.displayName = 'Select.Icon';
 
 // =============================================================================
-// STYLED CONTENT COMPONENT
+// STYLED CONTENT
 // =============================================================================
 
 export interface SelectContentProps extends ViewProps, ISelectContentProps {
+  asChild?: boolean;
   className?: string;
 }
 
 const SelectContent = forwardRef<View, SelectContentProps>(
-  ({ className, style, ...props }, ref) => {
+  ({ asChild, className, style, ...props }, ref) => {
     const computedClassName = cn(selectContentVariants(), className);
 
     return (
-      <SelectPrimitive.Content ref={ref} className={computedClassName} style={style} {...props} />
+      <SelectContentPrimitive
+        ref={ref}
+        asChild={asChild}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(props, dataAttributes({ slot: 'select-content' }))}
+      />
     );
   },
 );
@@ -146,24 +241,32 @@ const SelectContent = forwardRef<View, SelectContentProps>(
 SelectContent.displayName = 'Select.Content';
 
 // =============================================================================
-// STYLED ITEM COMPONENT
+// STYLED ITEM
 // =============================================================================
 
 export interface SelectItemProps extends ISelectItemProps {
+  asChild?: boolean;
   className?: string;
   children?: ReactNode;
 }
 
 const SelectItem = forwardRef<View, SelectItemProps>(
-  ({ className, children, style, ...props }, ref) => {
+  ({ asChild, className, children, style, ...props }, ref) => {
     const { size } = useSelectStyleContext();
 
     const computedClassName = cn(selectItemVariants({ size }), className);
 
     return (
-      <SelectPrimitive.Item ref={ref} className={computedClassName} style={style} {...props}>
+      <SelectItemPrimitive
+        ref={ref}
+        asChild={asChild}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(props, dataAttributes({ slot: 'select-item' }))}
+      >
         {children}
-      </SelectPrimitive.Item>
+      </SelectItemPrimitive>
     );
   },
 );
@@ -171,21 +274,38 @@ const SelectItem = forwardRef<View, SelectItemProps>(
 SelectItem.displayName = 'Select.Item';
 
 // =============================================================================
-// STYLED ITEM LABEL COMPONENT
+// STYLED ITEM LABEL (styled-only, reads item context for checked state)
 // =============================================================================
 
 export interface SelectItemLabelProps extends TextProps, ISelectItemLabelProps {
+  asChild?: boolean;
   className?: string;
 }
 
 const SelectItemLabel = forwardRef<Text, SelectItemLabelProps>(
-  ({ className, style, ...props }, ref) => {
+  ({ asChild, className, style, children, ...props }, ref) => {
     const { size } = useSelectStyleContext();
+    const { checked } = useSelectItemContext();
 
     const computedClassName = cn(selectItemLabelVariants({ size }), className);
+    const Comp = asChild ? Slot : Text;
 
     return (
-      <SelectPrimitive.ItemLabel ref={ref} className={computedClassName} style={style} {...props} />
+      <Comp
+        ref={ref}
+        className={computedClassName}
+        style={style}
+        {...props}
+        {...mergeDataAttributes(
+          props,
+          dataAttributes({
+            slot: 'select-item-label',
+            state: checked ? 'checked' : 'unchecked',
+          }),
+        )}
+      >
+        {children}
+      </Comp>
     );
   },
 );

package/src/components/Select/styles.ts

@@ -1,44 +1,29 @@
 import { Platform } from 'react-native';
 import { cva, type VariantProps } from 'class-variance-authority';
-import {
-  COLOR_BG_PRIMARY,
-  COLOR_BORDER_DEFAULT,
-  COLOR_TEXT_MUTED,
-  COLOR_TEXT_PRIMARY,
-  DISABLED_CURSOR,
-  DISABLED_OPACITY,
-  RADIUS_SM,
-  RADIUS_MD,
-  SHADOW_SM,
-  SHADOW_MD,
-  SIZE_SCALE,
-  TRANSITION_COLORS,
-} from '../../styles/primitives';
+import { DISABLED_CURSOR, TRANSITION_COLORS } from '../../styles/primitives';
 
 // ── Trigger ─────────────────────────────────────────────────
 
 export const selectTriggerVariants = cva(
   [
     'flex w-full min-w-0 flex-row items-center justify-between text-start',
-    RADIUS_SM,
-    SHADOW_SM,
+    'bg-surface-primary',
+    'border border-stroke-primary',
+    'rounded-[var(--border-radius-default)]',
     TRANSITION_COLORS,
-    COLOR_BG_PRIMARY,
-    `border ${COLOR_BORDER_DEFAULT}`,
-    DISABLED_OPACITY,
+    'data-[disabled=true]:bg-surface-secondary',
+    'data-[disabled=true]:opacity-[var(--opacity-disabled)]',
     DISABLED_CURSOR,
     'data-[readonly=true]:cursor-default',
-    'data-[state=open]:border-slate-900',
-    'data-[invalid=true]:border-red-500',
-    'data-[readonly=true]:bg-slate-50',
-    Platform.select({
-      default: 'data-[active=true]:border-slate-300',
-      web: [
-        'data-[hover=true]:border-slate-300 data-[active=true]:data-[hover=true]:border-slate-400',
-        'data-[focus-visible=true]:ring-2 data-[focus-visible=true]:ring-slate-400/50 data-[focus-visible=true]:ring-offset-2',
-        'data-[state=open]:ring-2 data-[state=open]:ring-slate-400/50',
-      ].join(' '),
-    }),
+    'data-[readonly=true]:bg-surface-secondary',
+    'web:hover:data-[focus=false]:data-[invalid=false]:border-stroke-hover',
+    'data-[focus=true]:border-[length:var(--border-width-focused)]',
+    'data-[focus=true]:data-[invalid=false]:border-stroke-action',
+    'data-[focus=true]:data-[invalid=true]:border-stroke-danger',
+    'data-[state=open]:border-[length:var(--border-width-focused)]',
+    'data-[state=open]:data-[invalid=false]:border-stroke-action',
+    'data-[state=open]:data-[invalid=true]:border-stroke-danger',
+    'data-[invalid=true]:border-stroke-danger',
   ],
   {
     variants: {
@@ -46,8 +31,20 @@ export const selectTriggerVariants = cva(
         outline: [],
       },
       size: {
-        default: `${SIZE_SCALE.default.height} ${SIZE_SCALE.default.px} ${SIZE_SCALE.default.gap}`,
-        small: `${SIZE_SCALE.small.height} ${SIZE_SCALE.small.px} ${SIZE_SCALE.small.gap}`,
+        default: [
+          'h-11 min-h-11 px-4 py-3 gap-4',
+          'data-[focus=true]:px-[calc(var(--spacing-4)-var(--spacing-px))]',
+          'data-[focus=true]:py-[calc(var(--spacing-3)-var(--spacing-px))]',
+          'data-[state=open]:px-[calc(var(--spacing-4)-var(--spacing-px))]',
+          'data-[state=open]:py-[calc(var(--spacing-3)-var(--spacing-px))]',
+        ],
+        small: [
+          'h-8 min-h-8 px-3 py-2 gap-1.5',
+          'data-[focus=true]:px-[calc(var(--spacing-3)-var(--spacing-px))]',
+          'data-[focus=true]:py-[calc(var(--spacing-2)-var(--spacing-px))]',
+          'data-[state=open]:px-[calc(var(--spacing-3)-var(--spacing-px))]',
+          'data-[state=open]:py-[calc(var(--spacing-2)-var(--spacing-px))]',
+        ],
       },
     },
     defaultVariants: {
@@ -62,15 +59,15 @@ export const selectTriggerVariants = cva(
 export const selectValueVariants = cva(
   [
     'min-w-0 flex-1 text-start',
-    'data-[placeholder=true]:text-slate-400',
-    'data-[invalid=true]:text-red-600',
-    COLOR_TEXT_PRIMARY,
+    'text-content-primary',
+    'data-[placeholder=true]:text-content-tertiary',
+    'data-[invalid=true]:text-content-danger',
   ],
   {
     variants: {
       size: {
-        default: SIZE_SCALE.default.text,
-        small: SIZE_SCALE.small.text,
+        default: 'text-[0.875rem]',
+        small: 'text-[0.75rem]',
       },
     },
     defaultVariants: {
@@ -84,14 +81,14 @@ export const selectValueVariants = cva(
 export const selectIconVariants = cva(
   [
     'shrink-0 items-center justify-center self-center',
-    COLOR_TEXT_MUTED,
-    'data-[invalid=true]:text-red-500',
+    'text-content-tertiary',
+    'data-[invalid=true]:text-content-danger',
   ],
   {
     variants: {
       size: {
-        default: 'h-5 w-5',
-        small: 'h-4 w-4',
+        default: 'size-5',
+        small: 'size-4',
       },
     },
     defaultVariants: {
@@ -103,12 +100,12 @@ export const selectIconVariants = cva(
 // ── Content ─────────────────────────────────────────────────
 
 export const selectContentVariants = cva([
-  COLOR_BG_PRIMARY,
-  `border ${COLOR_BORDER_DEFAULT}`,
+  'bg-surface-primary',
+  'border border-stroke-secondary',
   'overflow-hidden',
-  RADIUS_MD,
+  'rounded-xl',
   Platform.select({
-    web: SHADOW_MD,
+    web: 'shadow-sm',
     default: '',
   }),
   'max-h-60',
@@ -122,10 +119,10 @@ export const selectItemVariants = cva(
     'flex-row items-center',
     'transition-colors duration-100',
     'data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none',
-    'data-[state=checked]:bg-slate-50 data-[state=checked]:font-medium',
+    'data-[state=checked]:bg-surface-action-tint data-[state=checked]:font-medium',
     Platform.select({
-      default: 'data-[active=true]:bg-slate-100',
-      web: 'data-[hover=true]:bg-slate-50 data-[active=true]:data-[hover=true]:bg-slate-100 data-[highlighted=true]:bg-slate-50',
+      default: 'data-[active=true]:bg-surface-action-tint-active',
+      web: 'data-[hover=true]:bg-surface-action-tint-hover data-[active=true]:data-[hover=true]:bg-surface-action-tint-active data-[highlighted=true]:bg-surface-action-tint-hover',
     }),
   ],
   {
@@ -144,12 +141,12 @@ export const selectItemVariants = cva(
 // ── ItemLabel ───────────────────────────────────────────────
 
 export const selectItemLabelVariants = cva(
-  [COLOR_TEXT_PRIMARY, 'data-[state=checked]:font-medium'],
+  ['text-content-primary', 'data-[state=checked]:font-medium'],
   {
     variants: {
       size: {
-        default: SIZE_SCALE.default.text,
-        small: SIZE_SCALE.small.text,
+        default: 'text-[0.875rem]',
+        small: 'text-[0.75rem]',
       },
     },
     defaultVariants: {

package/src/components/Skeleton/index.tsx

@@ -0,0 +1,42 @@
+import { forwardRef, useEffect } from 'react';
+import { type ViewProps } from 'react-native';
+import Animated, {
+  Easing,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withTiming,
+} from 'react-native-reanimated';
+import { cn } from '@cdx-ui/utils';
+import { skeletonVariants } from './styles';
+
+export interface SkeletonProps extends ViewProps {
+  className?: string;
+  /** Pulse animation duration in milliseconds. @default 1000 */
+  duration?: number;
+}
+
+export const Skeleton = forwardRef<Animated.View, SkeletonProps>(
+  ({ className, style, duration = 1000, ...props }, ref) => {
+    const opacity = useSharedValue(1);
+
+    useEffect(() => {
+      opacity.set(
+        withRepeat(withTiming(0.35, { duration, easing: Easing.inOut(Easing.ease) }), -1, true),
+      );
+    }, [duration, opacity]);
+
+    const animatedStyle = useAnimatedStyle(() => ({ opacity: opacity.get() }));
+
+    return (
+      <Animated.View
+        ref={ref}
+        className={cn(skeletonVariants(), className)}
+        style={[animatedStyle, style]}
+        {...props}
+      />
+    );
+  },
+);
+
+Skeleton.displayName = 'Skeleton';

package/src/components/Skeleton/styles.ts

@@ -0,0 +1,5 @@
+import { cva, type VariantProps } from 'class-variance-authority';
+
+export const skeletonVariants = cva(['bg-surface-neutral-subtle', 'rounded-md']);
+
+export type SkeletonVariantProps = VariantProps<typeof skeletonVariants>;

package/src/components/Switch/BaseSwitch.tsx

@@ -1,6 +1,7 @@
 import { forwardRef } from 'react';
-import { Switch as RNSwitch, type SwitchProps } from 'react-native';
-import { cn } from '@cdx-ui/utils';
+import { Switch as RNSwitch, type SwitchProps as RNSwitchProps } from 'react-native';
+import { mergeDataAttributes, type IUseSwitchReturn } from '@cdx-ui/primitives';
+import { cn, composeEventHandlers } from '@cdx-ui/utils';
 import {
   switchIosBgVariants,
   switchThumbColorVariants,
@@ -8,29 +9,50 @@ import {
   switchTrackOnVariants,
 } from './styles';
 
-export interface BaseSwitchProps extends Omit<SwitchProps, 'className'> {
-  states?: Record<string, boolean | undefined>;
-  dataSet?: Record<string, string>;
+export interface BaseSwitchProps extends Omit<
+  RNSwitchProps,
+  | 'value'
+  | 'disabled'
+  | 'onValueChange'
+  | 'thumbColor'
+  | 'trackColor'
+  | 'ios_backgroundColor'
+  | 'className'
+> {
+  switchState: IUseSwitchReturn;
   className?: string;
-  size?: string;
+  size?: string | null;
 }
 
+/**
+ * Native host for `Switch`. Renders `RNSwitch` with Uniwind className passthrough
+ * derived from the resolved interaction state in `switchState`.
+ *
+ * All state/a11y/interaction machinery lives in the `useSwitch` hook; this file
+ * is pure rendering (Standard 3: primitives must not carry styling machinery).
+ */
 export const BaseSwitch = forwardRef<RNSwitch, BaseSwitchProps>(
-  ({ states, className, disabled, value, ...props }, ref) => {
-    const isChecked = value ?? states?.checked ?? false;
-    const isDisabled = disabled ?? states?.disabled ?? false;
-    const isInvalid = states?.invalid ?? false;
-
+  ({ switchState, className, size: _size, onFocus, onBlur, ...props }, ref) => {
     const uniwindProps: Record<string, string | undefined> = {
       className,
-      thumbColorClassName: cn(switchThumbColorVariants({ isDisabled })),
-      trackColorOnClassName: cn(switchTrackOnVariants({ isInvalid })),
-      trackColorOffClassName: cn(switchTrackOffVariants({ isInvalid })),
-      ios_backgroundColorClassName: cn(switchIosBgVariants({ isInvalid })),
+      thumbColorClassName: cn(switchThumbColorVariants({ isDisabled: switchState.isDisabled })),
+      trackColorOnClassName: cn(switchTrackOnVariants({ isInvalid: switchState.isInvalid })),
+      trackColorOffClassName: cn(switchTrackOffVariants({ isInvalid: switchState.isInvalid })),
+      ios_backgroundColorClassName: cn(switchIosBgVariants({ isInvalid: switchState.isInvalid })),
     };
 
     return (
-      <RNSwitch ref={ref} value={isChecked} disabled={isDisabled} {...uniwindProps} {...props} />
+      <RNSwitch
+        ref={ref}
+        value={switchState.checked}
+        disabled={switchState.isDisabled}
+        onValueChange={switchState.setChecked}
+        onFocus={composeEventHandlers(onFocus, switchState.focusProps.onFocus)}
+        onBlur={composeEventHandlers(onBlur, switchState.focusProps.onBlur)}
+        {...uniwindProps}
+        {...props}
+        {...mergeDataAttributes(props, switchState.dataAttrs)}
+      />
     );
   },
 );