Skip to content
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.

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

fix: UI issue on marketplace filters #30660

Merged
merged 11 commits into from
Oct 19, 2023
5 changes: 5 additions & 0 deletions .changeset/cyan-mangos-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: UI issue on marketplace filters
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, Button, Icon } from '@rocket.chat/fuselage';

Check failure on line 1 in apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDownAnchor.tsx

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint

Import "Button" is only used as types
juliajforesti marked this conversation as resolved.
Show resolved Hide resolved
import colorTokens from '@rocket.chat/fuselage-tokens/colors.json';
import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ComponentProps, MouseEventHandler } from 'react';
import React, { forwardRef } from 'react';
Expand All @@ -15,33 +16,40 @@

return (
<Box
is={Button}
is='button'
ref={ref}
onClick={onClick}
display='flex'
alignItems='center'
justifyContent='space-between'
minWidth='x144'
flexGrow={1}
flexShrink={1}
bg={selectedCategoriesCount ? colorTokens.b500 : 'light'}
borderColor={selectedCategoriesCount ? 'none' : 'light'}
borderRadius='x4'
borderWidth={selectedCategoriesCount ? 'none' : 'x1'}
{...(selectedCategoriesCount ? { primary: true } : { bg: 'surface-light' })}
display='flex'
flexGrow={1}
flexShrink={1}
justifyContent='space-between'
minWidth='x144'
pb={9}
csuadev marked this conversation as resolved.
Show resolved Hide resolved
pie={7}
pis={14}
csuadev marked this conversation as resolved.
Show resolved Hide resolved
{...props}
>
{selectedCategoriesCount > 0 && (
<Box
mie={6}
borderRadius='x32'
is='span'
alignItems='center'
bg='light'
fontWeight={700}
fontSize='micro'
borderRadius='x32'
color='info'
pi={6}
h='x40'
display='flex'
alignItems='center'
fontSize='micro'
fontWeight={700}
h='fit-content'
justifyContent='center'
mie={6}
minWidth={22}
pb={4}
pi={0}
>
{selectedCategoriesCount}
</Box>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Box, Button, Icon } from '@rocket.chat/fuselage';
import type { Button } from '@rocket.chat/fuselage';
import { Box, Icon } from '@rocket.chat/fuselage';
import type { ComponentProps } from 'react';
import React, { forwardRef } from 'react';

Expand All @@ -14,22 +15,24 @@ const RadioDownAnchor = forwardRef<HTMLElement, RadioDropdownAnchorProps>(functi

return (
<Box
is={Button}
is='button'
ref={ref}
onClick={onClick as any}
display='flex'
alignItems='center'
justifyContent='space-between'
bg='light'
borderColor='light'
borderWidth='x1'
borderRadius='x4'
bg='light'
borderWidth='x1'
color='secondary-info'
fontScale='p2'
minWidth='x144'
h='x40'
display='flex'
flexGrow={1}
flexShrink={1}
fontScale='p2'
h='x40'
justifyContent='space-between'
minWidth='x144'
pie={10}
pis={14}
{...props}
csuadev marked this conversation as resolved.
Show resolved Hide resolved
>
{selected}
Expand Down
Loading