Fix false usage of themeMap

Temzasse · May 22, 2022 · 2890b8e · 2890b8e
1 parent f555d71
commit 2890b8e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/src/internals/constants.js b/src/internals/constants.js
@@ -102,18 +102,18 @@ export const BORDER_STYLE_PROPERTIES = {
 };
 
 export const DEFAULT_THEME_MAP = {
-  borderStyles: BORDER_STYLE_PROPERTIES,
-  borderWidths: BORDER_WIDTH_PROPERTIES,
-  colors: COLOR_PROPERTIES,
-  fonts: FONT_PROPERTIES,
-  fontSizes: FONT_SIZE_PROPERTIES,
-  fontWeights: FONT_WEIGHT_PROPERTIES,
-  letterSpacings: LETTER_SPACING_PROPERTIES,
-  lineHeights: LINE_HEIGHT_PROPERTIES,
-  radii: RADII_PROPERTIES,
-  sizes: SIZE_PROPERTIES,
-  space: SPACE_PROPERTIES,
-  zIndices: Z_INDEX_PROPERTIES,
+  ...BORDER_STYLE_PROPERTIES,
+  ...BORDER_WIDTH_PROPERTIES,
+  ...COLOR_PROPERTIES,
+  ...FONT_PROPERTIES,
+  ...FONT_SIZE_PROPERTIES,
+  ...FONT_WEIGHT_PROPERTIES,
+  ...LETTER_SPACING_PROPERTIES,
+  ...LINE_HEIGHT_PROPERTIES,
+  ...RADII_PROPERTIES,
+  ...SIZE_PROPERTIES,
+  ...SPACE_PROPERTIES,
+  ...Z_INDEX_PROPERTIES,
 };
 
 const THEME_VALUES = {

diff --git a/src/internals/index.js b/src/internals/index.js
@@ -21,6 +21,8 @@ const ReactNative = require('react-native');
 /** @type {CreateStitches} */
 export function createStitches(config = {}) {
   const themes = [];
+
+  config.themeMap = utils.processThemeMap(config.themeMap || constants.DEFAULT_THEME_MAP);
 
   if (config.theme) {
     const processedTheme = utils.processTheme(config.theme);

diff --git a/src/internals/utils.js b/src/internals/utils.js
@@ -58,6 +58,20 @@ export function resolveMediaRangeQuery(query, windowWidth) {
   return result;
 }
 
+export function processThemeMap(themeMap) {
+  const definition = {};
+
+  Object.keys(themeMap).forEach(token => {
+    const scale = themeMap[token];
+
+    if (!definition[scale]) definition[scale] = {};
+
+    definition[scale][token] = scale;
+  });
+
+  return definition;
+}
+
 export function processTheme(theme) {
   const definition = {};
   const values = {};