partially apply configuration

storybookjs · Nov 11, 2019 · c74b1f6 · c74b1f6
1 parent 85a8acc
commit c74b1f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/addons/a11y/README.md b/addons/a11y/README.md
@@ -56,7 +56,6 @@ import { withA11y } from '@storybook/addon-a11y';
 addDecorator(withA11y)
 addParameters({
   a11y: {
-    // ... axe options
     element: '#root', // optional selector which element to inspect
     config: {}, // axe-core configurationOptions (https://github.com/dequelabs/axe-core/blob/develop/doc/API.md#parameters-1)
     options: {} // axe-core optionsParameter (https://github.com/dequelabs/axe-core/blob/develop/doc/API.md#options-parameter)

diff --git a/addons/a11y/src/index.ts b/addons/a11y/src/index.ts
@@ -48,18 +48,20 @@ if (module && module.hot && module.hot.decline) {
   module.hot.decline();
 }
 
-let storedSetup: Setup | null = null;
+let storedDefaultSetup: Setup | null = null;
 
 export const withA11y = makeDecorator({
   name: 'withA11Y',
   parameterName: PARAM_KEY,
   wrapper: (getStory, context, { parameters }) => {
     if (parameters) {
-      storedSetup = setup;
-      setup = parameters as Setup;
-    } else if (storedSetup) {
-      setup = storedSetup;
-      storedSetup = null;
+      if (storedDefaultSetup === null) {
+        storedDefaultSetup = { ...setup };
+      }
+      Object.assign(setup, parameters as Setup);
+    } else if (storedDefaultSetup !== null) {
+      Object.assign(setup, storedDefaultSetup);
+      storedDefaultSetup = null;
     }
     addons.getChannel().on(EVENTS.REQUEST, () => run(setup.element, setup.config, setup.options));