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

Prepare the storybook-readme #162

Merged
merged 5 commits into from
Jun 21, 2019
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
2 changes: 1 addition & 1 deletion .storybook/addons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '@storybook/addon-a11y/register'
import '@storybook/addon-actions/register'
import '@storybook/addon-links/register'
import '@storybook/addon-viewport/register'
import 'storybook-readme/register'
20 changes: 13 additions & 7 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import React from 'react'
import { configure, addDecorator, addParameters } from '@storybook/react'
import { create } from '@storybook/theming'
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
import { withA11y } from '@storybook/addon-a11y'
import { addReadme } from 'storybook-readme'

import { createTheme } from '../src/themes/createTheme'
import { ThemeProvider } from '../src/themes/ThemeProvider'
import { withA11y } from '@storybook/addon-a11y'

const req = require.context('../src/components', true, /.stories.tsx$/)

function loadStories() {
req.keys().forEach(filename => req(filename))
}

addParameters({
options: {
Expand All @@ -17,13 +25,11 @@ addParameters({
isToolshown: true,
},
})
addParameters({ viewport: { viewports: INITIAL_VIEWPORTS } })

const req = require.context('../src/components', true, /.stories.tsx$/)
function loadStories() {
req.keys().forEach(filename => req(filename))
}

addDecorator(withA11y)
addDecorator(addReadme)
addDecorator(storyFn => <ThemeProvider theme={createTheme()}>{storyFn()}</ThemeProvider>)

configure(loadStories, module)

addDecorator(withA11y)
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"@babel/core": "^7.2.2",
"@storybook/addon-a11y": "^5.1.1",
"@storybook/addon-actions": "^5.0.11",
"@storybook/addon-links": "^5.1.7",
"@storybook/addon-viewport": "^5.0.11",
"@storybook/addon-viewport": "^5.1.8",
"@storybook/addons": "^5.0.11",
"@storybook/cli": "^5.1.7",
"@storybook/react": "^5.0.11",
Expand Down Expand Up @@ -43,6 +42,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-test-renderer": "16.8.6",
"storybook-readme": "^5.0.3",
"styled-components": "^4.3.1",
"stylelint": "^10.1.0",
"stylelint-config-prettier": "^5.1.0",
Expand Down
17 changes: 12 additions & 5 deletions src/components/AppBar/AppBar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ import { storiesOf } from '@storybook/react'
import * as React from 'react'

import { AppBar } from './AppBar'
import readme from './README.md'

storiesOf('AppBar', module).add('all', () => (
<AppBar pcSize="l" tabletSize="m" spSize="s">
AppBar Component
</AppBar>
))
storiesOf('AppBar', module)
.addParameters({
readme: {
sidebar: readme,
},
})
.add('AppBar', () => (
<AppBar pcSize="l" tabletSize="m" spSize="s">
AppBar Component
</AppBar>
))
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
import { mount } from 'enzyme'
import React from 'react'
import ReactTestRenderer from 'react-test-renderer'
import { AppBar } from '../AppBar'

describe('index', () => {
import { AppBar } from './AppBar'

describe('AppBar', () => {
it('should be match snapshot', () => {
const component = mount(<AppBar />)
expect(component).toMatchSnapshot()
})

it('should be able to render without crashing', () => {
ReactTestRenderer.create(<AppBar />)
})

it('should be render a `<AppBarComponent />`', () => {
it('should render a `<AppBarComponent />`', () => {
const component = mount(
<AppBar pcSize="l" tabletSize="m" spSize="s">
AppBar Component
Expand Down
19 changes: 9 additions & 10 deletions src/components/AppBar/AppBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,39 @@ import * as React from 'react'
import styled, { css } from 'styled-components'

import { InjectedProps, withTheme } from '../../hocs/withTheme'
import { ComponentProps, SizePattern, StyledProperties } from '../../types/componentProps'
import { ComponentProps, Size, StyledProperties } from '../../types/props'

type MergedComponentProps = ComponentProps<{}> & InjectedProps
type MergedComponentProps = ComponentProps & InjectedProps
type MergedStyledProps = StyledProperties & InjectedProps

const AppBarComponent: React.FC<MergedComponentProps> = ({ ...props }) => <Wrapper {...props} />

export const AppBar = withTheme(AppBarComponent)

const getSpaceSize = (size: SizePattern): 'xs' | 's' | 'm' => {
const getSpaceSize = (size: Size): 'xs' | 's' | 'm' => {
const spaceMap: any = {
xs: 'xs',
s: 'xs',
m: 's',
l: 'm',
xl: 'm',
}
return spaceMap[size]
}
const Wrapper: any = styled.div`
const Wrapper = styled.div`
${({ spSize = 'm', pcSize = 'm', tabletSize = 'm', theme }: MergedStyledProps) => {
const { size, palette } = theme
const [pcPadding, tabletPadding, spPadding] = [pcSize, tabletSize, spSize]
.map(getSpaceSize)
.map(size => `0 ${theme.size.pxToRem(theme.size.space[size])}`)
.map(spaceSize => `0 ${size.pxToRem(size.space[spaceSize])}`)

return css`
padding: ${pcPadding};
background: ${theme.palette.SmartHRGreen};
background: ${palette.SmartHRGreen};

@media screen and (max-width: ${theme.size.mediaQuery.tablet}px) {
@media screen and (max-width: ${size.mediaQuery.tablet}px) {
padding: ${tabletPadding};
}

@media screen and (max-width: ${theme.size.mediaQuery.sp}px) {
@media screen and (max-width: ${size.mediaQuery.sp}px) {
padding: ${spPadding};
}
`
Expand Down
19 changes: 19 additions & 0 deletions src/components/AppBar/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# AppBar

```tsx
import { AppBar } from 'smarthr-ui'

<AppBar pcSize="l" tabletSize="m" spSize="s">
AppBar Component
</AppBar>
```

## props

| Name | Required | Type | DefaultValue | Description |
| ---------- | -------- | --------------------------------- | ------------ | ----------------------------------------------------------------- |
| pcSize | - | **enum** <br> s &#124; m &#124; l | m | Size of left and right padding when innerWidth is 1000px or more |
| tabletSize | - | **enum** <br> s &#124; m &#124; l | m | Size of left and right padding when innerWidth is 600px or more |
| spSize | - | **enum** <br> s &#124; m &#124; l | m | Size of left and right padding when innerWidth is less than 599px |

The number of mediaQuery can be overwritten by the user.
Loading