Fix SelectItem bug and lint warnings
This commit is contained in:
parent
dac1ed917d
commit
1621d53afa
4 changed files with 186 additions and 182 deletions
|
|
@ -37,11 +37,10 @@ const defaultProps = {
|
|||
size: 'medium',
|
||||
}
|
||||
|
||||
const Button = React.forwardRef<HTMLButtonElement, Props>(
|
||||
(
|
||||
const Button = React.forwardRef<HTMLButtonElement, Props>(function button(
|
||||
{ accessoryIcon, active, blended, contained, size, text, ...props },
|
||||
forwardedRef
|
||||
) => {
|
||||
) {
|
||||
const classes = classNames(
|
||||
{
|
||||
Button: true,
|
||||
|
|
@ -58,8 +57,7 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
|
|||
)
|
||||
|
||||
const hasAccessory = () => {
|
||||
if (accessoryIcon)
|
||||
return <span className="Accessory">{accessoryIcon}</span>
|
||||
if (accessoryIcon) return <span className="Accessory">{accessoryIcon}</span>
|
||||
}
|
||||
|
||||
const hasText = () => {
|
||||
|
|
@ -183,8 +181,7 @@ const Button = React.forwardRef<HTMLButtonElement, Props>(
|
|||
// )}
|
||||
// </button>
|
||||
// )
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
Button.defaultProps = defaultProps
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ interface Props
|
|||
> {}
|
||||
|
||||
export const DialogContent = React.forwardRef<HTMLDivElement, Props>(
|
||||
({ children, ...props }, forwardedRef) => {
|
||||
function dialog({ children, ...props }, forwardedRef) {
|
||||
const classes = classNames(
|
||||
{
|
||||
Dialog: true,
|
||||
|
|
|
|||
|
|
@ -11,8 +11,10 @@ interface Props
|
|||
label?: string
|
||||
}
|
||||
|
||||
const Input = React.forwardRef<HTMLInputElement, Props>(
|
||||
(props: Props, forwardedRef) => {
|
||||
const Input = React.forwardRef<HTMLInputElement, Props>(function input(
|
||||
props: Props,
|
||||
forwardedRef
|
||||
) {
|
||||
const classes = classNames({ Input: true }, props.className)
|
||||
|
||||
return (
|
||||
|
|
@ -31,7 +33,6 @@ const Input = React.forwardRef<HTMLInputElement, Props>(
|
|||
)}
|
||||
</label>
|
||||
)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
export default Input
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
import React from 'react'
|
||||
import React, { ComponentProps } from 'react'
|
||||
import * as Select from '@radix-ui/react-select'
|
||||
|
||||
import './index.scss'
|
||||
import classNames from 'classnames'
|
||||
|
||||
const SelectItem = React.forwardRef<HTMLDivElement>(
|
||||
({ children, className, ...props }, forwardedRef) => {
|
||||
interface Props extends ComponentProps<'div'> {
|
||||
value: string | number
|
||||
}
|
||||
|
||||
const SelectItem = React.forwardRef<HTMLDivElement, Props>(function selectItem(
|
||||
{ children, ...props },
|
||||
forwardedRef
|
||||
) {
|
||||
return (
|
||||
<Select.Item
|
||||
className={classNames('SelectItem', className)}
|
||||
className={classNames('SelectItem', props.className)}
|
||||
{...props}
|
||||
ref={forwardedRef}
|
||||
value={`${props.value}`}
|
||||
>
|
||||
<Select.ItemText>{children}</Select.ItemText>
|
||||
</Select.Item>
|
||||
)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
export default SelectItem
|
||||
|
|
|
|||
Loading…
Reference in a new issue