@tamagui/web 1.82.0 → 1.82.1
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/helpers/expandStyles.js +1 -1
- package/dist/cjs/helpers/expandStyles.js.map +1 -1
- package/dist/cjs/helpers/expandStyles.native.js +1 -1
- package/dist/cjs/helpers/expandStyles.native.js.map +1 -1
- package/dist/cjs/helpers/expandStylesAndRemoveNullishValues.js.map +1 -1
- package/dist/cjs/helpers/expandStylesAndRemoveNullishValues.native.js.map +1 -1
- package/dist/cjs/helpers/getExpandedShorthands.js.map +1 -1
- package/dist/cjs/helpers/getExpandedShorthands.native.js.map +1 -1
- package/dist/cjs/helpers/getVariantExtras.js +2 -2
- package/dist/cjs/helpers/getVariantExtras.js.map +1 -1
- package/dist/cjs/helpers/getVariantExtras.native.js +2 -2
- package/dist/cjs/helpers/getVariantExtras.native.js.map +1 -1
- package/dist/cjs/helpers/mergeVariants.js +8 -21
- package/dist/cjs/helpers/mergeVariants.js.map +1 -1
- package/dist/cjs/helpers/mergeVariants.native.js +8 -21
- package/dist/cjs/helpers/mergeVariants.native.js.map +1 -1
- package/dist/cjs/helpers/normalizeColor.js +2 -2
- package/dist/cjs/helpers/normalizeColor.js.map +1 -1
- package/dist/cjs/helpers/normalizeColor.native.js +2 -2
- package/dist/cjs/helpers/normalizeColor.native.js.map +1 -1
- package/dist/cjs/helpers/propMapper.js +2 -2
- package/dist/cjs/helpers/propMapper.js.map +1 -1
- package/dist/cjs/helpers/propMapper.native.js +2 -2
- package/dist/cjs/helpers/propMapper.native.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeToParents.js +5 -9
- package/dist/cjs/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeToParents.native.js +5 -9
- package/dist/cjs/helpers/proxyThemeToParents.native.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeVariables.js +1 -2
- package/dist/cjs/helpers/proxyThemeVariables.js.map +1 -1
- package/dist/cjs/helpers/proxyThemeVariables.native.js +1 -2
- package/dist/cjs/helpers/proxyThemeVariables.native.js.map +1 -1
- package/dist/cjs/helpers/themeable.js.map +1 -1
- package/dist/cjs/helpers/themeable.native.js.map +1 -1
- package/dist/cjs/helpers/themes.js +5 -5
- package/dist/cjs/helpers/themes.js.map +1 -1
- package/dist/cjs/helpers/themes.native.js +5 -5
- package/dist/cjs/helpers/themes.native.js.map +1 -1
- package/dist/cjs/hooks/useDisableSSR.js +4 -10
- package/dist/cjs/hooks/useDisableSSR.js.map +1 -1
- package/dist/cjs/hooks/useDisableSSR.native.js +4 -10
- package/dist/cjs/hooks/useDisableSSR.native.js.map +1 -1
- package/dist/cjs/hooks/useMedia.js +3 -3
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useMedia.native.js +3 -3
- package/dist/cjs/hooks/useMedia.native.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +2 -4
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/hooks/useTheme.native.js +2 -4
- package/dist/cjs/hooks/useTheme.native.js.map +1 -1
- package/dist/esm/helpers/expandStyles.js +1 -1
- package/dist/esm/helpers/expandStyles.js.map +1 -1
- package/dist/esm/helpers/expandStyles.native.js +1 -1
- package/dist/esm/helpers/expandStyles.native.js.map +1 -1
- package/dist/esm/helpers/expandStylesAndRemoveNullishValues.js.map +1 -1
- package/dist/esm/helpers/expandStylesAndRemoveNullishValues.native.js.map +1 -1
- package/dist/esm/helpers/getExpandedShorthands.js.map +1 -1
- package/dist/esm/helpers/getExpandedShorthands.native.js.map +1 -1
- package/dist/esm/helpers/getVariantExtras.js +1 -2
- package/dist/esm/helpers/getVariantExtras.js.map +1 -1
- package/dist/esm/helpers/getVariantExtras.native.js +1 -2
- package/dist/esm/helpers/getVariantExtras.native.js.map +1 -1
- package/dist/esm/helpers/mergeVariants.js +8 -21
- package/dist/esm/helpers/mergeVariants.js.map +1 -1
- package/dist/esm/helpers/mergeVariants.native.js +8 -21
- package/dist/esm/helpers/mergeVariants.native.js.map +1 -1
- package/dist/esm/helpers/normalizeColor.js +1 -2
- package/dist/esm/helpers/normalizeColor.js.map +1 -1
- package/dist/esm/helpers/normalizeColor.native.js +1 -2
- package/dist/esm/helpers/normalizeColor.native.js.map +1 -1
- package/dist/esm/helpers/propMapper.js +2 -2
- package/dist/esm/helpers/propMapper.js.map +1 -1
- package/dist/esm/helpers/propMapper.native.js +2 -2
- package/dist/esm/helpers/propMapper.native.js.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.js +3 -7
- package/dist/esm/helpers/proxyThemeToParents.js.map +1 -1
- package/dist/esm/helpers/proxyThemeToParents.native.js +3 -7
- package/dist/esm/helpers/proxyThemeToParents.native.js.map +1 -1
- package/dist/esm/helpers/proxyThemeVariables.js +1 -2
- package/dist/esm/helpers/proxyThemeVariables.js.map +1 -1
- package/dist/esm/helpers/proxyThemeVariables.native.js +1 -2
- package/dist/esm/helpers/proxyThemeVariables.native.js.map +1 -1
- package/dist/esm/helpers/themeable.js.map +1 -1
- package/dist/esm/helpers/themeable.native.js.map +1 -1
- package/dist/esm/helpers/themes.js +5 -5
- package/dist/esm/helpers/themes.js.map +1 -1
- package/dist/esm/helpers/themes.native.js +5 -5
- package/dist/esm/helpers/themes.native.js.map +1 -1
- package/dist/esm/hooks/useDisableSSR.js +2 -9
- package/dist/esm/hooks/useDisableSSR.js.map +1 -1
- package/dist/esm/hooks/useDisableSSR.native.js +2 -9
- package/dist/esm/hooks/useDisableSSR.native.js.map +1 -1
- package/dist/esm/hooks/useMedia.js +3 -4
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useMedia.native.js +3 -4
- package/dist/esm/hooks/useMedia.native.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +1 -5
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/hooks/useTheme.native.js +1 -5
- package/dist/esm/hooks/useTheme.native.js.map +1 -1
- package/package.json +10 -10
- package/src/helpers/expandStyles.ts +2 -2
- package/src/helpers/expandStylesAndRemoveNullishValues.ts +0 -1
- package/src/helpers/getExpandedShorthands.ts +3 -0
- package/src/helpers/getVariantExtras.tsx +1 -2
- package/src/helpers/mergeVariants.ts +13 -32
- package/src/helpers/normalizeColor.ts +1 -5
- package/src/helpers/propMapper.ts +3 -1
- package/src/helpers/proxyThemeToParents.ts +5 -8
- package/src/helpers/proxyThemeVariables.tsx +1 -3
- package/src/helpers/themeable.tsx +1 -1
- package/src/helpers/themes.ts +4 -5
- package/src/hooks/useDisableSSR.tsx +2 -10
- package/src/hooks/useMedia.tsx +4 -5
- package/src/hooks/useTheme.tsx +1 -7
- package/types/helpers/expandStylesAndRemoveNullishValues.d.ts.map +1 -1
- package/types/helpers/getExpandedShorthands.d.ts +3 -0
- package/types/helpers/getExpandedShorthands.d.ts.map +1 -1
- package/types/helpers/getVariantExtras.d.ts.map +1 -1
- package/types/helpers/mergeVariants.d.ts +1 -1
- package/types/helpers/mergeVariants.d.ts.map +1 -1
- package/types/helpers/normalizeColor.d.ts.map +1 -1
- package/types/helpers/propMapper.d.ts.map +1 -1
- package/types/helpers/proxyThemeToParents.d.ts +0 -1
- package/types/helpers/proxyThemeToParents.d.ts.map +1 -1
- package/types/helpers/proxyThemeVariables.d.ts.map +1 -1
- package/types/helpers/themes.d.ts.map +1 -1
- package/types/hooks/useDisableSSR.d.ts +1 -2
- package/types/hooks/useDisableSSR.d.ts.map +1 -1
- package/types/hooks/useMedia.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/src/helpers/createChainedWeakCache.tsx +0 -39
- package/src/helpers/createProxy.ts +0 -15
- package/src/hooks/getThemeUnwrapped.tsx +0 -5
- package/src/hooks/useId.tsx +0 -1
- package/src/hooks/useMemoDebug.tsx +0 -18
|
@@ -21,7 +21,7 @@ var import_constants = require("@tamagui/constants"), import_normalizeShadow = r
|
|
|
21
21
|
function fixStyles(style) {
|
|
22
22
|
(style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
|
|
23
23
|
for (const key in borderDefaults)
|
|
24
|
-
key in style &&
|
|
24
|
+
key in style && (style[borderDefaults[key]] ||= "solid");
|
|
25
25
|
}
|
|
26
26
|
const nativeStyle = import_constants.isWeb ? null : "borderStyle", borderDefaults = {
|
|
27
27
|
borderWidth: "borderStyle",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStyles.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -22,7 +22,7 @@ var import_constants = require("@tamagui/constants"), import_normalizeShadow = r
|
|
|
22
22
|
function fixStyles(style) {
|
|
23
23
|
"elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
|
|
24
24
|
for (const key in borderDefaults)
|
|
25
|
-
key in style &&
|
|
25
|
+
key in style && (style[borderDefaults[key]] ||= "solid");
|
|
26
26
|
}
|
|
27
27
|
const nativeStyle = import_constants.isWeb ? null : "borderStyle", borderDefaults = {
|
|
28
28
|
borderWidth: "borderStyle",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStyles.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAElD,EAAI,sBAAsB,UAExB,MAAM,YAAe,MAAM,kBAE3B,OAAO,MAAM,oBAKf,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAElD,EAAI,sBAAsB,UAExB,MAAM,YAAe,MAAM,kBAE3B,OAAO,MAAM,oBAKf,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AACnC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStylesAndRemoveNullishValues.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAA4B,0BAC5B,sBAA0B,2BAC1B,oCAA2C,yCAC3C,2BAAkC;AAU3B,SAAS,mCACd,OACA,mBAAmB,IACnB;AACA,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,OAAO,MAAM,GAAG;AACtB,QAAI,QAAQ;AAAM;AAClB,QAAI,OAAO,4CAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,MAAM,gBAAgB;AACpE;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,WAAO,8DAA2B,MAAM,GAAG,GAEtE,UAAM,gCAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,4CAAU,GAAG,GAEN;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStylesAndRemoveNullishValues.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAA4B,0BAC5B,sBAA0B,2BAC1B,oCAA2C,yCAC3C,2BAAkC;AAU3B,SAAS,mCACd,OACA,mBAAmB,IACnB;AACA,QAAM,MAA2B,CAAC;AAElC,WAAS,OAAO,OAAO;AACrB,UAAM,OAAO,MAAM,GAAG;AACtB,QAAI,QAAQ;AAAM;AAClB,QAAI,OAAO,4CAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,MAAM,gBAAgB;AACpE;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,WAAO,8DAA2B,MAAM,GAAG,GAEtE,UAAM,gCAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,4CAAU,GAAG,GAEN;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getExpandedShorthands.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;AAMnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,iBAAa,yBAAU,EAAE;AAC/B,MAAI,CAAC;AAAY,WAAO;AACxB,QAAM,MAAM,CAAC;AACb,aAAW,OAAO;AAEhB,QAAI,WAAW,GAAG,KAAK,GAAG,IAAI,MAAM,GAAG;AAEzC,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getExpandedShorthands.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;AAMnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,iBAAa,yBAAU,EAAE;AAC/B,MAAI,CAAC;AAAY,WAAO;AACxB,QAAM,MAAM,CAAC;AACb,aAAW,OAAO;AAEhB,QAAI,WAAW,GAAG,KAAK,GAAG,IAAI,MAAM,GAAG;AAEzC,SAAO;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,7 +18,7 @@ __export(getVariantExtras_exports, {
|
|
|
18
18
|
getVariantExtras: () => getVariantExtras
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(getVariantExtras_exports);
|
|
21
|
-
var import_createVariable = require("../createVariable")
|
|
21
|
+
var import_createVariable = require("../createVariable");
|
|
22
22
|
function getVariantExtras(styleState) {
|
|
23
23
|
const { curProps, conf, context, theme } = styleState;
|
|
24
24
|
let fonts = conf.fontsParsed;
|
|
@@ -34,7 +34,7 @@ function getVariantExtras(styleState) {
|
|
|
34
34
|
font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
|
|
35
35
|
// TODO do this in splitstlye
|
|
36
36
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
37
|
-
props:
|
|
37
|
+
props: new Proxy(curProps, {
|
|
38
38
|
// handles shorthands
|
|
39
39
|
get(target, key) {
|
|
40
40
|
const shorthand = conf.inverseShorthands[key];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getVariantExtras.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,2BAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,iBAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AA0BA,SAxBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,UAAU;AAAA;AAAA,MAEzB,IAAI,QAAQ,KAAK;AACf,cAAM,YAAY,KAAK,kBAAkB,GAAU;AAGnD,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS;AAC5C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAEtC,YAAI,QAAQ,IAAI,QAAQ,GAAG;AACzB,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -19,7 +19,7 @@ __export(getVariantExtras_exports, {
|
|
|
19
19
|
getVariantExtras: () => getVariantExtras
|
|
20
20
|
});
|
|
21
21
|
module.exports = __toCommonJS(getVariantExtras_exports);
|
|
22
|
-
var import_createVariable = require("../createVariable")
|
|
22
|
+
var import_createVariable = require("../createVariable");
|
|
23
23
|
function getVariantExtras(styleState) {
|
|
24
24
|
const { curProps, conf, context, theme } = styleState;
|
|
25
25
|
let fonts = conf.fontsParsed;
|
|
@@ -35,7 +35,7 @@ function getVariantExtras(styleState) {
|
|
|
35
35
|
font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
|
|
36
36
|
// TODO do this in splitstlye
|
|
37
37
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
38
|
-
props:
|
|
38
|
+
props: new Proxy(curProps, {
|
|
39
39
|
// handles shorthands
|
|
40
40
|
get(target, key) {
|
|
41
41
|
const shorthand = conf.inverseShorthands[key];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/getVariantExtras.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAiC;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,2BAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,iBAAa;AAAA,IACjB,WAAW,cAAc,WAAW,SAAS,cAAc,WAAW,KAAK;AAAA,EAC7E;AA0BA,SAxBa;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IACA;AAAA,IACA,MAAM,MAAM,UAAU,KAAK,MAAM,WAAW,KAAK,WAAY;AAAA;AAAA;AAAA,IAG7D,OAAO,IAAI,MAAM,UAAU;AAAA;AAAA,MAEzB,IAAI,QAAQ,KAAK;AACf,cAAM,YAAY,KAAK,kBAAkB,GAAU;AAGnD,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS;AAC5C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAEtC,YAAI,QAAQ,IAAI,QAAQ,GAAG;AACzB,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AAAA,IACF,CAAC;AAAA,EACH;AAGF;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,SAAS,oBAAoB,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ;AAChC,WAAO,kBAAkB,IAAI,QAAQ;AAEvC,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO;AAAA,MACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM;AAC7C,YAAI,SAAS;AACX,iBAAO,CAAC;AAEV,cAAM,UAAU,IAAI,IAAI,IAAI,IAAI;AAChC,eAAO,CAAC,IAAI,IAAI,IAAI,MAAM,OAAO,CAAC;AAAA,MACpC,CAAC;AAAA,IACH;AAAA,EACF;AACA,2BAAkB,IAAI,UAAU,IAAI,GAC7B;AACT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -17,31 +17,18 @@ __export(mergeVariants_exports, {
|
|
|
17
17
|
mergeVariants: () => mergeVariants
|
|
18
18
|
});
|
|
19
19
|
module.exports = __toCommonJS(mergeVariants_exports);
|
|
20
|
-
const mergeVariants = (parentVariants, ourVariants) => {
|
|
20
|
+
const mergeVariants = (parentVariants, ourVariants, level = 0) => {
|
|
21
21
|
const variants = {};
|
|
22
22
|
for (const key in ourVariants) {
|
|
23
23
|
const parentVariant = parentVariants == null ? void 0 : parentVariants[key], ourVariant = ourVariants[key];
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
variants[key] = parentVariant[key];
|
|
30
|
-
continue;
|
|
31
|
-
}
|
|
32
|
-
variants[key] = {};
|
|
33
|
-
for (const subKey in ourVariant) {
|
|
34
|
-
const val = ourVariant[subKey], parentVal = parentVariant == null ? void 0 : parentVariant[subKey];
|
|
35
|
-
typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
|
|
36
|
-
// keep order
|
|
37
|
-
...parentVal,
|
|
38
|
-
...val
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
parentVariant && (variants[key] = {
|
|
24
|
+
!parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
|
|
25
|
+
parentVariant,
|
|
26
|
+
ourVariant,
|
|
27
|
+
level + 1
|
|
28
|
+
) : variants[key] = {
|
|
42
29
|
...parentVariant,
|
|
43
|
-
...
|
|
44
|
-
}
|
|
30
|
+
...ourVariant
|
|
31
|
+
};
|
|
45
32
|
}
|
|
46
33
|
return {
|
|
47
34
|
...parentVariants,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/mergeVariants.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,gBAAgB,CAC3B,gBACA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,gBAAgB,CAC3B,gBACA,aACA,QAAQ,MACL;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iDAAiB,MACjC,aAAa,YAAY,GAAG;AAClC,IAAI,CAAC,iBAAiB,OAAO,cAAe,aAC1C,SAAS,GAAG,IAAI,aACP,iBAAiB,CAAC,aAC3B,SAAS,GAAG,IAAI,cAAc,GAAG,IAE7B,UAAU,IACZ,SAAS,GAAG,IAAI;AAAA,MACd;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,IACV,IAEA,SAAS,GAAG,IAAI;AAAA,MACd,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AAAA,EAGN;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,31 +18,18 @@ __export(mergeVariants_exports, {
|
|
|
18
18
|
mergeVariants: () => mergeVariants
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(mergeVariants_exports);
|
|
21
|
-
const mergeVariants = (parentVariants, ourVariants) => {
|
|
21
|
+
const mergeVariants = (parentVariants, ourVariants, level = 0) => {
|
|
22
22
|
const variants = {};
|
|
23
23
|
for (const key in ourVariants) {
|
|
24
24
|
const parentVariant = parentVariants == null ? void 0 : parentVariants[key], ourVariant = ourVariants[key];
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
variants[key] = parentVariant[key];
|
|
31
|
-
continue;
|
|
32
|
-
}
|
|
33
|
-
variants[key] = {};
|
|
34
|
-
for (const subKey in ourVariant) {
|
|
35
|
-
const val = ourVariant[subKey], parentVal = parentVariant == null ? void 0 : parentVariant[subKey];
|
|
36
|
-
typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
|
|
37
|
-
// keep order
|
|
38
|
-
...parentVal,
|
|
39
|
-
...val
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
parentVariant && (variants[key] = {
|
|
25
|
+
!parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
|
|
26
|
+
parentVariant,
|
|
27
|
+
ourVariant,
|
|
28
|
+
level + 1
|
|
29
|
+
) : variants[key] = {
|
|
43
30
|
...parentVariant,
|
|
44
|
-
...
|
|
45
|
-
}
|
|
31
|
+
...ourVariant
|
|
32
|
+
};
|
|
46
33
|
}
|
|
47
34
|
return {
|
|
48
35
|
...parentVariants,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/mergeVariants.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,gBAAgB,CAC3B,gBACA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,gBAAgB,CAC3B,gBACA,aACA,QAAQ,MACL;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iDAAiB,MACjC,aAAa,YAAY,GAAG;AAClC,IAAI,CAAC,iBAAiB,OAAO,cAAe,aAC1C,SAAS,GAAG,IAAI,aACP,iBAAiB,CAAC,aAC3B,SAAS,GAAG,IAAI,cAAc,GAAG,IAE7B,UAAU,IACZ,SAAS,GAAG,IAAI;AAAA,MACd;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,IACV,IAEA,SAAS,GAAG,IAAI;AAAA,MACd,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AAAA,EAGN;AAEA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,11 +18,11 @@ __export(normalizeColor_exports, {
|
|
|
18
18
|
rgba: () => import_normalize_css_color2.rgba
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(normalizeColor_exports);
|
|
21
|
-
var
|
|
21
|
+
var import_normalize_css_color = require("@tamagui/normalize-css-color"), import_normalize_css_color2 = require("@tamagui/normalize-css-color");
|
|
22
22
|
const normalizeColor = (color, opacity) => {
|
|
23
23
|
if (!color)
|
|
24
24
|
return;
|
|
25
|
-
if (color[0] === "$" || color
|
|
25
|
+
if (color[0] === "$" || color.startsWith("var("))
|
|
26
26
|
return color;
|
|
27
27
|
const colorProcessed = (0, import_normalize_css_color.normalizeCSSColor)(color);
|
|
28
28
|
if (colorProcessed != null) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeColor.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iCAAwC,yCAExCA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM;AAC7C,WAAO;AAET,QAAM,qBAAiB,8CAAkB,KAAK;AAC9C,MAAI,kBAAkB,MAAM;AAC1B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,QAAI,iCAAK,cAAc,GAEpC,SADI,WAAW,KAAK,GACV,QAAQ,CAAC;AACzB,WAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK;AAAA,EACrC;AACA,SAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK,wBAAwB,KAAK,EAAE,GAOvC;AACT;",
|
|
5
5
|
"names": ["import_normalize_css_color"]
|
|
6
6
|
}
|
|
@@ -19,11 +19,11 @@ __export(normalizeColor_exports, {
|
|
|
19
19
|
rgba: () => import_normalize_css_color2.rgba
|
|
20
20
|
});
|
|
21
21
|
module.exports = __toCommonJS(normalizeColor_exports);
|
|
22
|
-
var
|
|
22
|
+
var import_normalize_css_color = require("@tamagui/normalize-css-color"), import_normalize_css_color2 = require("@tamagui/normalize-css-color");
|
|
23
23
|
const normalizeColor = (color, opacity) => {
|
|
24
24
|
if (!color)
|
|
25
25
|
return;
|
|
26
|
-
if (color[0] === "$" || color
|
|
26
|
+
if (color[0] === "$" || color.startsWith("var("))
|
|
27
27
|
return color;
|
|
28
28
|
const colorProcessed = (0, import_normalize_css_color.normalizeCSSColor)(color);
|
|
29
29
|
if (colorProcessed != null) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/normalizeColor.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iCAAwC,yCAExCA,8BAAqB;AAEd,MAAM,iBAAiB,CAAC,OAAuB,YAAqB;AACzE,MAAI,CAAC;AAAO;AACZ,MAAI,MAAM,CAAC,MAAM,OAAO,MAAM,WAAW,MAAM;AAC7C,WAAO;AAET,QAAM,qBAAiB,8CAAkB,KAAK;AAC9C,MAAI,kBAAkB,MAAM;AAC1B,UAAM,EAAE,GAAG,GAAG,GAAG,EAAE,QAAI,iCAAK,cAAc,GAEpC,SADI,WAAW,KAAK,GACV,QAAQ,CAAC;AACzB,WAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK;AAAA,EACrC;AACA,EAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK,wBAAwB,KAAK,EAAE;AAQhD;",
|
|
5
5
|
"names": ["import_normalize_css_color"]
|
|
6
6
|
}
|
|
@@ -23,7 +23,7 @@ module.exports = __toCommonJS(propMapper_exports);
|
|
|
23
23
|
var import_constants = require("@tamagui/constants"), import_helpers = require("@tamagui/helpers"), import_config = require("../config"), import_isDevTools = require("../constants/isDevTools"), import_createVariable = require("../createVariable"), import_expandStyle = require("./expandStyle"), import_expandStylesAndRemoveNullishValues = require("./expandStylesAndRemoveNullishValues"), import_getVariantExtras = require("./getVariantExtras"), import_isObj = require("./isObj"), import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
24
24
|
const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
25
25
|
var _a;
|
|
26
|
-
if (key === "elevationAndroid")
|
|
26
|
+
if (lastFontFamilyToken = null, key === "elevationAndroid")
|
|
27
27
|
return;
|
|
28
28
|
if (value === "unset") {
|
|
29
29
|
const unsetVal = (_a = styleStateIn.conf.unset) == null ? void 0 : _a[key];
|
|
@@ -52,7 +52,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
|
52
52
|
const result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
|
|
53
53
|
[key, value]
|
|
54
54
|
];
|
|
55
|
-
return key === "fontFamily" && fontFamilyCache.set(result, lastFontFamilyToken), result;
|
|
55
|
+
return key === "fontFamily" && lastFontFamilyToken && fontFamilyCache.set(result, lastFontFamilyToken), result;
|
|
56
56
|
}
|
|
57
57
|
}, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
|
|
58
58
|
const { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/propMapper.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,+BAC1B,iBAAgC,6BAEhC,gBAA0B,sBAC1B,oBAA2B,oCAC3B,wBAAuD,8BASvD,qBAA4B,0BAC5B,4CAAmD,iDACnD,0BAAsD,+BACtD,eAAsB,oBACtB,2BAAkC;AAE3B,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AApBhF;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["key", "val"]
|
|
6
6
|
}
|
|
@@ -24,7 +24,7 @@ module.exports = __toCommonJS(propMapper_exports);
|
|
|
24
24
|
var import_constants = require("@tamagui/constants"), import_helpers = require("@tamagui/helpers"), import_config = require("../config"), import_isDevTools = require("../constants/isDevTools"), import_createVariable = require("../createVariable"), import_expandStyle = require("./expandStyle"), import_expandStylesAndRemoveNullishValues = require("./expandStylesAndRemoveNullishValues"), import_getVariantExtras = require("./getVariantExtras"), import_isObj = require("./isObj"), import_pseudoDescriptors = require("./pseudoDescriptors");
|
|
25
25
|
const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
26
26
|
var _a;
|
|
27
|
-
if (!import_constants.isAndroid && key === "elevationAndroid")
|
|
27
|
+
if (lastFontFamilyToken = null, !import_constants.isAndroid && key === "elevationAndroid")
|
|
28
28
|
return;
|
|
29
29
|
if (value === "unset") {
|
|
30
30
|
const unsetVal = (_a = styleStateIn.conf.unset) == null ? void 0 : _a[key];
|
|
@@ -53,7 +53,7 @@ const propMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
|
53
53
|
const result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
|
|
54
54
|
[key, value]
|
|
55
55
|
];
|
|
56
|
-
return key === "fontFamily" && fontFamilyCache.set(result, lastFontFamilyToken), result;
|
|
56
|
+
return key === "fontFamily" && lastFontFamilyToken && fontFamilyCache.set(result, lastFontFamilyToken), result;
|
|
57
57
|
}
|
|
58
58
|
}, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
|
|
59
59
|
const { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/propMapper.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,+BAC1B,iBAAgC,6BAEhC,gBAA0B,sBAC1B,oBAA2B,oCAC3B,wBAAuD,8BASvD,qBAA4B,0BAC5B,4CAAmD,iDACnD,0BAAsD,+BACtD,eAAsB,oBACtB,2BAAkC;AAE3B,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AApBhF;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,+BAC1B,iBAAgC,6BAEhC,gBAA0B,sBAC1B,oBAA2B,oCAC3B,wBAAuD,8BASvD,qBAA4B,0BAC5B,4CAAmD,iDACnD,0BAAsD,+BACtD,eAAsB,oBACtB,2BAAkC;AAE3B,MAAM,aAAyB,CAAC,KAAK,OAAO,cAAc,eAAe;AApBhF;AAuBE,MAFA,sBAAsB,MAElB,CAA6C,8BAE3C,QAAQ;AAAoB;AAGlC,MAAI,UAAU,SAAS;AACrB,UAAM,YAAW,kBAAa,KAAK,UAAlB,mBAA0B;AAC3C,QAAI,YAAY;AACd,cAAQ;AAAA;AAGR;AAAA,EAEJ;AAKA,QAAM,WAAW,aAAa,WAAW,iBAAiB,YAEpD,aAAa,WACf,IAAI,MAAM,cAAc;AAAA,IACtB,IAAI,GAAG,GAAG;AACR,aAAO,MAAM,aAAa,WAAW,QAAQ,IAAI,GAAG,CAAC;AAAA,IACvD;AAAA,EACF,CAAC,IACD,cAEE,EAAE,MAAM,YAAY,YAAY,aAAa,IAAI,YACjD,EAAE,SAAS,IAAI;AAiBrB,MAbE,QAAQ,IAAI,aAAa,iBACzB,cACA,WAAW,CAAC,MAAM,OAClB,EAAE,cAAc,KAAK,gBAGrB,QAAQ;AAAA,IACN,2BAA2B,UAAU,sBAAsB,OAAO,KAAK,KAAK,WAAW,EAAE;AAAA,MACvF;AAAA,IACF,CAAC;AAAA,EACH,GAGE,CAAC,WAAW,YACV,YAAY,OAAO,UAAU;AAC/B,eAAW,SAAS,GAAG,IAAI;AAE3B,UAAM,eAAe,gBAAgB,KAAK,OAAO,YAAY,YAAY,EAAE;AAC3E,QAAI;AACF,aAAO;AAAA,EAEX;AAGF,MAAI,eAAe;AAkBnB,MAfK,WAAW,2BACV,OAAO,KAAK,eACd,eAAe,IACf,MAAM,KAAK,WAAW,GAAG,IAIzB,UACE,MAAM,CAAC,MAAM,MACf,QAAQ,eAAe,KAAK,OAAO,WAAW,eAAe,UAAU,QAC9D,kCAAW,KAAK,MACzB,QAAQ,qBAAqB,KAAK,OAAO,WAAW,aAAa,KAIjE,gBAAgB,SAAS,MAAM;AACjC,UAAM,UAAU,WAAW,WAAW,WAAO,gCAAY,KAAK,KAAK,MAAM;AAAA,MACvE,CAAC,KAAK,KAAK;AAAA,IACb;AAEA,WAAI,QAAQ,gBAAgB,uBAC1B,gBAAgB,IAAI,QAAQ,mBAAmB,GAG1C;AAAA,EACT;AACF,GAEM,kBAAiC,CACrC,KACA,OACA,YACA,YACA,qBACG;AACH,QAAM,EAAE,cAAc,MAAM,MAAM,IAAI,YAChC,EAAE,SAAS,IAAI;AACrB,MAAI,CAAC;AAAU;AAEf,MAAI,eAAe,qBAAqB,SAAS,GAAG,GAAG,OAAO,IAAI;AAclE,MAZI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,cACtD,QAAQ,eAAe,wDAA0B,GAAG,EAAE,GACtD,QAAQ,KAAK;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,EAAE,GAAG,WAAW,SAAS;AAAA,EACrC,CAAC,GACD,QAAQ,SAAS,IAGf,CAAC,cAAc;AAGjB,QAAI,QAAQ,IAAI,oCAAoC,OAE9C,OAAO,SAAU,WAAW;AAC9B,YAAM,OAAO,aAAa,iBAAiB;AAC3C,cAAQ;AAAA,QACN,qBAAqB,IAAI,iBAAiB,GAAG,6BAA6B,KAAK;AAAA,MACjF;AAAA,IACF;AAEF;AAAA,EACF;AAEA,MAAI,OAAO,gBAAiB,YAAY;AACtC,UAAM,KAAK,cACL,aAAS,0CAAiB,UAAU;AAC1C,mBAAe,GAAG,OAAO,MAAM,GAE3B,QAAQ,IAAI,aAAa,iBAAiB,UAAU,cACtD,QAAQ,eAAe,kCAAkC,GAAG,GAC5D,QAAQ,KAAK,EAAE,IAAI,cAAc,OAAO,CAAC,GACzC,QAAQ,SAAS;AAAA,EAErB;AAEA,MAAI;AAEJ,UAAI,oBAAM,YAAY,GAAG;AACvB,UAAM,mBACJ,aAAa,cAAc,aAAa,KAAK,kBAAkB,UAAU;AAE3E,IAAI,qBACF,mBAAmB,gCAAgC,kBAAkB,IAAI,GACzE,WAAW,aAAa,kBAEpB,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,2BAA2B,gBAAgB,IAI5D,eAAe;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,cAAc;AAChB,UAAM,eAAW;AAAA,MACf;AAAA,MACA,CAAC,CAAC,WAAW;AAAA,IACf,GACM,OAAO,OAAO,QAAQ,QAAQ;AAGpC,WAAI,oBAAoB,iBAAiB,CAAC,MAAM,OAC9C,gBAAgB,IAAI,UAAM,wCAAiB,gBAAgB,CAAC,GAGvD;AAAA,EACT;AACF;AAIO,SAAS,gCAAgC,OAAY,MAA6B;AACvF,UAAI,kCAAW,KAAK,GAAG;AACrB,UAAM,MAAM,wBAAwB,IAAI,KAAK;AAC7C,QAAI;AAAK,aAAO;AAChB,eAAW,OAAO,KAAK,aAAa;AAClC,YAAM,iBAAiB,KAAK,YAAY,GAAG,EAAE;AAC7C,cAAI,kCAAW,cAAc,MAC3B,wBAAwB,IAAI,gBAAgB,GAAG,GAC3C,mBAAmB;AACrB,eAAO;AAAA,IAGb;AAAA,EACF,WAAW,OAAO,SAAU,YACtB,MAAM,CAAC,MAAM;AACf,WAAO;AAGb;AAEA,MAAM,0BAA0B,oBAAI,QAA0B,GAGxD,kBAAkB,oBAAI,QAAQ,GACvB,0BAA0B,CAAC,aAC/B,YAAY,gBAAgB,IAAI,QAAQ,GAG3C,2BAAkD,CACtD,KACA,OACA,YACA,YACA,qBACG;AA/OL;AAgPE,QAAM,EAAE,MAAM,cAAc,OAAO,MAAM,IAAI,YACvC,EAAE,SAAS,IAAI,cACf,MAAM,CAAC;AAEb,EAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,iCAAiC,KAAK,KAAK;AAG1D,aAAW,QAAQ,OAAO;AACxB,UAAM,SAAS,KAAK,WAAW,IAAI,KAAK,MAClC,MAAM,MAAM,IAAI;AAEtB,QAAI,WAAW;AACb,UAAI,MAAM,IAAI;AAAA,aAEV,YAAY,UAAU,UAAU;AAMlC,UAJA,WAAW,SAAS,MAAM,IAAI,KAI1B,oBAAoB,qBAAqB;AAC3C,YAAI,MAAM;AAAA,QAER,IAAI,CAAC,MAAM,MACP,eAAe,QAAQ,KAAK,WAAW,eAAe,UAAU,IAChE;AAAA,WACD;AACL,cAAM,aAAa,gBAAgB,QAAQ,KAAK,YAAY,YAAY,GAAG;AAG3E,YAAI;AACF,qBAAW,CAACA,MAAKC,IAAG,KAAK;AACvB,YAAIA,QAAO,SACPD,QAAO,8CACT,IAAIA,IAAG,MAAM,CAAC,GACd,OAAO,OAAO,IAAIA,IAAG,GAAGC,IAAG,KAE3B,IAAID,IAAG,IAAIC;AAAA,MAInB;AACA;AAAA,IACF;AAGF,YAAI,kCAAW,GAAG,GAAG;AACnB,UAAI,MAAM,IAAI,qBAAqB,QAAQ,KAAK,WAAW,aAAa;AACxE;AAAA,IACF;AAEA,QAAI,OAAO,OAAQ,UAAU;AAC3B,YAAM;AAAA;AAAA,QAEJ,IAAI,CAAC,MAAM,MACP,eAAe,QAAQ,KAAK,WAAW,eAAe,UAAU,IAChE;AAAA;AAEN,UAAI,MAAM,IAAI;AACd;AAAA,IACF;AAEA,YAAI,oBAAM,GAAG,GAAG;AACd,YAAM,YAAY,yBAAyB,QAAQ,KAAK,YAAY,YAAY,GAAG;AAEnF,MAAI,QAAQ,IAAI,aAAa,iBAAiB,UAAU,aACtD,QAAQ,KAAK,UAAU,QAAQ,SAAS,GAI1C,IAAI,MAAM,MAAM,CAAC,GACjB,OAAO,OAAO,IAAI,MAAM,GAAG,SAAS;AAAA,IACtC;AAEE,UAAI,MAAM,IAAI;AAGhB,IAAI,QAAQ,IAAI,aAAa,iBACvB,WACE,SAAI,MAAM,MAAV,mBAAc,QAAO,OACvB,QAAQ;AAAA,MACN,uCAA6B,MAAM,IAAI;AAAA,MACvC;AAAA,MACA,IAAI,MAAM;AAAA,MACV;AAAA,IACF;AAAA,EAIR;AAEA,SAAO;AACT,GAEM,YAAY,CAAC,QAAQ,SAAS,UAAU,SAAS,QAAQ,EAAE,IAAI,CAAC,UAAU;AAAA,EAC9E;AAAA,EACA,YAAY,MAAM,IAAI;AACxB,EAAE;AAGF,SAAS,qBAAqB,SAAc,OAAY,MAA6B;AACnF,MAAI,OAAO,WAAY;AACrB,WAAO;AAET,QAAM,QAAQ,QAAQ,KAAK;AAC3B,MAAI;AACF,WAAO;AAET,MAAI,SAAS,MAAM;AACjB,UAAM,EAAE,aAAa,IAAI;AACzB,eAAW,EAAE,MAAM,WAAW,KAAK;AACjC,UAAI,cAAc,WAAW,SAAS,aAAa,IAAI;AACrD,eAAO,QAAQ,UAAU;AAG7B,UAAM,kBAAkB,QAAQ,aAAa;AAC7C,QAAI,mBAAmB,KAAK,eAAe,IAAI,KAAK;AAClD,aAAO;AAAA,EAEX;AAEA,SAAO,QAAQ,IAAI,OAAO,KAAK,EAAE,KAAK,QAAQ,KAAK;AACrD;AAEA,MAAM,gBAAgB;AAAA,EACpB,UAAU;AAAA,EACV,YAAY;AACd;AAEA,IAAI,sBAA2B;AAExB,MAAM,iBAAiB,CAC5B,KACA,OACA,YAA+B,QAC/B,eACG;AAzXL;AA0XE,MAAI,cAAc;AAChB,WAAO;AAGT,QAAM,EAAE,OAAO,WAAO,yBAAU,GAAG,SAAS,YAAY,aAAa,IAAI,YAEnE,eAAe,KAAK;AAC1B,MAAI,UACA,SAAS;AACb,MAAI,SAAS,SAAS;AACpB,eAAW,MAAM,KAAK,GAClB,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ,KAAK,gBAAgB,GAAG,mBAAmB,KAAK,MAAK,0CAAU,QAAV,iCAAiB,EAAE,GAElF,SAAS;AAAA,WAEL,SAAS,KAAK;AAChB,aAAS,IACT,WAAW,KAAK,eAAe,KAAK;AAAA,OAC/B;AACL,UAAM,qBAAoB,kDAAc,iBAAd,mBAA6B;AACvD,QAAI,mBAAmB;AACrB,YAAM,MAAM,aAAa,iBAAiB,EAAE,KAAK;AACjD,MAAI,QACF,WAAW,KACX,SAAS;AAAA,IAEb,OAAO;AACL,cAAQ,KAAK;AAAA,QACX,KAAK,cAAc;AAIjB,uBAAW,MAHS,2BAAS,eACzB,6CAAoB,KAAK,aAAa,QAAQ,QAAQ,IACtD,KAAK,aACc,KAAK,MAAjB,mBAAoB,WAAU,OACzC,sBAAsB,OACtB,SAAS;AACT;AAAA,QACF;AAAA,QACA,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK,cAAc;AACjB,gBAAM,cAAc,KAAK,eAAe,SAClC,MAAM,cAAc;AAC1B,cAAI,KAAK;AACP,kBAAM,cAAc,2BAAS,eACzB,6CAAoB,KAAK,aAAa,QAAQ,QAAQ,IACtD,KAAK,aACH,OAAO,YAAY,GAAG,KAAK,YAAY,WAAW;AACxD,yBAAW,kCAAO,cAAc,GAAG,KAAK,SAA7B,mBAAoC,WAAU,OACzD,SAAS;AAAA,UACX;AACA;AAAA,QACF;AAAA,MACF;AACA,iBAAW,OAAO;AAChB,YAAI,OAAO,+BAAgB,GAAG,GAAG;AAC/B,gBAAM,MAAM,aAAa,GAAG,EAAE,KAAK;AACnC,UAAI,OAAO,SACT,WAAW,KACX,SAAS;AAAA,QAEb;AAAA,IAEJ;AAEA,QAAI,CAAC,QAAQ;AACX,YAAM,WAAW,aAAa,MAAM,KAAK;AACzC,MAAI,YAAY,SACd,WAAW,UACX,SAAS;AAAA,IAEb;AAAA,EACF;AAGF,MAAI,QAAQ;AACV,UAAM,MAAM,qBAAqB,KAAK,UAAU,SAAS;AACzD,WAAI,QAAQ,IAAI,aAAa,iBAAiB,WAAW,UAAU,aACjE,QAAQ,KAAK,YAAY,WAAW,UAAU,GAAG,GAE5C;AAAA,EACT;AAEA,SACE,QAAQ,IAAI,aAAa,iBACzB,gCACA,WAAW,UAAU,cAErB,QAAQ,eAAe,0BAAqB,KAAK,KAAK,GACtD,QAAQ,KAAK,EAAE,UAAU,OAAO,OAAO,GAAG,QAAQ,MAAM,GAAG,IAAI,EAAE,GACjE,QAAQ,SAAS,IAGZ;AACT;AAEA,SAAS,qBACP,KACA,UACA,eACA;AACA,MAAI,kBAAkB;AAAQ,WAAO;AACrC,UAAI,kCAAW,QAAQ,GAAG;AACxB,QAAI,kBAAkB;AACpB,aAAO,SAAS;AAGlB,UAAM,MAAM,qCAAU;AAGtB,WAA+C,QAAQ,iBACjD,OAAO,OAAQ,aACV,IAAI,kBAAkB,QAAQ,QAAQ,MAAS,IAIT,SAAS;AAAA,EAC5D;AACA,SAAO;AACT;",
|
|
5
5
|
"names": ["key", "val"]
|
|
6
6
|
}
|
|
@@ -15,11 +15,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
|
|
|
15
15
|
var proxyThemeToParents_exports = {};
|
|
16
16
|
__export(proxyThemeToParents_exports, {
|
|
17
17
|
proxyThemeToParents: () => proxyThemeToParents,
|
|
18
|
-
proxyThemesToParents: () => proxyThemesToParents
|
|
19
|
-
themesRaw: () => themesRaw
|
|
18
|
+
proxyThemesToParents: () => proxyThemesToParents
|
|
20
19
|
});
|
|
21
20
|
module.exports = __toCommonJS(proxyThemeToParents_exports);
|
|
22
|
-
var import_config = require("../config")
|
|
21
|
+
var import_config = require("../config");
|
|
23
22
|
const themesRaw = {};
|
|
24
23
|
function proxyThemesToParents(dedupedThemes) {
|
|
25
24
|
for (const { names, theme } of dedupedThemes)
|
|
@@ -37,9 +36,7 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
37
36
|
const cur = [], parents = themeName.split("_").slice(0, -1).map((part) => (cur.push(part), cur.join("_"))), numParents = parents.length;
|
|
38
37
|
return new Proxy(theme, {
|
|
39
38
|
get(target, key) {
|
|
40
|
-
if (key
|
|
41
|
-
return theme;
|
|
42
|
-
if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
39
|
+
if (!key || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
43
40
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
44
41
|
key == "undefined" || Reflect.has(target, key))
|
|
45
42
|
return Reflect.get(target, key);
|
|
@@ -48,14 +45,13 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
48
45
|
if (parent && Reflect.has(parent, key))
|
|
49
46
|
return Reflect.get(parent, key);
|
|
50
47
|
}
|
|
51
|
-
return (0, import_config.getTokenObject)(key)
|
|
48
|
+
return (0, import_config.getTokenObject)(key);
|
|
52
49
|
}
|
|
53
50
|
});
|
|
54
51
|
}
|
|
55
52
|
// Annotate the CommonJS export names for ESM import in node:
|
|
56
53
|
0 && (module.exports = {
|
|
57
54
|
proxyThemeToParents,
|
|
58
|
-
proxyThemesToParents
|
|
59
|
-
themesRaw
|
|
55
|
+
proxyThemesToParents
|
|
60
56
|
});
|
|
61
57
|
//# sourceMappingURL=proxyThemeToParents.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/proxyThemeToParents.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA+B;AAG/B,MAAM,YAAyC,CAAC;AAIzC,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,QAAQ;AACjB,gBAAU,IAAI,IAAI;AAItB,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAGF,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC,GAIjB,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,UACJ,IAAI,KAAK,IAAI,GACN,IAAI,KAAK,GAAG,EACpB,GAEG,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UACE,CAAC;AAAA;AAAA,MAGD,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG;AAEvB,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAGhC,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,UAAU,QAAQ,IAAI,QAAQ,GAAG;AACnC,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AACA,iBAAO,8BAAe,GAAU;AAAA,IAClC;AAAA,EACF,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -16,11 +16,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
|
|
|
16
16
|
var proxyThemeToParents_exports = {};
|
|
17
17
|
__export(proxyThemeToParents_exports, {
|
|
18
18
|
proxyThemeToParents: () => proxyThemeToParents,
|
|
19
|
-
proxyThemesToParents: () => proxyThemesToParents
|
|
20
|
-
themesRaw: () => themesRaw
|
|
19
|
+
proxyThemesToParents: () => proxyThemesToParents
|
|
21
20
|
});
|
|
22
21
|
module.exports = __toCommonJS(proxyThemeToParents_exports);
|
|
23
|
-
var import_config = require("../config")
|
|
22
|
+
var import_config = require("../config");
|
|
24
23
|
const themesRaw = {};
|
|
25
24
|
function proxyThemesToParents(dedupedThemes) {
|
|
26
25
|
for (const { names, theme } of dedupedThemes)
|
|
@@ -38,9 +37,7 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
38
37
|
const cur = [], parents = themeName.split("_").slice(0, -1).map((part) => (cur.push(part), cur.join("_"))), numParents = parents.length;
|
|
39
38
|
return new Proxy(theme, {
|
|
40
39
|
get(target, key) {
|
|
41
|
-
if (key
|
|
42
|
-
return theme;
|
|
43
|
-
if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
40
|
+
if (!key || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
44
41
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
45
42
|
key == "undefined" || Reflect.has(target, key))
|
|
46
43
|
return Reflect.get(target, key);
|
|
@@ -49,14 +46,13 @@ function proxyThemeToParents(themeName, theme) {
|
|
|
49
46
|
if (parent && Reflect.has(parent, key))
|
|
50
47
|
return Reflect.get(parent, key);
|
|
51
48
|
}
|
|
52
|
-
return (0, import_config.getTokenObject)(key)
|
|
49
|
+
return (0, import_config.getTokenObject)(key);
|
|
53
50
|
}
|
|
54
51
|
});
|
|
55
52
|
}
|
|
56
53
|
// Annotate the CommonJS export names for ESM import in node:
|
|
57
54
|
0 && (module.exports = {
|
|
58
55
|
proxyThemeToParents,
|
|
59
|
-
proxyThemesToParents
|
|
60
|
-
themesRaw
|
|
56
|
+
proxyThemesToParents
|
|
61
57
|
});
|
|
62
58
|
//# sourceMappingURL=proxyThemeToParents.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/proxyThemeToParents.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA+B;AAG/B,MAAM,YAAyC,CAAC;AAIzC,SAAS,qBACd,eAC6B;AAE7B,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,QAAQ;AACjB,gBAAU,IAAI,IAAI;AAItB,QAAM,SAAsC,CAAC;AAM7C,aAAW,EAAE,OAAO,MAAM,KAAK;AAC7B,eAAW,aAAa,OAAO;AAC7B,YAAM,eAAe,oBAAoB,WAAW,KAAK;AACzD,aAAO,SAAS,IAAI;AAAA,IACtB;AAGF,SAAO;AACT;AAEO,SAAS,oBAAoB,WAAmB,OAAoB;AACzE,QAAM,MAAgB,CAAC,GAIjB,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,UACJ,IAAI,KAAK,IAAI,GACN,IAAI,KAAK,GAAG,EACpB,GAEG,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UACE,CAAC;AAAA;AAAA,MAGD,OAAO,eACP,QAAQ,IAAI,QAAQ,GAAG;AAEvB,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAGhC,eAAS,IAAI,aAAa,GAAG,KAAK,GAAG,KAAK;AACxC,cAAM,SAAS,UAAU,QAAQ,CAAC,CAAC;AACnC,YAAI,UAAU,QAAQ,IAAI,QAAQ,GAAG;AACnC,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAElC;AACA,iBAAO,8BAAe,GAAU;AAAA,IAClC;AAAA,EACF,CAAC;AACH;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -17,9 +17,8 @@ __export(proxyThemeVariables_exports, {
|
|
|
17
17
|
proxyThemeVariables: () => proxyThemeVariables
|
|
18
18
|
});
|
|
19
19
|
module.exports = __toCommonJS(proxyThemeVariables_exports);
|
|
20
|
-
var import_createProxy = require("./createProxy");
|
|
21
20
|
function proxyThemeVariables(obj) {
|
|
22
|
-
return
|
|
21
|
+
return new Proxy(obj || {}, {
|
|
23
22
|
has(target, key) {
|
|
24
23
|
return Reflect.has(target, removeStarting$(key));
|
|
25
24
|
},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/proxyThemeVariables.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,SAAS,oBAAsC,KAAW;AAC/D,SAAO,IAAI,MAAS,OAAO,CAAC,GAAG;AAAA,IAC7B,IAAI,QAAQ,KAAK;AACf,aAAO,QAAQ,IAAI,QAAQ,gBAAgB,GAAG,CAAC;AAAA,IACjD;AAAA,IACA,IAAI,QAAQ,KAAK;AACf,aAAO,QAAQ,IAAI,QAAQ,gBAAgB,GAAG,CAAC;AAAA,IACjD;AAAA,EACF,CAAC;AACH;AAEA,MAAM,kBAAkB,CAAC,QACvB,OAAO,OAAQ,YAAY,IAAI,CAAC,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,9 +18,8 @@ __export(proxyThemeVariables_exports, {
|
|
|
18
18
|
proxyThemeVariables: () => proxyThemeVariables
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(proxyThemeVariables_exports);
|
|
21
|
-
var import_createProxy = require("./createProxy");
|
|
22
21
|
function proxyThemeVariables(obj) {
|
|
23
|
-
return
|
|
22
|
+
return new Proxy(obj || {}, {
|
|
24
23
|
has(target, key) {
|
|
25
24
|
return Reflect.has(target, removeStarting$(key));
|
|
26
25
|
},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/proxyThemeVariables.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,SAAS,oBAAsC,KAAW;AAC/D,SAAO,IAAI,MAAS,OAAO,CAAC,GAAG;AAAA,IAC7B,IAAI,QAAQ,KAAK;AACf,aAAO,QAAQ,IAAI,QAAQ,gBAAgB,GAAG,CAAC;AAAA,IACjD;AAAA,IACA,IAAI,QAAQ,KAAK;AACf,aAAO,QAAQ,IAAI,QAAQ,gBAAgB,GAAG,CAAC;AAAA,IACjD;AAAA,EACF,CAAC;AACH;AAEA,MAAM,kBAAkB,CAAC,QACvB,OAAO,OAAQ,YAAY,IAAI,CAAC,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B,kBAG3B,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ,WACjE,KAEO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themeable.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B,kBAG3B,eAAsB,2BAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,gBAtBqB,yBAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,4CAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,kBAAiB,6CAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,WACrB,uCAAmB,iBAAgB,uCAAmB,SAAQ,WACjE,KAEO;AAGT;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|