|
@@ -13,7 +13,7 @@ const mergeCurrent = (defaultJSON: RecursiveRecord, projectJSON: RecursiveRecord
|
|
|
} else {
|
|
} else {
|
|
|
if(typeof defaultJSON[pKey] !== "string") {
|
|
if(typeof defaultJSON[pKey] !== "string") {
|
|
|
if(defaultJSON[pKey]) {
|
|
if(defaultJSON[pKey]) {
|
|
|
- newJSON[pKey] = mergeCurrent(defaultJSON[pKey], projectJSON[pKey]);
|
|
|
|
|
|
|
+ newJSON[pKey] = mergeCurrent(defaultJSON[pKey], projectJSON[pKey]!);
|
|
|
} else {
|
|
} else {
|
|
|
newJSON[pKey] = projectJSON[pKey];
|
|
newJSON[pKey] = projectJSON[pKey];
|
|
|
}
|
|
}
|
|
@@ -31,8 +31,8 @@ export const mergeTheme = (
|
|
|
projectTheme: NCoreUIKit.ThemeTokens
|
|
projectTheme: NCoreUIKit.ThemeTokens
|
|
|
): NCoreUIKit.ThemeTokens => {
|
|
): NCoreUIKit.ThemeTokens => {
|
|
|
return {
|
|
return {
|
|
|
- content: mergeCurrent(defaultTheme.content, projectTheme.content),
|
|
|
|
|
- system: mergeCurrent(defaultTheme.system, projectTheme.system)
|
|
|
|
|
|
|
+ content: mergeCurrent(defaultTheme.content as unknown as RecursiveRecord, projectTheme.content as unknown as RecursiveRecord),
|
|
|
|
|
+ system: mergeCurrent(defaultTheme.system as unknown as RecursiveRecord, projectTheme.system as unknown as RecursiveRecord)
|
|
|
};
|
|
};
|
|
|
};
|
|
};
|
|
|
|
|
|