@cdx-ui/primitives 0.0.1-beta.5 → 0.0.1-beta.51

package/src/checkbox/createCheckboxRoot.web.tsx

@@ -6,8 +6,10 @@ import { CheckboxProvider } from './context';
 import type { ICheckboxProps } from './types';
 import { useCheckboxRoot } from './useCheckboxRoot';
 
-// TODO: Label is taking focus on keyboard navigation
-
+/**
+ * Web uses a native checkbox input (VisuallyHidden) for ARIA + focus management. The outer
+ * `Pressable` must not be in the tab order or each control consumes two Tab stops (wrapper + input).
+ */
 export const createCheckboxRoot = <T,>(BaseCheckbox: React.ComponentType<T>) =>
   forwardRef(({ children, ...props }: ICheckboxProps, ref?: React.Ref<T>) => {
     const {
@@ -41,6 +43,8 @@ export const createCheckboxRoot = <T,>(BaseCheckbox: React.ComponentType<T>) =>
       <BaseCheckbox
         {...(combinedProps as T)}
         ref={mergedRef}
+        // Native input is the only tab stop; Pressable is still clickable (mouse / screen reader).
+        tabIndex={-1}
         role="label"
         // eslint-disable-next-line react-native-a11y/has-valid-accessibility-role
         accessibilityRole="label"

package/src/chip/createChipRoot.tsx

@@ -0,0 +1,144 @@
+import React, { forwardRef } from 'react';
+import type { PressableProps } from 'react-native';
+import { composeEventHandlers, mergeRefs } from '@cdx-ui/utils';
+import { useFocus, useFocusRing } from '@react-native-aria/focus';
+import { useHover, usePress } from '@react-native-aria/interactions';
+import { dataAttributes } from '../utils/dataAttributes';
+import type { IChipPressablePassthrough, IChipProps } from './types';
+
+const rowStyle = {
+  flexDirection: 'row' as const,
+  alignItems: 'center' as const,
+  alignSelf: 'flex-start' as const,
+};
+
+const chipSlotAttrs = dataAttributes({ slot: 'chip' });
+
+export const createChipRoot = <V, P>(
+  BaseView: React.ComponentType<V>,
+  BasePressable: React.ComponentType<P>,
+) =>
+  forwardRef(
+    (
+      {
+        asChild = false,
+        children,
+        onPress,
+        disabled = false,
+        accessibilityRole,
+        style,
+        ...restProps
+      }: IChipProps,
+      ref: React.Ref<unknown>,
+    ) => {
+      const childOnPress = React.isValidElement(children)
+        ? ((children.props as { onPress?: unknown }).onPress as IChipProps['onPress'] | undefined)
+        : undefined;
+
+      const asChildInteractive = asChild && React.isValidElement(children);
+      const isPressableRoot = !!onPress && !asChildInteractive;
+
+      const pressState = usePress({
+        isDisabled: !isPressableRoot || disabled,
+      });
+      const isPressed = pressState.isPressed;
+      const pressProps = pressState.pressProps as Pick<PressableProps, 'onPressIn' | 'onPressOut'>;
+
+      const { hoverProps, isHovered } = useHover();
+      const { isFocused, focusProps } = useFocus();
+      const { isFocusVisible, focusProps: focusRingProps } = useFocusRing() as {
+        isFocusVisible: boolean;
+        focusProps: typeof focusProps;
+      };
+
+      if (asChildInteractive) {
+        const child = children as React.ReactElement<Record<string, unknown>>;
+
+        const childDisabled = !!(child.props as { disabled?: boolean }).disabled;
+        const resolvedDisabled = disabled || childDisabled;
+
+        const cloneProps: Record<string, unknown> = {
+          ...restProps,
+          ...chipSlotAttrs,
+          ...dataAttributes({
+            active: false,
+            hover: false,
+            disabled: resolvedDisabled,
+            focused: false,
+            focusVisible: false,
+          }),
+          ...(resolvedDisabled && { accessibilityState: { disabled: true } }),
+          disabled: resolvedDisabled,
+          ref: mergeRefs(ref, child.props.ref as React.Ref<unknown>),
+          style: [rowStyle, style, child.props.style],
+        };
+
+        if (resolvedDisabled) {
+          cloneProps.onPress = undefined;
+        } else if (onPress) {
+          cloneProps.onPress = composeEventHandlers(childOnPress, onPress);
+        }
+
+        return React.cloneElement(child, cloneProps);
+      }
+
+      if (isPressableRoot) {
+        const interactionAttrs = dataAttributes({
+          active: isPressed,
+          hover: isHovered,
+          disabled,
+          focused: isFocused,
+          focusVisible: isFocusVisible,
+        });
+
+        const {
+          onPressIn: onPressInProp,
+          onPressOut: onPressOutProp,
+          onHoverIn: onHoverInProp,
+          onHoverOut: onHoverOutProp,
+          onFocus: onFocusProp,
+          onBlur: onBlurProp,
+        } = restProps as IChipPressablePassthrough & Pick<PressableProps, 'onFocus' | 'onBlur'>;
+
+        return (
+          <BasePressable
+            {...(restProps as P)}
+            {...chipSlotAttrs}
+            {...interactionAttrs}
+            accessibilityRole={accessibilityRole ?? 'button'}
+            {...(disabled && { accessibilityState: { disabled: true } })}
+            disabled={disabled}
+            ref={ref as React.Ref<P>}
+            style={[rowStyle, style]}
+            onPress={disabled ? undefined : onPress}
+            onPressIn={composeEventHandlers(onPressInProp, pressProps.onPressIn)}
+            onPressOut={composeEventHandlers(onPressOutProp, pressProps.onPressOut)}
+            onHoverIn={composeEventHandlers(onHoverInProp, hoverProps.onHoverIn)}
+            onHoverOut={composeEventHandlers(onHoverOutProp, hoverProps.onHoverOut)}
+            onFocus={composeEventHandlers(
+              composeEventHandlers(onFocusProp, focusProps.onFocus),
+              focusRingProps.onFocus,
+            )}
+            onBlur={composeEventHandlers(
+              composeEventHandlers(onBlurProp, focusProps.onBlur),
+              focusRingProps.onBlur,
+            )}
+          >
+            {children}
+          </BasePressable>
+        );
+      }
+
+      return (
+        <BaseView
+          {...(restProps as V)}
+          {...chipSlotAttrs}
+          {...(disabled ? dataAttributes({ disabled: true }) : undefined)}
+          ref={ref as React.Ref<V>}
+          style={[rowStyle, style]}
+        >
+          {children}
+        </BaseView>
+      );
+    },
+  );

package/src/chip/index.ts

@@ -0,0 +1,18 @@
+import type React from 'react';
+import type { PressableProps, ViewProps } from 'react-native';
+import { createChipRoot } from './createChipRoot';
+import type { IChipComponentType } from './types';
+
+export type { IChipComponentType, IChipPressablePassthrough, IChipProps } from './types';
+
+export function createChip({
+  View,
+  Pressable,
+}: {
+  View: React.ComponentType<ViewProps>;
+  Pressable: React.ComponentType<PressableProps>;
+}) {
+  const Chip = createChipRoot(View, Pressable);
+  Chip.displayName = 'ChipPrimitive';
+  return Chip as IChipComponentType<ViewProps | PressableProps>;
+}

package/src/chip/types.ts

@@ -0,0 +1,23 @@
+import type { ForwardRefExoticComponent, RefAttributes } from 'react';
+import type { PressableProps, ViewProps } from 'react-native';
+
+export type IChipPressablePassthrough = Partial<
+  Pick<PressableProps, 'onPressIn' | 'onPressOut' | 'onHoverIn' | 'onHoverOut'>
+>;
+
+export interface IChipProps extends ViewProps, IChipPressablePassthrough {
+  /**
+   * When set (and `asChild` is not used with a valid element), root renders as pressable.
+   */
+  onPress?: PressableProps['onPress'];
+  /** Disables press handling when the root is pressable. */
+  disabled?: boolean;
+  /**
+   * Merge slot + interaction props onto a single child instead of rendering the default pressable root.
+   */
+  asChild?: boolean;
+}
+
+export type IChipComponentType<RootRef> = ForwardRefExoticComponent<
+  RefAttributes<RootRef> & IChipProps
+>;

package/src/field/createFieldLabel.tsx

@@ -20,7 +20,10 @@ export const createFieldLabel = <T,>(BaseFormLabel: React.ComponentType<T>) =>
           {...(props as T)}
           id={labelId}
           htmlFor={htmlFor}
-          {...dataAttributes({ invalid: field.isInvalid, required: field.isRequired })}
+          {...dataAttributes({
+            invalid: field.isInvalid,
+            required: field.isRequired,
+          })}
         >
           {children}
           {field.isRequired ? requiredIndicator : null}

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './avatar';
 export * from './button';
+export * from './chip';
 export * from './checkbox';
 export * from './dialog';
 export * from './field';
@@ -11,6 +12,9 @@ export * from './list-item';
 export { type EdgeInsets, OverlayInsetsProvider } from './overlay';
 export * from './select';
 export * from './switch';
+export * from './tile';
 export * from './progress';
+export * from './radio';
 export type { InteractionState } from './types';
 export { dataAttributes } from './utils/dataAttributes';
+export { domDataAttributes, type DomDataAttributeValue } from './utils/domDataAttributes';

package/src/input/createInputField.tsx

@@ -49,8 +49,14 @@ export const createInputField = <T,>(BaseInputField: React.ComponentType<T>) =>
 
       const field = useFormControlContext();
 
+      const reportLabelFocus = (focused: boolean) => {
+        const active = focused && !(isDisabled || inputProps.disabled);
+        field.setIsLabelFocused?.(active);
+      };
+
       const handleFocus = (focusState: boolean, callback: any) => {
         setIsFocused(focusState);
+        reportLabelFocus(focusState);
         callback();
       };
 

package/src/link/context.tsx

@@ -0,0 +1,10 @@
+import { createContext } from '@cdx-ui/utils';
+
+export interface LinkInteractionState {
+  hover: boolean;
+  visited: boolean;
+  focusVisible: boolean;
+}
+
+export const [LinkInteractionProvider, useLinkInteractionContext] =
+  createContext<LinkInteractionState>('LinkInteractionContext');

package/src/link/createLink.tsx

@@ -1,8 +1,9 @@
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 import { composeEventHandlers } from '@cdx-ui/utils';
 import { useFocusRing, useFocus } from '@react-native-aria/focus';
 import { useHover, usePress } from '@react-native-aria/interactions';
 import { dataAttributes } from '../utils/dataAttributes';
+import { LinkInteractionProvider } from './context';
 import { useLink } from './useLink';
 import type { ILinkProps } from './types';
 
@@ -15,6 +16,7 @@ export const createLink = <RootT, R = unknown>({ Root }: { Root: React.Component
         isPressed: isPressedProp,
         isFocused: isFocusedProp,
         isFocusVisible: isFocusVisibleProp,
+        isVisited: isVisitedProp,
         href,
         onPress,
         action,
@@ -38,34 +40,50 @@ export const createLink = <RootT, R = unknown>({ Root }: { Root: React.Component
         webProps,
       });
 
+      const hover = isHoveredProp || isHovered;
+      const visited = isVisitedProp ?? false;
+      const focusVisible = isFocusVisibleProp || isFocusVisible;
+
+      const interactionState = useMemo(
+        () => ({
+          hover,
+          visited,
+          focusVisible,
+        }),
+        [hover, visited, focusVisible],
+      );
+
       const interactionAttrs = dataAttributes({
-        hover: isHoveredProp || isHovered,
+        hover,
         focus: isFocusedProp || isFocused,
         active: isPressedProp || isPressed,
-        focusVisible: isFocusVisibleProp || isFocusVisible,
+        focusVisible,
+        visited,
       });
 
       return (
-        <Root
-          ref={ref}
-          {...interactionAttrs}
-          {...linkProps}
-          {...(props as RootT)}
-          onPressIn={composeEventHandlers(props?.onPressIn, pressProps.onPressIn)}
-          onPressOut={composeEventHandlers(props?.onPressOut, pressProps.onPressOut)}
-          onHoverIn={composeEventHandlers(props?.onHoverIn, hoverProps.onHoverIn)}
-          onHoverOut={composeEventHandlers(props?.onHoverOut, hoverProps.onHoverOut)}
-          onFocus={composeEventHandlers(
-            composeEventHandlers(props?.onFocus, focusProps.onFocus),
-            focusRingProps.onFocus,
-          )}
-          onBlur={composeEventHandlers(
-            composeEventHandlers(props?.onBlur, focusProps.onBlur),
-            focusRingProps.onBlur,
-          )}
-        >
-          {children}
-        </Root>
+        <LinkInteractionProvider value={interactionState}>
+          <Root
+            ref={ref}
+            {...interactionAttrs}
+            {...linkProps}
+            {...(props as RootT)}
+            onPressIn={composeEventHandlers(props?.onPressIn, pressProps.onPressIn)}
+            onPressOut={composeEventHandlers(props?.onPressOut, pressProps.onPressOut)}
+            onHoverIn={composeEventHandlers(props?.onHoverIn, hoverProps.onHoverIn)}
+            onHoverOut={composeEventHandlers(props?.onHoverOut, hoverProps.onHoverOut)}
+            onFocus={composeEventHandlers(
+              composeEventHandlers(props?.onFocus, focusProps.onFocus),
+              focusRingProps.onFocus,
+            )}
+            onBlur={composeEventHandlers(
+              composeEventHandlers(props?.onBlur, focusProps.onBlur),
+              focusRingProps.onBlur,
+            )}
+          >
+            {children}
+          </Root>
+        </LinkInteractionProvider>
       );
     },
   );

package/src/link/index.tsx

@@ -1,4 +1,6 @@
 export { createLink } from './createLink';
+export { LinkInteractionProvider, useLinkInteractionContext } from './context';
+export type { LinkInteractionState } from './context';
 export { LinkProvider } from './LinkProvider';
 export type { LinkConfig } from './LinkProvider';
 export { useLink } from './useLink';

package/src/link/types.ts

@@ -32,6 +32,7 @@ export interface ILinkProps extends PressableProps {
   isHovered?: boolean;
   isFocused?: boolean;
   isFocusVisible?: boolean;
+  isVisited?: boolean;
   /**
    * HTML anchor attributes applied only on web. Ignored on native platforms.
    * `target`, `rel`, and `download` are forwarded via react-native-web's `hrefAttrs`.

package/src/list-item/createListItemRoot.tsx

@@ -49,7 +49,17 @@ export const createListItemRoot = <V, P>(
       }: IListItemProps,
       ref: React.Ref<unknown>,
     ) => {
-      const asChildInteractive = asChild && !!onPress && React.isValidElement(children);
+      const childOnPress = React.isValidElement(children)
+        ? ((children.props as { onPress?: unknown }).onPress as
+            | IListItemProps['onPress']
+            | undefined)
+        : undefined;
+
+      // asChild always wins when explicitly set with a valid element — even when the press
+      // surface is built internally by the child (e.g. `Link` adds its onPress via `useLink`,
+      // not as a JSX-level prop). The clone path below preserves the child's own press by
+      // *omitting* `onPress` when there is nothing to compose.
+      const asChildInteractive = asChild && React.isValidElement(children);
       const isPressableRoot = !!onPress && !asChildInteractive;
 
       const pressState = usePress({
@@ -74,15 +84,33 @@ export const createListItemRoot = <V, P>(
       if (asChildInteractive) {
         const child = children as React.ReactElement<Record<string, unknown>>;
 
-        const mergedOnPress = composeEventHandlers(
-          child.props.onPress as IListItemProps['onPress'],
-          onPress,
-        );
-
         const childDisabled = !!(child.props as { disabled?: boolean }).disabled;
-
         const resolvedDisabled = disabled || childDisabled;
 
+        const cloneProps: Record<string, unknown> = {
+          ...restProps,
+          ...slotAttrs,
+          ...dataAttributes({
+            active: false,
+            hover: false,
+            disabled: resolvedDisabled,
+          }),
+          ...(resolvedDisabled && { accessibilityState: { disabled: true } }),
+          disabled: resolvedDisabled,
+          ref: mergeRefs(ref, child.props.ref as React.Ref<unknown>),
+          style: [rowStyleForCrossAlign(crossAlign), style, child.props.style],
+        };
+
+        // Only override the child's `onPress` when we have something to add (a parent handler)
+        // or need to suppress (disabled). Otherwise leave the child's own onPress alone — e.g.
+        // `Link` builds its navigation handler inside `useLink`, not as a JSX-level prop, and
+        // overriding here would shadow it.
+        if (resolvedDisabled) {
+          cloneProps.onPress = undefined;
+        } else if (onPress) {
+          cloneProps.onPress = composeEventHandlers(childOnPress, onPress);
+        }
+
         return (
           <ListItemProvider
             value={{
@@ -92,20 +120,7 @@ export const createListItemRoot = <V, P>(
               crossAlign: crossAlign ?? 'center',
             }}
           >
-            {React.cloneElement(child, {
-              ...restProps,
-              ...slotAttrs,
-              ...dataAttributes({
-                active: false,
-                hovered: false,
-                disabled: resolvedDisabled,
-              }),
-              ...(resolvedDisabled && { accessibilityState: { disabled: true } }),
-              disabled: resolvedDisabled,
-              onPress: resolvedDisabled ? undefined : mergedOnPress,
-              ref: mergeRefs(ref, child.props.ref as React.Ref<unknown>),
-              style: [rowStyleForCrossAlign(crossAlign), style, child.props.style],
-            })}
+            {React.cloneElement(child, cloneProps)}
           </ListItemProvider>
         );
       }
@@ -113,7 +128,7 @@ export const createListItemRoot = <V, P>(
       if (isPressableRoot) {
         const interactionAttrs = dataAttributes({
           active: isPressed,
-          hovered: isHovered,
+          hover: isHovered,
           disabled,
         });
 

package/src/radio/context.tsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import { createContext } from '@cdx-ui/utils';
+import type { RadioGroupState } from '@react-stately/radio';
+import type { IRadioContextValue } from './types';
+
+export const [RadioProvider, useRadioContext] = createContext<IRadioContextValue>('RadioContext');
+
+export interface IRadioGroupState {
+  isReadOnly: boolean;
+  isDisabled: boolean;
+  isInvalid: boolean;
+  isRequired: boolean;
+  isSelected: (value: string) => boolean;
+  selectValue: (value: string) => void;
+}
+
+export const RadioGroupContext = React.createContext<{
+  state: IRadioGroupState;
+  radioGroupState: RadioGroupState;
+  name?: string;
+} | null>(null);

package/src/radio/createRadioGroup.tsx

@@ -0,0 +1,67 @@
+import { forwardRef } from 'react';
+import { useFormControlContext } from '@cdx-ui/utils';
+import { useRadioGroup } from '@react-native-aria/radio';
+import { useRadioGroupState } from '@react-stately/radio';
+import { dataAttributes } from '../utils/dataAttributes';
+import { RadioGroupContext } from './context';
+import type { IRadioGroupProps } from './types';
+
+export const createRadioGroup = <T,>(BaseRadioGroup: React.ComponentType<T>) =>
+  forwardRef(({ children, ...props }: IRadioGroupProps, ref?: React.Ref<T>) => {
+    const formControlContext = useFormControlContext();
+
+    const combinedProps = {
+      ...formControlContext,
+      ...props,
+    };
+
+    const radioGroupState = useRadioGroupState({
+      ...combinedProps,
+      validationState: combinedProps.isInvalid ? 'invalid' : 'valid',
+    });
+
+    const { radioGroupProps } = useRadioGroup(
+      {
+        ...combinedProps,
+        'aria-label': combinedProps['aria-label'],
+      },
+      radioGroupState,
+    );
+
+    const isDisabled = combinedProps.isDisabled ?? false;
+    const isInvalid = combinedProps.isInvalid ?? false;
+    const isRequired = combinedProps.isRequired ?? false;
+    const isReadOnly = combinedProps.isReadOnly ?? false;
+
+    return (
+      <RadioGroupContext.Provider
+        value={{
+          state: {
+            isDisabled,
+            isInvalid,
+            isRequired,
+            isReadOnly,
+            isSelected: (value: string) => radioGroupState.selectedValue === value,
+            selectValue: (value: string) => radioGroupState.setSelectedValue(value),
+          },
+          radioGroupState,
+          name: combinedProps.name,
+        }}
+      >
+        <BaseRadioGroup
+          {...radioGroupProps}
+          {...(combinedProps as unknown as T)}
+          ref={ref}
+          aria-required={isRequired || undefined}
+          aria-readonly={isReadOnly || undefined}
+          {...dataAttributes({
+            slot: 'radio-group',
+            disabled: isDisabled,
+            invalid: isInvalid,
+          })}
+        >
+          {children}
+        </BaseRadioGroup>
+      </RadioGroupContext.Provider>
+    );
+  });

package/src/radio/createRadioIndicator.tsx

@@ -0,0 +1,32 @@
+import { forwardRef } from 'react';
+import { dataAttributes } from '../utils/dataAttributes';
+import { useRadioContext } from './context';
+import type { IRadioIndicatorProps } from './types';
+
+export const createRadioIndicator = <T,>(BaseRadioIndicator: React.ComponentType<T>) =>
+  forwardRef<unknown, IRadioIndicatorProps & { className?: string }>(
+    ({ children, className, ...props }, ref) => {
+      const { isChecked, isDisabled, isHovered, isInvalid, isReadOnly, isPressed, isFocusVisible } =
+        useRadioContext();
+
+      return (
+        <BaseRadioIndicator
+          className={className}
+          {...dataAttributes({
+            slot: 'radio-indicator',
+            hover: isHovered,
+            checked: isChecked,
+            disabled: isDisabled,
+            focusVisible: isFocusVisible,
+            invalid: isInvalid,
+            readonly: isReadOnly,
+            active: isPressed,
+          })}
+          {...(props as T)}
+          ref={ref}
+        >
+          {children}
+        </BaseRadioIndicator>
+      );
+    },
+  );

package/src/radio/createRadioLabel.tsx

@@ -0,0 +1,28 @@
+import { forwardRef } from 'react';
+import { dataAttributes } from '../utils/dataAttributes';
+import { useRadioContext } from './context';
+import type { IRadioLabelProps } from './types';
+
+export const createRadioLabel = <T,>(BaseRadioLabel: React.ComponentType<T>) =>
+  forwardRef<unknown, IRadioLabelProps & { className?: string }>(
+    ({ children, className, ...props }, ref) => {
+      const { isChecked, isDisabled, isHovered, isInvalid, isReadOnly } = useRadioContext();
+
+      return (
+        <BaseRadioLabel
+          className={className}
+          {...dataAttributes({
+            hover: isHovered,
+            checked: isChecked,
+            disabled: isDisabled,
+            invalid: isInvalid,
+            readonly: isReadOnly,
+          })}
+          {...(props as T)}
+          ref={ref}
+        >
+          {children}
+        </BaseRadioLabel>
+      );
+    },
+  );