Skip to content

Commit

Permalink
upgrade storybook to v4
Browse files Browse the repository at this point in the history
import object

move story wrappers to config

add min heights
  • Loading branch information
jscottsmith committed Oct 31, 2018
1 parent 860183e commit 0003565
Show file tree
Hide file tree
Showing 35 changed files with 2,190 additions and 1,577 deletions.
@@ -0,0 +1 @@
{"value":{"success":true,"data":{"latest":{"version":"4.0.0","info":{"plain":"- upgrade webpack & babel to latest\n- new addParameters and third argument to .add to pass data to addons\n- added the ability to theme storybook\n- improved ui for mobile devices\n- improved performance of addon-knobs"}}},"time":1540842081579},"type":"Object"}
62 changes: 29 additions & 33 deletions .storybook/config.js
@@ -1,42 +1,38 @@
import { configure, setAddon } from '@storybook/react';
import infoAddon, { setDefaults } from '@storybook/addon-info';
import { setOptions } from '@storybook/addon-options';
// import ReadmeContainer from 'storybook-readme/components/readme-container';
// import DefaultPreview from 'storybook-readme/with-docs';
import React from 'react';
import { configure, addDecorator } from '@storybook/react';
import { withOptions } from '@storybook/addon-options';
import { withInfo } from '@storybook/addon-info';

import './index.css';

setOptions({
name: 'Gumdrops',
url: 'https://storybook.gumgum.com',
goFullScreen: false,
showStoriesPanel: true,
showAddonPanel: true,
showSearchBox: false,
addonPanelInRight: true,
sortStoriesByKind: true
});

setDefaults({
inline: true,
header: false,
source: true,
styles: stylesheet => {
stylesheet.infoBody = {
infoBody: {
padding: '10px'
}
};
return stylesheet;
},
maxPropsIntoLine: 1
// propTablesExclude: [ReadmeContainer, DefaultPreview]
});

function loadStories() {
require('../_stories/');
}

setAddon(infoAddon);
const storyWrapper = story => <div style={{ margin: 35 }}>{story()}</div>;

addDecorator(
withInfo({
inline: true,
header: false,
source: true,
maxPropsIntoLine: 1
})
);

addDecorator(
withOptions({
name: 'Gumdrops',
url: 'https://storybook.gumgum.com',
goFullScreen: false,
showStoriesPanel: true,
showAddonPanel: true,
showSearchBox: false,
addonPanelInRight: true,
sortStoriesByKind: true
})
);

addDecorator(storyWrapper);

configure(loadStories, module);
2 changes: 1 addition & 1 deletion _stories/atoms/Button/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { text, selectV2 as select, boolean, object } from '@storybook/addon-knobs';
import { text, select, boolean, object } from '@storybook/addon-knobs';
import { optionalSelect } from '../../../components/utils/optionalSelect';
import { action } from '@storybook/addon-actions';

Expand Down
16 changes: 9 additions & 7 deletions _stories/atoms/NumberCircle/index.js
Expand Up @@ -24,13 +24,15 @@ const sizeOptions = {
};

const component = () => (
<NumberCircle
text={text('Text', '1')}
size={optionalSelect('Size', sizeOptions, '')}
context={optionalSelect('Context', contextOptions, '')}
className={text('ClassName', '')}
style={object('Styles', {})}
/>
<div style={{ minHeight: 100 }}>
<NumberCircle
text={text('Text', '1')}
size={optionalSelect('Size', sizeOptions, '')}
context={optionalSelect('Context', contextOptions, '')}
className={text('ClassName', '')}
style={object('Styles', {})}
/>
</div>
);

export default [readme, component];
2 changes: 1 addition & 1 deletion _stories/atoms/TextInput/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { boolean, selectV2 as select, text, object } from '@storybook/addon-knobs';
import { boolean, select, text, object } from '@storybook/addon-knobs';
import { optionalSelect } from '../../../components/utils/optionalSelect';
import { action } from '@storybook/addon-actions';

Expand Down
2 changes: 1 addition & 1 deletion _stories/atoms/Trend/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select, text, object } from '@storybook/addon-knobs';
import { select, text, object } from '@storybook/addon-knobs';

import readme from './README.md';
import Trend from '../../../components/atoms/Trend';
Expand Down
7 changes: 0 additions & 7 deletions _stories/atoms/index.js
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { withReadme } from 'storybook-readme';
import { withKnobs } from '@storybook/addon-knobs';
import { withInfo } from '@storybook/addon-info';

import Badge from './Badge/';
import Button from './Button/';
Expand All @@ -20,13 +19,7 @@ import TextInput from './TextInput';
import Select from './Select';

const stories = storiesOf('Atoms', module);
const storyWrapper = story => {
return <div style={{ margin: '35px' }}>{story()}</div>;
};

stories
.addDecorator((story, context) => withInfo('')(story)(context))
.addDecorator(storyWrapper)
.addDecorator(withKnobs)
.add('Badge', withReadme(...Badge))
.add('Button', withReadme(...Button))
Expand Down
6 changes: 0 additions & 6 deletions _stories/layout/index.js
Expand Up @@ -2,20 +2,14 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { withReadme } from 'storybook-readme';
import { withKnobs } from '@storybook/addon-knobs';
import { withInfo } from '@storybook/addon-info';

import Column from './Column/';
import LayoutContainer from './LayoutContainer/';
import Row from './Row/';

const stories = storiesOf('Layout', module);
const storyWrapper = story => {
return <div style={{ margin: '35px' }}>{story()}</div>;
};

stories
.addDecorator((story, context) => withInfo('')(story)(context))
.addDecorator(storyWrapper)
.addDecorator(withKnobs)
.add('Column', withReadme(...Column))
.add('LayoutContainer', withReadme(...LayoutContainer))
Expand Down
22 changes: 12 additions & 10 deletions _stories/molecules/Avatar/index.js
Expand Up @@ -14,16 +14,18 @@ const options = [
];

const component = () => (
<Avatar
open={boolean('Open', false)}
menuCallback={action('avatar_menu_toggled')}
optionCallback={action('avatar_menu_option_clicked')}
username={text('Username', 'Michele')}
img={text('Image url', '')}
menuOptions={options}
className={text('ClassName', '-float-right')}
style={object('Style', {})}
/>
<div style={{ minHeight: 100 }}>
<Avatar
open={boolean('Open', false)}
menuCallback={action('avatar_menu_toggled')}
optionCallback={action('avatar_menu_option_clicked')}
username={text('Username', 'Michele')}
img={text('Image url', '')}
menuOptions={options}
className={text('ClassName', '-float-right')}
style={object('Style', {})}
/>
</div>
);

export default [readme, component];
2 changes: 1 addition & 1 deletion _stories/molecules/Breadcrumbs/index.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { selectV2 as select, boolean } from '@storybook/addon-knobs';
import { select, boolean } from '@storybook/addon-knobs';

import readme from './README.md';
import Breadcrumbs from '../../../components/molecules/Breadcrumbs';
Expand Down
2 changes: 1 addition & 1 deletion _stories/molecules/MultiSelect/index.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { text } from '@storybook/addon-knobs';
import { optionalSelect } from '../../../components/utils/optionalSelect';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
// import { action } from '@storybook/addon-actions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/molecules/Pagination/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { number, boolean, selectV2 as select } from '@storybook/addon-knobs';
import { number, boolean, select } from '@storybook/addon-knobs';
import { action } from '@storybook/addon-actions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/molecules/SearchMultiSelect/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select, text, boolean, button } from '@storybook/addon-knobs';
import { select, button, text, boolean } from '@storybook/addon-knobs';
import { action } from '@storybook/addon-actions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/molecules/Toggle/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select, text, object } from '@storybook/addon-knobs';
import { select, text, object } from '@storybook/addon-knobs';
import { optionalSelect } from '../../../components/utils/optionalSelect';

import readme from './README.md';
Expand Down
4 changes: 0 additions & 4 deletions _stories/molecules/index.js
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { withReadme } from 'storybook-readme';
import { withKnobs } from '@storybook/addon-knobs';
import { withInfo } from '@storybook/addon-info';

import Accordion from './Accordion';
import Avatar from './Avatar/';
Expand All @@ -24,11 +23,8 @@ import Toggle from './Toggle/';
import Well from './Well/';

const stories = storiesOf('Molecules', module);
const storyWrapper = story => <div style={{ margin: '35px' }}>{story()}</div>;

stories
.addDecorator((story, context) => withInfo('')(story)(context))
.addDecorator(storyWrapper)
.addDecorator(withKnobs)
.add('Accordion', withReadme(...Accordion))
.add('Avatar', withReadme(...Avatar))
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/BorderRadius/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Color/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';

import readme from './README.md';
import { colors } from '../constants';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Cursor/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Disable/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import Button from '../../../components/atoms/Button';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Display/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Ellipsis/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Float/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select, object } from '@storybook/addon-knobs';
import { select, object } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Margin/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Overflow/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select, object } from '@storybook/addon-knobs';
import { select, object } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/Padding/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/PointerEvents/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import { action } from '@storybook/addon-actions';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/TextAlign/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/TextTransform/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/UserSelect/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';

import readme from './README.md';

Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/VerticalAlign/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';
import arrToObjOptions from '../../../components/utils/arrToObjOptions';

import readme from './README.md';
Expand Down
2 changes: 1 addition & 1 deletion _stories/utilities/ZIndex/index.js
@@ -1,5 +1,5 @@
import React from 'react';
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';

import readme from './README.md';
import { colors } from '../constants';
Expand Down
2 changes: 0 additions & 2 deletions _stories/utilities/index.js
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { withReadme } from 'storybook-readme';
import { withKnobs } from '@storybook/addon-knobs';
import { withInfo } from '@storybook/addon-info';

import AbsolutePosition from './AbsolutePosition';
import BorderRadius from './BorderRadius';
Expand All @@ -28,7 +27,6 @@ const storyWrapper = story => {
};

stories
.addDecorator((story, context) => withInfo('')(story)(context))
.addDecorator(storyWrapper)
.addDecorator(withKnobs)
.add('AbsolutePosition', withReadme(...AbsolutePosition))
Expand Down
2 changes: 1 addition & 1 deletion components/utils/optionalSelect.js
@@ -1,4 +1,4 @@
import { selectV2 as select } from '@storybook/addon-knobs';
import { select } from '@storybook/addon-knobs';

/**
Expand Down

0 comments on commit 0003565

Please sign in to comment.