diff --git a/addons/ondevice-backgrounds/src/BackgroundPanel.js b/addons/ondevice-backgrounds/src/BackgroundPanel.js index 882861b94d6..5590bf71fba 100644 --- a/addons/ondevice-backgrounds/src/BackgroundPanel.js +++ b/addons/ondevice-backgrounds/src/BackgroundPanel.js @@ -10,14 +10,15 @@ const defaultBackground = { }; const instructionsHtml = ` -import { storiesOf } from '@storybook/react'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; +import { storiesOf } from '@storybook/react-native'; storiesOf('First Component', module) - .addDecorator(withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998" }, - ])) + .addParameters({ + backgrounds: [ + { name: 'warm', value: 'hotpink', default: true }, + { name: 'cool', value: 'deepskyblue' }, + ], + }) .add("First Button", () => ); `.trim(); diff --git a/examples-native/crna-kitchen-sink/storybook/stories/index.js b/examples-native/crna-kitchen-sink/storybook/stories/index.js index f2378931896..baf4f8681c6 100644 --- a/examples-native/crna-kitchen-sink/storybook/stories/index.js +++ b/examples-native/crna-kitchen-sink/storybook/stories/index.js @@ -6,19 +6,19 @@ import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; import { withKnobs } from '@storybook/addon-knobs'; import { withNotes } from '@storybook/addon-ondevice-notes'; -import { withBackgrounds } from '@storybook/addon-ondevice-backgrounds'; import knobsWrapper from './Knobs'; import Button from './Button'; import CenterView from './CenterView'; import Welcome from './Welcome'; addDecorator(withNotes); -addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#6cff5d', default: true }, - { name: 'facebook', value: '#3b5998' }, - ]) -); + +addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], +}); storiesOf('Welcome', module).add('to Storybook', () => , { notes: ` @@ -31,8 +31,8 @@ storiesOf('Welcome', module).add('to Storybook', () => ({ component: AppComponent, props: {}, @@ -21,12 +20,12 @@ storiesOf('Addon|Background', module) declarations: [Button], }) ) - .addDecorator( - withBackgrounds([ + .addParameters({ + backgrounds: [ { name: 'twitter', value: '#00aced', default: true }, { name: 'facebook', value: '#3b5998' }, - ]) - ) + ], + }) .add('background template', () => ({ template: ``, props: { diff --git a/examples/ember-cli/stories/addon-backgrounds.stories.js b/examples/ember-cli/stories/addon-backgrounds.stories.js index 0de74828493..159bed0b138 100644 --- a/examples/ember-cli/stories/addon-backgrounds.stories.js +++ b/examples/ember-cli/stories/addon-backgrounds.stories.js @@ -1,16 +1,16 @@ import hbs from 'htmlbars-inline-precompile'; import { storiesOf } from '@storybook/ember'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; storiesOf('Addon|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'LinkedIn', value: '#0073b1', default: true }, - { name: 'Twitter', value: '#00aced' }, - { name: 'Facebook', value: '#3b5998' }, - ]) - ) - .addParameters({ options: { selectedAddonPanel: 'storybook-addon-background/background-panel' } }) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + options: { + selectedAddonPanel: 'storybook/background/panel', + }, + }) .add('story 1', () => ({ template: hbs``, })) diff --git a/examples/html-kitchen-sink/stories/addon-backgrounds.stories.js b/examples/html-kitchen-sink/stories/addon-backgrounds.stories.js index dfd37641883..7e8689f9656 100644 --- a/examples/html-kitchen-sink/stories/addon-backgrounds.stories.js +++ b/examples/html-kitchen-sink/stories/addon-backgrounds.stories.js @@ -1,14 +1,12 @@ import { storiesOf } from '@storybook/html'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; - storiesOf('Addons|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add( 'story 1', () => diff --git a/examples/mithril-kitchen-sink/src/stories/addon-backgrounds.stories.js b/examples/mithril-kitchen-sink/src/stories/addon-backgrounds.stories.js index 7fc90591385..ea67de2836c 100644 --- a/examples/mithril-kitchen-sink/src/stories/addon-backgrounds.stories.js +++ b/examples/mithril-kitchen-sink/src/stories/addon-backgrounds.stories.js @@ -4,16 +4,15 @@ import m from 'mithril'; import { storiesOf } from '@storybook/mithril'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; import BaseButton from '../BaseButton'; storiesOf('Addons|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add('story 1', () => ({ view: () => , })) diff --git a/examples/official-storybook/stories/addon-backgrounds.stories.js b/examples/official-storybook/stories/addon-backgrounds.stories.js index 83d61485983..f8b0e66b55b 100644 --- a/examples/official-storybook/stories/addon-backgrounds.stories.js +++ b/examples/official-storybook/stories/addon-backgrounds.stories.js @@ -1,17 +1,16 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; -import backgrounds from '@storybook/addon-backgrounds'; import BaseButton from '../components/BaseButton'; storiesOf('Addons|Backgrounds', module) .addParameters({ backgrounds: [ - { name: 'black', value: '#000000' }, - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, { name: 'white', value: '#ffffff' }, + { name: 'light', value: '#eeeeee' }, { name: 'gray', value: '#cccccc' }, + { name: 'dark', value: '#222222', default: true }, + { name: 'black', value: '#000000' }, ], options: { selectedPanel: 'storybook/background/panel', @@ -23,8 +22,8 @@ storiesOf('Addons|Backgrounds', module) .add('story 2', () => ) .add('overriden', () => , { backgrounds: [ - { name: 'red', value: '#F44336' }, - { name: 'blue', value: '#2196F3', default: true }, + { name: 'pink', value: 'hotpink' }, + { name: 'blue', value: 'deepskyblue', default: true }, ], }) .add('disabled via []', () => , { @@ -37,22 +36,3 @@ storiesOf('Addons|Backgrounds', module) backgrounds: { disable: true }, } ); - -storiesOf('Addons|Backgrounds.deprecated', module) - .addDecorator( - backgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) - .add('story 1', () => ( - - )) - .add('story 2', () => ) - .add( - 'overriden', - backgrounds([ - { name: 'red', value: '#F44336' }, - { name: 'blue', value: '#2196F3', default: true }, - ])(() => ) - ); diff --git a/examples/polymer-cli/src/stories/addon-backgrounds.stories.js b/examples/polymer-cli/src/stories/addon-backgrounds.stories.js index a988891d083..11ae7370b44 100644 --- a/examples/polymer-cli/src/stories/addon-backgrounds.stories.js +++ b/examples/polymer-cli/src/stories/addon-backgrounds.stories.js @@ -1,11 +1,10 @@ import { storiesOf } from '@storybook/polymer'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; storiesOf('Addon|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced', default: true }, - { name: 'facebook', value: '#3b5998' }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add('button with text', () => ''); diff --git a/examples/riot-kitchen-sink/src/stories/addon-backgrounds.stories.js b/examples/riot-kitchen-sink/src/stories/addon-backgrounds.stories.js index d0de31944c1..43f40d39e36 100644 --- a/examples/riot-kitchen-sink/src/stories/addon-backgrounds.stories.js +++ b/examples/riot-kitchen-sink/src/stories/addon-backgrounds.stories.js @@ -1,14 +1,13 @@ import { storiesOf } from '@storybook/riot'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; import ButtonRaw from './Button.txt'; storiesOf('Addon|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add('story 1', () => { const content = 'You should be able to switch backgrounds for this story'; diff --git a/examples/svelte-kitchen-sink/src/stories/addon-backgrounds.stories.js b/examples/svelte-kitchen-sink/src/stories/addon-backgrounds.stories.js index 93cb7ef53d6..a03bafbed00 100644 --- a/examples/svelte-kitchen-sink/src/stories/addon-backgrounds.stories.js +++ b/examples/svelte-kitchen-sink/src/stories/addon-backgrounds.stories.js @@ -1,15 +1,14 @@ import { storiesOf } from '@storybook/svelte'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; import ButtonView from './views/ButtonView.svelte'; storiesOf('Addon|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add('story 1', () => ({ Component: ButtonView, })); diff --git a/examples/vue-kitchen-sink/src/stories/addon-backgrounds.stories.js b/examples/vue-kitchen-sink/src/stories/addon-backgrounds.stories.js index 10723efaf9b..6a539fd04c8 100644 --- a/examples/vue-kitchen-sink/src/stories/addon-backgrounds.stories.js +++ b/examples/vue-kitchen-sink/src/stories/addon-backgrounds.stories.js @@ -1,13 +1,12 @@ import { storiesOf } from '@storybook/vue'; -import { withBackgrounds } from '@storybook/addon-backgrounds'; storiesOf('Addon|Backgrounds', module) - .addDecorator( - withBackgrounds([ - { name: 'twitter', value: '#00aced' }, - { name: 'facebook', value: '#3b5998', default: true }, - ]) - ) + .addParameters({ + backgrounds: [ + { name: 'light', value: '#eeeeee' }, + { name: 'dark', value: '#222222', default: true }, + ], + }) .add('story 1', () => { const content = 'You should be able to switch backgrounds for this story';