@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
|
@@ -19,14 +19,14 @@ __export(themes_exports, {
|
|
|
19
19
|
module.exports = __toCommonJS(themes_exports);
|
|
20
20
|
var import_createVariable = require("../createVariable");
|
|
21
21
|
function ensureThemeVariable(theme, key) {
|
|
22
|
-
const val = theme[key]
|
|
23
|
-
(0, import_createVariable.isVariable)(val) ? val.name !==
|
|
22
|
+
const val = theme[key];
|
|
23
|
+
(0, import_createVariable.isVariable)(val) ? val.name !== key && (theme[key] = (0, import_createVariable.createVariable)({
|
|
24
24
|
key: val.name,
|
|
25
|
-
name:
|
|
25
|
+
name: key,
|
|
26
26
|
val: val.val
|
|
27
27
|
})) : theme[key] = (0, import_createVariable.createVariable)({
|
|
28
|
-
key
|
|
29
|
-
name:
|
|
28
|
+
key,
|
|
29
|
+
name: key,
|
|
30
30
|
val
|
|
31
31
|
});
|
|
32
32
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themes.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAIpC,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM,GAAG
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAIpC,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM,GAAG;AACrB,MAAK,kCAAW,GAAG,IAOb,IAAI,SAAS,QAEf,MAAM,GAAG,QAAI,sCAAe;AAAA,IAC1B,KAAK,IAAI;AAAA,IACT,MAAM;AAAA,IACN,KAAK,IAAI;AAAA,EACX,CAAC,KAZH,MAAM,GAAG,QAAI,sCAAe;AAAA,IAC1B;AAAA,IACA,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AAWL;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -20,14 +20,14 @@ __export(themes_exports, {
|
|
|
20
20
|
module.exports = __toCommonJS(themes_exports);
|
|
21
21
|
var import_createVariable = require("../createVariable");
|
|
22
22
|
function ensureThemeVariable(theme, key) {
|
|
23
|
-
const val = theme[key]
|
|
24
|
-
(0, import_createVariable.isVariable)(val) ? val.name !==
|
|
23
|
+
const val = theme[key];
|
|
24
|
+
(0, import_createVariable.isVariable)(val) ? val.name !== key && (theme[key] = (0, import_createVariable.createVariable)({
|
|
25
25
|
key: val.name,
|
|
26
|
-
name:
|
|
26
|
+
name: key,
|
|
27
27
|
val: val.val
|
|
28
28
|
})) : theme[key] = (0, import_createVariable.createVariable)({
|
|
29
|
-
key
|
|
30
|
-
name:
|
|
29
|
+
key,
|
|
30
|
+
name: key,
|
|
31
31
|
val
|
|
32
32
|
});
|
|
33
33
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/themes.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAIpC,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM,GAAG
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2C;AAIpC,SAAS,oBAAoB,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM,GAAG;AACrB,MAAK,kCAAW,GAAG,IAOb,IAAI,SAAS,QAEf,MAAM,GAAG,QAAI,sCAAe;AAAA,IAC1B,KAAK,IAAI;AAAA,IACT,MAAM;AAAA,IACN,KAAK,IAAI;AAAA,EACX,CAAC,KAZH,MAAM,GAAG,QAAI,sCAAe;AAAA,IAC1B;AAAA,IACA,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AAWL;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -14,21 +14,15 @@ var __export = (target, all) => {
|
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
15
|
var useDisableSSR_exports = {};
|
|
16
16
|
__export(useDisableSSR_exports, {
|
|
17
|
-
getDisableSSR: () => getDisableSSR
|
|
18
|
-
useDisableSSR: () => useDisableSSR
|
|
17
|
+
getDisableSSR: () => getDisableSSR
|
|
19
18
|
});
|
|
20
19
|
module.exports = __toCommonJS(useDisableSSR_exports);
|
|
21
|
-
var
|
|
22
|
-
function useDisableSSR() {
|
|
23
|
-
const componentContext = (0, import_react.useContext)(import_ComponentContext.ComponentContext);
|
|
24
|
-
return getDisableSSR(componentContext);
|
|
25
|
-
}
|
|
20
|
+
var import_config = require("../config");
|
|
26
21
|
function getDisableSSR(componentContext) {
|
|
27
|
-
return componentContext.disableSSR ?? (0, import_config.getConfig)().disableSSR;
|
|
22
|
+
return (componentContext == null ? void 0 : componentContext.disableSSR) ?? (0, import_config.getConfig)().disableSSR;
|
|
28
23
|
}
|
|
29
24
|
// Annotate the CommonJS export names for ESM import in node:
|
|
30
25
|
0 && (module.exports = {
|
|
31
|
-
getDisableSSR
|
|
32
|
-
useDisableSSR
|
|
26
|
+
getDisableSSR
|
|
33
27
|
});
|
|
34
28
|
//# sourceMappingURL=useDisableSSR.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useDisableSSR.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;AAGnB,SAAS,cAAc,kBAAsC;AAClE,UAAO,qDAAkB,mBAAc,yBAAU,EAAE;AACrD;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -15,21 +15,15 @@ var __export = (target, all) => {
|
|
|
15
15
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
16
16
|
var useDisableSSR_exports = {};
|
|
17
17
|
__export(useDisableSSR_exports, {
|
|
18
|
-
getDisableSSR: () => getDisableSSR
|
|
19
|
-
useDisableSSR: () => useDisableSSR
|
|
18
|
+
getDisableSSR: () => getDisableSSR
|
|
20
19
|
});
|
|
21
20
|
module.exports = __toCommonJS(useDisableSSR_exports);
|
|
22
|
-
var
|
|
23
|
-
function useDisableSSR() {
|
|
24
|
-
const componentContext = (0, import_react.useContext)(import_ComponentContext.ComponentContext);
|
|
25
|
-
return getDisableSSR(componentContext);
|
|
26
|
-
}
|
|
21
|
+
var import_config = require("../config");
|
|
27
22
|
function getDisableSSR(componentContext) {
|
|
28
|
-
return componentContext.disableSSR ?? (0, import_config.getConfig)().disableSSR;
|
|
23
|
+
return (componentContext == null ? void 0 : componentContext.disableSSR) ?? (0, import_config.getConfig)().disableSSR;
|
|
29
24
|
}
|
|
30
25
|
// Annotate the CommonJS export names for ESM import in node:
|
|
31
26
|
0 && (module.exports = {
|
|
32
|
-
getDisableSSR
|
|
33
|
-
useDisableSSR
|
|
27
|
+
getDisableSSR
|
|
34
28
|
});
|
|
35
29
|
//# sourceMappingURL=useDisableSSR.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useDisableSSR.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA0B;AAGnB,SAAS,cAAc,kBAAsC;AAClE,UAAO,qDAAkB,mBAAc,yBAAU,EAAE;AACrD;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -31,10 +31,10 @@ __export(useMedia_exports, {
|
|
|
31
31
|
useMedia: () => useMedia
|
|
32
32
|
});
|
|
33
33
|
module.exports = __toCommonJS(useMedia_exports);
|
|
34
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"),
|
|
34
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useDisableSSR = require("./useDisableSSR");
|
|
35
35
|
let mediaState = (
|
|
36
36
|
// development only safeguard
|
|
37
|
-
process.env.NODE_ENV === "development" ?
|
|
37
|
+
process.env.NODE_ENV === "development" ? new Proxy(
|
|
38
38
|
{},
|
|
39
39
|
{
|
|
40
40
|
get(target, key) {
|
|
@@ -113,7 +113,7 @@ function subscribe(subscriber) {
|
|
|
113
113
|
return listeners.add(subscriber), () => listeners.delete(subscriber);
|
|
114
114
|
}
|
|
115
115
|
function useMedia(uid, componentContext) {
|
|
116
|
-
const internal = (0, import_react.useRef)(), initialState = ((
|
|
116
|
+
const internal = (0, import_react.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants.isWeb ? mediaState : initState) || {}, state = (0, import_react.useSyncExternalStore)(
|
|
117
117
|
subscribe,
|
|
118
118
|
() => {
|
|
119
119
|
if (!internal.current)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -32,10 +32,10 @@ __export(useMedia_exports, {
|
|
|
32
32
|
useMedia: () => useMedia
|
|
33
33
|
});
|
|
34
34
|
module.exports = __toCommonJS(useMedia_exports);
|
|
35
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"),
|
|
35
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_matchMedia = require("../helpers/matchMedia"), import_pseudoDescriptors = require("../helpers/pseudoDescriptors"), import_useDisableSSR = require("./useDisableSSR");
|
|
36
36
|
let mediaState = (
|
|
37
37
|
// development only safeguard
|
|
38
|
-
process.env.NODE_ENV === "development" ?
|
|
38
|
+
process.env.NODE_ENV === "development" ? new Proxy(
|
|
39
39
|
{},
|
|
40
40
|
{
|
|
41
41
|
get(target, key) {
|
|
@@ -115,7 +115,7 @@ function subscribe(subscriber) {
|
|
|
115
115
|
return listeners.add(subscriber), () => listeners.delete(subscriber);
|
|
116
116
|
}
|
|
117
117
|
function useMedia(uid, componentContext) {
|
|
118
|
-
const internal = (0, import_react.useRef)(), initialState = ((
|
|
118
|
+
const internal = (0, import_react.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants.isWeb ? mediaState : initState) || {}, state = (0, import_react.useSyncExternalStore)(
|
|
119
119
|
subscribe,
|
|
120
120
|
() => {
|
|
121
121
|
if (!internal.current)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useMedia.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAgC,+BAChC,eAA6C,kBAE7C,gBAA0B,sBAC1B,oBAA2B,kCAC3B,2BAAkC,yCAWlC,uBAA8B;AAEvB,IAAI;AAAA;AAAA,EAET,QAAQ,IAAI,aAAa,gBACrB,IAAI;AAAA,IACF,CAAC;AAAA,IACD;AAAA,MACE,IAAI,QAAQ,KAAK;AACf,YACE,OAAO,OAAQ,YACf,IAAI,CAAC,MAAM;AAAA,QAEX,IAAI,CAAC,MAAM;AAEX,gBAAM,IAAI,MAAM,yCAAyC,GAAG,EAAE;AAEhE,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,EACF,IACC,CAAC;AAAA;AAED,MAAM,mBAAiC,CAAC,GAElC,WAAW,MAAM,YAEjB,YAAY,oBAAI,IAAY,GAE5B,aAAa,CAAC,QAA6B;AACtD,MAAI,UAAU,IAAI,GAAG;AAAG,WAAO;AAC/B,MAAI,IAAI,CAAC,MAAM,KAAK;AAClB,QAAI,IAAI,WAAW,YAAY;AAAG,aAAO;AACzC,QAAI,IAAI,WAAW,SAAS;AAAG,aAAO;AACtC,QAAI,IAAI,WAAW,SAAS;AAAG,aAAO;AAAA,EACxC;AACA,SAAO;AACT;AAGA,IAAI;AAGJ,MAAM,yBAAyB,OAAO,KAAK,0CAAiB,EAAE;AAE9D,IAAI;AAEG,MAAM,wBAAwB,CAAC,QAAgB;AACpD,MAAI,QAAQ,IAAI,aAAa,iBAAiB,IAAI,CAAC,MAAM;AACvD,UAAM,IAAI,MAAM,eAAe;AAIjC,aADa,yBAAU,EACd,SAAS,iBACT,yBAMF,iBAAiB,QAAQ,GAAG,IAAI;AACzC,GAEM,UAAU,oBAAI,IAAc;AAElC,IAAI,eAAe;AAEZ,MAAM,iBAAiB,CAAC,WAAkC;AAC/D,QAAM,EAAE,OAAO,wBAAwB,IAAI;AAC3C,MAAK,OACL;AAAA;AACA,eAAW,OAAO;AAChB,iBAAW,GAAG,KAAI,mEAA0B,SAAQ,IACpD,UAAU,IAAI,IAAI,GAAG,EAAE;AAEzB,WAAO,OAAO,kBAAkB,KAAK,GACrC,YAAY,EAAE,GAAG,WAAW,GAC5B,mBAAmB,OAAO,KAAK,KAAK,GAEhC,OAAO,aACT,oBAAoB,IAEpB,mBAAmB;AAAA;AAEvB;AAEA,SAAS,WAAW;AAClB,UAAQ,QAAQ,CAAC,OAAO,GAAG,CAAC,GAC5B,QAAQ,MAAM;AAChB;AAOA,IAAI,eAAe;AACZ,SAAS,sBAAsB;AACpC,MAAI,4BAAS,8BAGT,iBAAiB,cACrB;AAAA,mBAAe,cAGf,SAAS;AAET,eAAW,OAAO,kBAAkB;AAgBlC,UAASA,UAAT,WAAkB;AAChB,cAAM,OAAO,CAAC,CAAC,SAAS,EAAE;AAC1B,QAAI,SAAS,WAAW,GAAG,MAC3B,aAAa,EAAE,GAAG,YAAY,CAAC,GAAG,GAAG,KAAK,GAC1C,mBAAmB;AAAA,MACrB;AALS,mBAAAA;AAfT,YAAM,MAAM,oBAAoB,iBAAiB,GAAG,GAAG,GAAG,GACpD,WAAW,UAAM,8BAAW,GAAG,GAC/B,QAAQ,SAAS;AACvB,UAAI,CAAC;AACH,cAAM,IAAI,MAAM,uBAAa;AAI/B,YAAM,YAAYA,OAAM,GACxB,QAAQ,IAAI,MAAM;AAChB,cAAM,eAAeA,OAAM;AAAA,MAC7B,CAAC,GAEDA,QAAO;AAAA,IAQT;AAAA;AACF;AAEA,MAAM,YAAY,oBAAI,IAAS;AAC/B,IAAI,WAAW,IACX,eAAe;AACnB,SAAS,qBAAqB;AAE5B,EAAI,YAAY,iBAAiB,iBAGjC,eAAe,cACf,WAAW,IACX,QAAQ,QAAQ,EAAE,KAAK,MAAM;AAC3B,eAAW,IACX,UAAU,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC;AAAA,EAC1C,CAAC;AACH;AAWA,MAAM,eAAe,oBAAI,QAA0B;AAE5C,SAAS,qBAAqB,KAAU,OAAoB;AACjE,SAAO,aAAa,IAAI,KAAK,KAAK;AACpC;AAOA,SAAS,UAAU,YAAiB;AAClC,mBAAU,IAAI,UAAU,GACjB,MAAM,UAAU,OAAO,UAAU;AAC1C;AAEO,SAAS,SAAS,KAAW,kBAAqD;AACvF,QAAM,eAAW,qBAA0C,GAGrD,oBADa,oCAAc,gBAAgB,KACb,CAAC,yBAAQ,aAAa,cAAc,CAAC,GAEnE,YAAQ;AAAA,IACZ;AAAA,IACA,MAAM;AACJ,UAAI,CAAC,SAAS;AACZ,eAAO;AAGT,YAAM,EAAE,SAAS,KAAK,IAAI,SAAS,SAC7B,iBAAiB,MAAM,aAAa,IAAI,GAAG,IAAI;AAErD,UAAI,kBAAkB,eAAe,YAAY;AAC/C,eAAO;AAGT,YAAM,YACJ,iDAAgB,WACd,CAAC,kBAAkB,eAAe,YAAY,UAAU,CAAC,GAAG,OAAO,IAAI;AAK3E,aAFE,CAAC,aAAY,qCAAU,MAAM,CAAC,QAAQ,WAAW,GAAG,MAAM,KAAK,GAAG,MAG3D,QAGT,SAAS,QAAQ,OAAO,YAEjB;AAAA,IACT;AAAA,IACA,MAAM;AAAA,EACR;AAEA,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,GAAG,KAAK;AACV,aAAI,OAAO,OAAQ,aACjB,SAAS,YAAY,EAAE,MAAM,aAAa,GAC1C,SAAS,QAAQ,YAAY,oBAAI,IAAI,GACrC,SAAS,QAAQ,QAAQ,IAAI,GAAG,IAE3B,QAAQ,IAAI,OAAO,GAAG;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAEO,MAAM,oCAAoC,CAC/C,UACA,KACA,iBACA,gBACG;AACH,QAAM,WAAO,yBAAU,GACjB,aACJ,eAAe,CAAC,KAAK,SAAS,iBAC1B,sBAAsB,QAAQ,IAC9B;AACN,SAAO,CAAC,gBAAgB,GAAG,KAAK,aAAa,gBAAgB,GAAG,IAAI,aAAa;AACnF;AAEO,SAAS,uBACd,MACA,UACA,KACA,OACA,iBACA,aACA,gBACA;AACA,MAAI,aAAa;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAIA,SAHI,mBACF,cAAc,cAAc,KAAK,iBAE/B,eAAe,OACV,MAET,gBAAgB,GAAG,IAAI,YACvB,KAAK,GAAG,IAAI,OACL;AACT;AAEA,SAAS,cAAc,KAAa;AAClC,SAAO,IAAI,QAAQ,UAAU,CAAC,MAAM,IAAI,EAAE,YAAY,CAAC,EAAE,EAAE,YAAY;AACzE;AAEA,MAAM,QAAQ,oBAAI,QAAqB,GACjC,wBAAgD,CAAC;AAEhD,SAAS,oBAAoB,OAAkC,KAAc;AAClF,MAAI,OAAO,SAAU;AACnB,WAAO;AAET,MAAI,MAAM,IAAI,KAAK;AACjB,WAAO,MAAM,IAAI,KAAK;AAExB,QAAM,MAAM,OAAO,QAAQ,KAAK,EAC7B,IAAI,CAAC,CAAC,SAAS,KAAK,OACnB,UAAU,cAAc,OAAO,GAC3B,OAAO,SAAU,WACZ,IAAI,OAAO,KAAK,KAAK,OAE1B,OAAO,SAAU,YAAY,kBAAkB,KAAK,OAAO,MAC7D,QAAQ,GAAG,KAAK,OAEX,IAAI,OAAO,KAAK,KAAK,KAC7B,EACA,KAAK,OAAO;AACf,SAAI,QACF,sBAAsB,GAAG,IAAI,MAE/B,MAAM,IAAI,OAAO,GAAG,GACb;AACT;AAEO,SAAS,gBAAgB,KAAa;AAC3C,SAAO,sBAAsB,GAAG,KAAK,oBAAoB,iBAAiB,GAAG,GAAG,GAAG;AACrF;AAEO,SAAS,cACd,KACA,YACA;AACA,QAAM,eAAe,iBAAiB,GAAG;AASzC,SARe,OAAO,KAAK,YAAY,EAAE,MAAM,CAAC,UAAU;AACxD,UAAM,cAAc,CAAC,aAAa,KAAK,GACjC,QAAQ,MAAM,WAAW,KAAK,GAC9B,UAAU,MAAM,SAAS,OAAO,GAChC,WAAW,WAAW,UAAU,UAAU,QAAQ;AAExD,WAAO,QAAQ,WAAW,cAAc,WAAW;AAAA,EACrD,CAAC;AAEH;",
|
|
5
5
|
"names": ["update"]
|
|
6
6
|
}
|
|
@@ -21,7 +21,7 @@ __export(useTheme_exports, {
|
|
|
21
21
|
useThemeWithState: () => useThemeWithState
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(useTheme_exports);
|
|
24
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"),
|
|
24
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext");
|
|
25
25
|
const emptyProps = { name: null };
|
|
26
26
|
let cached;
|
|
27
27
|
function getDefaultThemeProxied() {
|
|
@@ -64,7 +64,7 @@ function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys
|
|
|
64
64
|
function track(key) {
|
|
65
65
|
keys && !keys.includes(key) && (keys.push(key), process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
|
|
66
66
|
}
|
|
67
|
-
return
|
|
67
|
+
return new Proxy(theme, {
|
|
68
68
|
has(_, key) {
|
|
69
69
|
if (Reflect.has(theme, key))
|
|
70
70
|
return !0;
|
|
@@ -72,8 +72,6 @@ function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys
|
|
|
72
72
|
return key[0] === "$" && (key = key.slice(1)), themeManager == null ? void 0 : themeManager.allKeys.has(key);
|
|
73
73
|
},
|
|
74
74
|
get(_, key) {
|
|
75
|
-
if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
|
|
76
|
-
return theme;
|
|
77
75
|
if (
|
|
78
76
|
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
79
77
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,eAAiE,kBAEjE,gBAA0B,sBAC1B,wBAAsC,8BACtC
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
|
|
6
6
|
}
|
|
@@ -22,7 +22,7 @@ __export(useTheme_exports, {
|
|
|
22
22
|
useThemeWithState: () => useThemeWithState
|
|
23
23
|
});
|
|
24
24
|
module.exports = __toCommonJS(useTheme_exports);
|
|
25
|
-
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"),
|
|
25
|
+
var import_constants = require("@tamagui/constants"), import_react = require("react"), import_config = require("../config"), import_createVariable = require("../createVariable"), import_createShallowSetState = require("../helpers/createShallowSetState"), import_ThemeManager = require("../helpers/ThemeManager"), import_ThemeManagerContext = require("../helpers/ThemeManagerContext");
|
|
26
26
|
const emptyProps = { name: null };
|
|
27
27
|
let cached;
|
|
28
28
|
function getDefaultThemeProxied() {
|
|
@@ -65,7 +65,7 @@ function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys
|
|
|
65
65
|
function track(key) {
|
|
66
66
|
keys && !keys.includes(key) && (keys.push(key), process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
|
|
67
67
|
}
|
|
68
|
-
return
|
|
68
|
+
return new Proxy(theme, {
|
|
69
69
|
has(_, key) {
|
|
70
70
|
if (Reflect.has(theme, key))
|
|
71
71
|
return !0;
|
|
@@ -73,8 +73,6 @@ function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys
|
|
|
73
73
|
return key[0] === "$" && (key = key.slice(1)), themeManager == null ? void 0 : themeManager.allKeys.has(key);
|
|
74
74
|
},
|
|
75
75
|
get(_, key) {
|
|
76
|
-
if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
|
|
77
|
-
return theme;
|
|
78
76
|
if (
|
|
79
77
|
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
80
78
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0C,+BAC1C,eAAiE,kBAEjE,gBAA0B,sBAC1B,wBAAsC,8BACtC
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
|
|
6
6
|
}
|
|
@@ -3,7 +3,7 @@ import { normalizeShadow } from "./normalizeShadow";
|
|
|
3
3
|
function fixStyles(style) {
|
|
4
4
|
(style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
|
|
5
5
|
for (const key in borderDefaults)
|
|
6
|
-
key in style &&
|
|
6
|
+
key in style && (style[borderDefaults[key]] ||= "solid");
|
|
7
7
|
}
|
|
8
8
|
const nativeStyle = isWeb ? null : "borderStyle", borderDefaults = {
|
|
9
9
|
borderWidth: "borderStyle",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStyles.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,
|
|
4
|
+
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;AAEzB,SAAS,UAAU,OAA4B;AAUpD,GACE,MAAM,gBACN,MAAM,eACN,MAAM,iBACN,MAAM,iBAEN,OAAO,OAAO,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,QAAQ,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
|
}
|
|
@@ -3,7 +3,7 @@ import { normalizeShadow } from "./normalizeShadow";
|
|
|
3
3
|
function fixStyles(style) {
|
|
4
4
|
"elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, normalizeShadow(style));
|
|
5
5
|
for (const key in borderDefaults)
|
|
6
|
-
key in style &&
|
|
6
|
+
key in style && (style[borderDefaults[key]] ||= "solid");
|
|
7
7
|
}
|
|
8
8
|
const nativeStyle = isWeb ? null : "borderStyle", borderDefaults = {
|
|
9
9
|
borderWidth: "borderStyle",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/expandStyles.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;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,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,
|
|
4
|
+
"mappings": "AAAA,SAAS,aAAa;AAEtB,SAAS,uBAAuB;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,OAAO,gBAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,QAAQ,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": "
|
|
4
|
+
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,iBAAiB;AAC1B,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;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,mBAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,MAAM,gBAAgB;AACpE;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG,GAEtE,MAAM,YAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,mBAAU,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": "
|
|
4
|
+
"mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,iBAAiB;AAC1B,SAAS,kCAAkC;AAC3C,SAAS,yBAAyB;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,mBAAmB;AAC5B,UAAI,GAAG,IAAI,mCAAmC,MAAM,gBAAgB;AACpE;AAAA,IACF;AACA,UAAM,QAAQ,mBAAmB,OAAO,2BAA2B,MAAM,GAAG,GAEtE,MAAM,YAAY,KAAK,KAAK;AAClC,IAAI,MACF,OAAO,OAAO,KAAK,OAAO,YAAY,GAAG,CAAC,IAE1C,IAAI,GAAG,IAAI;AAAA,EAEf;AAEA,mBAAU,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,SAAS,iBAAiB;
|
|
4
|
+
"mappings": "AAAA,SAAS,iBAAiB;AAMnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,aAAa,UAAU,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,SAAS,iBAAiB;
|
|
4
|
+
"mappings": "AAAA,SAAS,iBAAiB;AAMnB,SAAS,sBACd,OAC2B;AAC3B,QAAM,aAAa,UAAU,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,5 +1,4 @@
|
|
|
1
1
|
import { getVariableValue } from "../createVariable";
|
|
2
|
-
import { createProxy } from "./createProxy";
|
|
3
2
|
function getVariantExtras(styleState) {
|
|
4
3
|
const { curProps, conf, context, theme } = styleState;
|
|
5
4
|
let fonts = conf.fontsParsed;
|
|
@@ -15,7 +14,7 @@ function getVariantExtras(styleState) {
|
|
|
15
14
|
font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
|
|
16
15
|
// TODO do this in splitstlye
|
|
17
16
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
18
|
-
props:
|
|
17
|
+
props: new Proxy(curProps, {
|
|
19
18
|
// handles shorthands
|
|
20
19
|
get(target, key) {
|
|
21
20
|
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,SAAS,wBAAwB;
|
|
4
|
+
"mappings": "AAAA,SAAS,wBAAwB;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,aAAa;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
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getVariableValue } from "../createVariable";
|
|
2
|
-
import { createProxy } from "./createProxy";
|
|
3
2
|
function getVariantExtras(styleState) {
|
|
4
3
|
const { curProps, conf, context, theme } = styleState;
|
|
5
4
|
let fonts = conf.fontsParsed;
|
|
@@ -15,7 +14,7 @@ function getVariantExtras(styleState) {
|
|
|
15
14
|
font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
|
|
16
15
|
// TODO do this in splitstlye
|
|
17
16
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
18
|
-
props:
|
|
17
|
+
props: new Proxy(curProps, {
|
|
19
18
|
// handles shorthands
|
|
20
19
|
get(target, key) {
|
|
21
20
|
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,SAAS,wBAAwB;
|
|
4
|
+
"mappings": "AAAA,SAAS,wBAAwB;AAI1B,SAAS,iBAAiB,YAA2B;AAC1D,QAAM,EAAE,UAAU,MAAM,SAAS,MAAM,IAAI;AAC3C,MAAI,QAAQ,KAAK;AACjB,EAAI,SAAS,aACX,QAAQ,oBAAoB,KAAK,aAAa,QAAQ,QAAQ;AAIhE,QAAM,aAAa;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
|
}
|
|
@@ -1,28 +1,15 @@
|
|
|
1
|
-
const mergeVariants = (parentVariants, ourVariants) => {
|
|
1
|
+
const mergeVariants = (parentVariants, ourVariants, level = 0) => {
|
|
2
2
|
const variants = {};
|
|
3
3
|
for (const key in ourVariants) {
|
|
4
4
|
const parentVariant = parentVariants?.[key], ourVariant = ourVariants[key];
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
variants[key] = parentVariant[key];
|
|
11
|
-
continue;
|
|
12
|
-
}
|
|
13
|
-
variants[key] = {};
|
|
14
|
-
for (const subKey in ourVariant) {
|
|
15
|
-
const val = ourVariant[subKey], parentVal = parentVariant?.[subKey];
|
|
16
|
-
typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
|
|
17
|
-
// keep order
|
|
18
|
-
...parentVal,
|
|
19
|
-
...val
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
|
-
parentVariant && (variants[key] = {
|
|
5
|
+
!parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
|
|
6
|
+
parentVariant,
|
|
7
|
+
ourVariant,
|
|
8
|
+
level + 1
|
|
9
|
+
) : variants[key] = {
|
|
23
10
|
...parentVariant,
|
|
24
|
-
...
|
|
25
|
-
}
|
|
11
|
+
...ourVariant
|
|
12
|
+
};
|
|
26
13
|
}
|
|
27
14
|
return {
|
|
28
15
|
...parentVariants,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/mergeVariants.ts"],
|
|
4
|
-
"mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,
|
|
4
|
+
"mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,aACA,QAAQ,MACL;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iBAAiB,GAAG,GACpC,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
|
}
|
|
@@ -1,28 +1,15 @@
|
|
|
1
|
-
const mergeVariants = (parentVariants, ourVariants) => {
|
|
1
|
+
const mergeVariants = (parentVariants, ourVariants, level = 0) => {
|
|
2
2
|
const variants = {};
|
|
3
3
|
for (const key in ourVariants) {
|
|
4
4
|
const parentVariant = parentVariants?.[key], ourVariant = ourVariants[key];
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
variants[key] = parentVariant[key];
|
|
11
|
-
continue;
|
|
12
|
-
}
|
|
13
|
-
variants[key] = {};
|
|
14
|
-
for (const subKey in ourVariant) {
|
|
15
|
-
const val = ourVariant[subKey], parentVal = parentVariant?.[subKey];
|
|
16
|
-
typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
|
|
17
|
-
// keep order
|
|
18
|
-
...parentVal,
|
|
19
|
-
...val
|
|
20
|
-
};
|
|
21
|
-
}
|
|
22
|
-
parentVariant && (variants[key] = {
|
|
5
|
+
!parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
|
|
6
|
+
parentVariant,
|
|
7
|
+
ourVariant,
|
|
8
|
+
level + 1
|
|
9
|
+
) : variants[key] = {
|
|
23
10
|
...parentVariant,
|
|
24
|
-
...
|
|
25
|
-
}
|
|
11
|
+
...ourVariant
|
|
12
|
+
};
|
|
26
13
|
}
|
|
27
14
|
return {
|
|
28
15
|
...parentVariants,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/mergeVariants.ts"],
|
|
4
|
-
"mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,
|
|
4
|
+
"mappings": "AAKO,MAAM,gBAAgB,CAC3B,gBACA,aACA,QAAQ,MACL;AACH,QAAM,WAAW,CAAC;AAElB,aAAW,OAAO,aAAa;AAC7B,UAAM,gBAAgB,iBAAiB,GAAG,GACpC,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
|
}
|