Ver código fonte

Merge branch 'release/1.0.0-pre-alpha.19'

lfabl 1 mês atrás
pai
commit
ecd3676bc4
2 arquivos alterados com 16 adições e 2 exclusões
  1. 1 1
      package.json
  2. 15 1
      src/helpers/theme/palette.ts

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
     "name": "ncore-ui-kit-mobile",
-    "version": "1.0.0-pre-alpha.17",
+    "version": "1.0.0-pre-alpha.19",
     "description": "NİBGAT® | NCore - UI Kit for React-Native Mobile Apps.",
     "main": "./lib/module/index.js",
     "types": "./lib/typescript/src/index.d.ts",

+ 15 - 1
src/helpers/theme/palette.ts

@@ -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);