Support Storybook v6

Author: usulpro

.storybook/stories.js

@@ -15,20 +15,23 @@ import { withAdk, adkParams } from '../dev/withAdk';
  */
 
 addParameters(
-  adkParams({ themes: ['theme1-aa', 'theme2-bb', 't3', 't4', 't5'], currentTheme: 0 })
+  adkParams({
+    themes: ['theme1-aa', 'theme2-bb', 't3', 't4', 't5'],
+    currentTheme: 0,
+  })
 );
 
 storiesOf('Storybook Addon Development Kit', module)
   .addDecorator(withAdk({ mainColor: 'green' }))
   .add(
     'Stories',
-    () => {
+    storyArgs => {
       return (
         <div>
           <button>Button 1</button>
         </div>
       );
-    },
+    }
     // adkParams({ currentTheme: 1 })
   )
   .add(
@@ -39,7 +42,7 @@ storiesOf('Storybook Addon Development Kit', module)
           <button>Button 2</button>
         </div>
       );
-    },
+    }
     // adkParams({ currentTheme: 0 })
   );
 //   .add('Details', () => (

dev/withAdk.js

@@ -6,7 +6,7 @@ const DecoratorUI = ({ context, getStory, theme, info }) => (
   <div>
     Theme: {theme} <br />
     Data: {info} <br />
-    {getStory(context)}
+    {getStory({ customAddonArgs: { result: 'foo' } })}
   </div>
 );
 

src/decorator.js

@@ -68,8 +68,31 @@ export const createDecorator = (
     createActions,
   })(createHOC(paramSelectors));
 
+  const getStoryAndInjectParams = ctx => {
+    const {
+      argTypes,
+      args,
+      globals,
+      hooks,
+      id,
+      kind,
+      loaded,
+      name,
+      parameters,
+      story,
+      viewMode,
+      ...additionalArgs
+    } = ctx || {};
+    Object.assign(context.args, additionalArgs);
+    return getStory(additionalArgs);
+  };
+
   return (
-    <WithChannel getStory={getStory} context={context} Component={Component} />
+    <WithChannel
+      getStory={getStoryAndInjectParams}
+      context={context}
+      Component={Component}
+    />
   );
 };