fix: radio disabled

GeekyAnts · Nov 16, 2021 · dcad172 · dcad172
1 parent 5023320
commit dcad172
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/example/storybook/stories/components/primitives/Radio/formControlled.tsx b/example/storybook/stories/components/primitives/Radio/formControlled.tsx
@@ -5,7 +5,7 @@ export const Example = () => {
   const [groupValue, setGroupValue] = React.useState('1');
   return (
     <Container>
-      <FormControl isDisabled>
+      <FormControl isInvalid>
         <FormControl.Label _text={{ fontSize: 'lg', bold: true }}>
           Select Prize
         </FormControl.Label>

diff --git a/src/components/primitives/Radio/Radio.tsx b/src/components/primitives/Radio/Radio.tsx
@@ -28,16 +28,12 @@ const Radio = ({ icon, wrapperRef, size, ...props }: IRadioProps, ref: any) => {
 
   const contextState = React.useContext(RadioContext);
 
-  const {
-    isInvalid,
-    isReadOnly,
-    isIndeterminate,
-    ...combinedProps
-  } = combineContextAndProps(contextState, props);
+  const combinedProps = combineContextAndProps(contextState, props);
 
+  const { isInvalid, isReadOnly, isIndeterminate } = combinedProps;
   const inputRef = React.useRef(null);
   const { inputProps } = useRadio(
-    { ...props, ...combinedProps },
+    combinedProps,
     contextState.state ?? {},
     inputRef
   );

diff --git a/src/components/primitives/Radio/Radio.web.tsx b/src/components/primitives/Radio/Radio.web.tsx
@@ -20,21 +20,13 @@ const Radio = (
 ) => {
   const contextState = React.useContext(RadioContext);
 
-  const {
-    isInvalid,
-    isReadOnly,
-    isIndeterminate,
-    ...combinedProps
-  } = combineContextAndProps(contextState, props);
+  const combinedProps = combineContextAndProps(contextState, props);
+
+  const { isInvalid, isReadOnly, isIndeterminate } = combinedProps;
 
   const inputRef = React.useRef(null);
   const { inputProps } = useRadio(
-    {
-      ...combinedProps,
-      ...props,
-      'aria-label': props.accessibilityLabel,
-      children,
-    },
+    { ...combinedProps, 'aria-label': props.accessibilityLabel, children },
     contextState.state ?? {},
     inputRef
   );
@@ -54,10 +46,7 @@ const Radio = (
 
   const { _interactionBox, _icon, ...resolvedProps } = usePropsResolution(
     'Radio',
-    {
-      ...combinedProps,
-      ...RadioContext,
-    },
+    combinedProps,
     {
       isInvalid,
       isReadOnly,