@cdx-ui/primitives 0.0.1-beta.140 → 0.0.1-beta.142

package/src/radio/RadioRoot.web.tsx

@@ -1,20 +1,27 @@
-import { forwardRef } from 'react';
+import { forwardRef, useContext, useEffect, useMemo, useRef } from 'react';
 import { Pressable } from 'react-native';
 import { VisuallyHidden } from '@react-aria/visually-hidden';
-import { mergeProps } from '@react-aria/utils';
+import { composeEventHandlers, mergeRefs } from '@cdx-ui/utils';
 import { useFocusRing } from '@react-native-aria/focus';
 import { Slot } from '../slot';
 import { dataAttributes, mergeDataAttributes } from '../utils/dataAttributes';
-import { RadioProvider } from './context';
+import { RadioGroupContext, RadioProvider } from './context';
 import type { IRadioProps, IRadioContextValue } from './types';
 import { useRadioRoot } from './useRadioRoot';
-
-// TODO: Keyboard focus is not working as expected
+import { getRovingFocusValue } from './useRadioGroupNavigation';
 
 export interface RadioRootProps extends IRadioProps {
   asChild?: boolean;
 }
 
+/**
+ * Web Radio root.
+ *
+ * On web, `@react-native-aria/radio` re-exports `@react-aria/radio`'s `useRadio`,
+ * whose `inputProps` target a native `<input type="radio">` (selection via
+ * `onChange`). Selection must be applied explicitly on the Pressable —
+ * `inputProps.onPress` does **not** call `setSelectedValue`.
+ */
 export const RadioRoot = forwardRef<React.ComponentRef<typeof Pressable>, RadioRootProps>(
   ({ asChild, children, ...props }, ref) => {
     const {
@@ -27,12 +34,13 @@ export const RadioRoot = forwardRef<React.ComponentRef<typeof Pressable>, RadioR
       isPressed,
     } = props;
 
+    const radioGroupContext = useContext(RadioGroupContext);
+
     const {
       combinedProps,
       isInvalid,
       isReadOnly,
       inputProps,
-      labelProps,
       isChecked,
       isDisabled,
       isHovered,
@@ -42,13 +50,80 @@ export const RadioRoot = forwardRef<React.ComponentRef<typeof Pressable>, RadioR
 
     const { focusProps, isFocusVisible } = useFocusRing();
 
+    const nodeRef = useRef<React.ComponentRef<typeof Pressable> | null>(null);
+    const setRefs = mergeRefs(mergedRef, nodeRef);
+
+    // Strip native-input / internal props — they must not land on Pressable.
+    const {
+      onPress: _onPress,
+      onChange: _onChange,
+      role: _role,
+      tabIndex: _tabIndex,
+      disabled: _disabled,
+      checked: _checked,
+      value: _value,
+      type: _type,
+      name: _name,
+      form: _form,
+      required: _required,
+      ...inputAriaProps
+    } = inputProps;
+
+    const resolvedDisabled = !!(isDisabled || isDisabledProp);
+    const resolvedReadOnly = !!(isReadOnly || isReadOnlyProp);
+
+    const selectThis = () => {
+      if (resolvedDisabled || resolvedReadOnly) {
+        return;
+      }
+      radioGroupContext?.radioGroupState.setSelectedValue(combinedProps.value);
+    };
+
+    const selectedValue = radioGroupContext?.radioGroupState.selectedValue;
+    const focusedValue = radioGroupContext?.focusedValue;
+    const registerRadio = radioGroupContext?.registerRadio;
+    const unregisterRadio = radioGroupContext?.unregisterRadio;
+    const getRadios = radioGroupContext?.getRadios;
+    const groupName = radioGroupContext?.name;
+
+    useEffect(() => {
+      if (!registerRadio || !unregisterRadio) {
+        return;
+      }
+
+      registerRadio(combinedProps.value, {
+        disabled: !!resolvedDisabled,
+        node: nodeRef.current as { focus?: () => void } | null,
+      });
+
+      return () => unregisterRadio(combinedProps.value);
+    }, [combinedProps.value, resolvedDisabled, registerRadio, unregisterRadio]);
+
+    const isRovingTabStop = useMemo(() => {
+      if (resolvedDisabled) {
+        return false;
+      }
+
+      const enabledRadios = getRadios?.().filter(([, entry]) => !entry.disabled) ?? [];
+      const rovingValue = getRovingFocusValue(focusedValue, selectedValue, enabledRadios);
+
+      return combinedProps.value === rovingValue;
+    }, [combinedProps.value, focusedValue, getRadios, resolvedDisabled, selectedValue]);
+
+    const handleKeyDown = (event: { key: string; preventDefault: () => void }) => {
+      if (event.key === ' ' || event.key === 'Spacebar') {
+        event.preventDefault();
+        selectThis();
+      }
+    };
+
     const contextValue: IRadioContextValue = {
       isChecked,
-      isDisabled: isDisabled || isDisabledProp,
+      isDisabled: resolvedDisabled,
       isFocusVisible: isFocusVisible || isFocusVisibleProp,
       isHovered: isHovered || isHoveredProp,
       isInvalid: isInvalid || isInvalidProp,
-      isReadOnly: isReadOnly || isReadOnlyProp,
+      isReadOnly: resolvedReadOnly,
       isPressed,
       isFocused,
     };
@@ -57,31 +132,61 @@ export const RadioRoot = forwardRef<React.ComponentRef<typeof Pressable>, RadioR
 
     return (
       <RadioProvider value={contextValue}>
-        <Comp
-          {...mergeProps(combinedProps as any, labelProps as any, focusProps as any)}
-          ref={mergedRef}
-          role="label"
-          // eslint-disable-next-line react-native-a11y/has-valid-accessibility-role
-          accessibilityRole="label"
-          {...mergeDataAttributes(
-            props,
-            dataAttributes({
-              checked: isChecked,
-              disabled: isDisabled || isDisabledProp,
-              hover: isHovered || isHoveredProp,
-              invalid: isInvalid || isInvalidProp,
-              readonly: isReadOnly || isReadOnlyProp,
-              active: isPressed,
-              focus: isFocused,
-              focusVisible: isFocusVisible || isFocusVisibleProp,
-            }),
-          )}
-        >
+        <>
           <VisuallyHidden>
-            <input {...inputProps} ref={inputRef} />
+            <input
+              ref={inputRef as React.RefObject<HTMLInputElement>}
+              type="radio"
+              name={groupName}
+              value={combinedProps.value}
+              checked={!!isChecked}
+              disabled={resolvedDisabled}
+              tabIndex={-1}
+              aria-hidden
+              readOnly
+              // Decorative form mirror — pointer events must not steal clicks from Pressable.
+              style={{ pointerEvents: 'none' }}
+            />
           </VisuallyHidden>
-          {children}
-        </Comp>
+          <Comp
+            {...(combinedProps as object)}
+            {...inputAriaProps}
+            ref={setRefs}
+            role="radio"
+            aria-checked={isChecked}
+            aria-disabled={resolvedDisabled || undefined}
+            accessibilityRole="radio"
+            accessibilityState={{ checked: isChecked, disabled: resolvedDisabled }}
+            tabIndex={resolvedDisabled ? -1 : isRovingTabStop ? 0 : -1}
+            disabled={resolvedDisabled}
+            {...focusProps}
+            onPress={selectThis}
+            onClick={selectThis}
+            onKeyDown={composeEventHandlers(
+              (
+                combinedProps as {
+                  onKeyDown?: (e: { key: string; preventDefault: () => void }) => void;
+                }
+              ).onKeyDown,
+              handleKeyDown,
+            )}
+            {...mergeDataAttributes(
+              props,
+              dataAttributes({
+                checked: isChecked,
+                disabled: resolvedDisabled,
+                hover: isHovered || isHoveredProp,
+                invalid: isInvalid || isInvalidProp,
+                readonly: resolvedReadOnly,
+                active: isPressed,
+                focus: isFocused,
+                focusVisible: isFocusVisible || isFocusVisibleProp,
+              }),
+            )}
+          >
+            {children}
+          </Comp>
+        </>
       </RadioProvider>
     );
   },

package/src/radio/context.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { createContext } from '@cdx-ui/utils';
 import type { RadioGroupState } from '@react-stately/radio';
-import type { IRadioContextValue } from './types';
+import type { IRadioContextValue, RegisteredRadio } from './types';
 
 export const [RadioProvider, useRadioContext] = createContext<IRadioContextValue>('RadioContext');
 
@@ -18,4 +18,9 @@ export const RadioGroupContext = React.createContext<{
   state: IRadioGroupState;
   radioGroupState: RadioGroupState;
   name?: string;
+  focusedValue?: string | undefined;
+  setFocusedValue?: (value: string | undefined) => void;
+  registerRadio?: (value: string, entry: RegisteredRadio) => void;
+  unregisterRadio?: (value: string) => void;
+  getRadios?: () => [string, RegisteredRadio][];
 } | null>(null);

package/src/radio/types.ts

@@ -43,3 +43,9 @@ export interface IRadioContextValue {
   isHovered?: boolean;
   isPressed?: boolean;
 }
+
+/** Web roving-focus registration entry for a single radio item. */
+export interface RegisteredRadio {
+  disabled: boolean;
+  node: { focus?: () => void } | null;
+}

package/src/radio/useRadioGroupNavigation.ts

@@ -0,0 +1,104 @@
+import { useCallback, useRef } from 'react';
+import type { RegisteredRadio } from './types';
+
+// Web-only — native platforms rely on OS-managed sequential focus (VoiceOver/TalkBack).
+
+function isEnabledRadioValue(
+  value: string | null | undefined,
+  enabledRadios: [string, RegisteredRadio][],
+): value is string {
+  return value != null && enabledRadios.some(([radioValue]) => radioValue === value);
+}
+
+/** Resolves which radio value should hold the roving tab stop / keyboard focus anchor. */
+export function getRovingFocusValue(
+  focusedValue: string | undefined,
+  selectedValue: string | null | undefined,
+  enabledRadios: [string, RegisteredRadio][],
+): string | undefined {
+  const defaultFocusValue = isEnabledRadioValue(selectedValue, enabledRadios)
+    ? selectedValue
+    : enabledRadios[0]?.[0];
+
+  const resolvedFocusedValue = isEnabledRadioValue(focusedValue, enabledRadios)
+    ? focusedValue
+    : undefined;
+
+  return resolvedFocusedValue ?? defaultFocusValue;
+}
+
+export interface UseRadioGroupNavigationOptions {
+  getRadios: () => [string, RegisteredRadio][];
+  focusedValue: string | undefined;
+  setFocusedValue: (value: string | undefined) => void;
+  selectedValue: string | null | undefined;
+  selectValue: (value: string) => void;
+}
+
+export function useRadioGroupNavigation({
+  getRadios,
+  focusedValue,
+  setFocusedValue,
+  selectedValue,
+  selectValue,
+}: UseRadioGroupNavigationOptions) {
+  const selectValueRef = useRef(selectValue);
+  selectValueRef.current = selectValue;
+
+  const getEnabledRadios = useCallback(
+    () => getRadios().filter(([, entry]) => !entry.disabled),
+    [getRadios],
+  );
+
+  const moveFocus = useCallback(
+    ([targetValue, targetEntry]: [string, RegisteredRadio]) => {
+      setFocusedValue(targetValue);
+      targetEntry.node?.focus?.();
+      selectValueRef.current(targetValue);
+    },
+    [setFocusedValue],
+  );
+
+  const handleKeyDown = useCallback(
+    (e: { key: string; preventDefault: () => void }) => {
+      const enabledRadios = getEnabledRadios();
+      if (enabledRadios.length === 0) {
+        return;
+      }
+
+      const currentValue = getRovingFocusValue(focusedValue, selectedValue, enabledRadios);
+      const idx = enabledRadios.findIndex(([value]) => value === currentValue);
+
+      switch (e.key) {
+        case 'ArrowDown':
+        case 'ArrowRight': {
+          e.preventDefault();
+          moveFocus(enabledRadios[idx < enabledRadios.length - 1 ? idx + 1 : 0]);
+          break;
+        }
+        case 'ArrowUp':
+        case 'ArrowLeft': {
+          e.preventDefault();
+          moveFocus(enabledRadios[idx > 0 ? idx - 1 : enabledRadios.length - 1]);
+          break;
+        }
+        case 'Home': {
+          e.preventDefault();
+          moveFocus(enabledRadios[0]);
+          break;
+        }
+        case 'End': {
+          e.preventDefault();
+          const last = enabledRadios.at(-1);
+          if (last) {
+            moveFocus(last);
+          }
+          break;
+        }
+      }
+    },
+    [focusedValue, selectedValue, getEnabledRadios, moveFocus],
+  );
+
+  return { handleKeyDown };
+}

package/src/radio/useRadioRoot.ts

@@ -15,12 +15,6 @@ export function useRadioRoot(
   { useInputRefForAria = false }: UseRadioRootOptions = {},
 ) {
   const formControlContext = useFormControlContext();
-
-  const { isInvalid, isReadOnly, ...combinedProps } = {
-    ...formControlContext,
-    ...props,
-  };
-
   const radioGroupContext = useContext(RadioGroupContext);
 
   if (!radioGroupContext) {
@@ -29,17 +23,30 @@ export function useRadioRoot(
     );
   }
 
+  const isInvalid = props.isInvalid ?? formControlContext.isInvalid;
+  const isReadOnly =
+    props.isReadOnly ?? formControlContext.isReadOnly ?? radioGroupContext.state.isReadOnly;
+  const isDisabled =
+    props.isDisabled ?? formControlContext.isDisabled ?? radioGroupContext.state.isDisabled;
+
+  const combinedProps = {
+    ...props,
+    isInvalid,
+    isReadOnly,
+    isDisabled,
+  };
+
   const rootRef = useRef(null);
   const inputRef = useRef<HTMLInputElement | null>(null);
   const mergedRootRef = mergeRefs(ref as any, rootRef as any);
-  const ariaLabel = combinedProps['aria-label'] || combinedProps.value || 'Radio';
+  const ariaLabel = props['aria-label'] || props.value || 'Radio';
 
   const radio = useRadio(
     {
       ...combinedProps,
       'aria-label': ariaLabel,
-      isReadOnly: isReadOnly || radioGroupContext.state.isReadOnly,
-      isDisabled: combinedProps.isDisabled || radioGroupContext.state.isDisabled,
+      isReadOnly,
+      isDisabled,
     } as any,
     radioGroupContext.radioGroupState,
     (useInputRefForAria ? inputRef : rootRef) as any,
@@ -49,7 +56,7 @@ export function useRadioRoot(
     labelProps?: Record<string, unknown>;
   };
 
-  const { checked: isChecked, disabled: isDisabled } = inputProps;
+  const { checked: isChecked, disabled: isDisabledFromInput } = inputProps;
 
   const { hoverProps, isHovered } = useHover({}, rootRef);
 
@@ -60,7 +67,7 @@ export function useRadioRoot(
     inputProps,
     labelProps: labelProps ?? {},
     isChecked,
-    isDisabled,
+    isDisabled: isDisabledFromInput,
     isHovered,
     hoverProps,
     mergedRef: mergedRootRef,

package/src/range-calendar/RangeCalendarRoot.tsx

@@ -0,0 +1,213 @@
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ComponentRef,
+  type ReactNode,
+} from 'react';
+import { View, type ViewProps } from 'react-native';
+import {
+  normalizeDateRange,
+  resolveDateComponentLabels,
+  todayMonthId,
+  toMonthId,
+  type DateComponentLabels,
+  type DateId,
+  type MonthId,
+} from '@cdx-ui/formatters';
+import { useControllableState } from '@cdx-ui/utils';
+import { Slot } from '../slot';
+import { accessibleLabelAttributes, resolveAccessibleLabel } from '../utils/accessibleLabel';
+import { dataAttributes, mergeDataAttributes } from '../utils/dataAttributes';
+import type { CalendarView } from '../calendar/context';
+import { RangeCalendarContext, type RangeCalendarFocus } from './context';
+
+export interface RangeCalendarRootProps extends Omit<ViewProps, 'children'> {
+  asChild?: boolean;
+  children?: ReactNode;
+  className?: string;
+  startValue?: DateId;
+  endValue?: DateId;
+  defaultStartValue?: DateId;
+  defaultEndValue?: DateId;
+  onRangeChange?: (range: { startId?: DateId; endId?: DateId }) => void;
+  monthId?: MonthId;
+  defaultMonthId?: MonthId;
+  onMonthIdChange?: (monthId: MonthId) => void;
+  focusedField?: RangeCalendarFocus;
+  defaultFocusedField?: RangeCalendarFocus;
+  onFocusedFieldChange?: (field: RangeCalendarFocus) => void;
+  /** Earliest selectable date. Build with `dateId(...)` from `@cdx-ui/formatters`. */
+  minValue?: DateId;
+  /** Latest selectable date. Build with `dateId(...)` from `@cdx-ui/formatters`. */
+  maxValue?: DateId;
+  disabled?: boolean;
+  locale?: string;
+  labels?: Partial<DateComponentLabels>;
+  /** Accessible name for the range-calendar region. */
+  accessibilityLabel?: string;
+}
+
+export const RangeCalendarRoot = forwardRef<ComponentRef<typeof View>, RangeCalendarRootProps>(
+  (props, ref) => {
+    const {
+      asChild,
+      children,
+      startValue: startProp,
+      endValue: endProp,
+      defaultStartValue,
+      defaultEndValue,
+      onRangeChange,
+      monthId: monthIdProp,
+      defaultMonthId,
+      onMonthIdChange,
+      focusedField: focusedProp,
+      defaultFocusedField = 'start',
+      onFocusedFieldChange,
+      minValue,
+      maxValue,
+      disabled = false,
+      locale = 'en-US',
+      labels: labelsProp,
+      accessibilityLabel: accessibilityLabelProp,
+      'aria-label': ariaLabelProp,
+      ...rest
+    } = props;
+
+    const labels = useMemo(() => resolveDateComponentLabels(labelsProp), [labelsProp]);
+    const accessibilityLabel = resolveAccessibleLabel({
+      accessibilityLabel: accessibilityLabelProp,
+      'aria-label': ariaLabelProp,
+    });
+
+    const isRangeControlled = 'startValue' in props || 'endValue' in props;
+    const [uncontrolledStart, setUncontrolledStart] = useState<DateId | undefined>(
+      defaultStartValue,
+    );
+    const [uncontrolledEnd, setUncontrolledEnd] = useState<DateId | undefined>(defaultEndValue);
+
+    const startId = isRangeControlled ? startProp : uncontrolledStart;
+    const endId = isRangeControlled ? endProp : uncontrolledEnd;
+
+    const [monthId, setMonthId] = useControllableState<MonthId>({
+      prop: monthIdProp,
+      defaultProp:
+        defaultMonthId ??
+        (startId ? toMonthId(startId) : endId ? toMonthId(endId) : todayMonthId()),
+      onChange: onMonthIdChange,
+    });
+
+    const prevRangeRef = useRef({ startId, endId });
+    useEffect(() => {
+      if (monthIdProp !== undefined) {
+        prevRangeRef.current = { startId, endId };
+        return;
+      }
+      if (prevRangeRef.current.startId === startId && prevRangeRef.current.endId === endId) {
+        return;
+      }
+      prevRangeRef.current = { startId, endId };
+      const anchor = startId ?? endId;
+      if (anchor !== undefined) {
+        setMonthId(toMonthId(anchor));
+      }
+    }, [endId, monthIdProp, setMonthId, startId]);
+
+    const [focusedField, setFocusedField] = useControllableState<RangeCalendarFocus>({
+      prop: focusedProp,
+      defaultProp: defaultFocusedField,
+      onChange: onFocusedFieldChange,
+    });
+
+    const [view, setViewState] = useState<CalendarView>('month');
+
+    const setView = useCallback((next: CalendarView) => {
+      setViewState(next);
+    }, []);
+
+    const onDayPress = useCallback(
+      (dateId: DateId) => {
+        if (disabled) {
+          return;
+        }
+
+        let next: { startId: DateId; endId?: DateId };
+
+        // Empty or complete range → start a new selection at this day.
+        if (!startId || endId) {
+          next = { startId: dateId, endId: undefined };
+          setFocusedField('end');
+        } else {
+          // Incomplete range (start only) → set end and normalize order.
+          next = normalizeDateRange({ startId, endId: dateId });
+          setFocusedField('start');
+        }
+
+        if (!isRangeControlled) {
+          setUncontrolledStart(next.startId);
+          setUncontrolledEnd(next.endId);
+        }
+        onRangeChange?.(next);
+      },
+      [disabled, endId, isRangeControlled, onRangeChange, setFocusedField, startId],
+    );
+
+    const contextValue = useMemo(
+      () => ({
+        startId,
+        endId,
+        onRangeChange,
+        monthId: monthId ?? todayMonthId(),
+        onMonthIdChange: setMonthId,
+        focusedField: focusedField ?? 'start',
+        onFocusedFieldChange: setFocusedField,
+        minValue,
+        maxValue,
+        disabled,
+        locale,
+        labels,
+        onDayPress,
+        view,
+        setView,
+      }),
+      [
+        startId,
+        endId,
+        onRangeChange,
+        monthId,
+        setMonthId,
+        focusedField,
+        setFocusedField,
+        minValue,
+        maxValue,
+        disabled,
+        locale,
+        labels,
+        onDayPress,
+        view,
+        setView,
+      ],
+    );
+
+    const Comp = asChild ? Slot : View;
+
+    return (
+      <RangeCalendarContext.Provider value={contextValue}>
+        <Comp
+          ref={ref}
+          accessibilityRole="none"
+          {...rest}
+          {...mergeDataAttributes(rest, dataAttributes({ disabled }))}
+          {...accessibleLabelAttributes(accessibilityLabel)}
+        >
+          {children}
+        </Comp>
+      </RangeCalendarContext.Provider>
+    );
+  },
+);
+
+RangeCalendarRoot.displayName = 'RangeCalendarRoot';

package/src/range-calendar/context.tsx

@@ -0,0 +1,33 @@
+import { createContext, useContext } from 'react';
+import type { DateComponentLabels, DateId, MonthId } from '@cdx-ui/formatters';
+import type { CalendarView } from '../calendar/context';
+
+export type RangeCalendarFocus = 'start' | 'end';
+
+export interface RangeCalendarContextValue {
+  startId?: DateId;
+  endId?: DateId;
+  onRangeChange?: (range: { startId?: DateId; endId?: DateId }) => void;
+  monthId: MonthId;
+  onMonthIdChange: (monthId: MonthId) => void;
+  focusedField: RangeCalendarFocus;
+  onFocusedFieldChange: (field: RangeCalendarFocus) => void;
+  minValue?: DateId;
+  maxValue?: DateId;
+  disabled: boolean;
+  locale: string;
+  labels: DateComponentLabels;
+  onDayPress: (dateId: DateId) => void;
+  view: CalendarView;
+  setView: (view: CalendarView) => void;
+}
+
+export const RangeCalendarContext = createContext<RangeCalendarContextValue | null>(null);
+
+export function useRangeCalendarContext(): RangeCalendarContextValue {
+  const ctx = useContext(RangeCalendarContext);
+  if (!ctx) {
+    throw new Error('RangeCalendar compound components must be used within RangeCalendarRoot');
+  }
+  return ctx;
+}

package/src/range-calendar/index.ts

@@ -0,0 +1,4 @@
+export { RangeCalendarRoot } from './RangeCalendarRoot';
+export type { RangeCalendarRootProps } from './RangeCalendarRoot';
+export { useRangeCalendarContext } from './context';
+export type { RangeCalendarFocus } from './context';

package/src/select/SelectRoot.tsx

@@ -28,7 +28,7 @@ export const SelectRoot = forwardRef<ComponentRef<typeof View>, SelectRootProps>
       value: valueProp,
       defaultValue,
       onValueChange,
-      open: openProp,
+      isOpen: openProp,
       defaultOpen = false,
       onOpenChange,
       disabled = false,

package/src/select/types.ts

@@ -17,7 +17,8 @@ export interface ISelectProps {
   value?: string;
   defaultValue?: string;
   onValueChange?: (value: string) => void;
-  open?: boolean;
+  /** Controlled open state. Use `defaultOpen` for the uncontrolled variant. */
+  isOpen?: boolean;
   defaultOpen?: boolean;
   onOpenChange?: (open: boolean) => void;
   disabled?: boolean;