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

refactor: update tag component to have optional icon if needed. #218

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/auto-renew.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/check-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/trash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 19 additions & 4 deletions components/tag/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import React, { FunctionComponent } from 'react';

import { TagContainer } from './tag.styled';
import Typography from '../typography';
import checkImageSrc from '../../assets/check-circle.svg';
import autoRenewImageSrc from '../../assets/auto-renew.svg';
import trashImageSrc from '../../assets/trash.svg';
import warningImageSrc from '../../assets/warning.svg';

import { TagContainer, IconImage } from './tag.styled';

export const TAG_COLOR_OPTIONS = [
'neon-green',
Expand All @@ -14,16 +20,25 @@ export const TAG_COLOR_OPTIONS = [
'green',
] as const;

export const TAG_ICON_OPTONS = {
'check': checkImageSrc,
'auto-renew': autoRenewImageSrc,
'trash': trashImageSrc,
'warning': warningImageSrc,
};

export type TagColor = (typeof TAG_COLOR_OPTIONS)[number];

export interface TagProps {
text: string;
bgColor?: TagColor;
icon?: keyof typeof TAG_ICON_OPTONS;
}

const Tag: FunctionComponent<TagProps> = ({ text, ...rest }) => (
<TagContainer {...rest} variant="body3">
{text}
const Tag: FunctionComponent<TagProps> = ({ text, icon, ...rest }) => (
<TagContainer {...rest}>
{icon && <IconImage src={TAG_ICON_OPTONS[icon]} alt={icon} width={16} height={16} />}
<Typography variant="body3">{text}</Typography>
</TagContainer>
);

Expand Down
6 changes: 5 additions & 1 deletion components/tag/tag.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Story } from '@storybook/react';

import Tag, { TAG_COLOR_OPTIONS, TagProps } from '.';
import Tag, { TAG_COLOR_OPTIONS, TagProps, TAG_ICON_OPTONS } from '.';

export default {
title: 'Components/Tag',
Expand All @@ -11,6 +11,10 @@ export default {
control: 'select',
options: TAG_COLOR_OPTIONS,
},
icon: {
control: 'radio',
options: Object.keys(TAG_ICON_OPTONS),
},
},
};

Expand Down
9 changes: 7 additions & 2 deletions components/tag/tag.styled.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import styled, { css } from 'styled-components';
import Image from 'next/image';

import Typography, { ITypographyProps } from '../typography';
import Row from '../row/';

import { TagColor } from '.';

export const TagContainer = styled(Typography)<{ bgColor?: TagColor } & ITypographyProps>`
export const TagContainer = styled(Row)<{ bgColor?: TagColor }>`
border-radius: 4px;
padding: 4px;
text-transform: capitalize;
Expand Down Expand Up @@ -60,3 +61,7 @@ export const TagContainer = styled(Typography)<{ bgColor?: TagColor } & ITypogra
color: #71717a;
`}
`;

export const IconImage = styled(Image)`
margin-right: 4px;
`;