fix(docz-theme-default): config transform function

doczjs · Jul 11, 2018 · fdb3118 · fdb3118
1 parent 5bcbc8c
commit fdb3118
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/docz-theme-default/src/index.tsx b/packages/docz-theme-default/src/index.tsx
@@ -54,10 +54,17 @@ webfont.load({
   },
 })
 
-const transform = ({ mode, ...config }: any) => ({
-  ...config,
-  prismTheme: (prismThemes as any)[mode],
-  colors: (modes as any)[mode],
-})
+const transform = ({ mode, ...config }: any) => {
+  const selectedMode: any = (modes as any)[mode]
+
+  return {
+    ...config,
+    prismTheme: (prismThemes as any)[mode],
+    colors: {
+      ...selectedMode,
+      ...config.colors,
+    },
+  }
+}
 
 export default theme(config, transform)(Theme)
diff --git a/packages/docz/src/theme.tsx b/packages/docz/src/theme.tsx
@@ -69,13 +69,10 @@ export type TransformFn = (config: ThemeConfig) => ThemeConfig
 export type ThemeReturn = (WrappedComponent: CT) => CT<ThemeProps>
 
 export function theme(
-  initialConfig?: ThemeConfig,
+  initialConfig: ThemeConfig,
   transform?: TransformFn
 ): ThemeReturn {
   return WrappedComponent => {
-    const cfg = initialConfig || {}
-    const newConfig = transform ? transform(cfg) : cfg
-
     const Theme: CT<ThemeProps> = ({
       wrapper: Wrapper = DefaultWrapper,
       entries,
@@ -84,10 +81,11 @@ export function theme(
       hashRouter = false,
     }) => {
       const Router = hashRouter ? HashRouter : BrowserRouter
+      const newConfig = merge(initialConfig, config)
       const value = {
         entries,
         imports,
-        config: merge(newConfig, config),
+        config: transform ? transform(newConfig) : newConfig,
       }
 
       return (