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

feat: add variants to the Text component #395

Merged
merged 4 commits into from
Apr 8, 2021
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/components/Grid/Grid.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,17 @@ export const withGap = () => (
<Block />
</Grid.Box>
</Grid.Layout>
<Grid.Layout inline gap="custom" customGap="64px" columns="auto auto auto">
<Grid.Box>
<Block>custom</Block>
</Grid.Box>
<Grid.Box>
<Block />
</Grid.Box>
<Grid.Box>
<Block />
</Grid.Box>
</Grid.Layout>
</Column>
);

Expand Down
11 changes: 8 additions & 3 deletions src/components/Grid/GridLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ type GridLayoutProps = {
/** when true then stretch to full width */
stretch?: boolean,
/** possbile spaces between grid items */
gap?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl' | 'none',
gap?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl' | 'none' | 'custom',
/** custom grid-gap value (it is required if the gap set to custom) */
customGap?: string,
/** when true then set inline-grid */
inline?: boolean,
/** possible paddings of the grid layout */
Expand Down Expand Up @@ -70,7 +72,7 @@ const [StyledTag, theme] = createThemeTag(name, {

return style;
},
modifiers: {
modifiers: (props) => ({
gap: {
xs: {
gridGap: '4px',
Expand All @@ -91,6 +93,9 @@ const [StyledTag, theme] = createThemeTag(name, {
gridGap: '40px',
},
none: {},
custom: {
gridGap: props.customGap,
},
},
padding: {
none: {},
Expand All @@ -115,7 +120,7 @@ const [StyledTag, theme] = createThemeTag(name, {
width: '100%',
maxWidth: '100%',
},
},
}),
});

class GridLayout extends React.PureComponent<GridLayoutProps> {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Paper/Paper.theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const [PaperTag, theme] = createThemeTag(name, ({ COLORS, SIZES }: *) => ({

background: COLORS.WHITE,
color: COLORS.BLACK,
boxShadow: '0 1px 3px 0 rgba(50,50,93,.14), 0 4px 6px 0 rgba(112,157,199,.08)',
boxShadow: '0px 2px 10px rgb(50 60 71 / 10%)',
position: 'relative',
overflow: 'hidden',
},
Expand Down
18 changes: 16 additions & 2 deletions src/components/Text/Text.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,29 @@ type TextProps = {
/** possible types of the css cursor property */
cursor?: 'pointer' | 'default' | 'auto',
/** modern text kinds */
kind?: 'overline-2' | 'overline-1' | 'small-2' | 'small-1' | 'body' | 'subtitle',
kind?: 'overline-2' | 'overline-1' | 'small-2' | 'small-1' | 'body' | 'subtitle' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5',
};

const TAG_NAMES = {
'overline-2': 'span',
'overline-1': 'span',
'small-2': 'span',
'small-1': 'span',
body: 'span',
subtitle: 'span',
h1: 'h1',
h2: 'h2',
h3: 'h3',
h4: 'h4',
h5: 'h5',
};

function Text({
text,
children,
...rest
}: TextProps) {
return <TextTag { ...rest } tagName="span">{ children || text }</TextTag>;
return <TextTag { ...rest } tagName={ TAG_NAMES[rest.kind || 'body'] }>{ children || text }</TextTag>;
}

Text.defaultProps = {
Expand Down
5 changes: 5 additions & 0 deletions src/components/Text/Text.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ common.story = {

export const withKindModifiers = () => (
<Column>
<Text kind="h1">H1 kind: { placeholderText }</Text>
<Text kind="h2">H2 kind: { placeholderText }</Text>
<Text kind="h3">H3 kind: { placeholderText }</Text>
<Text kind="h4">H4 kind: { placeholderText }</Text>
<Text kind="h5">H5 kind: { placeholderText }</Text>
<Text kind="subtitle">Subtitle kind: { placeholderText }</Text>
<Text kind="body">Body kind: { placeholderText }</Text>
<Text kind="overline-1">Overline-1 kind: { placeholderText }</Text>
Expand Down
15 changes: 15 additions & 0 deletions src/components/Text/Text.theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ const [TextTag, theme] = createThemeTag(name, ({ COLORS, FONTS }: *): * => ({
subtitle: {
...FONTS.SUBTITLE,
},
h1: {
...FONTS.H1,
},
h2: {
...FONTS.H2,
},
h3: {
...FONTS.H3,
},
h4: {
...FONTS.H4,
},
h5: {
...FONTS.H5,
},
},

color: fp.mapValues(
Expand Down