Skip to content

pr05 Typescript Migration: Update client/common folder to use the barrel folder structure #7

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

Open
wants to merge 4 commits into
base: pr05/migrate_client_common_rebuild
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
"no-use-before-define": "off",
"import/no-extraneous-dependencies": "off",
"no-unused-vars": "off",
"react/require-default-props": "off"
"react/require-default-props": "off",
"no-restricted-exports": "off"
}
},
{
Expand Down
255 changes: 0 additions & 255 deletions client/common/Button.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { action } from '@storybook/addon-actions';

import Button from './Button';
import { GithubIcon, DropdownArrowIcon, PlusIcon } from './icons';
import Button from './index';
import { GithubIcon, DropdownArrowIcon, PlusIcon } from '../icons';

export default {
title: 'Common/Button',
Expand Down
89 changes: 89 additions & 0 deletions client/common/Button/Button.styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import styled from 'styled-components';
import { remSize, prop } from '../../theme';
import { StyledButtonProps } from './Button.types';

export const StyledButton = styled.button<StyledButtonProps>`
&&& {
font-weight: bold;
display: ${({ display }) =>
display === 'inline' ? 'inline-flex' : 'flex'};
justify-content: center;
align-items: center;
width: max-content;
text-decoration: none;
color: ${({ kind }) => prop(`Button.${kind}.default.foreground`)};
background-color: ${({ kind }) =>
prop(`Button.${kind}.default.background`)};
cursor: pointer;
border: 2px solid ${({ kind }) => prop(`Button.${kind}.default.border`)};
border-radius: 2px;
padding: ${remSize(8)} ${remSize(25)};
line-height: 1;

svg * {
fill: ${({ kind }) => prop(`Button.${kind}.default.foreground`)};
}

&:hover:not(:disabled) {
color: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
background-color: ${({ kind }) =>
prop(`Button.${kind}.hover.background`)};
border-color: ${({ kind }) => prop(`Button.${kind}.hover.border`)};

svg * {
fill: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
}
}

&:active:not(:disabled) {
color: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
background-color: ${({ kind }) =>
prop(`Button.${kind}.active.background`)};

svg * {
fill: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
}
}

&:disabled {
color: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
background-color: ${({ kind }) =>
prop(`Button.${kind}.disabled.background`)};
border-color: ${({ kind }) => prop(`Button.${kind}.disabled.border`)};
cursor: not-allowed;

svg * {
fill: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
}
}

> * + * {
margin-left: ${remSize(8)};
}
}
`;

export const StyledInlineButton = styled.button`
&&& {
display: flex;
justify-content: center;
align-items: center;
text-decoration: none;
color: ${prop('primaryTextColor')};
cursor: pointer;
border: none;
line-height: 1;

svg * {
fill: ${prop('primaryTextColor')};
}

&:disabled {
cursor: not-allowed;
}

> * + * {
margin-left: ${remSize(8)};
}
}
`;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen, fireEvent } from '../test-utils';
import Button from './Button';
import { render, screen, fireEvent } from '../../test-utils';
import Button from './index';

const MockIcon = (props: React.SVGProps<SVGSVGElement>) => (
<svg data-testid="mock-icon" {...props} />
Expand Down
Loading