ADD special case for barSelectedColor, since it should be using `co…

…lorSecondary` as fallback
storybookjs · Mar 4, 2019 · 2aec10a · 2aec10a · vercel · Mar 4, 2019
1 parent fac9ee3
commit 2aec10a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/theming/src/create.ts b/lib/theming/src/create.ts
@@ -82,11 +82,15 @@ const darkSyntaxColors = {
 export const create = (vars: ThemeVars = { base: 'light' }, rest?: Rest): ThemeVars => {
   const inherit: ThemeVars = {
     ...themes.light,
-    ...(themes[vars.base] || themes.light),
+    ...(themes[vars.base] || {}),
     ...vars,
     ...{ base: themes[vars.base] ? vars.base : 'light' },
   };
-  return { ...rest, ...inherit };
+  return {
+    ...rest,
+    ...inherit,
+    ...{ barSelectedColor: vars.barSelectedColor || inherit.colorSecondary },
+  };
 };
 
 export const convert = (inherit: ThemeVars = lightThemeVars): Theme => {

diff --git a/lib/ui/src/core/layout.js b/lib/ui/src/core/layout.js
@@ -10,6 +10,7 @@ const deprecatedThemeOptions = {
   name: 'brandTitle',
   url: 'brandUrl',
 };
+
 const deprecatedLayoutOptions = {
   goFullScreen: 'isFullscreen',
   showStoriesPanel: 'showNav',
@@ -152,6 +153,7 @@ export default function({ store }) {
         };
 
         const modification = {};
+
         if (!deepEqual(ui, updatedUi)) {
           modification.ui = updatedUi;
         }