fix `<Shortcut />` (#609)

* f

* f

* Create early-apes-judge.md
This commit is contained in:
pavel 2024-10-11 13:32:32 +02:00 committed by GitHub
parent d48508b162
commit 7f21132f0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 7 deletions

View File

@ -0,0 +1,5 @@
---
"@status-im/components": patch
---
fix `<Shortcut />`icon prop and symbol centering

View File

@ -9,7 +9,7 @@ const variants = ['primary', 'secondary', 'gray'] as const
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
const renderVariant = (variant: (typeof variants)[number]) => (props: any) => ( const renderVariant = (variant: (typeof variants)[number]) => (props: any) => (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Shortcut {...props} variant={variant} icon={CommandIcon} /> <Shortcut {...props} variant={variant} icon={<CommandIcon />} />
<Shortcut {...props} variant={variant} symbol="K" /> <Shortcut {...props} variant={variant} symbol="K" />
</div> </div>
) )

View File

@ -1,13 +1,14 @@
import { forwardRef } from 'react' import { cloneElement, forwardRef } from 'react'
import { match, P } from 'ts-pattern' import { match, P } from 'ts-pattern'
import { cva } from '../utils/variants' import { cva } from '../utils/variants'
import type { IconElement } from '../types'
import type { VariantProps } from '../utils/variants' import type { VariantProps } from '../utils/variants'
const styles = cva({ const styles = cva({
base: 'flex size-4 flex-shrink-0 items-center justify-center rounded-6 border', base: 'grid size-4 flex-shrink-0 place-items-center rounded-6 border',
variants: { variants: {
variant: { variant: {
primary: [ primary: [
@ -32,7 +33,7 @@ const styles = cva({
type Props = VariantProps<typeof styles> & type Props = VariantProps<typeof styles> &
( (
| { | {
icon: React.ComponentType<React.SVGProps<SVGSVGElement>> icon: IconElement
symbol?: never symbol?: never
} }
| { | {
@ -42,15 +43,17 @@ type Props = VariantProps<typeof styles> &
) )
const Shortcut = (props: Props, ref: React.Ref<HTMLDivElement>) => { const Shortcut = (props: Props, ref: React.Ref<HTMLDivElement>) => {
const { variant = 'primary', ...rest } = props const { variant = 'primary' } = props
return ( return (
<div className={styles({ variant })} ref={ref} {...rest}> <div className={styles({ variant })} ref={ref}>
{match(props) {match(props)
.with({ symbol: P.string }, ({ symbol }) => ( .with({ symbol: P.string }, ({ symbol }) => (
<span className="text-11 font-medium">{symbol}</span> <span className="text-11 font-medium">{symbol}</span>
)) ))
.with({ icon: P._ }, ({ icon: Icon }) => <Icon className="size-3" />) .with({ icon: P._ }, ({ icon }) =>
cloneElement(icon, { className: 'size-3' }),
)
.exhaustive()} .exhaustive()}
</div> </div>
) )