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

package/lib/module/portal/portal.js

@@ -3,6 +3,7 @@
 import * as React from 'react';
 import { useEffect, useSyncExternalStore } from 'react';
 import { Platform } from 'react-native';
+import { createPortalFn } from '../utils/createPortal';
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 const DEFAULT_PORTAL_HOST = 'FORGE_UI_DEFAULT_HOST_NAME';
 const store = {
@@ -10,11 +11,53 @@ const store = {
   listeners: new Set()
 };
 
+/** Tracks mounted PortalHost instances per host name — only the first mount renders portals. */
+const hostStackStore = {
+  stacks: new Map(),
+  listeners: new Set()
+};
+let hasWarnedMultiplePortalHosts = false;
+
 // --------------------------------------------------
 
 function emit() {
   for (const cb of store.listeners) cb();
 }
+function emitHostStack() {
+  for (const cb of hostStackStore.listeners) cb();
+}
+function getHostStackSnapshot() {
+  return hostStackStore.stacks;
+}
+function subscribeHostStack(cb) {
+  hostStackStore.listeners.add(cb);
+  return () => {
+    hostStackStore.listeners.delete(cb);
+  };
+}
+function pushPortalHost(name, id) {
+  const stacks = new Map(hostStackStore.stacks);
+  const stack = [...(stacks.get(name) ?? [])];
+  stack.push(id);
+  stacks.set(name, stack);
+  hostStackStore.stacks = stacks;
+  if (__DEV__ && !hasWarnedMultiplePortalHosts && stack.length > 1) {
+    hasWarnedMultiplePortalHosts = true;
+    console.warn('[Forge UI] Multiple PortalHost instances detected for the same host name. ' + 'Only the first mounted PortalHost renders portal content. ' + 'Mount a single PortalHost near your app root (ForgeDesignProvider does this automatically).');
+  }
+  emitHostStack();
+}
+function popPortalHost(name, id) {
+  const stacks = new Map(hostStackStore.stacks);
+  const stack = (stacks.get(name) ?? []).filter(entry => entry !== id);
+  stacks.set(name, stack);
+  hostStackStore.stacks = stacks;
+  emitHostStack();
+}
+function isActivePortalHost(name, id) {
+  const stack = hostStackStore.stacks.get(name) ?? [];
+  return stack.length > 0 && stack[0] === id;
+}
 function getSnapshot() {
   return store.map;
 }
@@ -46,12 +89,26 @@ function removePortal(hostName, name) {
 export function PortalHost({
   name = DEFAULT_PORTAL_HOST
 }) {
+  const hostId = React.useRef(Symbol()).current;
+  useEffect(() => {
+    pushPortalHost(name, hostId);
+    return () => {
+      popPortalHost(name, hostId);
+    };
+  }, [name, hostId]);
+  useSyncExternalStore(subscribeHostStack, getHostStackSnapshot, getHostStackSnapshot);
   const map = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   const portalMap = map.get(name) ?? new Map();
-  if (portalMap.size === 0) return null;
-  return /*#__PURE__*/_jsx(_Fragment, {
+  if (!isActivePortalHost(name, hostId) || portalMap.size === 0) {
+    return null;
+  }
+  const content = /*#__PURE__*/_jsx(_Fragment, {
     children: Array.from(portalMap.values())
   });
+  if (Platform.OS === 'web' && createPortalFn && typeof document !== 'undefined') {
+    return createPortalFn(content, document.body);
+  }
+  return content;
 }
 
 // --------------------------------------------------

package/lib/module/portal/portal.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useSyncExternalStore","Platform","Fragment","_Fragment","jsx","_jsx","DEFAULT_PORTAL_HOST","store","map","Map","set","listeners","Set","emit","cb","getSnapshot","subscribe","add","delete","updatePortal","hostName","name","children","next","portal","get","removePortal","PortalHost","portalMap","size","Array","from","values","Portal","ROOT","flex","useModalPortalRoot","ref","useRef","offset","setSideOffSet","useState","onLayout","useCallback","OS","current","measure","_x","_y","_width","_height","_pageX","pageY","style"],"sourceRoot":"../../../src","sources":["portal/portal.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useSyncExternalStore","Platform","createPortalFn","Fragment","_Fragment","jsx","_jsx","DEFAULT_PORTAL_HOST","store","map","Map","set","listeners","Set","hostStackStore","stacks","hasWarnedMultiplePortalHosts","emit","cb","emitHostStack","getHostStackSnapshot","subscribeHostStack","add","delete","pushPortalHost","name","id","stack","get","push","__DEV__","length","console","warn","popPortalHost","filter","entry","isActivePortalHost","getSnapshot","subscribe","updatePortal","hostName","children","next","portal","removePortal","PortalHost","hostId","useRef","Symbol","current","portalMap","size","content","Array","from","values","OS","document","body","Portal","ROOT","flex","useModalPortalRoot","ref","offset","setSideOffSet","useState","onLayout","useCallback","measure","_x","_y","_width","_height","_pageX","pageY","style"],"sourceRoot":"../../../src","sources":["portal/portal.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/radio/RadioGroup.js

@@ -1,13 +1,14 @@
 "use strict";
 
-import { forwardRef } from 'react';
-import { View } from 'react-native';
-import { useFormControlContext } from '@cdx-ui/utils';
+import { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
+import { Platform, View } from 'react-native';
+import { composeEventHandlers, useFormControl } from '@cdx-ui/utils';
 import { useRadioGroup } from '@react-native-aria/radio';
 import { useRadioGroupState } from '@react-stately/radio';
 import { Slot } from '../slot';
 import { dataAttributes, mergeDataAttributes } from '../utils/dataAttributes';
 import { RadioGroupContext } from './context';
+import { useRadioGroupNavigation } from './useRadioGroupNavigation';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const RadioGroup = /*#__PURE__*/forwardRef(({
   asChild,
@@ -16,25 +17,66 @@ export const RadioGroup = /*#__PURE__*/forwardRef(({
   style,
   ...props
 }, ref) => {
-  const formControlContext = useFormControlContext();
-  const combinedProps = {
-    ...formControlContext,
-    ...props
-  };
+  const formControlProps = 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 = 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
   } = 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] = useState(undefined);
+  // Identity of getRadios depends on this so roving tabIndex recomputes after register/unregister.
+  const [registrationEpoch, setRegistrationEpoch] = useState(0);
+  const radiosRef = useRef(new Map());
+  useEffect(() => {
+    setFocusedValue(prev => prev !== undefined && prev !== radioGroupState.selectedValue ? undefined : prev);
+  }, [radioGroupState.selectedValue]);
+  const registerRadio = useCallback((value, entry) => {
+    radiosRef.current.set(value, entry);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const unregisterRadio = useCallback(value => {
+    radiosRef.current.delete(value);
+    setRegistrationEpoch(epoch => epoch + 1);
+  }, []);
+  const getRadios = useCallback(() => Array.from(radiosRef.current.entries()), [registrationEpoch]);
+  const {
+    handleKeyDown
+  } = useRadioGroupNavigation({
+    getRadios,
+    focusedValue,
+    setFocusedValue,
+    selectedValue: radioGroupState.selectedValue,
+    selectValue: value => radioGroupState.setSelectedValue(value)
+  });
+  const webProps = Platform.OS === 'web' ? {
+    onKeyDown: composeEventHandlers(props.onKeyDown, handleKeyDown)
+  } : {};
   const Comp = asChild ? Slot : View;
   return /*#__PURE__*/_jsx(RadioGroupContext.Provider, {
     value: {
@@ -47,17 +89,24 @@ export const RadioGroup = /*#__PURE__*/forwardRef(({
         selectValue: value => radioGroupState.setSelectedValue(value)
       },
       radioGroupState,
-      name: combinedProps.name
+      name,
+      focusedValue,
+      setFocusedValue,
+      registerRadio,
+      unregisterRadio,
+      getRadios
     },
     children: /*#__PURE__*/_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,
       ...mergeDataAttributes(props, dataAttributes({
         disabled: isDisabled,
         invalid: isInvalid

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

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","View","useFormControlContext","useRadioGroup","useRadioGroupState","Slot","dataAttributes","mergeDataAttributes","RadioGroupContext","jsx","_jsx","RadioGroup","asChild","children","className","style","props","ref","formControlContext","combinedProps","radioGroupState","validationState","isInvalid","radioGroupProps","isDisabled","isRequired","isReadOnly","Comp","Provider","value","state","isSelected","selectedValue","selectValue","setSelectedValue","name","undefined","disabled","invalid","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioGroup.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,OAAO;AAClC,SAASC,IAAI,QAAwB,cAAc;AACnD,SAASC,qBAAqB,QAAQ,eAAe;AACrD,SAASC,aAAa,QAAQ,0BAA0B;AACxD,SAASC,kBAAkB,QAAQ,sBAAsB;AACzD,SAASC,IAAI,QAAQ,SAAS;AAC9B,SAASC,cAAc,EAAEC,mBAAmB,QAAQ,yBAAyB;AAC7E,SAASC,iBAAiB,QAAQ,WAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAS9C,OAAO,MAAMC,UAAU,gBAAGX,UAAU,CAClC,CAAC;EAAEY,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,kBAAkB,GAAGhB,qBAAqB,CAAC,CAAC;EAElD,MAAMiB,aAAa,GAAG;IACpB,GAAGD,kBAAkB;IACrB,GAAGF;EACL,CAAC;EAED,MAAMI,eAAe,GAAGhB,kBAAkB,CAAC;IACzC,GAAGe,aAAa;IAChBE,eAAe,EAAEF,aAAa,CAACG,SAAS,GAAG,SAAS,GAAG;EACzD,CAAC,CAAC;EAEF,MAAM;IAAEC;EAAgB,CAAC,GAAGpB,aAAa,CACvC;IACE,GAAGgB,aAAa;IAChB,YAAY,EAAEA,aAAa,CAAC,YAAY;EAC1C,CAAC,EACDC,eACF,CAAC;EAED,MAAMI,UAAU,GAAGL,aAAa,CAACK,UAAU,IAAI,KAAK;EACpD,MAAMF,SAAS,GAAGH,aAAa,CAACG,SAAS,IAAI,KAAK;EAClD,MAAMG,UAAU,GAAGN,aAAa,CAACM,UAAU,IAAI,KAAK;EACpD,MAAMC,UAAU,GAAGP,aAAa,CAACO,UAAU,IAAI,KAAK;EAEpD,MAAMC,IAAI,GAAGf,OAAO,GAAGP,IAAI,GAAGJ,IAAI;EAElC,oBACES,IAAA,CAACF,iBAAiB,CAACoB,QAAQ;IACzBC,KAAK,EAAE;MACLC,KAAK,EAAE;QACLN,UAAU;QACVF,SAAS;QACTG,UAAU;QACVC,UAAU;QACVK,UAAU,EAAGF,KAAa,IAAKT,eAAe,CAACY,aAAa,KAAKH,KAAK;QACtEI,WAAW,EAAGJ,KAAa,IAAKT,eAAe,CAACc,gBAAgB,CAACL,KAAK;MACxE,CAAC;MACDT,eAAe;MACfe,IAAI,EAAEhB,aAAa,CAACgB;IACtB,CAAE;IAAAtB,QAAA,eAEFH,IAAA,CAACiB,IAAI;MAAA,GACCJ,eAAe;MACnB,cAAYJ,aAAa,CAAC,YAAY,CAAE;MACxC,mBAAiBA,aAAa,CAAC,iBAAiB,CAAE;MAClD,iBAAeM,UAAU,IAAIW,SAAU;MACvC,iBAAeV,UAAU,IAAIU,SAAU;MACvCtB,SAAS,EAAEA,SAAU;MACrBC,KAAK,EAAEA,KAAM;MACbE,GAAG,EAAEA,GAAI;MAAA,GACLV,mBAAmB,CACrBS,KAAK,EACLV,cAAc,CAAC;QACb+B,QAAQ,EAAEb,UAAU;QACpBc,OAAO,EAAEhB;MACX,CAAC,CACH,CAAC;MAAAT,QAAA,EAEAA;IAAQ,CACL;EAAC,CACmB,CAAC;AAEjC,CACF,CAAC;AAEDF,UAAU,CAAC4B,WAAW,GAAG,YAAY","ignoreList":[]}
+{"version":3,"names":["forwardRef","useCallback","useEffect","useRef","useState","Platform","View","composeEventHandlers","useFormControl","useRadioGroup","useRadioGroupState","Slot","dataAttributes","mergeDataAttributes","RadioGroupContext","useRadioGroupNavigation","jsx","_jsx","RadioGroup","asChild","children","className","style","props","ref","formControlProps","isDisabled","isRequired","isInvalid","isReadOnly","Boolean","disabled","required","readOnly","name","ariaLabel","ariaLabelledBy","ariaDescribedBy","radioGroupState","value","defaultValue","onChange","validationState","radioGroupProps","focusedValue","setFocusedValue","undefined","registrationEpoch","setRegistrationEpoch","radiosRef","Map","prev","selectedValue","registerRadio","entry","current","set","epoch","unregisterRadio","delete","getRadios","Array","from","entries","handleKeyDown","selectValue","setSelectedValue","webProps","OS","onKeyDown","Comp","Provider","state","isSelected","invalid","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioGroup.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -1,17 +1,24 @@
 "use strict";
 
-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 { useRadioRoot } from './useRadioRoot';
-
-// TODO: Keyboard focus is not working as expected
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { getRovingFocusValue } from './useRadioGroupNavigation';
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 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 = /*#__PURE__*/forwardRef(({
   asChild,
   children,
@@ -26,12 +33,12 @@ export const RadioRoot = /*#__PURE__*/forwardRef(({
     isFocused,
     isPressed
   } = props;
+  const radioGroupContext = useContext(RadioGroupContext);
   const {
     combinedProps,
     isInvalid,
     isReadOnly,
     inputProps,
-    labelProps,
     isChecked,
     isDisabled,
     isHovered,
@@ -44,42 +51,123 @@ export const RadioRoot = /*#__PURE__*/forwardRef(({
     focusProps,
     isFocusVisible
   } = useFocusRing();
+  const nodeRef = useRef(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
+    });
+    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 => {
+    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 : Pressable;
   return /*#__PURE__*/_jsx(RadioProvider, {
     value: contextValue,
-    children: /*#__PURE__*/_jsxs(Comp, {
-      ...mergeProps(combinedProps, labelProps, focusProps),
-      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
-      })),
+    children: /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(VisuallyHidden, {
         children: /*#__PURE__*/_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__*/_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: composeEventHandlers(combinedProps.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: children
+      })]
     })
   });
 });

package/lib/module/radio/RadioRoot.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","Pressable","VisuallyHidden","mergeProps","useFocusRing","Slot","dataAttributes","mergeDataAttributes","RadioProvider","useRadioRoot","jsx","_jsx","jsxs","_jsxs","RadioRoot","asChild","children","props","ref","isHovered","isHoveredProp","isFocusVisible","isFocusVisibleProp","isDisabled","isDisabledProp","isInvalid","isInvalidProp","isReadOnly","isReadOnlyProp","isFocused","isPressed","combinedProps","inputProps","labelProps","isChecked","mergedRef","inputRef","useInputRefForAria","focusProps","contextValue","Comp","value","role","accessibilityRole","checked","disabled","hover","invalid","readonly","active","focus","focusVisible","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioRoot.web.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,OAAO;AAClC,SAASC,SAAS,QAAQ,cAAc;AACxC,SAASC,cAAc,QAAQ,6BAA6B;AAC5D,SAASC,UAAU,QAAQ,mBAAmB;AAC9C,SAASC,YAAY,QAAQ,0BAA0B;AACvD,SAASC,IAAI,QAAQ,SAAS;AAC9B,SAASC,cAAc,EAAEC,mBAAmB,QAAQ,yBAAyB;AAC7E,SAASC,aAAa,QAAQ,WAAW;AAEzC,SAASC,YAAY,QAAQ,gBAAgB;;AAE7C;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAMA,OAAO,MAAMC,SAAS,gBAAGd,UAAU,CACjC,CAAC;EAAEe,OAAO;EAAEC,QAAQ;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EACxC,MAAM;IACJC,SAAS,EAAEC,aAAa;IACxBC,cAAc,EAAEC,kBAAkB;IAClCC,UAAU,EAAEC,cAAc;IAC1BC,SAAS,EAAEC,aAAa;IACxBC,UAAU,EAAEC,cAAc;IAC1BC,SAAS;IACTC;EACF,CAAC,GAAGb,KAAK;EAET,MAAM;IACJc,aAAa;IACbN,SAAS;IACTE,UAAU;IACVK,UAAU;IACVC,UAAU;IACVC,SAAS;IACTX,UAAU;IACVJ,SAAS;IACTgB,SAAS;IACTC;EACF,CAAC,GAAG3B,YAAY,CAACQ,KAAK,EAAEC,GAAG,EAAE;IAAEmB,kBAAkB,EAAE;EAAK,CAAC,CAAC;EAE1D,MAAM;IAAEC,UAAU;IAAEjB;EAAe,CAAC,GAAGjB,YAAY,CAAC,CAAC;EAErD,MAAMmC,YAAgC,GAAG;IACvCL,SAAS;IACTX,UAAU,EAAEA,UAAU,IAAIC,cAAc;IACxCH,cAAc,EAAEA,cAAc,IAAIC,kBAAkB;IACpDH,SAAS,EAAEA,SAAS,IAAIC,aAAa;IACrCK,SAAS,EAAEA,SAAS,IAAIC,aAAa;IACrCC,UAAU,EAAEA,UAAU,IAAIC,cAAc;IACxCE,SAAS;IACTD;EACF,CAAC;EAED,MAAMW,IAAI,GAAGzB,OAAO,GAAGV,IAAI,GAAGJ,SAAS;EAEvC,oBACEU,IAAA,CAACH,aAAa;IAACiC,KAAK,EAAEF,YAAa;IAAAvB,QAAA,eACjCH,KAAA,CAAC2B,IAAI;MAAA,GACCrC,UAAU,CAAC4B,aAAa,EAASE,UAAU,EAASK,UAAiB,CAAC;MAC1EpB,GAAG,EAAEiB,SAAU;MACfO,IAAI,EAAC;MACL;MAAA;MACAC,iBAAiB,EAAC,OAAO;MAAA,GACrBpC,mBAAmB,CACrBU,KAAK,EACLX,cAAc,CAAC;QACbsC,OAAO,EAAEV,SAAS;QAClBW,QAAQ,EAAEtB,UAAU,IAAIC,cAAc;QACtCsB,KAAK,EAAE3B,SAAS,IAAIC,aAAa;QACjC2B,OAAO,EAAEtB,SAAS,IAAIC,aAAa;QACnCsB,QAAQ,EAAErB,UAAU,IAAIC,cAAc;QACtCqB,MAAM,EAAEnB,SAAS;QACjBoB,KAAK,EAAErB,SAAS;QAChBsB,YAAY,EAAE9B,cAAc,IAAIC;MAClC,CAAC,CACH,CAAC;MAAAN,QAAA,gBAEDL,IAAA,CAACT,cAAc;QAAAc,QAAA,eACbL,IAAA;UAAA,GAAWqB,UAAU;UAAEd,GAAG,EAAEkB;QAAS,CAAE;MAAC,CAC1B,CAAC,EAChBpB,QAAQ;IAAA,CACL;EAAC,CACM,CAAC;AAEpB,CACF,CAAC;AAEDF,SAAS,CAACsC,WAAW,GAAG,WAAW","ignoreList":[]}
+{"version":3,"names":["forwardRef","useContext","useEffect","useMemo","useRef","Pressable","VisuallyHidden","composeEventHandlers","mergeRefs","useFocusRing","Slot","dataAttributes","mergeDataAttributes","RadioGroupContext","RadioProvider","useRadioRoot","getRovingFocusValue","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","RadioRoot","asChild","children","props","ref","isHovered","isHoveredProp","isFocusVisible","isFocusVisibleProp","isDisabled","isDisabledProp","isInvalid","isInvalidProp","isReadOnly","isReadOnlyProp","isFocused","isPressed","radioGroupContext","combinedProps","inputProps","isChecked","mergedRef","inputRef","useInputRefForAria","focusProps","nodeRef","setRefs","onPress","_onPress","onChange","_onChange","role","_role","tabIndex","_tabIndex","disabled","_disabled","checked","_checked","value","_value","type","_type","name","_name","form","_form","required","_required","inputAriaProps","resolvedDisabled","resolvedReadOnly","selectThis","radioGroupState","setSelectedValue","selectedValue","focusedValue","registerRadio","unregisterRadio","getRadios","groupName","node","current","isRovingTabStop","enabledRadios","filter","entry","rovingValue","handleKeyDown","event","key","preventDefault","contextValue","Comp","readOnly","style","pointerEvents","undefined","accessibilityRole","accessibilityState","onClick","onKeyDown","hover","invalid","readonly","active","focus","focusVisible","displayName"],"sourceRoot":"../../../src","sources":["radio/RadioRoot.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/radio/context.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","RadioProvider","useRadioContext","RadioGroupContext"],"sourceRoot":"../../../src","sources":["radio/context.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,aAAa,QAAQ,eAAe;AAI7C,OAAO,MAAM,CAACC,aAAa,EAAEC,eAAe,CAAC,GAAGF,aAAa,CAAqB,cAAc,CAAC;AAWjG,OAAO,MAAMG,iBAAiB,gBAAGJ,KAAK,CAACC,aAAa,CAI1C,IAAI,CAAC","ignoreList":[]}
+{"version":3,"names":["React","createContext","RadioProvider","useRadioContext","RadioGroupContext"],"sourceRoot":"../../../src","sources":["radio/context.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,aAAa,QAAQ,eAAe;AAI7C,OAAO,MAAM,CAACC,aAAa,EAAEC,eAAe,CAAC,GAAGF,aAAa,CAAqB,cAAc,CAAC;AAWjG,OAAO,MAAMG,iBAAiB,gBAAGJ,KAAK,CAACC,aAAa,CAS1C,IAAI,CAAC","ignoreList":[]}

package/lib/module/radio/useRadioGroupNavigation.js

@@ -0,0 +1,74 @@
+"use strict";
+
+import { useCallback, useRef } from 'react';
+// Web-only — native platforms rely on OS-managed sequential focus (VoiceOver/TalkBack).
+
+function isEnabledRadioValue(value, enabledRadios) {
+  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, selectedValue, enabledRadios) {
+  const defaultFocusValue = isEnabledRadioValue(selectedValue, enabledRadios) ? selectedValue : enabledRadios[0]?.[0];
+  const resolvedFocusedValue = isEnabledRadioValue(focusedValue, enabledRadios) ? focusedValue : undefined;
+  return resolvedFocusedValue ?? defaultFocusValue;
+}
+export function useRadioGroupNavigation({
+  getRadios,
+  focusedValue,
+  setFocusedValue,
+  selectedValue,
+  selectValue
+}) {
+  const selectValueRef = useRef(selectValue);
+  selectValueRef.current = selectValue;
+  const getEnabledRadios = useCallback(() => getRadios().filter(([, entry]) => !entry.disabled), [getRadios]);
+  const moveFocus = useCallback(([targetValue, targetEntry]) => {
+    setFocusedValue(targetValue);
+    targetEntry.node?.focus?.();
+    selectValueRef.current(targetValue);
+  }, [setFocusedValue]);
+  const handleKeyDown = useCallback(e => {
+    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
+  };
+}
+//# sourceMappingURL=useRadioGroupNavigation.js.map

package/lib/module/radio/useRadioGroupNavigation.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useRef","isEnabledRadioValue","value","enabledRadios","some","radioValue","getRovingFocusValue","focusedValue","selectedValue","defaultFocusValue","resolvedFocusedValue","undefined","useRadioGroupNavigation","getRadios","setFocusedValue","selectValue","selectValueRef","current","getEnabledRadios","filter","entry","disabled","moveFocus","targetValue","targetEntry","node","focus","handleKeyDown","e","length","currentValue","idx","findIndex","key","preventDefault","last","at"],"sourceRoot":"../../../src","sources":["radio/useRadioGroupNavigation.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/radio/useRadioRoot.js

@@ -9,27 +9,28 @@ export function useRadioRoot(props, ref, {
   useInputRefForAria = false
 } = {}) {
   const formControlContext = useFormControlContext();
-  const {
-    isInvalid,
-    isReadOnly,
-    ...combinedProps
-  } = {
-    ...formControlContext,
-    ...props
-  };
   const radioGroupContext = useContext(RadioGroupContext);
   if (!radioGroupContext) {
     throw new Error('Radio must be rendered inside a Radio.Group. Standalone Radio is not supported.');
   }
+  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(null);
   const mergedRootRef = mergeRefs(ref, rootRef);
-  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
   }, radioGroupContext.radioGroupState, useInputRefForAria ? inputRef : rootRef);
   const {
     inputProps,
@@ -37,7 +38,7 @@ export function useRadioRoot(props, ref, {
   } = radio;
   const {
     checked: isChecked,
-    disabled: isDisabled
+    disabled: isDisabledFromInput
   } = inputProps;
   const {
     hoverProps,
@@ -50,7 +51,7 @@ export function useRadioRoot(props, ref, {
     inputProps,
     labelProps: labelProps ?? {},
     isChecked,
-    isDisabled,
+    isDisabled: isDisabledFromInput,
     isHovered,
     hoverProps,
     mergedRef: mergedRootRef,