Skip to content

fix: radio type #2735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oasis-cloud merged 5 commits into from
Nov 11, 2024
Merged

fix: radio type #2735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d65a60
fix: radio type
oasis-cloud Nov 11, 2024
64b31d7
fix: radio type
oasis-cloud Nov 11, 2024
2687bd1
fix: radio type
oasis-cloud Nov 11, 2024
604aba9
fix: radio type
oasis-cloud Nov 11, 2024
bc0d5c8
fix: radio type
oasis-cloud Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/packages/radio/radio.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -156,4 +155,3 @@ export const Radio: FC<
}

Radio.displayName = 'NutRadio'
Radio.Group = RadioGroup
2 changes: 0 additions & 2 deletions src/packages/radio/radio.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -149,4 +148,3 @@ export const Radio: FunctionComponent<
}

Radio.displayName = 'NutRadio'
Radio.Group = RadioGroup
8 changes: 2 additions & 6 deletions src/packages/radiogroup/radiogroup.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -32,11 +33,7 @@ const defaultProps = {
const classPrefix = 'nut-radiogroup'

export const RadioGroup = React.forwardRef(
(
props: Partial<RadioGroupProps> &
Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'>,
ref
) => {
(props: Partial<RadioGroupProps> & Omit<ViewProps, 'onChange'>, ref) => {
const {
children,
className,
Expand All @@ -50,7 +47,6 @@ export const RadioGroup = React.forwardRef(
disabled,
...rest
} = { ...defaultProps, ...props }

const cls = classNames(
classPrefix,
{
Expand Down