Skip to content

fix(radio): color of icon #2768

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

Closed
oasis-cloud wants to merge 1 commit into from
Closed

fix(radio): color of icon #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/packages/radio/radio.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import RadioContext from '../radiogroup/context'
import { BasicComponent, ComponentDefaults } from '@/utils/typings'
import { usePropsValue } from '@/utils/use-props-value'
import { RadioPosition, RadioShape } from '@/packages/radio/types'
import { harmony } from '@/utils/platform-taro'

export interface RadioProps extends BasicComponent {
disabled: boolean
Expand Down Expand Up @@ -89,25 +90,32 @@ export const Radio: FC<
const renderIcon = () => {
const { icon, activeIcon } = props
if (disabled && !checkedStatement) {
return <CheckDisabled className={classNames(color())} />
const colors = harmony() ? { color: '#c2c4cc' } : {}
return <CheckDisabled className={classNames(color())} {...colors} />
}
if (checkedStatement) {
const colors = harmony()
? { color: disabled ? '#ffadbe' : '#ff0f23' }
: {}
return React.isValidElement(activeIcon) ? (
React.cloneElement<any>(activeIcon, {
...activeIcon.props,
className: classNames(color()),
...colors,
})
) : (
<CheckChecked className={classNames(color())} />
<CheckChecked className={classNames(color())} {...colors} />
Comment on lines +97 to +107

@coderabbitai coderabbitai Bot Nov 19, 2024

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

建议优化选中状态的颜色处理逻辑

当前代码在多处重复处理颜色逻辑，建议将颜色计算逻辑提取到单独的函数中，以提高代码的可维护性和复用性。

+const getCheckedStateColors = (disabled: boolean) => {
+  if (!harmony()) return {}
+  return {
+    color: disabled ? '#ffadbe' : '#ff0f23'
+  }
+}

 if (checkedStatement) {
-  const colors = harmony()
-    ? { color: disabled ? '#ffadbe' : '#ff0f23' }
-    : {}
+  const colors = getCheckedStateColors(disabled)
   return React.isValidElement(activeIcon) ? (
     React.cloneElement<any>(activeIcon, {
       ...activeIcon.props,
       className: classNames(color()),
       ...colors,
     })
   ) : (
     <CheckChecked className={classNames(color())} {...colors} />
   )
 }

Committable suggestion skipped: line range outside the PR's diff.

)
}
const colors = harmony() ? { color: '#c2c4cc' } : {}
return React.isValidElement(icon) ? (
React.cloneElement<any>(icon, {
...icon.props,
className: classNames(color()),
...colors,
})
) : (
<CheckNormal className={classNames(color())} />
<CheckNormal className={classNames(color())} {...colors} />
)
}
const renderLabel = () => {
Expand Down
2 changes: 2 additions & 0 deletions src/packages/radiogroup/radiogroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
}

&-horizontal {
display: flex;

.nut-radio {
display: inline-flex;

Expand Down