FIX a bug with animations not being stringify-able

storybookjs · Mar 4, 2019 · 1c27092 · 1c27092 · vercel · Mar 4, 2019
1 parent caa78fb
commit 1c27092
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/theming/src/create.ts b/lib/theming/src/create.ts
@@ -126,7 +126,7 @@ export const create = (vars: ThemeVars = { base: 'light' }, rest?: Rest): Theme
 
     // Toolbar default/active colors
     barTextColor: inherit.barTextColor,
-    barSelectedColor: inherit.barSelectedColor,
+    barSelectedColor: vars.barSelectedColor || inherit.colorSecondary,
     barBg: inherit.barBg,
 
     // Brand logo/text

diff --git a/lib/theming/src/ensure.ts b/lib/theming/src/ensure.ts
@@ -38,6 +38,7 @@ export const ensure = (input: any): Theme => {
   if (!input) {
     return light;
   } else {
+    // debugger;
     const missing = deletedDiff(base, input);
     if (Object.keys(missing).length) {
       logger.warn(
@@ -50,6 +51,6 @@ export const ensure = (input: any): Theme => {
       );
     }
 
-    return merge(light, input);
+    return merge(light, { ...input, animation: light.animation });
   }
 };