Skip to content

Fix: correct mergeTheme function #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krishan711 merged 1 commit into from
Jan 30, 2025
+2 −3
Merged

Fix: correct mergeTheme function #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/util/themeUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<string>
Expand Down Expand Up @@ -64,9 +64,8 @@ export interface ThemeMap<Theme extends ThemeType> extends PartialThemeMap<Theme

export type ThemeCssFunction<Theme extends ThemeType> = (theme: Theme | RecursivePartial<Theme>) => 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<Theme extends ThemeType>(baseTheme: Theme, ...partialThemes: (RecursivePartial<Theme> | undefined)[]): Theme {
return { ...baseTheme, ...partialThemes };
return merge(baseTheme, ...partialThemes);
}

export function mergeThemePartial<Theme extends ThemeType>(...partialThemes: (RecursivePartial<Theme> | undefined)[]): RecursivePartial<Theme> {
Expand Down