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

package/lib/commonjs/checkbox/CheckboxRoot.web.js

@@ -7,12 +7,21 @@ exports.CheckboxRoot = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
 var _visuallyHidden = require("@react-aria/visually-hidden");
+var _utils = require("@cdx-ui/utils");
 var _focus = require("@react-native-aria/focus");
 var _slot = require("../slot");
 var _dataAttributes = require("../utils/dataAttributes");
 var _context = require("./context");
 var _useCheckboxRoot = require("./useCheckboxRoot");
 var _jsxRuntime = require("react/jsx-runtime");
+/**
+ * Web Checkbox root.
+ *
+ * On web, `@react-native-aria/checkbox` re-exports `@react-aria/checkbox`'s
+ * `useCheckbox`, whose `inputProps` target a native `<input type="checkbox">`
+ * (selection via `onChange`). Toggle must be applied explicitly on the Pressable —
+ * `inputProps.onPress` does **not** call `toggleState.toggle()`.
+ */
 const CheckboxRoot = exports.CheckboxRoot = /*#__PURE__*/(0, _react.forwardRef)(({
   asChild,
   children,
@@ -39,7 +48,8 @@ const CheckboxRoot = exports.CheckboxRoot = /*#__PURE__*/(0, _react.forwardRef)(
     isDisabled,
     isHovered,
     mergedRef,
-    inputRef
+    inputRef,
+    toggle
   } = (0, _useCheckboxRoot.useCheckboxRoot)(props, ref, {
     useInputRefForAria: true
   });
@@ -47,46 +57,99 @@ const CheckboxRoot = exports.CheckboxRoot = /*#__PURE__*/(0, _react.forwardRef)(
     focusProps,
     isFocusVisible
   } = (0, _focus.useFocusRing)();
+
+  // 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
+  } = groupItemInputProps;
+  const resolvedChecked = !!(isChecked || isCheckedProp);
+  const resolvedIndeterminate = !!(isIndeterminate || isIndeterminateProp);
+  const resolvedDisabled = !!(isDisabled || isDisabledProp);
+  const resolvedReadOnly = !!(isReadOnly || isReadOnlyProp);
+  const ariaChecked = resolvedIndeterminate ? 'mixed' : resolvedChecked;
+  const handleToggle = () => {
+    if (resolvedDisabled || resolvedReadOnly) {
+      return;
+    }
+    toggle();
+  };
+  const handleKeyDown = event => {
+    if (event.key === ' ' || event.key === 'Spacebar') {
+      event.preventDefault();
+      handleToggle();
+    }
+  };
   const contextValue = {
-    isChecked: isChecked || isCheckedProp,
-    isDisabled: isDisabled || isDisabledProp,
+    isChecked: resolvedChecked,
+    isDisabled: resolvedDisabled,
     isFocusVisible: isFocusVisible || isFocusVisibleProp,
     isHovered: isHovered || isHoveredProp,
     isInvalid: isInvalid || isInvalidProp,
-    isReadOnly: isReadOnly || isReadOnlyProp,
-    isIndeterminate: isIndeterminate || isIndeterminateProp,
+    isReadOnly: resolvedReadOnly,
+    isIndeterminate: resolvedIndeterminate,
     isPressed,
     isFocused
   };
   const Comp = asChild ? _slot.Slot : _reactNative.Pressable;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.CheckboxProvider, {
     value: contextValue,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Comp, {
-      ...combinedProps,
-      ref: mergedRef,
-      tabIndex: -1,
-      role: "label"
-      // eslint-disable-next-line react-native-a11y/has-valid-accessibility-role
-      ,
-      accessibilityRole: "label",
-      ...(0, _dataAttributes.mergeDataAttributes)(props, (0, _dataAttributes.dataAttributes)({
-        checked: isChecked || isCheckedProp,
-        disabled: isDisabled || isDisabledProp,
-        hover: isHovered || isHoveredProp,
-        invalid: isInvalid || isInvalidProp,
-        readonly: isReadOnly || isReadOnlyProp,
-        active: isPressed,
-        focus: isFocused,
-        indeterminate: isIndeterminate || isIndeterminateProp,
-        focusVisible: isFocusVisible
-      })),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_visuallyHidden.VisuallyHidden, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
-          ...groupItemInputProps,
-          ...focusProps,
-          ref: inputRef
+          ref: inputRef,
+          type: "checkbox",
+          value: combinedProps.value,
+          checked: resolvedChecked,
+          disabled: resolvedDisabled,
+          tabIndex: -1,
+          "aria-hidden": true,
+          readOnly: true,
+          style: {
+            pointerEvents: 'none'
+          }
         })
-      }), children]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
+        ...combinedProps,
+        ...inputAriaProps,
+        ref: mergedRef,
+        role: "checkbox",
+        "aria-checked": ariaChecked,
+        "aria-disabled": resolvedDisabled || undefined,
+        accessibilityRole: "checkbox",
+        accessibilityState: {
+          checked: resolvedIndeterminate ? 'mixed' : resolvedChecked,
+          disabled: resolvedDisabled
+        },
+        tabIndex: resolvedDisabled ? -1 : 0,
+        disabled: resolvedDisabled,
+        ...focusProps,
+        onPress: handleToggle,
+        onClick: handleToggle,
+        onKeyDown: (0, _utils.composeEventHandlers)(combinedProps.onKeyDown, handleKeyDown),
+        ...(0, _dataAttributes.mergeDataAttributes)(props, (0, _dataAttributes.dataAttributes)({
+          checked: resolvedChecked,
+          disabled: resolvedDisabled,
+          hover: isHovered || isHoveredProp,
+          invalid: isInvalid || isInvalidProp,
+          readonly: resolvedReadOnly,
+          active: isPressed,
+          focus: isFocused,
+          indeterminate: resolvedIndeterminate,
+          focusVisible: isFocusVisible || isFocusVisibleProp
+        })),
+        children: children
+      })]
     })
   });
 });

package/lib/commonjs/checkbox/CheckboxRoot.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_visuallyHidden","_focus","_slot","_dataAttributes","_context","_useCheckboxRoot","_jsxRuntime","CheckboxRoot","exports","forwardRef","asChild","children","props","ref","isHovered","isHoveredProp","isFocusVisible","isFocusVisibleProp","isChecked","isCheckedProp","isDisabled","isDisabledProp","isInvalid","isInvalidProp","isReadOnly","isReadOnlyProp","isIndeterminate","isIndeterminateProp","isFocused","isPressed","combinedProps","groupItemInputProps","mergedRef","inputRef","useCheckboxRoot","useInputRefForAria","focusProps","useFocusRing","contextValue","Comp","Slot","Pressable","jsx","CheckboxProvider","value","jsxs","tabIndex","role","accessibilityRole","mergeDataAttributes","dataAttributes","checked","disabled","hover","invalid","readonly","active","focus","indeterminate","focusVisible","VisuallyHidden","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxRoot.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_visuallyHidden","_utils","_focus","_slot","_dataAttributes","_context","_useCheckboxRoot","_jsxRuntime","CheckboxRoot","exports","forwardRef","asChild","children","props","ref","isHovered","isHoveredProp","isFocusVisible","isFocusVisibleProp","isChecked","isCheckedProp","isDisabled","isDisabledProp","isInvalid","isInvalidProp","isReadOnly","isReadOnlyProp","isIndeterminate","isIndeterminateProp","isFocused","isPressed","combinedProps","groupItemInputProps","mergedRef","inputRef","toggle","useCheckboxRoot","useInputRefForAria","focusProps","useFocusRing","onPress","_onPress","onChange","_onChange","role","_role","tabIndex","_tabIndex","disabled","_disabled","checked","_checked","value","_value","type","_type","name","_name","form","_form","required","_required","inputAriaProps","resolvedChecked","resolvedIndeterminate","resolvedDisabled","resolvedReadOnly","ariaChecked","handleToggle","handleKeyDown","event","key","preventDefault","contextValue","Comp","Slot","Pressable","jsx","CheckboxProvider","jsxs","Fragment","VisuallyHidden","readOnly","style","pointerEvents","undefined","accessibilityRole","accessibilityState","onClick","onKeyDown","composeEventHandlers","mergeDataAttributes","dataAttributes","hover","invalid","readonly","active","focus","indeterminate","focusVisible","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxRoot.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/checkbox/useCheckboxRoot.js

@@ -14,27 +14,35 @@ function useCheckboxRoot(props, ref, {
   useInputRefForAria = false
 } = {}) {
   const formControlContext = (0, _utils.useFormControlContext)();
-  const {
+  const checkboxGroupContext = (0, _react.useContext)(_context.CheckboxGroupContext);
+
+  // Only pull field-state flags from FormControl — never spread the whole context
+  // (ids, setters, htmlProps) onto the host element.
+  const isInvalid = props.isInvalid ?? formControlContext.isInvalid;
+  const isReadOnly = props.isReadOnly ?? formControlContext.isReadOnly ?? checkboxGroupContext?.state.isReadOnly;
+  const isDisabled = props.isDisabled ?? formControlContext.isDisabled ?? checkboxGroupContext?.state.isDisabled;
+  const isIndeterminate = props.isIndeterminate;
+  const combinedProps = {
+    ...props,
     isInvalid,
     isReadOnly,
-    isIndeterminate,
-    ...combinedProps
-  } = {
-    ...formControlContext,
-    ...props
+    isDisabled,
+    isIndeterminate
   };
-  const checkboxGroupContext = (0, _react.useContext)(_context.CheckboxGroupContext);
   const state = (0, _toggle.useToggleState)({
-    ...combinedProps,
     defaultSelected: props.defaultIsChecked,
-    isSelected: props.isChecked
+    isSelected: props.isChecked,
+    onChange: props.onChange,
+    isReadOnly,
+    isDisabled
   });
   const rootRef = (0, _react.useRef)(null);
   const inputRef = (0, _react.useRef)(null);
   const mergedRootRef = (0, _utils.mergeRefs)(ref, rootRef);
-  const ariaLabel = combinedProps['aria-label'] || combinedProps.value || 'Checkbox';
+  const ariaLabel = props['aria-label'] || props.value || 'Checkbox';
   const groupToggleState = (0, _toggle.useToggleState)(checkboxGroupContext ? {
-    isReadOnly: isReadOnly || checkboxGroupContext.state.isReadOnly,
+    isReadOnly: !!isReadOnly,
+    isDisabled: !!isDisabled,
     isSelected: checkboxGroupContext.state.isSelected(combinedProps.value),
     onChange(isSelected) {
       if (isSelected) {
@@ -47,24 +55,29 @@ function useCheckboxRoot(props, ref, {
   } : {
     isSelected: false
   });
+  const toggleState = checkboxGroupContext ? groupToggleState : state;
   const {
     inputProps: groupItemInputProps
   } = (0, _checkbox.useCheckbox)({
     ...combinedProps,
     'aria-label': ariaLabel,
-    ...(checkboxGroupContext && {
-      isReadOnly: isReadOnly || checkboxGroupContext.state.isReadOnly,
-      isDisabled: combinedProps.isDisabled || checkboxGroupContext.state.isDisabled
-    })
-  }, checkboxGroupContext ? groupToggleState : state, useInputRefForAria ? inputRef : rootRef);
+    isReadOnly: !!isReadOnly,
+    isDisabled: !!isDisabled
+  }, toggleState, useInputRefForAria ? inputRef : rootRef);
   const {
     checked: isChecked,
-    disabled: isDisabled
+    disabled: isDisabledFromInput
   } = groupItemInputProps;
   const {
     hoverProps,
     isHovered
   } = (0, _interactions.useHover)({}, rootRef);
+  const toggle = (0, _react.useCallback)(() => {
+    if (isDisabled || isReadOnly) {
+      return;
+    }
+    toggleState.toggle();
+  }, [isDisabled, isReadOnly, toggleState]);
   return {
     combinedProps,
     isInvalid,
@@ -72,11 +85,12 @@ function useCheckboxRoot(props, ref, {
     isIndeterminate,
     groupItemInputProps,
     isChecked,
-    isDisabled,
+    isDisabled: isDisabledFromInput,
     isHovered,
     hoverProps,
     mergedRef: mergedRootRef,
-    inputRef
+    inputRef,
+    toggle
   };
 }
 //# sourceMappingURL=useCheckboxRoot.js.map

package/lib/commonjs/checkbox/useCheckboxRoot.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_utils","_checkbox","_interactions","_toggle","_context","useCheckboxRoot","props","ref","useInputRefForAria","formControlContext","useFormControlContext","isInvalid","isReadOnly","isIndeterminate","combinedProps","checkboxGroupContext","useContext","CheckboxGroupContext","state","useToggleState","defaultSelected","defaultIsChecked","isSelected","isChecked","rootRef","useRef","inputRef","mergedRootRef","mergeRefs","ariaLabel","value","groupToggleState","onChange","addValue","removeValue","inputProps","groupItemInputProps","useCheckbox","isDisabled","checked","disabled","hoverProps","isHovered","useHover","mergedRef"],"sourceRoot":"../../../src","sources":["checkbox/useCheckboxRoot.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_utils","_checkbox","_interactions","_toggle","_context","useCheckboxRoot","props","ref","useInputRefForAria","formControlContext","useFormControlContext","checkboxGroupContext","useContext","CheckboxGroupContext","isInvalid","isReadOnly","state","isDisabled","isIndeterminate","combinedProps","useToggleState","defaultSelected","defaultIsChecked","isSelected","isChecked","onChange","rootRef","useRef","inputRef","mergedRootRef","mergeRefs","ariaLabel","value","groupToggleState","addValue","removeValue","toggleState","inputProps","groupItemInputProps","useCheckbox","checked","disabled","isDisabledFromInput","hoverProps","isHovered","useHover","toggle","useCallback","mergedRef"],"sourceRoot":"../../../src","sources":["checkbox/useCheckboxRoot.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAL,OAAA;AAOO,SAASM,eAAeA,CAC7BC,KAAqB,EACrBC,GAAwB,EACxB;EAAEC,kBAAkB,GAAG;AAA8B,CAAC,GAAG,CAAC,CAAC,EAC3D;EACA,MAAMC,kBAAkB,GAAG,IAAAC,4BAAqB,EAAC,CAAC;EAClD,MAAMC,oBAAoB,GAAG,IAAAC,iBAAU,EAACC,6BAAoB,CAAC;;EAE7D;EACA;EACA,MAAMC,SAAS,GAAGR,KAAK,CAACQ,SAAS,IAAIL,kBAAkB,CAACK,SAAS;EACjE,MAAMC,UAAU,GACdT,KAAK,CAACS,UAAU,IAAIN,kBAAkB,CAACM,UAAU,IAAIJ,oBAAoB,EAAEK,KAAK,CAACD,UAAU;EAC7F,MAAME,UAAU,GACdX,KAAK,CAACW,UAAU,IAAIR,kBAAkB,CAACQ,UAAU,IAAIN,oBAAoB,EAAEK,KAAK,CAACC,UAAU;EAC7F,MAAMC,eAAe,GAAGZ,KAAK,CAACY,eAAe;EAE7C,MAAMC,aAAa,GAAG;IACpB,GAAGb,KAAK;IACRQ,SAAS;IACTC,UAAU;IACVE,UAAU;IACVC;EACF,CAAC;EAED,MAAMF,KAAK,GAAG,IAAAI,sBAAc,EAAC;IAC3BC,eAAe,EAAEf,KAAK,CAACgB,gBAAgB;IACvCC,UAAU,EAAEjB,KAAK,CAACkB,SAAS;IAC3BC,QAAQ,EAAEnB,KAAK,CAACmB,QAAQ;IACxBV,UAAU;IACVE;EACF,CAAC,CAAC;EAEF,MAAMS,OAAO,GAAG,IAAAC,aAAM,EAAC,IAAI,CAAC;EAC5B,MAAMC,QAAQ,GAAG,IAAAD,aAAM,EAA0B,IAAI,CAAC;EACtD,MAAME,aAAa,GAAG,IAAAC,gBAAS,EAACvB,GAAG,EAASmB,OAAc,CAAC;EAC3D,MAAMK,SAAS,GAAGzB,KAAK,CAAC,YAAY,CAAC,IAAIA,KAAK,CAAC0B,KAAK,IAAI,UAAU;EAElE,MAAMC,gBAAgB,GAAG,IAAAb,sBAAc,EACrCT,oBAAoB,GAChB;IACEI,UAAU,EAAE,CAAC,CAACA,UAAU;IACxBE,UAAU,EAAE,CAAC,CAACA,UAAU;IACxBM,UAAU,EAAEZ,oBAAoB,CAACK,KAAK,CAACO,UAAU,CAACJ,aAAa,CAACa,KAAK,CAAC;IACtEP,QAAQA,CAACF,UAAmB,EAAE;MAC5B,IAAIA,UAAU,EAAE;QACdZ,oBAAoB,CAACK,KAAK,CAACkB,QAAQ,CAACf,aAAa,CAACa,KAAK,CAAC;MAC1D,CAAC,MAAM;QACLrB,oBAAoB,CAACK,KAAK,CAACmB,WAAW,CAAChB,aAAa,CAACa,KAAK,CAAC;MAC7D;MACAb,aAAa,CAACM,QAAQ,GAAGF,UAAU,CAAC;IACtC;EACF,CAAC,GACD;IAAEA,UAAU,EAAE;EAAM,CAC1B,CAAC;EAED,MAAMa,WAAW,GAAGzB,oBAAoB,GAAGsB,gBAAgB,GAAGjB,KAAK;EAEnE,MAAM;IAAEqB,UAAU,EAAEC;EAAoB,CAAC,GAAG,IAAAC,qBAAW,EACrD;IACE,GAAGpB,aAAa;IAChB,YAAY,EAAEY,SAAS;IACvBhB,UAAU,EAAE,CAAC,CAACA,UAAU;IACxBE,UAAU,EAAE,CAAC,CAACA;EAChB,CAAC,EACDmB,WAAW,EACV5B,kBAAkB,GAAGoB,QAAQ,GAAGF,OACnC,CAAC;EAED,MAAM;IAAEc,OAAO,EAAEhB,SAAS;IAAEiB,QAAQ,EAAEC;EAAoB,CAAC,GAAGJ,mBAAmB;EAEjF,MAAM;IAAEK,UAAU;IAAEC;EAAU,CAAC,GAAG,IAAAC,sBAAQ,EAAC,CAAC,CAAC,EAAEnB,OAAO,CAAC;EAEvD,MAAMoB,MAAM,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAC/B,IAAI9B,UAAU,IAAIF,UAAU,EAAE;MAC5B;IACF;IACAqB,WAAW,CAACU,MAAM,CAAC,CAAC;EACtB,CAAC,EAAE,CAAC7B,UAAU,EAAEF,UAAU,EAAEqB,WAAW,CAAC,CAAC;EAEzC,OAAO;IACLjB,aAAa;IACbL,SAAS;IACTC,UAAU;IACVG,eAAe;IACfoB,mBAAmB;IACnBd,SAAS;IACTP,UAAU,EAAEyB,mBAAmB;IAC/BE,SAAS;IACTD,UAAU;IACVK,SAAS,EAAEnB,aAAa;IACxBD,QAAQ;IACRkB;EACF,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/radio/RadioGroup.js

@@ -12,6 +12,7 @@ var _radio2 = require("@react-stately/radio");
 var _slot = require("../slot");
 var _dataAttributes = require("../utils/dataAttributes");
 var _context = require("./context");
+var _useRadioGroupNavigation = require("./useRadioGroupNavigation");
 var _jsxRuntime = require("react/jsx-runtime");
 const RadioGroup = exports.RadioGroup = /*#__PURE__*/(0, _react.forwardRef)(({
   asChild,
@@ -20,25 +21,66 @@ const RadioGroup = exports.RadioGroup = /*#__PURE__*/(0, _react.forwardRef)(({
   style,
   ...props
 }, ref) => {
-  const formControlContext = (0, _utils.useFormControlContext)();
-  const combinedProps = {
-    ...formControlContext,
-    ...props
-  };
+  const formControlProps = (0, _utils.useFormControl)({
+    isDisabled: props.isDisabled,
+    isRequired: props.isRequired,
+    isInvalid: props.isInvalid,
+    isReadOnly: props.isReadOnly
+  });
+  const isDisabled = props.isDisabled ?? Boolean(formControlProps.disabled);
+  const isInvalid = props.isInvalid ?? Boolean(formControlProps['aria-invalid']);
+  const isRequired = props.isRequired ?? Boolean(formControlProps.required);
+  const isReadOnly = props.isReadOnly ?? Boolean(formControlProps.readOnly);
+  const name = props.name ?? formControlProps.name;
+  const ariaLabel = props['aria-label'];
+  const ariaLabelledBy = props['aria-labelledby'] ?? formControlProps['aria-labelledby'];
+  const ariaDescribedBy = formControlProps['aria-describedby'];
   const radioGroupState = (0, _radio2.useRadioGroupState)({
-    ...combinedProps,
-    validationState: combinedProps.isInvalid ? 'invalid' : 'valid'
+    name,
+    value: props.value,
+    defaultValue: props.defaultValue,
+    onChange: props.onChange,
+    isDisabled,
+    isInvalid,
+    isRequired,
+    isReadOnly,
+    validationState: isInvalid ? 'invalid' : 'valid'
   });
   const {
     radioGroupProps
   } = (0, _radio.useRadioGroup)({
-    ...combinedProps,
-    'aria-label': combinedProps['aria-label']
+    'aria-label': ariaLabel,
+    'aria-labelledby': ariaLabelledBy,
+    isDisabled
   }, radioGroupState);
-  const isDisabled = combinedProps.isDisabled ?? false;
-  const isInvalid = combinedProps.isInvalid ?? false;
-  const isRequired = combinedProps.isRequired ?? false;
-  const isReadOnly = combinedProps.isReadOnly ?? false;
+  const [focusedValue, setFocusedValue] = (0, _react.useState)(undefined);
+  // Identity of getRadios depends on this so roving tabIndex recomputes after register/unregister.
+  const [registrationEpoch, setRegistrationEpoch] = (0, _react.useState)(0);
+  const radiosRef = (0, _react.useRef)(new Map());
+  (0, _react.useEffect)(() => {
+    setFocusedValue(prev => prev !== undefined && prev !== radioGroupState.selectedValue ? undefined : prev);
+  }, [radioGroupState.selectedValue]);
+  const registerRadio = (0, _react.useCallback)((value, entry) => {
+    radiosRef.current.set(value, entry);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const unregisterRadio = (0, _react.useCallback)(value => {
+    radiosRef.current.delete(value);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const getRadios = (0, _react.useCallback)(() => Array.from(radiosRef.current.entries()), [registrationEpoch]);
+  const {
+    handleKeyDown
+  } = (0, _useRadioGroupNavigation.useRadioGroupNavigation)({
+    getRadios,
+    focusedValue,
+    setFocusedValue,
+    selectedValue: radioGroupState.selectedValue,
+    selectValue: value => radioGroupState.setSelectedValue(value)
+  });
+  const webProps = _reactNative.Platform.OS === 'web' ? {
+    onKeyDown: (0, _utils.composeEventHandlers)(props.onKeyDown, handleKeyDown)
+  } : {};
   const Comp = asChild ? _slot.Slot : _reactNative.View;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.RadioGroupContext.Provider, {
     value: {
@@ -51,17 +93,24 @@ const RadioGroup = exports.RadioGroup = /*#__PURE__*/(0, _react.forwardRef)(({
         selectValue: value => radioGroupState.setSelectedValue(value)
       },
       radioGroupState,
-      name: combinedProps.name
+      name,
+      focusedValue,
+      setFocusedValue,
+      registerRadio,
+      unregisterRadio,
+      getRadios
     },
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
       ...radioGroupProps,
-      "aria-label": combinedProps['aria-label'],
-      "aria-labelledby": combinedProps['aria-labelledby'],
+      "aria-label": ariaLabel,
+      "aria-labelledby": ariaLabelledBy,
+      "aria-describedby": ariaDescribedBy,
       "aria-required": isRequired || undefined,
       "aria-readonly": isReadOnly || undefined,
       className: className,
       style: style,
       ref: ref,
+      ...webProps,
       ...(0, _dataAttributes.mergeDataAttributes)(props, (0, _dataAttributes.dataAttributes)({
         disabled: isDisabled,
         invalid: isInvalid

package/lib/commonjs/radio/RadioGroup.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_utils","_radio","_radio2","_slot","_dataAttributes","_context","_jsxRuntime","RadioGroup","exports","forwardRef","asChild","children","className","style","props","ref","formControlContext","useFormControlContext","combinedProps","radioGroupState","useRadioGroupState","validationState","isInvalid","radioGroupProps","useRadioGroup","isDisabled","isRequired","isReadOnly","Comp","Slot","View","jsx","RadioGroupContext","Provider","value","state","isSelected","selectedValue","selectValue","setSelectedValue","name","undefined","mergeDataAttributes","dataAttributes","disabled","invalid","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioGroup.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AACA,IAAAO,QAAA,GAAAP,OAAA;AAA8C,IAAAQ,WAAA,GAAAR,OAAA;AASvC,MAAMS,UAAU,GAAAC,OAAA,CAAAD,UAAA,gBAAG,IAAAE,iBAAU,EAClC,CAAC;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,kBAAkB,GAAG,IAAAC,4BAAqB,EAAC,CAAC;EAElD,MAAMC,aAAa,GAAG;IACpB,GAAGF,kBAAkB;IACrB,GAAGF;EACL,CAAC;EAED,MAAMK,eAAe,GAAG,IAAAC,0BAAkB,EAAC;IACzC,GAAGF,aAAa;IAChBG,eAAe,EAAEH,aAAa,CAACI,SAAS,GAAG,SAAS,GAAG;EACzD,CAAC,CAAC;EAEF,MAAM;IAAEC;EAAgB,CAAC,GAAG,IAAAC,oBAAa,EACvC;IACE,GAAGN,aAAa;IAChB,YAAY,EAAEA,aAAa,CAAC,YAAY;EAC1C,CAAC,EACDC,eACF,CAAC;EAED,MAAMM,UAAU,GAAGP,aAAa,CAACO,UAAU,IAAI,KAAK;EACpD,MAAMH,SAAS,GAAGJ,aAAa,CAACI,SAAS,IAAI,KAAK;EAClD,MAAMI,UAAU,GAAGR,aAAa,CAACQ,UAAU,IAAI,KAAK;EACpD,MAAMC,UAAU,GAAGT,aAAa,CAACS,UAAU,IAAI,KAAK;EAEpD,MAAMC,IAAI,GAAGlB,OAAO,GAAGmB,UAAI,GAAGC,iBAAI;EAElC,oBACE,IAAAxB,WAAA,CAAAyB,GAAA,EAAC1B,QAAA,CAAA2B,iBAAiB,CAACC,QAAQ;IACzBC,KAAK,EAAE;MACLC,KAAK,EAAE;QACLV,UAAU;QACVH,SAAS;QACTI,UAAU;QACVC,UAAU;QACVS,UAAU,EAAGF,KAAa,IAAKf,eAAe,CAACkB,aAAa,KAAKH,KAAK;QACtEI,WAAW,EAAGJ,KAAa,IAAKf,eAAe,CAACoB,gBAAgB,CAACL,KAAK;MACxE,CAAC;MACDf,eAAe;MACfqB,IAAI,EAAEtB,aAAa,CAACsB;IACtB,CAAE;IAAA7B,QAAA,eAEF,IAAAL,WAAA,CAAAyB,GAAA,EAACH,IAAI;MAAA,GACCL,eAAe;MACnB,cAAYL,aAAa,CAAC,YAAY,CAAE;MACxC,mBAAiBA,aAAa,CAAC,iBAAiB,CAAE;MAClD,iBAAeQ,UAAU,IAAIe,SAAU;MACvC,iBAAed,UAAU,IAAIc,SAAU;MACvC7B,SAAS,EAAEA,SAAU;MACrBC,KAAK,EAAEA,KAAM;MACbE,GAAG,EAAEA,GAAI;MAAA,GACL,IAAA2B,mCAAmB,EACrB5B,KAAK,EACL,IAAA6B,8BAAc,EAAC;QACbC,QAAQ,EAAEnB,UAAU;QACpBoB,OAAO,EAAEvB;MACX,CAAC,CACH,CAAC;MAAAX,QAAA,EAEAA;IAAQ,CACL;EAAC,CACmB,CAAC;AAEjC,CACF,CAAC;AAEDJ,UAAU,CAACuC,WAAW,GAAG,YAAY","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_utils","_radio","_radio2","_slot","_dataAttributes","_context","_useRadioGroupNavigation","_jsxRuntime","RadioGroup","exports","forwardRef","asChild","children","className","style","props","ref","formControlProps","useFormControl","isDisabled","isRequired","isInvalid","isReadOnly","Boolean","disabled","required","readOnly","name","ariaLabel","ariaLabelledBy","ariaDescribedBy","radioGroupState","useRadioGroupState","value","defaultValue","onChange","validationState","radioGroupProps","useRadioGroup","focusedValue","setFocusedValue","useState","undefined","registrationEpoch","setRegistrationEpoch","radiosRef","useRef","Map","useEffect","prev","selectedValue","registerRadio","useCallback","entry","current","set","epoch","unregisterRadio","delete","getRadios","Array","from","entries","handleKeyDown","useRadioGroupNavigation","selectValue","setSelectedValue","webProps","Platform","OS","onKeyDown","composeEventHandlers","Comp","Slot","View","jsx","RadioGroupContext","Provider","state","isSelected","mergeDataAttributes","dataAttributes","invalid","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioGroup.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/radio/RadioRoot.web.js

@@ -7,15 +7,22 @@ exports.RadioRoot = void 0;
 var _react = require("react");
 var _reactNative = require("react-native");
 var _visuallyHidden = require("@react-aria/visually-hidden");
-var _utils = require("@react-aria/utils");
+var _utils = require("@cdx-ui/utils");
 var _focus = require("@react-native-aria/focus");
 var _slot = require("../slot");
 var _dataAttributes = require("../utils/dataAttributes");
 var _context = require("./context");
 var _useRadioRoot = require("./useRadioRoot");
+var _useRadioGroupNavigation = require("./useRadioGroupNavigation");
 var _jsxRuntime = require("react/jsx-runtime");
-// TODO: Keyboard focus is not working as expected
-
+/**
+ * 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`.
+ */
 const RadioRoot = exports.RadioRoot = /*#__PURE__*/(0, _react.forwardRef)(({
   asChild,
   children,
@@ -30,12 +37,12 @@ const RadioRoot = exports.RadioRoot = /*#__PURE__*/(0, _react.forwardRef)(({
     isFocused,
     isPressed
   } = props;
+  const radioGroupContext = (0, _react.useContext)(_context.RadioGroupContext);
   const {
     combinedProps,
     isInvalid,
     isReadOnly,
     inputProps,
-    labelProps,
     isChecked,
     isDisabled,
     isHovered,
@@ -48,42 +55,123 @@ const RadioRoot = exports.RadioRoot = /*#__PURE__*/(0, _react.forwardRef)(({
     focusProps,
     isFocusVisible
   } = (0, _focus.useFocusRing)();
+  const nodeRef = (0, _react.useRef)(null);
+  const setRefs = (0, _utils.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;
+  (0, _react.useEffect)(() => {
+    if (!registerRadio || !unregisterRadio) {
+      return;
+    }
+    registerRadio(combinedProps.value, {
+      disabled: !!resolvedDisabled,
+      node: nodeRef.current
+    });
+    return () => unregisterRadio(combinedProps.value);
+  }, [combinedProps.value, resolvedDisabled, registerRadio, unregisterRadio]);
+  const isRovingTabStop = (0, _react.useMemo)(() => {
+    if (resolvedDisabled) {
+      return false;
+    }
+    const enabledRadios = getRadios?.().filter(([, entry]) => !entry.disabled) ?? [];
+    const rovingValue = (0, _useRadioGroupNavigation.getRovingFocusValue)(focusedValue, selectedValue, enabledRadios);
+    return combinedProps.value === rovingValue;
+  }, [combinedProps.value, focusedValue, getRadios, resolvedDisabled, selectedValue]);
+  const handleKeyDown = event => {
+    if (event.key === ' ' || event.key === 'Spacebar') {
+      event.preventDefault();
+      selectThis();
+    }
+  };
   const contextValue = {
     isChecked,
-    isDisabled: isDisabled || isDisabledProp,
+    isDisabled: resolvedDisabled,
     isFocusVisible: isFocusVisible || isFocusVisibleProp,
     isHovered: isHovered || isHoveredProp,
     isInvalid: isInvalid || isInvalidProp,
-    isReadOnly: isReadOnly || isReadOnlyProp,
+    isReadOnly: resolvedReadOnly,
     isPressed,
     isFocused
   };
   const Comp = asChild ? _slot.Slot : _reactNative.Pressable;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.RadioProvider, {
     value: contextValue,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Comp, {
-      ...(0, _utils.mergeProps)(combinedProps, labelProps, focusProps),
-      ref: mergedRef,
-      role: "label"
-      // eslint-disable-next-line react-native-a11y/has-valid-accessibility-role
-      ,
-      accessibilityRole: "label",
-      ...(0, _dataAttributes.mergeDataAttributes)(props, (0, _dataAttributes.dataAttributes)({
-        checked: isChecked,
-        disabled: isDisabled || isDisabledProp,
-        hover: isHovered || isHoveredProp,
-        invalid: isInvalid || isInvalidProp,
-        readonly: isReadOnly || isReadOnlyProp,
-        active: isPressed,
-        focus: isFocused,
-        focusVisible: isFocusVisible || isFocusVisibleProp
-      })),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_visuallyHidden.VisuallyHidden, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
-          ...inputProps,
-          ref: inputRef
+          ref: inputRef,
+          type: "radio",
+          name: groupName,
+          value: combinedProps.value,
+          checked: !!isChecked,
+          disabled: resolvedDisabled,
+          tabIndex: -1,
+          "aria-hidden": true,
+          readOnly: true
+          // Decorative form mirror — pointer events must not steal clicks from Pressable.
+          ,
+          style: {
+            pointerEvents: 'none'
+          }
         })
-      }), children]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
+        ...combinedProps,
+        ...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: (0, _utils.composeEventHandlers)(combinedProps.onKeyDown, handleKeyDown),
+        ...(0, _dataAttributes.mergeDataAttributes)(props, (0, _dataAttributes.dataAttributes)({
+          checked: isChecked,
+          disabled: resolvedDisabled,
+          hover: isHovered || isHoveredProp,
+          invalid: isInvalid || isInvalidProp,
+          readonly: resolvedReadOnly,
+          active: isPressed,
+          focus: isFocused,
+          focusVisible: isFocusVisible || isFocusVisibleProp
+        })),
+        children: children
+      })]
     })
   });
 });