From 7d65a60fc71fa504c8c11930deebb0e101233fe0 Mon Sep 17 00:00:00 2001 From: oasis Date: Mon, 11 Nov 2024 21:37:22 +0800 Subject: [PATCH 1/5] fix: radio type --- src/packages/radio/radio.taro.tsx | 2 -- src/packages/radio/radio.tsx | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/packages/radio/radio.taro.tsx b/src/packages/radio/radio.taro.tsx index e494b0feb5..1b4b46eb5e 100644 --- a/src/packages/radio/radio.taro.tsx +++ b/src/packages/radio/radio.taro.tsx @@ -7,7 +7,6 @@ import { import classNames, { Mapping } from 'classnames' import { ITouchEvent, View } from '@tarojs/components' import RadioContext from '../radiogroup/context' -import RadioGroup from '@/packages/radiogroup/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' import { RadioPosition, RadioShape } from '@/packages/radio/types' @@ -156,4 +155,3 @@ export const Radio: FC< } Radio.displayName = 'NutRadio' -Radio.Group = RadioGroup diff --git a/src/packages/radio/radio.tsx b/src/packages/radio/radio.tsx index e4ceb2cfd1..5eeab9ba28 100644 --- a/src/packages/radio/radio.tsx +++ b/src/packages/radio/radio.tsx @@ -2,7 +2,6 @@ import React, { FunctionComponent, MouseEventHandler, useContext } from 'react' import { CheckChecked, CheckNormal, CheckDisabled } from '@nutui/icons-react' import classNames from 'classnames' import RadioContext from '../radiogroup/context' -import RadioGroup from '@/packages/radiogroup' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' import { RadioPosition, RadioShape } from '@/packages/radio/types' @@ -149,4 +148,3 @@ export const Radio: FunctionComponent< } Radio.displayName = 'NutRadio' -Radio.Group = RadioGroup From 64b31d7d6a5f87521a73b2a5a89f65092a54a469 Mon Sep 17 00:00:00 2001 From: oasis Date: Mon, 11 Nov 2024 21:47:00 +0800 Subject: [PATCH 2/5] fix: radio type --- src/packages/radiogroup/radiogroup.taro.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx index ceabc69275..1bdeb389bd 100644 --- a/src/packages/radiogroup/radiogroup.taro.tsx +++ b/src/packages/radiogroup/radiogroup.taro.tsx @@ -1,6 +1,7 @@ import React, { useCallback } from 'react' import classNames from 'classnames' import { View } from '@tarojs/components' +import { ViewProps } from '@tarojs/components/types/View' import { RadioGroupDirection, RadioGroupOption, @@ -48,9 +49,9 @@ export const RadioGroup = React.forwardRef( direction, options, disabled, - ...rest + ...others } = { ...defaultProps, ...props } - + const rest = others as ViewProps const cls = classNames( classPrefix, { From 2687bd1be6306cfcab671d2f436eb4911932b0e6 Mon Sep 17 00:00:00 2001 From: oasis Date: Mon, 11 Nov 2024 21:52:57 +0800 Subject: [PATCH 3/5] fix: radio type --- src/packages/radiogroup/radiogroup.taro.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx index 1bdeb389bd..41880283f8 100644 --- a/src/packages/radiogroup/radiogroup.taro.tsx +++ b/src/packages/radiogroup/radiogroup.taro.tsx @@ -99,7 +99,7 @@ export const RadioGroup = React.forwardRef( }, }} > - + {options?.length ? renderOptionsChildren() : children} From 604aba9dbf802ca8ac22bc560d2ecf24da5f71da Mon Sep 17 00:00:00 2001 From: oasis Date: Mon, 11 Nov 2024 21:57:08 +0800 Subject: [PATCH 4/5] fix: radio type --- src/packages/radiogroup/radiogroup.taro.tsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx index 41880283f8..6ed3ab9f53 100644 --- a/src/packages/radiogroup/radiogroup.taro.tsx +++ b/src/packages/radiogroup/radiogroup.taro.tsx @@ -33,11 +33,7 @@ const defaultProps = { const classPrefix = 'nut-radiogroup' export const RadioGroup = React.forwardRef( - ( - props: Partial & - Omit, 'onChange'>, - ref - ) => { + (props: Partial & Omit, ref) => { const { children, className, @@ -49,9 +45,8 @@ export const RadioGroup = React.forwardRef( direction, options, disabled, - ...others + ...rest } = { ...defaultProps, ...props } - const rest = others as ViewProps const cls = classNames( classPrefix, { @@ -71,7 +66,6 @@ export const RadioGroup = React.forwardRef( return options?.map(({ label, value, disabled, onChange, ...rest }) => { return ( Date: Mon, 11 Nov 2024 21:58:46 +0800 Subject: [PATCH 5/5] fix: radio type --- src/packages/radiogroup/radiogroup.taro.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx index 6ed3ab9f53..aaec98a75c 100644 --- a/src/packages/radiogroup/radiogroup.taro.tsx +++ b/src/packages/radiogroup/radiogroup.taro.tsx @@ -66,6 +66,7 @@ export const RadioGroup = React.forwardRef( return options?.map(({ label, value, disabled, onChange, ...rest }) => { return ( - + {options?.length ? renderOptionsChildren() : children}