@cdx-ui/primitives 0.0.1-beta.141 → 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,