@tamagui/web 1.57.1 → 1.57.3
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/createComponent.js +25 -8
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.js +11 -14
- package/dist/cjs/helpers/ThemeManager.js.map +2 -2
- package/dist/cjs/helpers/createPropMapper.js +455 -0
- package/dist/cjs/helpers/createPropMapper.js.map +6 -0
- package/dist/cjs/helpers/extendStaticConfig.js +93 -0
- package/dist/cjs/helpers/extendStaticConfig.js.map +6 -0
- package/dist/cjs/helpers/getSplitStyles.js +19 -13
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/parseStaticConfig.js +40 -0
- package/dist/cjs/helpers/parseStaticConfig.js.map +6 -0
- package/dist/cjs/helpers/useShallowSetState.js +18 -10
- package/dist/cjs/helpers/useShallowSetState.js.map +1 -1
- package/dist/cjs/hooks/useSafeRef.js +59 -0
- package/dist/cjs/hooks/useSafeRef.js.map +6 -0
- package/dist/cjs/hooks/useServerHooks.js +36 -0
- package/dist/cjs/hooks/useServerHooks.js.map +6 -0
- package/dist/cjs/hooks/useTheme.js +7 -19
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/esm/createComponent.js +25 -8
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.js +4 -7
- package/dist/esm/helpers/ThemeManager.js.map +1 -1
- package/dist/esm/helpers/createPropMapper.js +429 -0
- package/dist/esm/helpers/createPropMapper.js.map +6 -0
- package/dist/esm/helpers/extendStaticConfig.js +67 -0
- package/dist/esm/helpers/extendStaticConfig.js.map +6 -0
- package/dist/esm/helpers/getSplitStyles.js +19 -13
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/parseStaticConfig.js +16 -0
- package/dist/esm/helpers/parseStaticConfig.js.map +6 -0
- package/dist/esm/helpers/useShallowSetState.js +18 -10
- package/dist/esm/helpers/useShallowSetState.js.map +1 -1
- package/dist/esm/hooks/useSafeRef.js +35 -0
- package/dist/esm/hooks/useSafeRef.js.map +6 -0
- package/dist/esm/hooks/useServerHooks.js +11 -0
- package/dist/esm/hooks/useServerHooks.js.map +6 -0
- package/dist/esm/hooks/useTheme.js +7 -19
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/package.json +10 -10
- package/src/createComponent.tsx +31 -4
- package/src/helpers/ThemeManager.tsx +5 -9
- package/src/helpers/getSplitStyles.tsx +27 -19
- package/src/hooks/useTheme.tsx +9 -24
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/ThemeManager.d.ts +2 -2
- package/types/helpers/ThemeManager.d.ts.map +1 -1
- package/types/helpers/createChainedWeakCache.d.ts +1 -1
- package/types/helpers/createPropMapper.d.ts.map +1 -0
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/parseStaticConfig.d.ts.map +1 -0
- package/types/helpers/useShallowSetState.d.ts.map +1 -1
- package/types/hooks/useSafeRef.d.ts.map +1 -0
- package/types/hooks/useServerHooks.d.ts.map +1 -0
- package/types/hooks/useTheme.d.ts +1 -4
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/dist/cjs/CSSColorNames.js +0 -17
- package/dist/cjs/CSSColorNames.js.map +0 -6
- package/dist/cjs/GetRef.js +0 -17
- package/dist/cjs/GetRef.js.map +0 -6
- package/dist/cjs/Role.js +0 -17
- package/dist/cjs/Role.js.map +0 -6
- package/dist/cjs/types/CSSColorNames.js +0 -17
- package/dist/cjs/types/CSSColorNames.js.map +0 -6
- package/dist/cjs/types/GetRef.js +0 -17
- package/dist/cjs/types/GetRef.js.map +0 -6
- package/dist/cjs/types/Role.js +0 -17
- package/dist/cjs/types/Role.js.map +0 -6
- package/dist/esm/CSSColorNames.js +0 -1
- package/dist/esm/CSSColorNames.js.map +0 -6
- package/dist/esm/GetRef.js +0 -1
- package/dist/esm/GetRef.js.map +0 -6
- package/dist/esm/Role.js +0 -1
- package/dist/esm/Role.js.map +0 -6
- package/dist/esm/types/CSSColorNames.js +0 -1
- package/dist/esm/types/CSSColorNames.js.map +0 -6
- package/dist/esm/types/GetRef.js +0 -1
- package/dist/esm/types/GetRef.js.map +0 -6
- package/dist/esm/types/Role.js +0 -1
- package/dist/esm/types/Role.js.map +0 -6
- package/types/CSSColorNames.d.ts +0 -2
- package/types/CSSColorNames.d.ts.map +0 -1
- package/types/GetRef.d.ts +0 -23
- package/types/GetRef.d.ts.map +0 -1
- package/types/Role.d.ts +0 -2
- package/types/Role.d.ts.map +0 -1
- package/types/contexts/AnimationDriverContext.d.ts +0 -4
- package/types/contexts/ButtonNestingContext.d.ts +0 -3
- package/types/contexts/FontLanguageContext.d.ts +0 -5
- package/types/contexts/TextAncestorContext.d.ts +0 -3
- package/types/helpers/useShallowSetState.d.ts +0 -4
- package/types/types/CSSColorNames.d.ts +0 -2
- package/types/types/CSSColorNames.d.ts.map +0 -1
- package/types/types/GetRef.d.ts +0 -6
- package/types/types/GetRef.d.ts.map +0 -1
- package/types/types/Role.d.ts +0 -2
- package/types/types/Role.d.ts.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/ThemeManager.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,iBAAiB;AAC1B,SAAS,wBAAwB,4BAA4B;AA0B7D,MAAM,aAAgC,EAAE,MAAM,GAAG;AAE1C,SAAS,yBAAyB,OAAmB;AAC1D,SAAO,
|
|
4
|
+
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,iBAAiB;AAC1B,SAAS,wBAAwB,4BAA4B;AA0B7D,MAAM,aAAgC,EAAE,MAAM,GAAG;AAE1C,SAAS,yBAAyB,OAAmB;AAC1D,SAAO,MAAM,QAAQ,MAAM,iBAAiB,MAAM,WAAW,MAAM;AACrE;AAEA,IAAI,MAAM;AAEH,MAAM,aAAa;AAAA,EAQxB,YACS,QAAoB,CAAC,GAC5B,iBACA;AAFO;AART,cAAK;AACL,uBAAc;AACd,0BAAiB,oBAAI,IAAmB;AACxC,yBAAqC;AACrC,iBAA2B;AAC3B,kBAAkC;AAiGlC,oBAA+B;AA3F7B,QAAI,oBAAoB,QAAQ;AAC9B,WAAK,qBAAqB,OAAO,KAAK;AACtC;AAAA,IACF;AAEA,QAAI,CAAC,iBAAiB;AACpB,UAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,cAAM,IAAI;AAAA,UACR;AAAA,QACF;AAAA,MACF;AACA,YAAM;AAAA,IACR;AAEA,SAAK,gBAAgB;AAErB,QAAI,KAAK,qBAAqB,OAAO,KAAK,GAAG;AAC3C;AAAA,IACF;AAEA,WAAO,mBAAmB;AAAA,EAC5B;AAAA,EAEA,qBACE,QAAmD,KAAK,SAAS,CAAC,GAClE,eAAe,MACf;AACA,SAAK,QAAQ;AACb,QAAI,MAAM,YAAY;AACpB,WAAK,MAAM,QAAQ,MAAM;AACzB,WAAK,MAAM,OAAO,MAAM,QAAQ;AAChC,aAAO;AAAA,IACT;AACA,UAAM,YAAY,KAAK,kBAAkB,KAAK;AAC9C,QAAI,WAAW;AACb,WAAK,YAAY,WAAW,YAAY;AACxC,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,YAAY,WAA8B,eAAe,MAAM;AAC7D,SAAK,QAAQ;AACb,UAAM,QAAQ,KAAK,MAAM,KAAK,MAAM,GAAG;AACvC,UAAM,WAAW,MAAM,MAAM,SAAS,CAAC,EAAE,CAAC;AAC1C,SAAK,cAAc,SAAS,CAAC,MAAM,SAAS,CAAC,EAAE,YAAY;AAC3D,SAAK,WAAW;AAChB,SAAK,SAAS,MAAM,CAAC,MAAM,UAAU,UAAU,MAAM,CAAC,MAAM,SAAS,SAAS;AAC9E,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,WAAK,sBAAsB,MAAM;AACjC,WAAK,sBAAsB;AAAA,IAC7B;AACA,QAAI,cAAc;AAChB,qBAAe,MAAM;AACnB,aAAK,OAAO;AAAA,MACd,CAAC;AAAA,IACH;AAAA,EACF;AAAA,EAEA,kBACE,QAAQ,KAAK,OACb,QAAkC,KAAK,OACvC,gBAAgB,KAAK,eACrB;AACA,UAAM,IAAI,KAAK,SAAS,OAAO,aAAa;AAG5C,QAAI,SAAS,UAAU,cAAc,CAAC,GAAG;AACvC,aAAO,+CAAe;AAAA,IACxB;AACA,QAAI,KAAK,qBAAqB,GAAG,KAAK,GAAG;AACvC,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,qBACE,WACA,QAAkC,KAAK,OACvC;AACA,QAAI,EAAC,uCAAW,UAAS,UAAU,WAAU,+BAAO,QAAO;AACzD,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA,EAEA,SAAS,QAAQ,KAAK,OAAO,gBAAgB,KAAK,eAAe;AAC/D,UAAM,OACJ,SAAS,OAAO,aAAa,MAC5B,QAAQ,IAAI,mBAAmB,YAAW,+CAAe,UAAS,OAAO;AAC5E,WAAO;AAAA,EACT;AAAA,EAGA,IAAI,UAAU;AA7IhB;AA8II,SAAK,aAAa,oBAAI,IAAI;AAAA,MACxB,KAAI,UAAK,kBAAL,mBAAoB,YAAW,CAAC;AAAA,MACpC,GAAG,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC,CAAC;AAAA,IACvC,CAAC;AACD,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,OAAO,SAAS,OAAO;AACrB,SAAK,eAAe,QAAQ,CAAC,OAAO,GAAG,KAAK,MAAM,MAAM,MAAM,MAAM,CAAC;AAAA,EACvE;AAAA,EAEA,cAAc,IAAmB,SAAkB;AACjD,QAAI,QAAQ,IAAI,aAAa,iBAAiB,SAAS;AAErD,WAAK,kBAAkB,oBAAI,IAAI;AAE/B,WAAK,cAAc,IAAI,OAAO;AAAA,IAChC;AAEA,SAAK,eAAe,IAAI,EAAE;AAC1B,WAAO,MAAM;AACX,WAAK,eAAe,OAAO,EAAE;AAAA,IAC/B;AAAA,EACF;AACF;AAEA,SAAS,sBAAsB,MAAc;AAC3C,QAAM,OAAO,eAAe,sBAAsB,GAAG,IAAI;AACzD,SAAO,KAAK,QAAQ,UAAU,EAAE,EAAE,QAAQ,SAAS,EAAE;AACvD;AAEA,SAAS,SACP,OACA,eAC0B;AAhL5B;AAiLE,QAAM,oCAAoC,6BAA6B,aAAa;AACpF,kBAAgB,kCAAkC,CAAC;AACnD,QAAM,qBAAqB,kCAAkC,CAAC;AAC9D,QAAM,SAAS,UAAU;AACzB,QAAM,gCAAgC,mBAAmB,SAAS;AAElE,MAAI,MAAM,QAAQ,MAAM,OAAO;AAC7B,UAAM,IAAI,MAAM,6BAA6B;AAAA,EAC/C;AAEA,MAAI,CAAC,MAAM,QAAQ,CAAC,MAAM,WAAW,CAAC,MAAM,SAAS,CAAC,MAAM,eAAe;AACzE,WAAO;AAAA,EACT;AAEA,MAAI,MAAM,SAAS,CAAC,iCAAiC,EAAC,+CAAe,gBAAe;AAClF,QAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,cAAQ,KAAK,oCAAoC;AAAA,IACnD;AACA,WAAO;AAAA,EACT;AAEA,MAAI,SAAmC;AAEvC,QAAM,WAAW,MAAM,QACnB,kCACE,oDAAe,UAAf,mBAAsB,SAAQ,OAC9B,0DAAe,kBAAf,mBAA8B,UAA9B,mBAAqC,SAAQ,KAC/C,MAAM,QAAQ;AAClB,QAAM,EAAE,cAAc,IAAI;AAC1B,QAAM,aAAa,MAAM,QACrB;AAAA;AAAA,MAEE,oDAAe,kBAAf,mBAA8B,MAAM,SAAQ;AAAA,QAC5C,0DAAe,kBAAf,mBAA8B,kBAA9B,mBAA6C,MAAM,SAAQ,KAC7D,gCACA,mBAAmB,CAAC,KAAK,MACzB,+CAAe,MAAM,SAAQ;AAEjC,MAAI,MAAM,SAAS,+BAA+B;AAEhD,uBAAmB,MAAM;AAAA,EAC3B;AAGA,QAAM,OAAO,WAAW,MAAM,oBAAoB;AAClD,QAAM,cAAc,KAAK,KAAK,SAAS,CAAC;AACxC,QAAM,yBACJ,cAAc,YAAY,CAAC,EAAE,YAAY,MAAM,YAAY,CAAC;AAC9D,MAAI,wBAAwB;AAC1B,SAAK,IAAI;AAAA,EACX;AACA,QAAM,kBAAkB,yBACpB,KAAK,MAAM,GAAG,KAAK,MAAM,EAAE,KAAK,oBAAoB,IACpD;AACJ,QAAM,MAAM,KAAK;AACjB,QAAM,MACJ,iBAAiB,CAAC,WACd,MACA;AAEN,MAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,MAAM,UAAU,UAAU;AAC7E,YAAQ,eAAe,yBAAyB;AAEhD,YAAQ,IAAI;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,WAAS,IAAI,KAAK,KAAK,KAAK,KAAK;AAC/B,QAAI,SAAS,KAAK,MAAM,GAAG,CAAC,EAAE,KAAK,oBAAoB;AAEvD,QAAI,MAAM,SAAS;AACjB,eAAS,iBAAiB,MAAM;AAAA,IAClC;AACA,QAAI,aAAuB,CAAC;AAE5B,QAAI,UAAU,WAAW,iBAAiB;AACxC,iBAAW,KAAK,MAAM;AAAA,IACxB;AACA,QAAI,UAAU;AACZ,iBAAW,QAAQ,SAAS,GAAG,MAAM,IAAI,QAAQ,KAAK,QAAQ;AAAA,IAChE;AACA,QAAI,MAAM,GAAG;AACX,YAAMA,eAAc,WAAW,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,CAAC;AAChE,UAAIA,eAAc,GAAG;AACnB,mBAAW,OAAOA,cAAa,GAAG,QAAQ;AAAA,MAC5C;AAAA,IACF;AAEA,QAAI,eAAe;AACjB,UAAI,sBAAgC,CAAC;AAErC,UAAI,UAAU;AACZ,cAAM,kBAAkB,OAAO,MAAM,GAAG,OAAO,QAAQ,oBAAoB,CAAC;AAC5E,4BAAoB,KAAK,GAAG,eAAe,IAAI,QAAQ,IAAI,aAAa,EAAE;AAAA,MAC5E;AACA,0BAAoB,KAAK,GAAG,MAAM,IAAI,aAAa,EAAE;AACrD,UAAI,UAAU;AAEZ,cAAM,gBAAgB,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,KAAK,oBAAoB;AACpE,YAAI,eAAe;AACjB,gBAAM,eAAe,GAAG,aAAa,IAAI,QAAQ,IAAI,aAAa;AAClE,8BAAoB,QAAQ,YAAY;AAAA,QAC1C;AACA,cAAM,eAAe,GAAG,MAAM,IAAI,QAAQ,IAAI,aAAa;AAC3D,4BAAoB,QAAQ,YAAY;AAAA,MAC1C;AACA,mBAAa,CAAC,GAAG,qBAAqB,GAAG,YAAY,GAAG,kBAAkB;AAAA,IAC5E;AACA,UAAM,QAAQ,WAAW,KAAK,CAAC,MAAM,KAAK,MAAM;AAEhD,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,MAAM,UAAU,UAAU;AAE7E,cAAQ,IAAI,OAAO,EAAE,OAAO,YAAY,cAAc,CAAC;AAAA,IACzD;AAEA,QAAI,OAAO;AACT,eAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO,OAAO,KAAK;AAAA,QACnB,WAAW,QAAQ,sBAAsB,KAAK,IAAI;AAAA,QAClD;AAAA,QACA;AAAA,QACA,SAAS,MAAM;AAAA,MACjB;AACA;AAAA,IACF;AAAA,EACF;AAEA,MACE,QAAQ,IAAI,aAAa,iBACzB,OAAO,MAAM,UAAU,YACvB,OAAO,WAAW,aAClB;AACA,YAAQ,KAAK,4BAA4B;AAAA,MACvC;AAAA,IACF,CAAC;AACD,YAAQ,MAAM;AACd,YAAQ,SAAS;AAAA,EACnB;AAEA,SAAO;AACT;AAEA,MAAM,mBAAmB,CAAC,cAAsB;AAC9C,SAAO,UAAU,WAAW,OAAO,IAC/B,UAAU,QAAQ,UAAU,MAAM,IAClC,UAAU,QAAQ,SAAS,OAAO;AACxC;AAEO,SAAS,6BAA6B,cAAoC;AA7UjF;AAiVE,MAAI,MAAM;AACV,MAAI,sBAAgC,CAAC;AACrC,SAAO,KAAK;AACV,QAAI,2BAAK,aAAa;AACpB,0BAAoB,MAAK,gCAAK,UAAL,mBAAY,IAAK;AAC1C,YAAM,IAAI;AAAA,IACZ,OAAO;AACL;AAAA,IACF;AAAA,EACF;AACA,SAAO,CAAC,OAAO,MAAM,mBAAmB;AAC1C;",
|
|
5
5
|
"names": ["lastSegment"]
|
|
6
6
|
}
|
|
@@ -0,0 +1,429 @@
|
|
|
1
|
+
import { isAndroid, isWeb } from "@tamagui/constants";
|
|
2
|
+
import { getConfig } from "../config";
|
|
3
|
+
import { isDevTools } from "../constants/isDevTools";
|
|
4
|
+
import { getVariableValue, isVariable } from "../createVariable";
|
|
5
|
+
import { expandStyle } from "./expandStyle";
|
|
6
|
+
import { expandStyles } from "./expandStyles";
|
|
7
|
+
import { getFontsForLanguage, getVariantExtras } from "./getVariantExtras";
|
|
8
|
+
import { isObj } from "./isObj";
|
|
9
|
+
import { mergeProps } from "./mergeProps";
|
|
10
|
+
import { pseudoDescriptors } from "./pseudoDescriptors";
|
|
11
|
+
const createPropMapper = (staticConfig) => {
|
|
12
|
+
const variants = staticConfig.variants || {};
|
|
13
|
+
const defaultProps = mergeProps(staticConfig.defaultProps || {}, {}, false)[0];
|
|
14
|
+
let conf;
|
|
15
|
+
const mapper = (key, value, theme, propsIn, state, languageContext, avoidDefaultProps = false, debug) => {
|
|
16
|
+
conf ||= getConfig();
|
|
17
|
+
if (!(process.env.TAMAGUI_TARGET === "native" && isAndroid)) {
|
|
18
|
+
if (key === "elevationAndroid") {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
const props = state.fallbackProps || propsIn;
|
|
23
|
+
const returnVariablesAs = state.resolveVariablesAs === "value" ? "value" : "auto";
|
|
24
|
+
let fontFamily = props[conf.inverseShorthands.fontFamily] || props.fontFamily || defaultProps.fontFamily || propsIn.fontFamily || `$${conf.defaultFont}`;
|
|
25
|
+
if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed)) {
|
|
26
|
+
console.warn(
|
|
27
|
+
`Warning: no fontFamily "${fontFamily}" found in config: ${Object.keys(
|
|
28
|
+
conf.fontsParsed
|
|
29
|
+
).join(", ")}`
|
|
30
|
+
);
|
|
31
|
+
}
|
|
32
|
+
const variantValue = resolveVariants(
|
|
33
|
+
key,
|
|
34
|
+
value,
|
|
35
|
+
props,
|
|
36
|
+
defaultProps,
|
|
37
|
+
theme,
|
|
38
|
+
variants,
|
|
39
|
+
fontFamily,
|
|
40
|
+
conf,
|
|
41
|
+
returnVariablesAs,
|
|
42
|
+
staticConfig,
|
|
43
|
+
"",
|
|
44
|
+
languageContext,
|
|
45
|
+
avoidDefaultProps,
|
|
46
|
+
debug
|
|
47
|
+
);
|
|
48
|
+
if (variantValue) {
|
|
49
|
+
return variantValue;
|
|
50
|
+
}
|
|
51
|
+
let shouldReturn = value !== void 0 && value !== null;
|
|
52
|
+
if (key in conf.shorthands) {
|
|
53
|
+
shouldReturn = true;
|
|
54
|
+
key = conf.shorthands[key];
|
|
55
|
+
}
|
|
56
|
+
if (value) {
|
|
57
|
+
if (value[0] === "$") {
|
|
58
|
+
value = getToken(
|
|
59
|
+
key,
|
|
60
|
+
value,
|
|
61
|
+
conf,
|
|
62
|
+
theme,
|
|
63
|
+
fontFamily,
|
|
64
|
+
languageContext,
|
|
65
|
+
returnVariablesAs,
|
|
66
|
+
debug
|
|
67
|
+
);
|
|
68
|
+
} else if (isVariable(value)) {
|
|
69
|
+
value = resolveVariableValue(key, value, returnVariablesAs);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
if (shouldReturn) {
|
|
73
|
+
return expandStyle(key, value) || [[key, value]];
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
return mapper;
|
|
77
|
+
};
|
|
78
|
+
const resolveVariants = (key, value, props, defaultProps, theme, variants, fontFamily, conf, returnVariablesAs, staticConfig, parentVariantKey, languageContext, avoidDefaultProps = false, debug) => {
|
|
79
|
+
if (!(key in variants) || value === void 0) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
let variantValue = getVariantDefinition(variants[key], key, value, conf);
|
|
83
|
+
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
84
|
+
console.log("resolve variant", { key, value, variantValue });
|
|
85
|
+
}
|
|
86
|
+
if (!variantValue) {
|
|
87
|
+
if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1") {
|
|
88
|
+
if (typeof value !== "boolean") {
|
|
89
|
+
const name = staticConfig.componentName || "[UnnamedComponent]";
|
|
90
|
+
console.warn(
|
|
91
|
+
`No variant found: ${name} has variant "${key}", but no matching value "${value}"`
|
|
92
|
+
);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
if (typeof variantValue === "function") {
|
|
98
|
+
const fn = variantValue;
|
|
99
|
+
variantValue = fn(
|
|
100
|
+
value,
|
|
101
|
+
getVariantExtras(
|
|
102
|
+
props,
|
|
103
|
+
languageContext,
|
|
104
|
+
theme,
|
|
105
|
+
defaultProps,
|
|
106
|
+
avoidDefaultProps,
|
|
107
|
+
fontFamily
|
|
108
|
+
)
|
|
109
|
+
);
|
|
110
|
+
if (process.env.NODE_ENV === "development") {
|
|
111
|
+
if (debug === "verbose") {
|
|
112
|
+
console.log("expanded functional variant", {
|
|
113
|
+
variant: fn,
|
|
114
|
+
response: variantValue
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
let fontFamilyResult;
|
|
120
|
+
if (isObj(variantValue)) {
|
|
121
|
+
const fontFamilyUpdate = variantValue.fontFamily || variantValue[conf.inverseShorthands.fontFamily];
|
|
122
|
+
if (fontFamilyUpdate) {
|
|
123
|
+
fontFamilyResult = getFontFamilyFromNameOrVariable(fontFamilyUpdate, conf);
|
|
124
|
+
}
|
|
125
|
+
variantValue = resolveTokensAndVariants(
|
|
126
|
+
key,
|
|
127
|
+
variantValue,
|
|
128
|
+
props,
|
|
129
|
+
defaultProps,
|
|
130
|
+
theme,
|
|
131
|
+
variants,
|
|
132
|
+
fontFamilyResult || fontFamily,
|
|
133
|
+
conf,
|
|
134
|
+
returnVariablesAs,
|
|
135
|
+
staticConfig,
|
|
136
|
+
parentVariantKey,
|
|
137
|
+
languageContext,
|
|
138
|
+
avoidDefaultProps,
|
|
139
|
+
debug
|
|
140
|
+
);
|
|
141
|
+
}
|
|
142
|
+
if (variantValue) {
|
|
143
|
+
const next = Object.entries(expandStyles(variantValue));
|
|
144
|
+
if (fontFamilyResult && fontFamilyResult[0] === "$") {
|
|
145
|
+
fontFamilyCache.set(next, getVariableValue(fontFamilyResult));
|
|
146
|
+
}
|
|
147
|
+
return next;
|
|
148
|
+
}
|
|
149
|
+
};
|
|
150
|
+
function getFontFamilyFromNameOrVariable(input, conf) {
|
|
151
|
+
if (isVariable(input)) {
|
|
152
|
+
const val = variableToFontNameCache.get(input);
|
|
153
|
+
if (val) {
|
|
154
|
+
return val;
|
|
155
|
+
} else {
|
|
156
|
+
for (const key in conf.fontsParsed) {
|
|
157
|
+
const familyVariable = conf.fontsParsed[key].family;
|
|
158
|
+
if (isVariable(familyVariable)) {
|
|
159
|
+
variableToFontNameCache.set(familyVariable, key);
|
|
160
|
+
if (familyVariable === input) {
|
|
161
|
+
return key;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
} else if (typeof input === "string") {
|
|
167
|
+
if ((input == null ? void 0 : input[0]) === "$") {
|
|
168
|
+
return input;
|
|
169
|
+
} else {
|
|
170
|
+
if (process.env.NODE_ENV === "development") {
|
|
171
|
+
console.log("[tamagui] should map back", input);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
const variableToFontNameCache = /* @__PURE__ */ new WeakMap();
|
|
177
|
+
const fontFamilyCache = /* @__PURE__ */ new WeakMap();
|
|
178
|
+
const getPropMappedFontFamily = (expanded) => {
|
|
179
|
+
return expanded && fontFamilyCache.get(expanded);
|
|
180
|
+
};
|
|
181
|
+
const resolveTokensAndVariants = (key, value, props, defaultProps, theme, variants, fontFamily, conf, returnVariablesAs, staticConfig, parentVariantKey, languageContext, avoidDefaultProps, debug) => {
|
|
182
|
+
var _a;
|
|
183
|
+
const res = {};
|
|
184
|
+
for (const rKey in value) {
|
|
185
|
+
const fKey = conf.shorthands[rKey] || rKey;
|
|
186
|
+
const val = value[rKey];
|
|
187
|
+
if (fKey in variants) {
|
|
188
|
+
if (parentVariantKey && parentVariantKey === key) {
|
|
189
|
+
res[fKey] = val;
|
|
190
|
+
} else {
|
|
191
|
+
const variantOut = resolveVariants(
|
|
192
|
+
fKey,
|
|
193
|
+
val,
|
|
194
|
+
props,
|
|
195
|
+
defaultProps,
|
|
196
|
+
theme,
|
|
197
|
+
variants,
|
|
198
|
+
fontFamily,
|
|
199
|
+
conf,
|
|
200
|
+
returnVariablesAs,
|
|
201
|
+
staticConfig,
|
|
202
|
+
key,
|
|
203
|
+
languageContext,
|
|
204
|
+
avoidDefaultProps,
|
|
205
|
+
debug
|
|
206
|
+
);
|
|
207
|
+
if (variantOut) {
|
|
208
|
+
for (const [key2, val2] of variantOut) {
|
|
209
|
+
if (val2 == null)
|
|
210
|
+
continue;
|
|
211
|
+
if (key2 in pseudoDescriptors) {
|
|
212
|
+
res[key2] ??= {};
|
|
213
|
+
Object.assign(res[key2], val2);
|
|
214
|
+
} else {
|
|
215
|
+
res[key2] = val2;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
if (isVariable(val)) {
|
|
223
|
+
res[fKey] = !isWeb || returnVariablesAs === "value" ? val.val : val.variable;
|
|
224
|
+
continue;
|
|
225
|
+
}
|
|
226
|
+
if (typeof val === "string") {
|
|
227
|
+
const fVal = val[0] === "$" ? getToken(
|
|
228
|
+
fKey,
|
|
229
|
+
val,
|
|
230
|
+
conf,
|
|
231
|
+
theme,
|
|
232
|
+
fontFamily,
|
|
233
|
+
languageContext,
|
|
234
|
+
returnVariablesAs,
|
|
235
|
+
debug
|
|
236
|
+
) : val;
|
|
237
|
+
res[fKey] = fVal;
|
|
238
|
+
continue;
|
|
239
|
+
}
|
|
240
|
+
if (isObj(val)) {
|
|
241
|
+
res[fKey] ??= {};
|
|
242
|
+
Object.assign(
|
|
243
|
+
res[fKey],
|
|
244
|
+
resolveTokensAndVariants(
|
|
245
|
+
fKey,
|
|
246
|
+
val,
|
|
247
|
+
props,
|
|
248
|
+
defaultProps,
|
|
249
|
+
theme,
|
|
250
|
+
variants,
|
|
251
|
+
fontFamily,
|
|
252
|
+
conf,
|
|
253
|
+
returnVariablesAs,
|
|
254
|
+
staticConfig,
|
|
255
|
+
key,
|
|
256
|
+
languageContext,
|
|
257
|
+
avoidDefaultProps,
|
|
258
|
+
debug
|
|
259
|
+
)
|
|
260
|
+
);
|
|
261
|
+
} else {
|
|
262
|
+
res[fKey] = val;
|
|
263
|
+
}
|
|
264
|
+
if (process.env.NODE_ENV === "development") {
|
|
265
|
+
if (debug) {
|
|
266
|
+
if (((_a = res[fKey]) == null ? void 0 : _a[0]) === "$") {
|
|
267
|
+
console.warn(`\u26A0\uFE0F Missing token in theme ${theme.name}:`, fKey, res[fKey], theme);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
return res;
|
|
273
|
+
};
|
|
274
|
+
const tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
|
|
275
|
+
name,
|
|
276
|
+
spreadName: `...${name}`
|
|
277
|
+
}));
|
|
278
|
+
function getVariantDefinition(variant, key, value, conf) {
|
|
279
|
+
if (typeof variant === "function") {
|
|
280
|
+
return variant;
|
|
281
|
+
}
|
|
282
|
+
if (variant[value]) {
|
|
283
|
+
return variant[value];
|
|
284
|
+
}
|
|
285
|
+
const { tokensParsed } = conf;
|
|
286
|
+
for (const { name, spreadName } of tokenCats) {
|
|
287
|
+
if (spreadName in variant && value in tokensParsed[name]) {
|
|
288
|
+
return variant[spreadName];
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
const fontSizeVariant = variant["...fontSize"];
|
|
292
|
+
if (fontSizeVariant && conf.fontSizeTokens.has(value)) {
|
|
293
|
+
return fontSizeVariant;
|
|
294
|
+
}
|
|
295
|
+
return variant[`:${typeof value}`] || variant["..."] || variant["...size"];
|
|
296
|
+
}
|
|
297
|
+
const fontShorthand = {
|
|
298
|
+
fontSize: "size",
|
|
299
|
+
fontWeight: "weight"
|
|
300
|
+
};
|
|
301
|
+
const getToken = (key, value, conf, theme, fontFamily, languageContext, resolveAs, debug) => {
|
|
302
|
+
var _a, _b, _c;
|
|
303
|
+
const tokensParsed = conf.tokensParsed;
|
|
304
|
+
let valOrVar;
|
|
305
|
+
let hasSet = false;
|
|
306
|
+
if (value in theme) {
|
|
307
|
+
if (process.env.NODE_ENV === "development" && debug === "verbose") {
|
|
308
|
+
console.log(`Getting theme value for ${key} from ${value} = ${theme[value].val}`);
|
|
309
|
+
}
|
|
310
|
+
valOrVar = theme[value];
|
|
311
|
+
hasSet = true;
|
|
312
|
+
} else {
|
|
313
|
+
if (value in conf.specificTokens) {
|
|
314
|
+
hasSet = true;
|
|
315
|
+
valOrVar = conf.specificTokens[value];
|
|
316
|
+
} else {
|
|
317
|
+
switch (key) {
|
|
318
|
+
case "fontFamily": {
|
|
319
|
+
const fontsParsed = languageContext ? getFontsForLanguage(conf.fontsParsed, languageContext) : conf.fontsParsed;
|
|
320
|
+
valOrVar = ((_a = fontsParsed[value]) == null ? void 0 : _a.family) || value;
|
|
321
|
+
hasSet = true;
|
|
322
|
+
break;
|
|
323
|
+
}
|
|
324
|
+
case "fontSize":
|
|
325
|
+
case "lineHeight":
|
|
326
|
+
case "letterSpacing":
|
|
327
|
+
case "fontWeight": {
|
|
328
|
+
if (fontFamily) {
|
|
329
|
+
const fontsParsed = languageContext ? getFontsForLanguage(conf.fontsParsed, languageContext) : conf.fontsParsed;
|
|
330
|
+
valOrVar = ((_c = (_b = fontsParsed[fontFamily]) == null ? void 0 : _b[fontShorthand[key] || key]) == null ? void 0 : _c[value]) || value;
|
|
331
|
+
hasSet = true;
|
|
332
|
+
}
|
|
333
|
+
break;
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
for (const cat in tokenCategories) {
|
|
337
|
+
if (key in tokenCategories[cat]) {
|
|
338
|
+
const res = tokensParsed[cat][value];
|
|
339
|
+
if (res) {
|
|
340
|
+
valOrVar = res;
|
|
341
|
+
hasSet = true;
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
if (!hasSet) {
|
|
346
|
+
const spaceVar = tokensParsed.space[value];
|
|
347
|
+
if (spaceVar) {
|
|
348
|
+
valOrVar = spaceVar;
|
|
349
|
+
hasSet = true;
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
if (hasSet) {
|
|
355
|
+
const out = resolveVariableValue(key, valOrVar, resolveAs);
|
|
356
|
+
if (process.env.NODE_ENV === "development" && isDevTools && debug === "verbose") {
|
|
357
|
+
console.groupCollapsed(" \uFE52 propMap", key, out);
|
|
358
|
+
console.log({ valOrVar, theme, hasSet, resolveAs }, theme[key]);
|
|
359
|
+
console.groupEnd();
|
|
360
|
+
}
|
|
361
|
+
return out;
|
|
362
|
+
}
|
|
363
|
+
if (process.env.NODE_ENV === "development") {
|
|
364
|
+
if (value && value[0] === "$") {
|
|
365
|
+
return;
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
if (process.env.NODE_ENV === "development" && isDevTools && debug === "verbose") {
|
|
369
|
+
console.groupCollapsed(" \uFE52 propMap (val)", key, value);
|
|
370
|
+
console.log({ valOrVar, theme, hasSet, resolveAs }, theme[key]);
|
|
371
|
+
console.groupEnd();
|
|
372
|
+
}
|
|
373
|
+
return value;
|
|
374
|
+
};
|
|
375
|
+
function resolveVariableValue(key, valOrVar, resolveAs = "auto") {
|
|
376
|
+
if (isVariable(valOrVar)) {
|
|
377
|
+
if (resolveAs === "variable") {
|
|
378
|
+
return valOrVar;
|
|
379
|
+
}
|
|
380
|
+
if (resolveAs === "non-color-value") {
|
|
381
|
+
if (isWeb) {
|
|
382
|
+
if (key in tokenCategories.color) {
|
|
383
|
+
return valOrVar.variable;
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
return valOrVar.val;
|
|
387
|
+
}
|
|
388
|
+
if (!isWeb || resolveAs === "value") {
|
|
389
|
+
return valOrVar.val;
|
|
390
|
+
}
|
|
391
|
+
return valOrVar.variable;
|
|
392
|
+
}
|
|
393
|
+
return valOrVar;
|
|
394
|
+
}
|
|
395
|
+
const tokenCategories = {
|
|
396
|
+
radius: {
|
|
397
|
+
borderRadius: true,
|
|
398
|
+
borderTopLeftRadius: true,
|
|
399
|
+
borderTopRightRadius: true,
|
|
400
|
+
borderBottomLeftRadius: true,
|
|
401
|
+
borderBottomRightRadius: true
|
|
402
|
+
},
|
|
403
|
+
size: {
|
|
404
|
+
width: true,
|
|
405
|
+
height: true,
|
|
406
|
+
minWidth: true,
|
|
407
|
+
minHeight: true,
|
|
408
|
+
maxWidth: true,
|
|
409
|
+
maxHeight: true
|
|
410
|
+
},
|
|
411
|
+
zIndex: {
|
|
412
|
+
zIndex: true
|
|
413
|
+
},
|
|
414
|
+
color: {
|
|
415
|
+
color: true,
|
|
416
|
+
backgroundColor: true,
|
|
417
|
+
borderColor: true,
|
|
418
|
+
borderBottomColor: true,
|
|
419
|
+
borderTopColor: true,
|
|
420
|
+
borderLeftColor: true,
|
|
421
|
+
borderRightColor: true
|
|
422
|
+
}
|
|
423
|
+
};
|
|
424
|
+
export {
|
|
425
|
+
createPropMapper,
|
|
426
|
+
getFontFamilyFromNameOrVariable,
|
|
427
|
+
getPropMappedFontFamily
|
|
428
|
+
};
|
|
429
|
+
//# sourceMappingURL=createPropMapper.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/helpers/createPropMapper.ts"],
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["key", "val"]
|
|
6
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { stylePropsView } from "@tamagui/helpers";
|
|
2
|
+
import { createPropMapper } from "./createPropMapper";
|
|
3
|
+
import { mergeProps } from "./mergeProps";
|
|
4
|
+
function extendStaticConfig(config, parent) {
|
|
5
|
+
if (!(parent && "staticConfig" in parent)) {
|
|
6
|
+
return parseStaticConfig(config);
|
|
7
|
+
}
|
|
8
|
+
const parentStaticConfig = parent.staticConfig;
|
|
9
|
+
const variants = mergeVariants(parentStaticConfig.variants, config.variants);
|
|
10
|
+
const parentNames = [...parentStaticConfig.parentNames || []];
|
|
11
|
+
if (parentStaticConfig.componentName) {
|
|
12
|
+
parentNames.push(parentStaticConfig.componentName);
|
|
13
|
+
}
|
|
14
|
+
const deoptProps = config.deoptProps || /* @__PURE__ */ new Set();
|
|
15
|
+
const defaultProps = mergeProps(parentStaticConfig.defaultProps, {
|
|
16
|
+
...config.defaultProps,
|
|
17
|
+
...config.defaultVariants
|
|
18
|
+
})[0];
|
|
19
|
+
return parseStaticConfig({
|
|
20
|
+
...parentStaticConfig,
|
|
21
|
+
...config,
|
|
22
|
+
parentStaticConfig,
|
|
23
|
+
deoptProps,
|
|
24
|
+
variants,
|
|
25
|
+
parentNames,
|
|
26
|
+
validStyles: config.validStyles ? {
|
|
27
|
+
...parentStaticConfig.validStyles,
|
|
28
|
+
...config.validStyles
|
|
29
|
+
} : parentStaticConfig.validStyles || stylePropsView,
|
|
30
|
+
defaultProps
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
const mergeVariants = (parentVariants, ourVariants) => {
|
|
34
|
+
const variants = {
|
|
35
|
+
...parentVariants
|
|
36
|
+
};
|
|
37
|
+
if (ourVariants) {
|
|
38
|
+
for (const key in ourVariants) {
|
|
39
|
+
if (key in variants) {
|
|
40
|
+
variants[key] = {
|
|
41
|
+
...variants[key],
|
|
42
|
+
...ourVariants[key]
|
|
43
|
+
};
|
|
44
|
+
} else {
|
|
45
|
+
variants[key] = ourVariants[key];
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return variants;
|
|
50
|
+
};
|
|
51
|
+
const parseStaticConfig = (config) => {
|
|
52
|
+
const parsed = {
|
|
53
|
+
defaultProps: {},
|
|
54
|
+
...config,
|
|
55
|
+
parsed: true
|
|
56
|
+
};
|
|
57
|
+
return {
|
|
58
|
+
...parsed,
|
|
59
|
+
propMapper: createPropMapper(parsed)
|
|
60
|
+
};
|
|
61
|
+
};
|
|
62
|
+
export {
|
|
63
|
+
extendStaticConfig,
|
|
64
|
+
mergeVariants,
|
|
65
|
+
parseStaticConfig
|
|
66
|
+
};
|
|
67
|
+
//# sourceMappingURL=extendStaticConfig.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/helpers/extendStaticConfig.ts"],
|
|
4
|
+
"mappings": "AAAA,SAAS,sBAAsB;AAQ/B,SAAS,wBAAwB;AACjC,SAAS,kBAAkB;AAEpB,SAAS,mBACd,QACA,QACA;AACA,MAAI,EAAE,UAAU,kBAAkB,SAAS;AACzC,WAAO,kBAAkB,MAAM;AAAA,EACjC;AAEA,QAAM,qBAAqB,OAAO;AAGlC,QAAM,WAAW,cAAc,mBAAmB,UAAU,OAAO,QAAQ;AAG3E,QAAM,cAAc,CAAC,GAAI,mBAAmB,eAAe,CAAC,CAAE;AAC9D,MAAI,mBAAmB,eAAe;AACpC,gBAAY,KAAK,mBAAmB,aAAa;AAAA,EACnD;AAEA,QAAM,aAAa,OAAO,cAAc,oBAAI,IAAY;AAExD,QAAM,eAAe,WAAW,mBAAmB,cAAc;AAAA,IAC/D,GAAG,OAAO;AAAA,IACV,GAAG,OAAO;AAAA,EACZ,CAAC,EAAE,CAAC;AAEJ,SAAO,kBAAkB;AAAA,IACvB,GAAG;AAAA,IACH,GAAG;AAAA,IACH;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,OAAO,cAChB;AAAA,MACE,GAAG,mBAAmB;AAAA,MACtB,GAAG,OAAO;AAAA,IACZ,IACA,mBAAmB,eAAe;AAAA,IACtC;AAAA,EACF,CAAC;AACH;AAEO,MAAM,gBAAgB,CAC3B,gBACA,gBACG;AACH,QAAM,WAAW;AAAA,IACf,GAAG;AAAA,EACL;AAEA,MAAI,aAAa;AACf,eAAW,OAAO,aAAa;AAC7B,UAAI,OAAO,UAAU;AACnB,iBAAS,GAAG,IAAI;AAAA,UACd,GAAG,SAAS,GAAG;AAAA,UACf,GAAG,YAAY,GAAG;AAAA,QACpB;AAAA,MACF,OAAO;AACL,iBAAS,GAAG,IAAI,YAAY,GAAG;AAAA,MACjC;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEO,MAAM,oBAAoB,CAAC,WAAsD;AACtF,QAAM,SAAS;AAAA,IACb,cAAc,CAAC;AAAA,IACf,GAAG;AAAA,IACH,QAAQ;AAAA,EACV;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,iBAAiB,MAA4B;AAAA,EAC3D;AACF;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -146,21 +146,24 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
|
|
|
146
146
|
continue;
|
|
147
147
|
if (keyInit in skipProps && !isHOC) {
|
|
148
148
|
if (keyInit === "group") {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
149
|
+
if (process.env.TAMAGUI_TARGET === "web") {
|
|
150
|
+
const identifier = `t_group_${valInit}`;
|
|
151
|
+
const containerCSS = {
|
|
152
|
+
identifier,
|
|
153
|
+
property: "container",
|
|
154
|
+
rules: [
|
|
155
|
+
`.${identifier} { container-name: ${valInit}; container-type: inline-size; }`
|
|
156
|
+
]
|
|
157
|
+
};
|
|
158
|
+
addStyleToInsertRules(rulesToInsert, containerCSS);
|
|
159
|
+
}
|
|
158
160
|
}
|
|
159
161
|
continue;
|
|
160
162
|
}
|
|
163
|
+
const valInitType = typeof valInit;
|
|
161
164
|
styleState.curProps[keyInit] = valInit;
|
|
162
165
|
if (process.env.TAMAGUI_TARGET === "web") {
|
|
163
|
-
if (
|
|
166
|
+
if (valInitType === "string" && valInit[0] === "_") {
|
|
164
167
|
if (keyInit in validStyleProps || keyInit.includes("-")) {
|
|
165
168
|
if (process.env.NODE_ENV === "development" && debug) {
|
|
166
169
|
console.log(`Adding compiled style ${keyInit}: ${valInit}`);
|
|
@@ -229,7 +232,7 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
|
|
|
229
232
|
}
|
|
230
233
|
continue;
|
|
231
234
|
}
|
|
232
|
-
if (keyInit.startsWith("_style")) {
|
|
235
|
+
if (keyInit[0] === "_" && keyInit.startsWith("_style")) {
|
|
233
236
|
mergeStyleProp(styleState, valInit);
|
|
234
237
|
continue;
|
|
235
238
|
}
|
|
@@ -381,8 +384,11 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
|
|
|
381
384
|
styleState.fontFamily = valInit;
|
|
382
385
|
}
|
|
383
386
|
}
|
|
384
|
-
|
|
385
|
-
|
|
387
|
+
if (process.env.TAMAGUI_TARGET === "native" && isValidStyleKeyInit && !variants && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
|
|
388
|
+
style[keyInit] = valInit;
|
|
389
|
+
continue;
|
|
390
|
+
}
|
|
391
|
+
const avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit;
|
|
386
392
|
const expanded = avoidPropMap ? [[keyInit, valInit]] : propMapper(keyInit, valInit, styleState);
|
|
387
393
|
const next = getPropMappedFontFamily(expanded);
|
|
388
394
|
if (next) {
|