Merge pull request #31 from kadirahq/on-story-bug-fix

On story bug fix
storybookjs · Aug 24, 2016 · 7f55722 · 7f55722
2 parents 66cb59d + bafe09d
commit 7f55722
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/modules/api/configs/__tests__/init_api.js b/src/modules/api/configs/__tests__/init_api.js
@@ -63,10 +63,14 @@ describe('manager.api.config.initApi', () => {
 
   it('should support to add multiple onStory callback', (done) => {
     const actions = { api: {}, shortcuts: {} };
+    const selectedKind = 'XXdd';
+    const selectedStory = 'u8sd';
 
     const reduxStore = {
       subscribe: sinon.stub(),
-      getState: () => ({ api: {} }),
+      getState: () => ({
+        api: { selectedKind, selectedStory },
+      }),
     };
 
     const provider = {
@@ -91,10 +95,14 @@ describe('manager.api.config.initApi', () => {
 
   it('should support a way to remove onStory callback', (done) => {
     const actions = { api: {}, shortcuts: {} };
+    const selectedKind = 'XXdd';
+    const selectedStory = 'u8sd';
 
     const reduxStore = {
       subscribe: sinon.stub(),
-      getState: () => ({ api: {} }),
+      getState: () => ({
+        api: { selectedKind, selectedStory },
+      }),
     };
 
     const provider = {

diff --git a/src/modules/api/configs/init_api.js b/src/modules/api/configs/init_api.js
@@ -29,10 +29,19 @@ export default function (provider, reduxStore, actions) {
   provider.handleAPI(providerApi);
 
   // subscribe to redux store and trigger onStory's callback
+  let currentKind;
+  let currentStory;
   reduxStore.subscribe(function () {
     const { api } = reduxStore.getState();
     if (!api) return;
 
+    if (api.selectedKind === currentKind && api.selectedStory === currentStory) {
+      // No change in the selected story so avoid emitting 'story'
+      return;
+    }
+
+    currentKind = api.selectedKind;
+    currentStory = api.selectedStory;
     callbacks.emit('story', api.selectedKind, api.selectedStory);
     // providerApi._onStoryCallback(api.selectedKind, api.selectedStory);
   });