@tamagui/web 1.132.14 → 1.132.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/createTamagui.cjs +3 -2
- package/dist/cjs/createTamagui.js +3 -2
- package/dist/cjs/createTamagui.js.map +1 -1
- package/dist/cjs/createTamagui.native.js +3 -2
- package/dist/cjs/createTamagui.native.js.map +2 -2
- package/dist/cjs/views/FontLanguage.native.js +2 -1
- package/dist/cjs/views/FontLanguage.native.js.map +2 -2
- package/dist/esm/createTamagui.js +3 -2
- package/dist/esm/createTamagui.js.map +1 -1
- package/dist/esm/createTamagui.mjs +3 -2
- package/dist/esm/createTamagui.mjs.map +1 -1
- package/dist/esm/createTamagui.native.js +3 -2
- package/dist/esm/createTamagui.native.js.map +1 -1
- package/dist/esm/views/FontLanguage.native.js +2 -0
- package/dist/esm/views/FontLanguage.native.js.map +1 -1
- package/package.json +12 -12
- package/src/createTamagui.ts +11 -2
- package/src/views/FontLanguage.native.tsx +4 -1
- package/types/views/FontLanguage.native.d.ts.map +1 -1
|
@@ -121,7 +121,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
const themesIn = configIn.themes,
|
|
124
|
-
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn);
|
|
124
|
+
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color);
|
|
125
125
|
return {
|
|
126
126
|
themes: (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes),
|
|
127
127
|
cssRuleSets,
|
|
@@ -223,7 +223,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
223
223
|
};
|
|
224
224
|
return (0, import_config.setConfig)(config), (0, import_useMedia.configureMedia)(config), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), import_config.configListeners.size && (import_config.configListeners.forEach(cb => cb(config)), import_config.configListeners.clear()), process.env.NODE_ENV === "development" && (process.env.DEBUG?.startsWith("tamagui") && console.info("Tamagui config:", config), globalThis.Tamagui || (globalThis.Tamagui = import_Tamagui.Tamagui)), config;
|
|
225
225
|
}
|
|
226
|
-
function getThemesDeduped(themes) {
|
|
226
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
227
227
|
const dedupedThemes = [],
|
|
228
228
|
existing = /* @__PURE__ */new Map();
|
|
229
229
|
for (const themeName in themes) {
|
|
@@ -237,6 +237,7 @@ function getThemesDeduped(themes) {
|
|
|
237
237
|
const theme = {
|
|
238
238
|
...rawTheme
|
|
239
239
|
};
|
|
240
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
240
241
|
for (const key2 in theme) (0, import_themes.ensureThemeVariable)(theme, key2);
|
|
241
242
|
const deduped = {
|
|
242
243
|
names: [themeName],
|
|
@@ -92,7 +92,7 @@ ${JSON.stringify(variable, null, 2)}`
|
|
|
92
92
|
cssRuleSets.push(specificRuleSet);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
const themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn);
|
|
95
|
+
const themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color);
|
|
96
96
|
return {
|
|
97
97
|
themes: (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes),
|
|
98
98
|
cssRuleSets,
|
|
@@ -177,7 +177,7 @@ ${JSON.stringify(variable, null, 2)}`
|
|
|
177
177
|
};
|
|
178
178
|
return (0, import_config.setConfig)(config), (0, import_useMedia.configureMedia)(config), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), import_config.configListeners.size && (import_config.configListeners.forEach((cb) => cb(config)), import_config.configListeners.clear()), process.env.NODE_ENV === "development" && (process.env.DEBUG?.startsWith("tamagui") && console.info("Tamagui config:", config), globalThis.Tamagui || (globalThis.Tamagui = import_Tamagui.Tamagui)), config;
|
|
179
179
|
}
|
|
180
|
-
function getThemesDeduped(themes) {
|
|
180
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
181
181
|
const dedupedThemes = [], existing = /* @__PURE__ */ new Map();
|
|
182
182
|
for (const themeName in themes) {
|
|
183
183
|
const darkOrLightSpecificPrefix = themeName.startsWith("dark") ? "dark" : themeName.startsWith("light") ? "light" : "", rawTheme = themes[themeName], key = darkOrLightSpecificPrefix + JSON.stringify(rawTheme);
|
|
@@ -186,6 +186,7 @@ function getThemesDeduped(themes) {
|
|
|
186
186
|
continue;
|
|
187
187
|
}
|
|
188
188
|
const theme = { ...rawTheme };
|
|
189
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
189
190
|
for (const key2 in theme)
|
|
190
191
|
(0, import_themes.ensureThemeVariable)(theme, key2);
|
|
191
192
|
const deduped = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createTamagui.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["declarations", "key"]
|
|
6
6
|
}
|
|
@@ -90,7 +90,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
90
90
|
for (var key22 in fontDeclarations)
|
|
91
91
|
var name1, declarations1, language1, fontSelector, langSelector, selectors, specificRuleSet;
|
|
92
92
|
}
|
|
93
|
-
var themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn), themes = (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes);
|
|
93
|
+
var themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color), themes = (0, import_proxyThemeToParents.proxyThemesToParents)(dedupedThemes);
|
|
94
94
|
return {
|
|
95
95
|
themes,
|
|
96
96
|
cssRuleSets,
|
|
@@ -197,7 +197,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
197
197
|
}
|
|
198
198
|
return config;
|
|
199
199
|
}
|
|
200
|
-
function getThemesDeduped(themes) {
|
|
200
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
201
201
|
var dedupedThemes = [], existing = /* @__PURE__ */ new Map();
|
|
202
202
|
for (var themeName in themes) {
|
|
203
203
|
var darkOrLightSpecificPrefix = themeName.startsWith("dark") ? "dark" : themeName.startsWith("light") ? "light" : "", rawTheme = themes[themeName], key = darkOrLightSpecificPrefix + JSON.stringify(rawTheme);
|
|
@@ -209,6 +209,7 @@ function getThemesDeduped(themes) {
|
|
|
209
209
|
var theme = {
|
|
210
210
|
...rawTheme
|
|
211
211
|
};
|
|
212
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
212
213
|
for (var key1 in theme)
|
|
213
214
|
(0, import_themes.ensureThemeVariable)(theme, key1);
|
|
214
215
|
var deduped = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createTamagui.ts"],
|
|
4
|
-
"mappings": "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
|
|
5
|
-
"names": ["shouldTokenCategoryHaveUnits", "category", "UNIT_CATEGORIES", "Set", "has", "createTamagui", "configIn", "dup", "loadDuplicatedConfig", "tokensParsed", "tokens", "createVariables", "tokensMerged", "cat", "tokenCat", "key", "val", "prefixedKey", "setTokens", "foundThemes", "themes", "noThemes", "Object", "keys", "length", "scanAllSheets", "fontSizeTokens", "fontsParsed", "fonts", "fontTokens", "fromEntries", "entries", "map", "k", "v", "res", "familyName", "font", "fontParsed", "parseFont", "size", "specificTokens", "themeConfig", "cssRuleSets", "declarations", "fontDeclarations", "skey", "variable", "process", "env", "NODE_ENV", "Error", "JSON", "stringify", "isWeb", "registerCSSVariable", "variableNeedsPx", "needsPx", "categoryNeedsPx", "shouldBeUnitless", "push", "variableToCSS", "declarationsToRuleSet", "name", "language", "fontVars", "sep", "fontSelector", "langSelector", "selectors", "specificRuleSet", "themesIn", "dedupedThemes", "getThemesDeduped", "proxyThemesToParents", "getThemeRulesSets", "themeRuleSets", "names", "theme", "nextRules", "getThemeCSSRules", "config", "themeName", "shorthands", "lastCSSInsertedRulesIndex", "getCSS", "opts", "separator", "sinceLastCall", "exclude", "rules", "runtimeStyles", "designSystem", "getNewCSS", "defaultFontSetting", "settings", "defaultFont", "slice", "defaultFontToken", "unset", "fontFamily", "onlyAllowShorthands", "fontLanguages", "animations", "media", "disableSSR", "disableRootThemeClass", "mediaQueryDefaultActive", "themeClassNameOnRoot", "cssStyleSeparator", "webContainerType", "inverseShorthands", "parsed", "setConfig", "configureMedia", "globalThis", "__tamaguiConfig", "configListeners", "forEach", "cb", "clear", "DEBUG", "startsWith", "console", "info", "Tamagui", "existing", "Map", "darkOrLightSpecificPrefix", "rawTheme", "e", "get", "ensureThemeVariable", "deduped", "set"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["shouldTokenCategoryHaveUnits", "category", "UNIT_CATEGORIES", "Set", "has", "createTamagui", "configIn", "dup", "loadDuplicatedConfig", "tokensParsed", "tokens", "createVariables", "tokensMerged", "cat", "tokenCat", "key", "val", "prefixedKey", "setTokens", "foundThemes", "themes", "noThemes", "Object", "keys", "length", "scanAllSheets", "fontSizeTokens", "fontsParsed", "fonts", "fontTokens", "fromEntries", "entries", "map", "k", "v", "res", "familyName", "font", "fontParsed", "parseFont", "size", "specificTokens", "themeConfig", "cssRuleSets", "declarations", "fontDeclarations", "skey", "variable", "process", "env", "NODE_ENV", "Error", "JSON", "stringify", "isWeb", "registerCSSVariable", "variableNeedsPx", "needsPx", "categoryNeedsPx", "shouldBeUnitless", "push", "variableToCSS", "declarationsToRuleSet", "name", "language", "fontVars", "sep", "fontSelector", "langSelector", "selectors", "specificRuleSet", "themesIn", "dedupedThemes", "getThemesDeduped", "color", "proxyThemesToParents", "getThemeRulesSets", "themeRuleSets", "names", "theme", "nextRules", "getThemeCSSRules", "config", "themeName", "shorthands", "lastCSSInsertedRulesIndex", "getCSS", "opts", "separator", "sinceLastCall", "exclude", "rules", "runtimeStyles", "designSystem", "getNewCSS", "defaultFontSetting", "settings", "defaultFont", "slice", "defaultFontToken", "unset", "fontFamily", "onlyAllowShorthands", "fontLanguages", "animations", "media", "disableSSR", "disableRootThemeClass", "mediaQueryDefaultActive", "themeClassNameOnRoot", "cssStyleSeparator", "webContainerType", "inverseShorthands", "parsed", "setConfig", "configureMedia", "globalThis", "__tamaguiConfig", "configListeners", "forEach", "cb", "clear", "DEBUG", "startsWith", "console", "info", "Tamagui", "colorTokens", "existing", "Map", "darkOrLightSpecificPrefix", "rawTheme", "e", "get", "assign", "ensureThemeVariable", "deduped", "set"]
|
|
6
6
|
}
|
|
@@ -27,12 +27,13 @@ __export(FontLanguage_native_exports, {
|
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(FontLanguage_native_exports);
|
|
29
29
|
var import_jsx_runtime = require("react/jsx-runtime"), import_react = __toESM(require("react")), import_ComponentContext = require("../contexts/ComponentContext"), FontLanguage = function(param) {
|
|
30
|
-
var { children, ...props } = param, language = import_react.default.useMemo(function() {
|
|
30
|
+
var { children, ...props } = param, parentProps = import_react.default.useContext(import_ComponentContext.ComponentContext), language = import_react.default.useMemo(function() {
|
|
31
31
|
return props;
|
|
32
32
|
}, [
|
|
33
33
|
JSON.stringify(props)
|
|
34
34
|
]);
|
|
35
35
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ComponentContext.ComponentContext.Provider, {
|
|
36
|
+
...parentProps,
|
|
36
37
|
language,
|
|
37
38
|
children
|
|
38
39
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/FontLanguage.native.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAElB,0BAAiC,yCAGpBA,eAAe,SAAA,OAAA;MAAC,EAAEC,UAAU,GAAGC,MAAAA,IAA0B,OAC9DC,
|
|
5
|
-
"names": ["FontLanguage", "children", "props", "
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAAA,eAAkB,2BAElB,0BAAiC,yCAGpBA,eAAe,SAAA,OAAA;MAAC,EAAEC,UAAU,GAAGC,MAAAA,IAA0B,OAC9DC,cAAcC,aAAAA,QAAMC,WAAWC,wCAAAA,GAC/BC,WAAWH,aAAAA,QAAMI,QAAQ,WAAA;WAAMN;KAAO;IAACO,KAAKC,UAAUR,KAAAA;GAAO;AACnE,SACE,uCAAAS,KAACL,yCAAiBM,UAAQ;IAAE,GAAGT;IAAaI;;;AAIhD;AAEAP,aAAa,cAAiB;",
|
|
5
|
+
"names": ["FontLanguage", "children", "props", "parentProps", "React", "useContext", "ComponentContext", "language", "useMemo", "JSON", "stringify", "_jsx", "Provider"]
|
|
6
6
|
}
|
|
@@ -84,7 +84,7 @@ ${JSON.stringify(variable, null, 2)}`
|
|
|
84
84
|
cssRuleSets.push(specificRuleSet);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
const themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn);
|
|
87
|
+
const themesIn = configIn.themes, dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color);
|
|
88
88
|
return {
|
|
89
89
|
themes: proxyThemesToParents(dedupedThemes),
|
|
90
90
|
cssRuleSets,
|
|
@@ -169,7 +169,7 @@ ${JSON.stringify(variable, null, 2)}`
|
|
|
169
169
|
};
|
|
170
170
|
return setConfig(config), configureMedia(config), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), configListeners.size && (configListeners.forEach((cb) => cb(config)), configListeners.clear()), process.env.NODE_ENV === "development" && (process.env.DEBUG?.startsWith("tamagui") && console.info("Tamagui config:", config), globalThis.Tamagui || (globalThis.Tamagui = Tamagui)), config;
|
|
171
171
|
}
|
|
172
|
-
function getThemesDeduped(themes) {
|
|
172
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
173
173
|
const dedupedThemes = [], existing = /* @__PURE__ */ new Map();
|
|
174
174
|
for (const themeName in themes) {
|
|
175
175
|
const darkOrLightSpecificPrefix = themeName.startsWith("dark") ? "dark" : themeName.startsWith("light") ? "light" : "", rawTheme = themes[themeName], key = darkOrLightSpecificPrefix + JSON.stringify(rawTheme);
|
|
@@ -178,6 +178,7 @@ function getThemesDeduped(themes) {
|
|
|
178
178
|
continue;
|
|
179
179
|
}
|
|
180
180
|
const theme = { ...rawTheme };
|
|
181
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
181
182
|
for (const key2 in theme)
|
|
182
183
|
ensureThemeVariable(theme, key2);
|
|
183
184
|
const deduped = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createTamagui.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AACtB,SAAS,iBAAiB,WAAW,iBAAiB;AAGtD,SAAS,uBAAuB;AAChC,SAAS,wBAAwB;AACjC,SAAS,aAAa,qBAAqB;AAC3C,SAAS,4BAA4B;AACrC,SAAS,qBAAqB,qBAAqB;AACnD,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,WAAW,6BAA6B;AACjD,SAAS,4BAA4B;AACrC,SAAS,eAAe;AAoBxB,SAAS,6BAA6B,UAA2B;AAO/D,UAJwB,oBAAI,IAAI,CAAC,QAAQ,SAAS,QAAQ,CAAC,GAIpC,IAAI,QAAQ;AACrC;AAEO,SAAS,cACd,UAC0B;AAC1B,QAAM,MAAM,qBAAqB;AACjC,MAAI;AACF,WAAO;AAIT,QAAM,eAA6B,CAAC,GAC9B,SAAS,gBAAgB,SAAS,UAAU,CAAC,CAAC;AAEpD,MAAI,SAAS,QAAQ;AAEnB,UAAM,eAA6B,CAAC;AACpC,eAAW,OAAO,QAAQ;AACxB,mBAAa,GAAG,IAAI,CAAC,GACrB,aAAa,GAAG,IAAI,CAAC;AACrB,YAAM,WAAW,OAAO,GAAG;AAC3B,iBAAW,OAAO,UAAU;AAC1B,cAAM,MAAM,SAAS,GAAG,GAClB,cAAc,IAAI,GAAG;AAC3B,qBAAa,GAAG,EAAE,WAAW,IAAI,KACjC,aAAa,GAAG,EAAE,WAAW,IAAI,KACjC,aAAa,GAAG,EAAE,GAAG,IAAI;AAAA,MAC3B;AAAA,IACF;AACA,cAAU,YAAY;AAAA,EACxB;AAEA,MAAI;AACJ,MAAI,SAAS,QAAQ;AACnB,UAAM,WAAW,OAAO,KAAK,SAAS,MAAM,EAAE,WAAW;AACzD,IAAI,aACF,cAAc,cAAc,UAAU,YAAY;AAAA,EAEtD;AAEA,MAAI,iBAAqC,MACrC;AAMJ,MAAI,SAAS,OAAO;AAClB,UAAM,aAAa,OAAO;AAAA,MACxB,OAAO,QAAQ,SAAS,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,MAChC,CAAC,GAAG,gBAAgB,GAAG,KAAK,EAAI,CAAC,CACzC;AAAA,IACH;AAEA,mBAAe,MAAM;AACnB,YAAM,MAAM,CAAC;AACb,iBAAW,cAAc,YAAY;AACnC,cAAM,OAAO,WAAW,UAAU,GAC5B,aAAa,UAAU,IAAI;AACjC,YAAI,IAAI,UAAU,EAAE,IAAI,YACpB,CAAC,kBAAkB,WAAW,SAChC,iBAAiB,IAAI,IAAI,OAAO,KAAK,WAAW,IAAI,CAAC;AAAA,MAEzD;AACA,aAAO;AAAA,IACT,GAAG;AAAA,EACL;AAEA,QAAM,iBAAiB,CAAC,GAElB,eAAe,MAAM;AACzB,UAAM,cAAwB,CAAC,GAEzB,eAAyB,CAAC,GAC1B,mBAGF,CAAC;AAEL,eAAW,OAAO;AAChB,iBAAW,QAAQ,OAAO,GAAG,GAAG;AAC9B,cAAM,WAAW,OAAO,GAAG,EAAE,IAAI;AAKjC,YAFA,eAAe,IAAI,GAAG,IAAI,IAAI,EAAE,IAAI,UAEhC,QAAQ,IAAI,aAAa,iBACvB,OAAO,WAAa;AACtB,gBAAM,IAAI;AAAA,YACR,uBAAuB,GAAG,IAAI,IAAI;AAAA,EAAM,KAAK,UAAU,UAAU,MAAM,CAAC,CAAC;AAAA,UAC3E;AAIJ,YAAI,OAAO;AACT,8BAAoB,QAAQ;AAE5B,gBAAM,kBAAkB,SAAS,YAAY,IACvC,kBAAkB,6BAA6B,GAAG,GAClD,mBAAmB,EAAE,mBAAmB;AAC9C,uBAAa,KAAK,cAAc,UAAU,gBAAgB,CAAC;AAAA,QAC7D;AAAA,MACF;AAGwC;AAaxC,UAAS,wBAAT,SAA+B,MAAgB,WAAW,IAAI;AAC5D,eAAO,QAAQ,QAAQ,KAAK,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,KAAK,IAAI,GAAG,EAAE,CAAC,GAAG,GAAG;AAAA,MACnE;AAdA,iBAAW,OAAO,aAAa;AAC7B,cAAM,aAAa,YAAY,GAAG,GAC5B,CAAC,MAAM,QAAQ,IAAI,IAAI,SAAS,GAAG,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,GAC5D,WAAW,sBAAsB,UAAU;AACjD,yBAAiB,GAAG,IAAI;AAAA,UACtB,MAAM,KAAK,MAAM,CAAC;AAAA,UAClB,cAAc;AAAA,UACd;AAAA,QACF;AAAA,MACF;AAEA,YAAM,MAAM,SAAS,qBAAqB;AAS1C,UAHA,YAAY,KAAK,sBAAsB,YAAY,CAAC,GAGhD;AACF,mBAAW,OAAO,kBAAkB;AAClC,gBAAM,EAAE,MAAM,cAAAA,eAAc,WAAW,UAAU,IAAI,iBAAiB,GAAG,GACnE,eAAe,SAAS,IAAI,IAC5B,eAAe,iBAAiB,IAAI,IAAI,QAAQ,IAAI,YAAY,IAChE,YACJ,aAAa,YAAY,IAAI,YAAY,KAAK,YAAY,KAAK,cAC3D,kBAAkB,sBAAsBA,eAAc,SAAS;AACrE,sBAAY,KAAK,eAAe;AAAA,QAClC;AAAA,IAEJ;AAEA,UAAM,WAAW,SAAS,QACpB,gBAAgB,eAAe,iBAAiB,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["declarations", "key"]
|
|
6
6
|
}
|
|
@@ -96,7 +96,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
const themesIn = configIn.themes,
|
|
99
|
-
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn);
|
|
99
|
+
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color);
|
|
100
100
|
return {
|
|
101
101
|
themes: proxyThemesToParents(dedupedThemes),
|
|
102
102
|
cssRuleSets,
|
|
@@ -198,7 +198,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
198
198
|
};
|
|
199
199
|
return setConfig(config), configureMedia(config), process.env.NODE_ENV === "test" && (globalThis.__tamaguiConfig = config), configListeners.size && (configListeners.forEach(cb => cb(config)), configListeners.clear()), process.env.NODE_ENV === "development" && (process.env.DEBUG?.startsWith("tamagui") && console.info("Tamagui config:", config), globalThis.Tamagui || (globalThis.Tamagui = Tamagui)), config;
|
|
200
200
|
}
|
|
201
|
-
function getThemesDeduped(themes) {
|
|
201
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
202
202
|
const dedupedThemes = [],
|
|
203
203
|
existing = /* @__PURE__ */new Map();
|
|
204
204
|
for (const themeName in themes) {
|
|
@@ -212,6 +212,7 @@ function getThemesDeduped(themes) {
|
|
|
212
212
|
const theme = {
|
|
213
213
|
...rawTheme
|
|
214
214
|
};
|
|
215
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
215
216
|
for (const key2 in theme) ensureThemeVariable(theme, key2);
|
|
216
217
|
const deduped = {
|
|
217
218
|
names: [themeName],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWeb","configListeners","setConfig","setTokens","createVariables","getThemeCSSRules","getAllRules","scanAllSheets","proxyThemesToParents","registerCSSVariable","variableToCSS","ensureThemeVariable","configureMedia","parseFont","registerFontVariables","loadDuplicatedConfig","Tamagui","shouldTokenCategoryHaveUnits","category","Set","has","createTamagui","configIn","dup","tokensParsed","tokens","tokensMerged","cat","tokenCat","key","val","prefixedKey","foundThemes","themes","noThemes","Object","keys","length","fontSizeTokens","fontsParsed","fonts","fontTokens","fromEntries","entries","map","k","v","res","familyName","font","fontParsed","size","specificTokens","themeConfig","cssRuleSets","declarations","fontDeclarations","skey","variable","process","env","NODE_ENV","Error","JSON","stringify","variableNeedsPx","needsPx","categoryNeedsPx","shouldBeUnitless","push","declarationsToRuleSet","decs","selector","sep","join","name","language","includes","split","fontVars","slice","cssStyleSeparator","declarations2","fontSelector","langSelector","selectors","specificRuleSet","themesIn","dedupedThemes","getThemesDeduped","getThemeRulesSets","themeRuleSets","names","theme","nextRules","config","themeName","shorthands","lastCSSInsertedRulesIndex","getCSS","opts","separator","sinceLastCall","exclude","rules","runtimeStyles","getNewCSS","defaultFontSetting","settings","defaultFont","defaultFontToken","unset","fontFamily","onlyAllowShorthands","fontLanguages","animations","media","disableSSR","disableRootThemeClass","mediaQueryDefaultActive","themeClassNameOnRoot","webContainerType","inverseShorthands","parsed","globalThis","__tamaguiConfig","forEach","cb","clear","DEBUG","startsWith","console","info","existing","Map","darkOrLightSpecificPrefix","rawTheme","get","key2","deduped","set"],"sources":["../../src/createTamagui.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["isWeb","configListeners","setConfig","setTokens","createVariables","getThemeCSSRules","getAllRules","scanAllSheets","proxyThemesToParents","registerCSSVariable","variableToCSS","ensureThemeVariable","configureMedia","parseFont","registerFontVariables","loadDuplicatedConfig","Tamagui","shouldTokenCategoryHaveUnits","category","Set","has","createTamagui","configIn","dup","tokensParsed","tokens","tokensMerged","cat","tokenCat","key","val","prefixedKey","foundThemes","themes","noThemes","Object","keys","length","fontSizeTokens","fontsParsed","fonts","fontTokens","fromEntries","entries","map","k","v","res","familyName","font","fontParsed","size","specificTokens","themeConfig","cssRuleSets","declarations","fontDeclarations","skey","variable","process","env","NODE_ENV","Error","JSON","stringify","variableNeedsPx","needsPx","categoryNeedsPx","shouldBeUnitless","push","declarationsToRuleSet","decs","selector","sep","join","name","language","includes","split","fontVars","slice","cssStyleSeparator","declarations2","fontSelector","langSelector","selectors","specificRuleSet","themesIn","dedupedThemes","getThemesDeduped","color","getThemeRulesSets","themeRuleSets","names","theme","nextRules","config","themeName","shorthands","lastCSSInsertedRulesIndex","getCSS","opts","separator","sinceLastCall","exclude","rules","runtimeStyles","getNewCSS","defaultFontSetting","settings","defaultFont","defaultFontToken","unset","fontFamily","onlyAllowShorthands","fontLanguages","animations","media","disableSSR","disableRootThemeClass","mediaQueryDefaultActive","themeClassNameOnRoot","webContainerType","inverseShorthands","parsed","globalThis","__tamaguiConfig","forEach","cb","clear","DEBUG","startsWith","console","info","colorTokens","existing","Map","darkOrLightSpecificPrefix","rawTheme","get","assign","key2","deduped","set"],"sources":["../../src/createTamagui.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AACtB,SAASC,eAAA,EAAiBC,SAAA,EAAWC,SAAA,QAAiB;AAGtD,SAASC,eAAA,QAAuB;AAChC,SAASC,gBAAA,QAAwB;AACjC,SAASC,WAAA,EAAaC,aAAA,QAAqB;AAC3C,SAASC,oBAAA,QAA4B;AACrC,SAASC,mBAAA,EAAqBC,aAAA,QAAqB;AACnD,SAASC,mBAAA,QAA2B;AACpC,SAASC,cAAA,QAAsB;AAC/B,SAASC,SAAA,EAAWC,qBAAA,QAA6B;AACjD,SAASC,oBAAA,QAA4B;AACrC,SAASC,OAAA,QAAe;AAoBxB,SAASC,6BAA6BC,QAAA,EAA2B;EAO/D,QAJwB,mBAAIC,GAAA,CAAI,CAAC,QAAQ,SAAS,QAAQ,CAAC,GAIpCC,GAAA,CAAIF,QAAQ;AACrC;AAEO,SAASG,cACdC,QAAA,EAC0B;EAC1B,MAAMC,GAAA,GAAMR,oBAAA,CAAqB;EACjC,IAAIQ,GAAA,EACF,OAAOA,GAAA;EAIT,MAAMC,YAAA,GAA6B,CAAC;IAC9BC,MAAA,GAASrB,eAAA,CAAgBkB,QAAA,CAASG,MAAA,IAAU,CAAC,CAAC;EAEpD,IAAIH,QAAA,CAASG,MAAA,EAAQ;IAEnB,MAAMC,YAAA,GAA6B,CAAC;IACpC,WAAWC,GAAA,IAAOF,MAAA,EAAQ;MACxBD,YAAA,CAAaG,GAAG,IAAI,CAAC,GACrBD,YAAA,CAAaC,GAAG,IAAI,CAAC;MACrB,MAAMC,QAAA,GAAWH,MAAA,CAAOE,GAAG;MAC3B,WAAWE,GAAA,IAAOD,QAAA,EAAU;QAC1B,MAAME,GAAA,GAAMF,QAAA,CAASC,GAAG;UAClBE,WAAA,GAAc,IAAIF,GAAG;QAC3BL,YAAA,CAAaG,GAAG,EAAEI,WAAW,IAAID,GAAA,EACjCJ,YAAA,CAAaC,GAAG,EAAEI,WAAW,IAAID,GAAA,EACjCJ,YAAA,CAAaC,GAAG,EAAEE,GAAG,IAAIC,GAAA;MAC3B;IACF;IACA3B,SAAA,CAAUuB,YAAY;EACxB;EAEA,IAAIM,WAAA;EACJ,IAAIV,QAAA,CAASW,MAAA,EAAQ;IACnB,MAAMC,QAAA,GAAWC,MAAA,CAAOC,IAAA,CAAKd,QAAA,CAASW,MAAM,EAAEI,MAAA,KAAW;IACrDH,QAAA,KACFF,WAAA,GAAczB,aAAA,CAAc2B,QAAA,EAAUV,YAAY;EAEtD;EAEA,IAAIc,cAAA,GAAqC;IACrCC,WAAA;EAMJ,IAAIjB,QAAA,CAASkB,KAAA,EAAO;IAClB,MAAMC,UAAA,GAAaN,MAAA,CAAOO,WAAA,CACxBP,MAAA,CAAOQ,OAAA,CAAQrB,QAAA,CAASkB,KAAK,EAAEI,GAAA,CAAI,CAAC,CAACC,CAAA,EAAGC,CAAC,MAChC,CAACD,CAAA,EAAGzC,eAAA,CAAgB0C,CAAA,EAAG,KAAK,EAAI,CAAC,CACzC,CACH;IAEAP,WAAA,IAAe,MAAM;MACnB,MAAMQ,GAAA,GAAM,CAAC;MACb,WAAWC,UAAA,IAAcP,UAAA,EAAY;QACnC,MAAMQ,IAAA,GAAOR,UAAA,CAAWO,UAAU;UAC5BE,UAAA,GAAarC,SAAA,CAAUoC,IAAI;QACjCF,GAAA,CAAI,IAAIC,UAAU,EAAE,IAAIE,UAAA,EACpB,CAACZ,cAAA,IAAkBY,UAAA,CAAWC,IAAA,KAChCb,cAAA,GAAiB,IAAInB,GAAA,CAAIgB,MAAA,CAAOC,IAAA,CAAKc,UAAA,CAAWC,IAAI,CAAC;MAEzD;MACA,OAAOJ,GAAA;IACT,GAAG;EACL;EAEA,MAAMK,cAAA,GAAiB,CAAC;IAElBC,WAAA,IAAe,MAAM;MACzB,MAAMC,WAAA,GAAwB,EAAC;QAEzBC,YAAA,GAAyB,EAAC;QAC1BC,gBAAA,GAGF,CAAC;MAEL,WAAW3B,GAAA,IAAOJ,MAAA,EAChB,WAAWgC,IAAA,IAAQhC,MAAA,CAAOI,GAAG,GAAG;QAC9B,MAAM6B,QAAA,GAAWjC,MAAA,CAAOI,GAAG,EAAE4B,IAAI;QAKjC,IAFAL,cAAA,CAAe,IAAIvB,GAAG,IAAI4B,IAAI,EAAE,IAAIC,QAAA,EAEhCC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvB,OAAOH,QAAA,GAAa,KACtB,MAAM,IAAII,KAAA,CACR,uBAAuBjC,GAAG,IAAI4B,IAAI;AAAA,EAAMM,IAAA,CAAKC,SAAA,CAAUN,QAAA,EAAU,MAAM,CAAC,CAAC,EAC3E;QAIJ,IAAI1D,KAAA,EAAO;UACTS,mBAAA,CAAoBiD,QAAQ;UAE5B,MAAMO,eAAA,GAAkBP,QAAA,CAASQ,OAAA,KAAY;YACvCC,eAAA,GAAkBlD,4BAAA,CAA6BY,GAAG;YAClDuC,gBAAA,GAAmB,EAAEH,eAAA,IAAmBE,eAAA;UAC9CZ,YAAA,CAAac,IAAA,CAAK3D,aAAA,CAAcgD,QAAA,EAAUU,gBAAgB,CAAC;QAC7D;MACF;MAGwC;QAaxC,IAASE,qBAAA,GAAT,SAAAA,CAA+BC,IAAA,EAAgBC,QAAA,GAAW,IAAI;UAC5D,OAAO,QAAQA,QAAQ,KAAKC,GAAG,GAAG,CAAC,GAAGF,IAAI,EAAEG,IAAA,CAAK,IAAID,GAAG,EAAE,CAAC,GAAGA,GAAG;QACnE;QAdA,WAAW5C,GAAA,IAAOU,WAAA,EAAa;UAC7B,MAAMW,UAAA,GAAaX,WAAA,CAAYV,GAAG;YAC5B,CAAC8C,IAAA,EAAMC,QAAQ,IAAI/C,GAAA,CAAIgD,QAAA,CAAS,GAAG,IAAIhD,GAAA,CAAIiD,KAAA,CAAM,GAAG,IAAI,CAACjD,GAAG;YAC5DkD,QAAA,GAAWjE,qBAAA,CAAsBoC,UAAU;UACjDM,gBAAA,CAAiB3B,GAAG,IAAI;YACtB8C,IAAA,EAAMA,IAAA,CAAKK,KAAA,CAAM,CAAC;YAClBzB,YAAA,EAAcwB,QAAA;YACdH;UACF;QACF;QAEA,MAAMH,GAAA,GAAMnD,QAAA,CAAS2D,iBAAA,IAAqB;QAS1C,IAHA3B,WAAA,CAAYe,IAAA,CAAKC,qBAAA,CAAsBf,YAAY,CAAC,GAGhDC,gBAAA,EACF,WAAW3B,GAAA,IAAO2B,gBAAA,EAAkB;UAClC,MAAM;cAAEmB,IAAA;cAAMpB,YAAA,EAAA2B,aAAA;cAAcN,QAAA,GAAW;YAAU,IAAIpB,gBAAA,CAAiB3B,GAAG;YACnEsD,YAAA,GAAe,SAASR,IAAI;YAC5BS,YAAA,GAAe,iBAAiBT,IAAI,IAAIC,QAAQ,IAAIO,YAAY;YAChEE,SAAA,GACJT,QAAA,KAAa,YAAY,IAAIO,YAAY,KAAKC,YAAY,KAAKA,YAAA;YAC3DE,eAAA,GAAkBhB,qBAAA,CAAsBY,aAAA,EAAcG,SAAS;UACrE/B,WAAA,CAAYe,IAAA,CAAKiB,eAAe;QAClC;MAEJ;MAEA,MAAMC,QAAA,GAAWjE,QAAA,CAASW,MAAA;QACpBuD,aAAA,GAAgBxD,WAAA,IAAeyD,gBAAA,CAAiBF,QAAA,EAAU9D,MAAA,CAAOiE,KAAK;MAG5E,OAAO;QACLzD,MAAA,EAHazB,oBAAA,CAAqBgF,aAAa;QAI/ClC,WAAA;QACAqC,kBAAA,EAAoB;UAElB,IAAIC,aAAA,GAA0B,EAAC;UAE/B,IAAI5F,KAAA,EACF,WAAW;YAAE6F,KAAA;YAAOC;UAAM,KAAKN,aAAA,EAAe;YAC5C,MAAMO,SAAA,GAAY1F,gBAAA,CAAiB;cACjC2F,MAAA,EAAQ1E,QAAA;cACR2E,SAAA,EAAWJ,KAAA,CAAM,CAAC;cAClBA,KAAA;cACAC;YACF,CAAC;YAEDF,aAAA,GAAgB,CAAC,GAAGA,aAAA,EAAe,GAAGG,SAAS;UACjD;UAGF,OAAOH,aAAA;QACT;MACF;IACF,GAAG;IAEGM,UAAA,GAAa5E,QAAA,CAAS4E,UAAA,IAAc,CAAC;EAE3C,IAAIC,yBAAA,GAA4B;EAEhC,MAAMC,MAAA,GAAiBA,CAACC,IAAA,GAAO,CAAC,MAAM;MACM;QACxC,MAAM;UAAEC,SAAA,GAAY;AAAA;UAAMC,aAAA;UAAeC;QAAQ,IAAIH,IAAA;QACrD,IAAIE,aAAA,IAAiBJ,yBAAA,IAA6B,GAAG;UAEnD,MAAMM,KAAA,GAAQnG,WAAA,CAAY;UAC1B,OAAA6F,yBAAA,GAA4BM,KAAA,CAAMpE,MAAA,EAC3BoE,KAAA,CAAMzB,KAAA,CAAMmB,yBAAyB,EAAEzB,IAAA,CAAK4B,SAAS;QAC9D;QAGAH,yBAAA,GAA4B;QAE5B,MAAMO,aAAA,GAAgBpG,WAAA,CAAY,EAAEoE,IAAA,CAAK4B,SAAS;QAElD,OAAIE,OAAA,KAAY,kBACPE,aAAA,GASF,GANc;AAAA;AAAA;AAAA;AAAA,IAIvBrD,WAAA,CAAYC,WAAA,CAAYoB,IAAA,CAAK4B,SAAS,CAAC,EAEf;AAAA,IACxBE,OAAA,GAAU,KAAKnD,WAAA,CAAYsC,iBAAA,CAAkB,EAAEjB,IAAA,CAAK4B,SAAS,CAAC;AAAA,IAC9DI,aAAa;MACb;IAGF;IAEMC,SAAA,GAAqBN,IAAA,IAASD,MAAA,CAAO;MAAE,GAAGC,IAAA;MAAME,aAAA,EAAe;IAAK,CAAC;IAErEK,kBAAA,GAAqBtF,QAAA,CAASuF,QAAA,EAAUC,WAAA,IAAexF,QAAA,CAASwF,WAAA;IAEhEA,WAAA,IAAe,MAAM;MACzB,IAAIhF,GAAA,GAAM8E,kBAAA;MACV,OAAI9E,GAAA,GAAM,CAAC,MAAM,QACfA,GAAA,GAAMA,GAAA,CAAIkD,KAAA,CAAM,CAAC,IAEZlD,GAAA;IACT,GAAG;IAGGiF,gBAAA,GAAmBD,WAAA,GAAc,IAAIA,WAAW,KAAK;IAErDE,KAAA,GAAQ;MAAE,GAAG1F,QAAA,CAAS0F;IAAM;EAC9B,CAACA,KAAA,CAAMC,UAAA,IAAcH,WAAA,KACvBE,KAAA,CAAMC,UAAA,GAAaF,gBAAA;EAGrB,MAAMf,MAAA,GAAgC;IACpCxD,KAAA,EAAO,CAAC;IACR0E,mBAAA,EAAqB;IACrBC,aAAA,EAAe,EAAC;IAChBC,UAAA,EAAY,CAAC;IACbC,KAAA,EAAO,CAAC;IACR,GAAG/F,QAAA;IACH0F,KAAA;IACAH,QAAA,EAAU;MAAA;MAAA;MAGRS,UAAA,EAAYhG,QAAA,CAASgG,UAAA;MACrBR,WAAA,EAAaxF,QAAA,CAASwF,WAAA;MACtBS,qBAAA,EAAuBjG,QAAA,CAASiG,qBAAA;MAChCL,mBAAA,EAAqB5F,QAAA,CAAS4F,mBAAA;MAC9BM,uBAAA,EAAyBlG,QAAA,CAASkG,uBAAA;MAClCC,oBAAA,EAAsBnG,QAAA,CAASmG,oBAAA;MAC/BxC,iBAAA,EAAmB3D,QAAA,CAAS2D,iBAAA;MAE5ByC,gBAAA,EAAkB;MAClB,GAAGpG,QAAA,CAASuF;IACd;IACApF,MAAA;IAAA;IAEAyE,UAAA;IACAyB,iBAAA,EAAmBzB,UAAA,GACf/D,MAAA,CAAOO,WAAA,CAAYP,MAAA,CAAOQ,OAAA,CAAQuD,UAAU,EAAEtD,GAAA,CAAI,CAAC,CAACC,CAAA,EAAGC,CAAC,MAAM,CAACA,CAAA,EAAGD,CAAC,CAAC,CAAC,IACrE,CAAC;IACLZ,MAAA,EAAQoB,WAAA,CAAYpB,MAAA;IACpBM,WAAA,EAAaA,WAAA,IAAe,CAAC;IAC7Bc,WAAA;IACA7B,YAAA;IACAoG,MAAA,EAAQ;IACRjB,SAAA;IACAP,MAAA;IACAU,WAAA;IACAxE,cAAA,EAAgBA,cAAA,IAAkB,mBAAInB,GAAA,CAAI;IAC1CiC,cAAA;IACA2D;IAAA;IAAA;EAGF;EAEA,OAAA7G,SAAA,CAAU8F,MAAM,GAChBpF,cAAA,CAAeoF,MAAM,GAEjBrC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,WAC3BgE,UAAA,CAAWC,eAAA,GAAkB9B,MAAA,GAG3B/F,eAAA,CAAgBkD,IAAA,KAClBlD,eAAA,CAAgB8H,OAAA,CAASC,EAAA,IAAOA,EAAA,CAAGhC,MAAM,CAAC,GAC1C/F,eAAA,CAAgBgI,KAAA,CAAM,IAGpBtE,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,kBACvBF,OAAA,CAAQC,GAAA,CAAIsE,KAAA,EAAOC,UAAA,CAAW,SAAS,KACzCC,OAAA,CAAQC,IAAA,CAAK,mBAAmBrC,MAAM,GAEnC6B,UAAA,CAAW7G,OAAA,KACd6G,UAAA,CAAW7G,OAAA,GAAaA,OAAA,IAIrBgF,MAAA;AACT;AAGA,SAASP,iBACPxD,MAAA,EACAqG,WAAA,EACe;EACf,MAAM9C,aAAA,GAA+B,EAAC;IAChC+C,QAAA,GAAW,mBAAIC,GAAA,CAA0B;EAG/C,WAAWvC,SAAA,IAAahE,MAAA,EAAQ;IAE9B,MAAMwG,yBAAA,GAA4BxC,SAAA,CAAUkC,UAAA,CAAW,MAAM,IACzD,SACAlC,SAAA,CAAUkC,UAAA,CAAW,OAAO,IAC1B,UACA;MAEAO,QAAA,GAAWzG,MAAA,CAAOgE,SAAS;MAI3BpE,GAAA,GAAM4G,yBAAA,GAA4B1E,IAAA,CAAKC,SAAA,CAAU0E,QAAQ;IAG/D,IAAIH,QAAA,CAASnH,GAAA,CAAIS,GAAG,GAAG;MACX0G,QAAA,CAASI,GAAA,CAAI9G,GAAG,EACxBgE,KAAA,CAAMxB,IAAA,CAAK4B,SAAS;MACtB;IACF;IAIA,MAAMH,KAAA,GAAQ;MAAE,GAAG4C;IAAS;IAGxBJ,WAAA,IACFnG,MAAA,CAAOyG,MAAA,CAAO9C,KAAA,EAAOwC,WAAW;IAIlC,WAAWO,IAAA,IAAO/C,KAAA,EAEhBnF,mBAAA,CAAoBmF,KAAA,EAAO+C,IAAG;IAIhC,MAAMC,OAAA,GAAwB;MAC5BjD,KAAA,EAAO,CAACI,SAAS;MACjBH;IACF;IACAN,aAAA,CAAcnB,IAAA,CAAKyE,OAAO,GAC1BP,QAAA,CAASQ,GAAA,CAAIlH,GAAA,EAAKiH,OAAO;EAC3B;EAEA,OAAOtD,aAAA;AACT","ignoreList":[]}
|
|
@@ -79,7 +79,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
79
79
|
if (fontDeclarations) for (var key22 in fontDeclarations) var name1, declarations1, language1, fontSelector, langSelector, selectors, specificRuleSet;
|
|
80
80
|
}
|
|
81
81
|
var themesIn = configIn.themes,
|
|
82
|
-
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn),
|
|
82
|
+
dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color),
|
|
83
83
|
themes = proxyThemesToParents(dedupedThemes);
|
|
84
84
|
return {
|
|
85
85
|
themes,
|
|
@@ -193,7 +193,7 @@ ${JSON.stringify(variable, null, 2)}`);
|
|
|
193
193
|
}
|
|
194
194
|
return config;
|
|
195
195
|
}
|
|
196
|
-
function getThemesDeduped(themes) {
|
|
196
|
+
function getThemesDeduped(themes, colorTokens) {
|
|
197
197
|
var dedupedThemes = [],
|
|
198
198
|
existing = /* @__PURE__ */new Map();
|
|
199
199
|
for (var themeName in themes) {
|
|
@@ -208,6 +208,7 @@ function getThemesDeduped(themes) {
|
|
|
208
208
|
var theme = {
|
|
209
209
|
...rawTheme
|
|
210
210
|
};
|
|
211
|
+
colorTokens && Object.assign(theme, colorTokens);
|
|
211
212
|
for (var key1 in theme) ensureThemeVariable(theme, key1);
|
|
212
213
|
var deduped = {
|
|
213
214
|
names: [themeName],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWeb","configListeners","setConfig","setTokens","createVariables","getThemeCSSRules","scanAllSheets","proxyThemesToParents","registerCSSVariable","variableToCSS","ensureThemeVariable","configureMedia","parseFont","loadDuplicatedConfig","Tamagui","shouldTokenCategoryHaveUnits","category","UNIT_CATEGORIES","Set","has","createTamagui","configIn","_configIn_settings","dup","tokensParsed","tokens","tokensMerged","cat","tokenCat","key","val","prefixedKey","foundThemes","themes","noThemes","Object","keys","length","fontSizeTokens","fontsParsed","fonts","fontTokens","fromEntries","entries","map","param","k","v","res","familyName","font","fontParsed","size","specificTokens","themeConfig","cssRuleSets","declarations","fontDeclarations","key2","skey","variable","process","env","NODE_ENV","Error","JSON","stringify","variableNeedsPx","needsPx","categoryNeedsPx","shouldBeUnitless","push","declarationsToRuleSet","key1","name","language","fontVars","sep","key22","name1","declarations1","language1","fontSelector","langSelector","selectors","specificRuleSet","themesIn","dedupedThemes","getThemesDeduped","getThemeRulesSets","themeRuleSets","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","names","theme","value","nextRules","config","themeName","err","return","shorthands","lastCSSInsertedRulesIndex","getCSS","opts","arguments","separator","sinceLastCall","exclude","rules","runtimeStyles","designSystem","getNewCSS","_configIn_settings_defaultFont","defaultFontSetting","settings","defaultFont","val2","slice","defaultFontToken","unset","fontFamily","onlyAllowShorthands","fontLanguages","animations","media","disableSSR","disableRootThemeClass","mediaQueryDefaultActive","themeClassNameOnRoot","cssStyleSeparator","webContainerType","inverseShorthands","parsed","globalThis","__tamaguiConfig","forEach","cb","clear","_process_env_DEBUG","DEBUG","startsWith","console","info"],"sources":["../../src/createTamagui.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["isWeb","configListeners","setConfig","setTokens","createVariables","getThemeCSSRules","scanAllSheets","proxyThemesToParents","registerCSSVariable","variableToCSS","ensureThemeVariable","configureMedia","parseFont","loadDuplicatedConfig","Tamagui","shouldTokenCategoryHaveUnits","category","UNIT_CATEGORIES","Set","has","createTamagui","configIn","_configIn_settings","dup","tokensParsed","tokens","tokensMerged","cat","tokenCat","key","val","prefixedKey","foundThemes","themes","noThemes","Object","keys","length","fontSizeTokens","fontsParsed","fonts","fontTokens","fromEntries","entries","map","param","k","v","res","familyName","font","fontParsed","size","specificTokens","themeConfig","cssRuleSets","declarations","fontDeclarations","key2","skey","variable","process","env","NODE_ENV","Error","JSON","stringify","variableNeedsPx","needsPx","categoryNeedsPx","shouldBeUnitless","push","declarationsToRuleSet","key1","name","language","fontVars","sep","key22","name1","declarations1","language1","fontSelector","langSelector","selectors","specificRuleSet","themesIn","dedupedThemes","getThemesDeduped","color","getThemeRulesSets","themeRuleSets","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","names","theme","value","nextRules","config","themeName","err","return","shorthands","lastCSSInsertedRulesIndex","getCSS","opts","arguments","separator","sinceLastCall","exclude","rules","runtimeStyles","designSystem","getNewCSS","_configIn_settings_defaultFont","defaultFontSetting","settings","defaultFont","val2","slice","defaultFontToken","unset","fontFamily","onlyAllowShorthands","fontLanguages","animations","media","disableSSR","disableRootThemeClass","mediaQueryDefaultActive","themeClassNameOnRoot","cssStyleSeparator","webContainerType","inverseShorthands","parsed","globalThis","__tamaguiConfig","forEach","cb","clear","_process_env_DEBUG","DEBUG","startsWith","console","info","colorTokens"],"sources":["../../src/createTamagui.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -6,10 +6,12 @@ var FontLanguage = function (param) {
|
|
|
6
6
|
children,
|
|
7
7
|
...props
|
|
8
8
|
} = param,
|
|
9
|
+
parentProps = React.useContext(ComponentContext),
|
|
9
10
|
language = React.useMemo(function () {
|
|
10
11
|
return props;
|
|
11
12
|
}, [JSON.stringify(props)]);
|
|
12
13
|
return /* @__PURE__ */_jsx(ComponentContext.Provider, {
|
|
14
|
+
...parentProps,
|
|
13
15
|
language,
|
|
14
16
|
children
|
|
15
17
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","ComponentContext","FontLanguage","param","children","props","language","useMemo","JSON","stringify","_jsx","Provider","displayName"],"sources":["../../../src/views/FontLanguage.native.tsx"],"sourcesContent":[null],"mappings":";AAAA,OAAOA,KAAA,MAAW;AAElB,SAASC,gBAAA,QAAwB;AAG1B,IAAMC,YAAA,GAAe,SAAAA,CAAAC,KAAA;MAAC;MAAEC,QAAA;MAAU,GAAGC;IAAA,IAA0BF,KAAA;IAC9DG,
|
|
1
|
+
{"version":3,"names":["React","ComponentContext","FontLanguage","param","children","props","parentProps","useContext","language","useMemo","JSON","stringify","_jsx","Provider","displayName"],"sources":["../../../src/views/FontLanguage.native.tsx"],"sourcesContent":[null],"mappings":";AAAA,OAAOA,KAAA,MAAW;AAElB,SAASC,gBAAA,QAAwB;AAG1B,IAAMC,YAAA,GAAe,SAAAA,CAAAC,KAAA;MAAC;MAAEC,QAAA;MAAU,GAAGC;IAAA,IAA0BF,KAAA;IAC9DG,WAAA,GAAcN,KAAA,CAAMO,UAAA,CAAWN,gBAAA;IAC/BO,QAAA,GAAWR,KAAA,CAAMS,OAAA,CAAQ;aAAMJ,KAAA;OAAO,CAACK,IAAA,CAAKC,SAAA,CAAUN,KAAA,EAAO;EACnE,OACE,eAAAO,IAAA,CAACX,gBAAA,CAAiBY,QAAA,EAAQ;IAAE,GAAGP,WAAA;IAAaE,QAAA;;;AAIhD;AAEAN,YAAA,CAAaY,WAAA,GAAiB","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.132.
|
|
3
|
+
"version": "1.132.16",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,16 +27,16 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.132.
|
|
31
|
-
"@tamagui/constants": "1.132.
|
|
32
|
-
"@tamagui/helpers": "1.132.
|
|
33
|
-
"@tamagui/is-equal-shallow": "1.132.
|
|
34
|
-
"@tamagui/normalize-css-color": "1.132.
|
|
35
|
-
"@tamagui/timer": "1.132.
|
|
36
|
-
"@tamagui/types": "1.132.
|
|
37
|
-
"@tamagui/use-did-finish-ssr": "1.132.
|
|
38
|
-
"@tamagui/use-event": "1.132.
|
|
39
|
-
"@tamagui/use-force-update": "1.132.
|
|
30
|
+
"@tamagui/compose-refs": "1.132.16",
|
|
31
|
+
"@tamagui/constants": "1.132.16",
|
|
32
|
+
"@tamagui/helpers": "1.132.16",
|
|
33
|
+
"@tamagui/is-equal-shallow": "1.132.16",
|
|
34
|
+
"@tamagui/normalize-css-color": "1.132.16",
|
|
35
|
+
"@tamagui/timer": "1.132.16",
|
|
36
|
+
"@tamagui/types": "1.132.16",
|
|
37
|
+
"@tamagui/use-did-finish-ssr": "1.132.16",
|
|
38
|
+
"@tamagui/use-event": "1.132.16",
|
|
39
|
+
"@tamagui/use-force-update": "1.132.16"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
42
|
"react": "*",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"react-native": "*"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@tamagui/build": "1.132.
|
|
47
|
+
"@tamagui/build": "1.132.16",
|
|
48
48
|
"@testing-library/react": "^16.1.0",
|
|
49
49
|
"csstype": "^3.0.10",
|
|
50
50
|
"react": "*",
|
package/src/createTamagui.ts
CHANGED
|
@@ -179,7 +179,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
179
179
|
}
|
|
180
180
|
|
|
181
181
|
const themesIn = configIn.themes as ThemesLikeObject
|
|
182
|
-
const dedupedThemes = foundThemes ?? getThemesDeduped(themesIn)
|
|
182
|
+
const dedupedThemes = foundThemes ?? getThemesDeduped(themesIn, tokens.color)
|
|
183
183
|
const themes = proxyThemesToParents(dedupedThemes)
|
|
184
184
|
|
|
185
185
|
return {
|
|
@@ -332,7 +332,10 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
332
332
|
}
|
|
333
333
|
|
|
334
334
|
// dedupes the themes if given them via JS config
|
|
335
|
-
function getThemesDeduped(
|
|
335
|
+
function getThemesDeduped(
|
|
336
|
+
themes: ThemesLikeObject,
|
|
337
|
+
colorTokens?: Record<string, any>
|
|
338
|
+
): DedupedThemes {
|
|
336
339
|
const dedupedThemes: DedupedThemes = []
|
|
337
340
|
const existing = new Map<string, DedupedTheme>()
|
|
338
341
|
|
|
@@ -361,6 +364,12 @@ function getThemesDeduped(themes: ThemesLikeObject): DedupedThemes {
|
|
|
361
364
|
// ensure each theme object unique for dedupe
|
|
362
365
|
// is ThemeParsed because we call ensureThemeVariable
|
|
363
366
|
const theme = { ...rawTheme } as any as ThemeParsed
|
|
367
|
+
|
|
368
|
+
// automatically merge color tokens into themes
|
|
369
|
+
if (colorTokens) {
|
|
370
|
+
Object.assign(theme, colorTokens)
|
|
371
|
+
}
|
|
372
|
+
|
|
364
373
|
// parse into variables
|
|
365
374
|
for (const key in theme) {
|
|
366
375
|
// make sure properly names theme variables
|
|
@@ -4,9 +4,12 @@ import { ComponentContext } from '../contexts/ComponentContext'
|
|
|
4
4
|
import type { FontLanguageProps } from './FontLanguage.types'
|
|
5
5
|
|
|
6
6
|
export const FontLanguage = ({ children, ...props }: FontLanguageProps) => {
|
|
7
|
+
const parentProps = React.useContext(ComponentContext)
|
|
7
8
|
const language = React.useMemo(() => props, [JSON.stringify(props)])
|
|
8
9
|
return (
|
|
9
|
-
<ComponentContext.Provider language={language}>
|
|
10
|
+
<ComponentContext.Provider {...parentProps} language={language}>
|
|
11
|
+
{children}
|
|
12
|
+
</ComponentContext.Provider>
|
|
10
13
|
)
|
|
11
14
|
}
|
|
12
15
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FontLanguage.native.d.ts","sourceRoot":"","sources":["../../src/views/FontLanguage.native.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,eAAO,MAAM,YAAY;6BAA4B,iBAAiB;;
|
|
1
|
+
{"version":3,"file":"FontLanguage.native.d.ts","sourceRoot":"","sources":["../../src/views/FontLanguage.native.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,eAAO,MAAM,YAAY;6BAA4B,iBAAiB;;CAQrE,CAAA"}
|