Skip to content

Commit

Permalink
Merge branch 'oleksndrspv/dm-chip' of https://github.com/PeculiarVent…
Browse files Browse the repository at this point in the history
…ures/peculiar-ui into oleksndrspv/dm-chip
  • Loading branch information
donskov committed Sep 25, 2023
2 parents b356e70 + fb72a4f commit 2913baa
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions packages/react-components/src/Select/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ const SelectRoot = styled('select')<SelectRootProps>({
height: 'var(--pv-size-base-8)',
}));

const Label = styled('label')({
const SelectLabel = styled('label')({
marginBottom: '2px',
display: 'inline-block',
});

const ErrorText = styled(Typography)({
const SelectErrorMessage = styled(Typography)({
marginTop: '2px',
});

Expand Down Expand Up @@ -183,7 +183,7 @@ export const Select = React.forwardRef<HTMLDivElement, SelectProps>((props, ref)
className={className}
>
{label && (
<Label
<SelectLabel
htmlFor={id}
>
<Typography
Expand All @@ -193,7 +193,7 @@ export const Select = React.forwardRef<HTMLDivElement, SelectProps>((props, ref)
>
{label}
</Typography>
</Label>
</SelectLabel>
)}
<InputContainer>
<SelectRoot
Expand Down Expand Up @@ -231,12 +231,12 @@ export const Select = React.forwardRef<HTMLDivElement, SelectProps>((props, ref)
/>
</InputContainer>
{error && errorText && (
<ErrorText
<SelectErrorMessage
variant="c2"
color="wrong"
>
{errorText}
</ErrorText>
</SelectErrorMessage>
)}
</div>
);
Expand Down

0 comments on commit 2913baa

Please sign in to comment.