-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into storybook-4
- Loading branch information
Showing
7 changed files
with
4,384 additions
and
4,402 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,4 @@ | ||
| { | ||
| "plugins": [ | ||
| "@babel/plugin-proposal-class-properties" | ||
| ], | ||
| "presets": [ | ||
| "@babel/preset-env", | ||
| "@babel/preset-react", | ||
| "@babel/preset-flow" | ||
| ] | ||
| "plugins": ["@babel/plugin-proposal-class-properties"], | ||
| "presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-flow"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| import { configure } from '@storybook/react'; | ||
|
|
||
| function loadStories() { | ||
| require('../stories/index.js'); | ||
| require('../stories/canvas-renderer.js'); | ||
| require('../stories/radial-progress'); | ||
| require('../stories/canvas-renderer'); | ||
| } | ||
|
|
||
| configure(loadStories, module); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,90 @@ | ||
| import React from 'react'; | ||
| import { storiesOf, setAddon } from '@storybook/react'; | ||
| import { storiesOf } from '@storybook/react'; | ||
| import { | ||
| withKnobs, | ||
| text, | ||
| boolean, | ||
| number, | ||
| color, | ||
| } from '@storybook/addon-knobs/react'; | ||
| import backgrounds from '@storybook/addon-backgrounds'; | ||
| import JSXAddon from 'storybook-addon-jsx'; | ||
| } from '@storybook/addon-knobs'; | ||
| import { jsxDecorator } from 'storybook-addon-jsx'; | ||
| import { CanvasRenderer } from '../src/renderers/'; | ||
|
|
||
| setAddon(JSXAddon); | ||
|
|
||
| const myBackgrounds = backgrounds([ | ||
| const backgrounds = [ | ||
| { name: 'white', value: '#fff', default: true }, | ||
| { name: 'blue', value: '#ccf' }, | ||
| { name: 'black', value: '#000' }, | ||
| ]); | ||
|
|
||
| let canvasRendererStories = storiesOf('CanvasRenderer', module); | ||
| canvasRendererStories.addDecorator(withKnobs); | ||
| canvasRendererStories.addDecorator(myBackgrounds); | ||
| ]; | ||
|
|
||
| canvasRendererStories.addWithJSX('The kitchen sink', () => { | ||
| const coloursGroup = 'Colour options'; | ||
| const displayGroup = 'Display options'; | ||
| const progressGroup = 'Progress display options'; | ||
| return ( | ||
| <div style={{ width: 200, height: 200 }}> | ||
| <CanvasRenderer | ||
| steps={number( | ||
| 'steps', | ||
| 10, | ||
| { | ||
| range: true, | ||
| min: 5, | ||
| max: 12, | ||
| step: 1, | ||
| }, | ||
| progressGroup | ||
| )} | ||
| proportion={number( | ||
| 'proportion', | ||
| 0.55, | ||
| { | ||
| range: true, | ||
| min: 0, | ||
| max: 1, | ||
| step: 1 / 500, | ||
| }, | ||
| progressGroup | ||
| )} | ||
| showIntermediateProgress={boolean( | ||
| 'showIntermediateProgress', | ||
| true, | ||
| progressGroup | ||
| )} | ||
| segmented={boolean('segmented', true, displayGroup)} | ||
| ringBgColour={color('ringBgColour', '#ccc', coloursGroup)} | ||
| ringIntermediateColour={color( | ||
| 'ringIntermediateColour', | ||
| '#aaa', | ||
| coloursGroup | ||
| )} | ||
| ringFgColour={color('ringFgColour', '#000', coloursGroup)} | ||
| backgroundColour={color('backgroundColour', '#fff', coloursGroup)} | ||
| backgroundTransparent={boolean( | ||
| 'backgroundTransparent', | ||
| true, | ||
| coloursGroup | ||
| )} | ||
| ringThickness={number( | ||
| 'ringThickness', | ||
| 0.2, | ||
| { | ||
| range: true, | ||
| min: 0, | ||
| max: 0.5, | ||
| step: 1 / 100, | ||
| }, | ||
| displayGroup | ||
| )} | ||
| /> | ||
| </div> | ||
| storiesOf('CanvasRenderer', module) | ||
| .addDecorator(jsxDecorator) | ||
| .addDecorator(withKnobs) | ||
| .add( | ||
| 'The kitchen sink', | ||
| () => { | ||
| const coloursGroup = 'Colour options'; | ||
| const displayGroup = 'Display options'; | ||
| const progressGroup = 'Progress display options'; | ||
| return ( | ||
| <div style={{ width: 200, height: 200 }}> | ||
| <CanvasRenderer | ||
| steps={number( | ||
| 'steps', | ||
| 10, | ||
| { | ||
| range: true, | ||
| min: 5, | ||
| max: 12, | ||
| step: 1, | ||
| }, | ||
| progressGroup | ||
| )} | ||
| proportion={number( | ||
| 'proportion', | ||
| 0.55, | ||
| { | ||
| range: true, | ||
| min: 0, | ||
| max: 1, | ||
| step: 1 / 500, | ||
| }, | ||
| progressGroup | ||
| )} | ||
| showIntermediateProgress={boolean( | ||
| 'showIntermediateProgress', | ||
| true, | ||
| progressGroup | ||
| )} | ||
| segmented={boolean('segmented', true, displayGroup)} | ||
| ringBgColour={color('ringBgColour', '#ccc', coloursGroup)} | ||
| ringIntermediateColour={color( | ||
| 'ringIntermediateColour', | ||
| '#aaa', | ||
| coloursGroup | ||
| )} | ||
| ringFgColour={color('ringFgColour', '#000', coloursGroup)} | ||
| backgroundColour={color('backgroundColour', '#fff', coloursGroup)} | ||
| backgroundTransparent={boolean( | ||
| 'backgroundTransparent', | ||
| true, | ||
| coloursGroup | ||
| )} | ||
| ringThickness={number( | ||
| 'ringThickness', | ||
| 0.2, | ||
| { | ||
| range: true, | ||
| min: 0, | ||
| max: 0.5, | ||
| step: 1 / 100, | ||
| }, | ||
| displayGroup | ||
| )} | ||
| /> | ||
| </div> | ||
| ); | ||
| }, | ||
| { | ||
| backgrounds: backgrounds, | ||
| } | ||
| ); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.