Added global addOptions and chapter.addOptions

app/angular/src/client/index.js

@@ -1,3 +1,3 @@
-export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
+export { storiesOf, setAddon, addDecorator, addOptions, configure, getStorybook } from './preview';
 
 export { moduleMetadata } from './preview/angular/decorators';

app/angular/src/client/preview/index.js

@@ -41,7 +41,14 @@ if (isBrowser) {
 }
 
 const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+export const {
+  storiesOf,
+  setAddon,
+  addDecorator,
+  addOptions,
+  clearDecorators,
+  getStorybook,
+} = clientApi;
 
 const configApi = new ConfigApi({ ...context, clearDecorators });
 export const { configure } = configApi;

app/polymer/src/client/index.js

@@ -1 +1 @@
-export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
+export { storiesOf, setAddon, addDecorator, addOptions, configure, getStorybook } from './preview';

app/polymer/src/client/preview/index.js

@@ -42,7 +42,14 @@ if (isBrowser) {
 }
 
 const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+export const {
+  storiesOf,
+  setAddon,
+  addDecorator,
+  addOptions,
+  clearDecorators,
+  getStorybook,
+} = clientApi;
 
 const configApi = new ConfigApi({ clearDecorators, ...context });
 export const { configure } = configApi;

app/react-native/src/index.js

@@ -11,6 +11,7 @@ const preview = new Preview();
 export const storiesOf = preview.storiesOf.bind(preview);
 export const setAddon = preview.setAddon.bind(preview);
 export const addDecorator = preview.addDecorator.bind(preview);
+export const addOptions = preview.addOptions.bind(preview);
 export const clearDecorators = preview.clearDecorators.bind(preview);
 export const configure = preview.configure.bind(preview);
 export const getStorybook = preview.getStorybook.bind(preview);

app/react-native/src/preview/index.js

@@ -18,7 +18,14 @@ export default class Preview {
     this._stories = new StoryStore();
     this._clientApi = new ClientApi({ storyStore: this._stories });
 
-    ['storiesOf', 'setAddon', 'addDecorator', 'clearDecorators', 'getStorybook'].forEach(method => {
+    [
+      'storiesOf',
+      'setAddon',
+      'addDecorator',
+      'addOptions',
+      'clearDecorators',
+      'getStorybook',
+    ].forEach(method => {
       this[method] = this._clientApi[method].bind(this._clientApi);
     });
   }

app/react/src/client/index.js

@@ -8,6 +8,7 @@ export {
   storiesOf,
   setAddon,
   addDecorator,
+  addOptions,
   configure,
   getStorybook,
   forceReRender,

app/react/src/client/preview/index.js

@@ -42,7 +42,14 @@ if (isBrowser) {
 }
 
 const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+export const {
+  storiesOf,
+  setAddon,
+  addDecorator,
+  addOptions,
+  clearDecorators,
+  getStorybook,
+} = clientApi;
 
 const configApi = new ConfigApi({ clearDecorators, ...context });
 export const { configure } = configApi;

app/vue/src/client/index.js

@@ -1 +1 @@
-export { storiesOf, setAddon, addDecorator, configure, getStorybook } from './preview';
+export { storiesOf, setAddon, addDecorator, addOptions, configure, getStorybook } from './preview';

app/vue/src/client/preview/index.js

@@ -60,7 +60,14 @@ if (isBrowser) {
 }
 
 const clientApi = new ClientApi(context);
-export const { storiesOf, setAddon, addDecorator, clearDecorators, getStorybook } = clientApi;
+export const {
+  storiesOf,
+  setAddon,
+  addDecorator,
+  addOptions,
+  clearDecorators,
+  getStorybook,
+} = clientApi;
 
 const configApi = new ConfigApi({ ...context, clearDecorators });
 export const { configure } = configApi;

examples/official-storybook/stories/core.stories.js

@@ -1,12 +1,14 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
+import { storiesOf, addOptions } from '@storybook/react';
 
-storiesOf('core/options', module).add(
-  'passed to story',
-  ({ options: { myOption } }) => (
-    <div>
-      Value of <code>myOption</code> is '<code>{myOption}</code>'
-    </div>
-  ),
-  { myOption: 'value' }
-);
+const globalOption = 'globalOption';
+const chapterOption = 'chapterOption';
+const storyOption = 'storyOption';
+
+addOptions({ globalOption });
+
+storiesOf('core/options', module)
+  .addOptions({ chapterOption })
+  .add('passed to story', ({ options }) => <div>Options are {JSON.stringify(options)}</div>, {
+    storyOption,
+  });

lib/core/src/client/preview/client_api.js

@@ -15,6 +15,7 @@ export default class ClientApi {
     this._storyStore = storyStore;
     this._addons = {};
     this._globalDecorators = [];
+    this._globalOptions = {};
     this._decorateStory = decorateStory;
   }
 
@@ -29,6 +30,10 @@ export default class ClientApi {
     this._globalDecorators.push(decorator);
   };
 
+  addOptions = options => {
+    this._globalOptions = options;
+  };
+
   clearDecorators = () => {
     this._globalDecorators = [];
   };
@@ -52,6 +57,7 @@ export default class ClientApi {
     }
 
     const localDecorators = [];
+    let localOptions = {};
     const api = {
       kind,
     };
@@ -83,6 +89,8 @@ export default class ClientApi {
 
       // Add the fully decorated getStory function.
       this._storyStore.addStory(kind, storyName, this._decorateStory(getStory, decorators), {
+        ...this._globalOptions,
+        ...localOptions,
         ...options,
         fileName,
       });
@@ -94,6 +102,11 @@ export default class ClientApi {
       return api;
     };
 
+    api.addOptions = options => {
+      localOptions = { ...localOptions, ...options };
+      return api;
+    };
+
     return api;
   };