diff --git a/src/components/Label/Label.props.ts b/src/components/Label/Label.props.ts index edfea552..808c5835 100644 --- a/src/components/Label/Label.props.ts +++ b/src/components/Label/Label.props.ts @@ -1,15 +1,15 @@ import { SystemProps } from '@xstyled/styled-components'; import { config } from './Label.styles'; -import { ButtonProps } from '../Button'; +// import { ButtonProps } from '../Button'; import { Theme } from '@/theme'; import { DeepPartial } from '@/utility-types/DeepPartial'; export type LabelProps = { label: string; - action?: ButtonProps<'bare'>; + // action?: ButtonProps<'bare'>; tooltip?: boolean; - optional?: boolean; + optional?: string; custom?: DeepPartial & typeof config>; }; diff --git a/src/components/Label/Label.tsx b/src/components/Label/Label.tsx index 08f53eb6..cf8ad6e0 100644 --- a/src/components/Label/Label.tsx +++ b/src/components/Label/Label.tsx @@ -4,7 +4,7 @@ import { merge } from 'lodash'; import { LabelProps } from './Label.props'; import { config as defaultConfig } from './Label.styles'; -import { Button } from '../Button'; +// import { Button } from '../Button'; import { tet } from '@/tetrisly'; @@ -24,9 +24,9 @@ export const Label = ({ return ( {label} - {optional && ( + {!!optional && ( - (optional) + ({optional}) )} {/* TODO: add tooltip instead of bare icon, when we get one */} @@ -35,14 +35,15 @@ export const Label = ({ )} - {!!action && ( + {/* TODO: add action when we discuss how they should behave */} + {/* {!!action && (