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

Initial implementation of theme structure #1

Open
wants to merge 1 commit into
base: master
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
node_modules
build
storybook-static
build
lib
11 changes: 10 additions & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
import React from 'react';
import { ThemeProvider } from 'styled-components'
import { configure } from '@storybook/react';
import { setAddon, addDecorator } from '@storybook/react';
import JSXAddon from 'storybook-addon-jsx';
import { withInfo } from '@storybook/addon-info';

import { Theme } from "../theme/index";

setAddon(JSXAddon);
addDecorator(withInfo);
addDecorator(story => (
<ThemeProvider theme={Theme}>
{story()}
</ThemeProvider>
))

// automatically import all files ending in *.stories.js
const req = require.context('../src', true, /.stories.js$/);
const req = require.context('../src', true, /\.stories\.tsx$/);
function loadStories() {
req.keys().forEach(req);
}
Expand Down
4 changes: 2 additions & 2 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const styledComponentsTransformer = createStyledComponentsTransformer();

module.exports = ({ config, mode }) => {
config.module.rules.push({
test: /\.tsx?$/,
include: path.resolve(__dirname, "../src"),
test: /\.(ts|tsx)$/,
include: [path.resolve(__dirname, "../src"), path.resolve(__dirname, "../theme")],
use: [
{
loader: require.resolve("awesome-typescript-loader"),
Expand Down
184 changes: 184 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
"main": "index.js",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.4.3",
"@storybook/addon-actions": "^5.0.10",
"@storybook/addon-info": "^5.0.10",
"@storybook/addon-links": "^5.0.10",
"@storybook/addons": "^5.0.10",
"@storybook/react": "^5.0.10",
"@types/jest": "^23.3.10",
"@types/react-test-renderer": "^16.0.3",
"@types/rebass": "^3.0.3",
"@types/storybook__react": "^4.0.1",
"@types/styled-components": "^4.1.2",
"awesome-typescript-loader": "^5.2.1",
Expand All @@ -28,12 +30,13 @@
"dependencies": {
"react": "^16.6.3",
"react-dom": "^16.6.3",
"rebass": "^3.1.0",
"styled-components": "^4.1.2"
},
"scripts": {
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook",
"check-types": "tsc",
"compile": "tsc",
"test": "jest"
}
}
}
4 changes: 3 additions & 1 deletion src/button/__tests__/button.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { Button } from "../index";

describe("Button test suite", () => {
test("Snapshot test", () => {
const tree = renderer.create(<Button>Facebook</Button>).toJSON();
const tree = renderer
.create(<Button variant="primary">Facebook</Button>)
.toJSON();

expect(tree).toMatchSnapshot();
});
Expand Down
18 changes: 0 additions & 18 deletions src/button/button.stories.js

This file was deleted.

29 changes: 29 additions & 0 deletions src/button/button.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import * as React from "react";
import { storiesOf } from "@storybook/react";

import { Button } from "./index";

const stories = storiesOf("Button", module);

stories
.add("Primary", () => <Button variant="primary">Hello TypeScript</Button>, {
info: { inline: true }
})
.add(
"Secondary",
() => <Button variant="secondary">Hello TypeScript</Button>,
{
info: { inline: true }
}
)
.add(
"Disabled",
() => (
<Button variant="primary" isDisabled={true}>
Hello TypeScript
</Button>
),
{
info: { inline: true }
}
);
20 changes: 12 additions & 8 deletions src/button/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import * as React from "react";
import styled from "styled-components";

const StyledButton = styled.button`
background-color: blue;
font-size: 20px;
`;
import { Button as BaseButton } from "rebass";

export interface Props {
/** Children to be rendered. */
Expand All @@ -15,16 +10,25 @@ export interface Props {
* @default false
*/
isDisabled?: boolean;
/**
* Type of display that the button should be shown.
*
* @default primary
*/
variant: string;
}

function Button(props: Props) {
return (
<StyledButton disabled={props.isDisabled}>{props.children}</StyledButton>
<BaseButton variant={props.variant} disabled={props.isDisabled}>
{props.children}
</BaseButton>
);
}

Button.defaultProps = {
isDisabled: false
isDisabled: false,
variant: "primary"
};

export { Button };
Loading