fix: smart marked as false

ccontrols · May 13, 2021 · ac6d2e0 · ac6d2e0
1 parent 571f925
commit ac6d2e0
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/core/core/src/controls-utils.ts b/core/core/src/controls-utils.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import escape from 'escape-html';
-import { deepmerge, deepMergeReplaceArrays } from './deepMerge';
+import { deepmerge } from './deepMerge';
 import { Components, getComponentName } from './components';
 import { Story, Document } from './document';
 import { SmartControls } from './common';
@@ -351,18 +351,22 @@ const controlShortcuts = (
 export const transformControls = (
   controls?: ComponentControls,
   propControls?: ComponentControls,
+  smart = true,
 ): ComponentControls | undefined => {
   return controls
-    ? Object.keys({ ...propControls, ...controls }).reduce((acc, key) => {
-        const control = controlShortcuts(key, controls, propControls);
-        if (control.defaultValue === undefined) {
-          const defaultValue = getControlValue(control);
-          if (typeof defaultValue !== 'function') {
-            control.defaultValue = defaultValue;
+    ? Object.keys(smart ? { ...propControls, ...controls } : controls).reduce(
+        (acc, key) => {
+          const control = controlShortcuts(key, controls, propControls);
+          if (control.defaultValue === undefined) {
+            const defaultValue = getControlValue(control);
+            if (typeof defaultValue !== 'function') {
+              control.defaultValue = defaultValue;
+            }
           }
-        }
-        return { ...acc, [key]: control };
-      }, {})
+          return { ...acc, [key]: control };
+        },
+        {},
+      )
     : undefined;
 };
 
@@ -445,14 +449,10 @@ export const getStoryControls = (
           return true;
         })
         .reduce((acc, key) => ({ ...acc, [key]: newControls[key] }), {});
-      const transformed = transformControls(storyControls, filteredControls);
       const { smart = true } = smartControls;
-      if (!story.component || !smart || story.smartControls === false) {
-        return transformControls(storyControls, filteredControls);
-      }
-      return transformed
-        ? deepMergeReplaceArrays(filteredControls, transformed)
-        : filteredControls;
+      const isSmart: boolean = story.smartControls !== false && smart;
+
+      return transformControls(storyControls, filteredControls, isSmart);
     }
   }
   return transformControls(storyControls);