|
|
@@ -45,7 +45,21 @@ export const mergePalettes = (
|
|
|
const defaultPalette = defaultPalettes.find(p => p.name === activePalette);
|
|
|
|
|
|
if(!defaultPalette) {
|
|
|
- throw new Error("Palette not found!.");
|
|
|
+ const projectPalette = projectPalettes.find(p => p.name === activePalette);
|
|
|
+
|
|
|
+ if(projectPalette) {
|
|
|
+ const projectThemeKey = Object.keys(projectPalette.themes).find(t => t === activeTheme) as keyof typeof projectPalette.themes;
|
|
|
+
|
|
|
+ if(projectThemeKey) {
|
|
|
+ const projectTheme = projectPalette.themes[projectThemeKey] as unknown as NCoreUIKit.ThemeTokens;
|
|
|
+
|
|
|
+ return projectTheme;
|
|
|
+ }
|
|
|
+
|
|
|
+ throw new Error("Theme not found!.");
|
|
|
+ } else {
|
|
|
+ throw new Error("Palette not found!.");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
const projectPalette = projectPalettes.find(p => p.name === activePalette);
|