fix(docz): add theme config transform before merge

doczjs · Jul 11, 2018 · dc3448a · dc3448a
1 parent fb8069d
commit dc3448a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/examples/basic/doczrc.js b/examples/basic/doczrc.js
@@ -0,0 +1,7 @@
+export default {
+  themeConfig: {
+    colors: {
+      primary: 'rebeccapurple',
+    },
+  },
+}
diff --git a/packages/docz/src/theme.tsx b/packages/docz/src/theme.tsx
@@ -69,10 +69,13 @@ export type TransformFn = (config: ThemeConfig) => ThemeConfig
 export type ThemeReturn = (WrappedComponent: CT) => CT<ThemeProps>
 
 export function theme(
-  defaultConfig?: 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,
@@ -81,11 +84,10 @@ export function theme(
       hashRouter = false,
     }) => {
       const Router = hashRouter ? HashRouter : BrowserRouter
-      const newConfig = merge(defaultConfig, config)
       const value = {
         entries,
         imports,
-        config: transform ? transform(newConfig) : newConfig,
+        config: merge(newConfig, config),
       }
 
       return (