diff --git a/src/util/themeUtil.ts b/src/util/themeUtil.ts index c4a0ed03..37aacc6c 100644 --- a/src/util/themeUtil.ts +++ b/src/util/themeUtil.ts @@ -1,4 +1,4 @@ -import { camelCaseToKebabCase, mergePartial, RecursivePartial } from '@kibalabs/core'; +import { camelCaseToKebabCase, merge, mergePartial, RecursivePartial } from '@kibalabs/core'; export type CssTheme = { [key: string]: Readonly @@ -64,9 +64,8 @@ export interface ThemeMap extends PartialThemeMap = (theme: Theme | RecursivePartial) => string; -// NOTE(krishan711): stuck here cos deepmerge doesn't look like its being exported or read properly when running `make start-docs` export function mergeTheme(baseTheme: Theme, ...partialThemes: (RecursivePartial | undefined)[]): Theme { - return { ...baseTheme, ...partialThemes }; + return merge(baseTheme, ...partialThemes); } export function mergeThemePartial(...partialThemes: (RecursivePartial | undefined)[]): RecursivePartial {