@tamagui/web 1.81.4 → 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/createComponent.js +1 -2
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/createComponent.native.js +1 -2
- package/dist/cjs/createComponent.native.js.map +1 -1
- 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/cjs/views/Configuration.js +1 -0
- package/dist/cjs/views/Configuration.js.map +1 -1
- package/dist/cjs/views/Configuration.native.js +1 -0
- package/dist/cjs/views/Configuration.native.js.map +1 -1
- package/dist/cjs/views/FontLanguage.js +1 -0
- package/dist/cjs/views/FontLanguage.js.map +1 -1
- package/dist/cjs/views/FontLanguage.native.js +1 -0
- package/dist/cjs/views/FontLanguage.native.js.map +1 -1
- package/dist/cjs/views/Slot.js +5 -1
- package/dist/cjs/views/Slot.js.map +1 -1
- package/dist/cjs/views/Slot.native.js +5 -1
- package/dist/cjs/views/Slot.native.js.map +1 -1
- package/dist/cjs/views/Stack.js +1 -0
- package/dist/cjs/views/Stack.js.map +1 -1
- package/dist/cjs/views/Stack.native.js +1 -0
- package/dist/cjs/views/Stack.native.js.map +1 -1
- package/dist/cjs/views/TamaguiProvider.js +1 -0
- package/dist/cjs/views/TamaguiProvider.js.map +1 -1
- package/dist/cjs/views/TamaguiProvider.native.js +1 -0
- package/dist/cjs/views/TamaguiProvider.native.js.map +1 -1
- package/dist/cjs/views/Text.js +9 -2
- package/dist/cjs/views/Text.js.map +1 -1
- package/dist/cjs/views/Text.native.js +12 -5
- package/dist/cjs/views/Text.native.js.map +1 -1
- package/dist/cjs/views/Theme.js +1 -0
- package/dist/cjs/views/Theme.js.map +1 -1
- package/dist/cjs/views/Theme.native.js +1 -0
- package/dist/cjs/views/Theme.native.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.js +1 -0
- package/dist/cjs/views/ThemeDebug.js.map +1 -1
- package/dist/cjs/views/ThemeDebug.native.js +1 -0
- package/dist/cjs/views/ThemeDebug.native.js.map +1 -1
- package/dist/esm/createComponent.js +1 -2
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createComponent.native.js +1 -2
- package/dist/esm/createComponent.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/dist/esm/views/Configuration.js +1 -0
- package/dist/esm/views/Configuration.js.map +1 -1
- package/dist/esm/views/Configuration.native.js +1 -0
- package/dist/esm/views/Configuration.native.js.map +1 -1
- package/dist/esm/views/FontLanguage.js +1 -0
- package/dist/esm/views/FontLanguage.js.map +1 -1
- package/dist/esm/views/FontLanguage.native.js +1 -0
- package/dist/esm/views/FontLanguage.native.js.map +1 -1
- package/dist/esm/views/Slot.js +5 -1
- package/dist/esm/views/Slot.js.map +1 -1
- package/dist/esm/views/Slot.native.js +5 -1
- package/dist/esm/views/Slot.native.js.map +1 -1
- package/dist/esm/views/Stack.js +1 -0
- package/dist/esm/views/Stack.js.map +1 -1
- package/dist/esm/views/Stack.native.js +1 -0
- package/dist/esm/views/Stack.native.js.map +1 -1
- package/dist/esm/views/TamaguiProvider.js +1 -0
- package/dist/esm/views/TamaguiProvider.js.map +1 -1
- package/dist/esm/views/TamaguiProvider.native.js +1 -0
- package/dist/esm/views/TamaguiProvider.native.js.map +1 -1
- package/dist/esm/views/Text.js +9 -2
- package/dist/esm/views/Text.js.map +1 -1
- package/dist/esm/views/Text.native.js +12 -5
- package/dist/esm/views/Text.native.js.map +1 -1
- package/dist/esm/views/Theme.js +1 -0
- package/dist/esm/views/Theme.js.map +1 -1
- package/dist/esm/views/Theme.native.js +1 -0
- package/dist/esm/views/Theme.native.js.map +1 -1
- package/dist/esm/views/ThemeDebug.js +1 -0
- package/dist/esm/views/ThemeDebug.js.map +1 -1
- package/dist/esm/views/ThemeDebug.native.js +1 -0
- package/dist/esm/views/ThemeDebug.native.js.map +1 -1
- package/package.json +16 -13
- package/src/createComponent.tsx +0 -3
- 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/src/types.tsx +1 -0
- package/src/views/Configuration.tsx +2 -0
- package/src/views/FontLanguage.native.tsx +2 -0
- package/src/views/FontLanguage.tsx +2 -0
- package/src/views/Slot.tsx +4 -0
- package/src/views/Stack.tsx +2 -0
- package/src/views/TamaguiProvider.tsx +2 -0
- package/src/views/Text.tsx +18 -7
- package/src/views/Theme.tsx +1 -1
- package/src/views/ThemeDebug.native.tsx +2 -0
- package/src/views/ThemeDebug.tsx +2 -0
- package/types/createComponent.d.ts.map +1 -1
- 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/types/types.d.ts +1 -0
- package/types/types.d.ts.map +1 -1
- package/types/views/Configuration.d.ts +4 -1
- package/types/views/Configuration.d.ts.map +1 -1
- package/types/views/FontLanguage.d.ts +4 -1
- package/types/views/FontLanguage.d.ts.map +1 -1
- package/types/views/FontLanguage.native.d.ts +4 -1
- package/types/views/FontLanguage.native.d.ts.map +1 -1
- package/types/views/Slot.d.ts +6 -3
- package/types/views/Slot.d.ts.map +1 -1
- package/types/views/Text.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
package/dist/esm/views/Text.js
CHANGED
|
@@ -10,7 +10,7 @@ const ellipseStyle = {
|
|
|
10
10
|
boxSizing: "border-box",
|
|
11
11
|
wordWrap: "break-word",
|
|
12
12
|
margin: 0
|
|
13
|
-
}, Text = createComponent({
|
|
13
|
+
}, ellipsisStyle = ellipseStyle, Text = createComponent({
|
|
14
14
|
acceptsClassName: !0,
|
|
15
15
|
isText: !0,
|
|
16
16
|
defaultProps: {
|
|
@@ -42,8 +42,14 @@ const ellipseStyle = {
|
|
|
42
42
|
cursor: "default"
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
|
+
/**
|
|
46
|
+
* @deprecated Use ellipsis instead
|
|
47
|
+
*/
|
|
45
48
|
ellipse: {
|
|
46
|
-
true:
|
|
49
|
+
true: ellipsisStyle
|
|
50
|
+
},
|
|
51
|
+
ellipsis: {
|
|
52
|
+
true: ellipsisStyle
|
|
47
53
|
}
|
|
48
54
|
},
|
|
49
55
|
validStyles: {
|
|
@@ -51,6 +57,7 @@ const ellipseStyle = {
|
|
|
51
57
|
...stylePropsTextOnly
|
|
52
58
|
}
|
|
53
59
|
});
|
|
60
|
+
Text.displayName = "Text";
|
|
54
61
|
export {
|
|
55
62
|
Text
|
|
56
63
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Text.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;AAGhC,MAAM,eAAe;AAAA,EACnB,UAAU;AAAA,EACV,UAAU;AAAA,EACV,cAAc;AAAA,EACd,YAAY;AACd,GAIM,kBAAkB;AAAA,EACtB,SAAS;AAAA,EACT,WAAW;AAAA,EACX,UAAU;AAAA,EACV,QAAQ;AACV,
|
|
4
|
+
"mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;AAGhC,MAAM,eAAe;AAAA,EACnB,UAAU;AAAA,EACV,UAAU;AAAA,EACV,cAAc;AAAA,EACd,YAAY;AACd,GAIM,kBAAkB;AAAA,EACtB,SAAS;AAAA,EACT,WAAW;AAAA,EACX,UAAU;AAAA,EACV,QAAQ;AACV,GAEM,gBAEA,cAMO,OAAO,gBAAgD;AAAA,EAClE,kBAAkB;AAAA,EAClB,QAAQ;AAAA,EAER,cAAc;AAAA,IACZ,YAAY;AAAA,IACZ,GACI;AAAA,EAIN;AAAA,EAEA,uBAAuB,oBAAI,IAAI,CAAC,YAAY,CAAC;AAAA,EAE7C,UAAU;AAAA,IAEN,eAAe;AAAA,MACb,GAAG;AAAA,MAEH,WAAW,CAAC,kBACV,iBAAiB,IACb;AAAA,QACE,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,QACjB,SAAS;AAAA,QACT,UAAU;AAAA,MACZ,IACA;AAAA,IACR;AAAA;AAAA,IAIF,eAAe;AAAA,MACb,OAAO,MAAM;AAAA,IACf;AAAA,IAGE,YAAY;AAAA,MACV,MAAM;AAAA,QACJ,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,MACA,OAAO;AAAA,QACL,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,IACF;AAAA;AAAA;AAAA;AAAA,IAMF,SAAS;AAAA,MACP,MAAM;AAAA,IACR;AAAA,IAEA,UAAU;AAAA,MACR,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,aAAa;AAAA,IACX,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF,CAAC;AAED,KAAK,cAAiB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { stylePropsTextOnly, validStyles } from "@tamagui/helpers";
|
|
2
2
|
import { createComponent } from "../createComponent";
|
|
3
|
-
const
|
|
3
|
+
const ellipsisStyle = {
|
|
4
|
+
numberOfLines: 1,
|
|
5
|
+
lineBreakMode: "clip"
|
|
6
|
+
}, Text = createComponent({
|
|
4
7
|
acceptsClassName: !0,
|
|
5
8
|
isText: !0,
|
|
6
9
|
defaultProps: {
|
|
@@ -13,11 +16,14 @@ const Text = createComponent({
|
|
|
13
16
|
ellipsizeMode: {
|
|
14
17
|
"...": () => null
|
|
15
18
|
},
|
|
19
|
+
/**
|
|
20
|
+
* @deprecated Use ellipsis instead
|
|
21
|
+
*/
|
|
16
22
|
ellipse: {
|
|
17
|
-
true:
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
23
|
+
true: ellipsisStyle
|
|
24
|
+
},
|
|
25
|
+
ellipsis: {
|
|
26
|
+
true: ellipsisStyle
|
|
21
27
|
}
|
|
22
28
|
},
|
|
23
29
|
validStyles: {
|
|
@@ -25,6 +31,7 @@ const Text = createComponent({
|
|
|
25
31
|
...stylePropsTextOnly
|
|
26
32
|
}
|
|
27
33
|
});
|
|
34
|
+
Text.displayName = "Text";
|
|
28
35
|
export {
|
|
29
36
|
Text
|
|
30
37
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Text.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;
|
|
4
|
+
"mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;AAmBhC,MAAM,gBAGA;AAAA,EACE,eAAe;AAAA,EACf,eAAe;AACjB,GAEO,OAAO,gBAAgD;AAAA,EAClE,kBAAkB;AAAA,EAClB,QAAQ;AAAA,EAER,cAAc;AAAA,IACZ,YAAY;AAAA,IAIN,sBAAsB;AAAA,EAE9B;AAAA,EAEA,uBAAuB,oBAAI,IAAI,CAAC,YAAY,CAAC;AAAA,EAE7C,UAAU;AAAA;AAAA,IAkBR,eAAe;AAAA,MACb,OAAO,MAAM;AAAA,IACf;AAAA;AAAA;AAAA;AAAA,IAkBA,SAAS;AAAA,MACP,MAAM;AAAA,IACR;AAAA,IAEA,UAAU;AAAA,MACR,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,aAAa;AAAA,IACX,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF,CAAC;AAED,KAAK,cAAiB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/views/Theme.js
CHANGED
|
@@ -29,6 +29,7 @@ const Theme = forwardRef(function(props, ref) {
|
|
|
29
29
|
}, [props.children, disableDirectChildTheme]);
|
|
30
30
|
return useThemedChildren(themeState, children, props, isRoot);
|
|
31
31
|
});
|
|
32
|
+
Theme.displayName = "Theme";
|
|
32
33
|
Theme.avoidForwardRef = !0;
|
|
33
34
|
function useThemedChildren(themeState, children, props, isRoot = !1, avoidWrap = !1) {
|
|
34
35
|
const { themeManager, isNewTheme } = themeState, { shallow, forceClassName } = props, hasEverThemed = useRef(!1);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AACtB,OAAO;AAAA,EACL;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAA+B,4BAA4B;AAE3D,SAAS,kBAAkB;AA+BjB;AA7BH,MAAM,QAAQ,WAAW,SAAe,OAAmB,KAAK;AAErE,MAAI,MAAM;AACR,WAAO,MAAM;AAGf,QAAM,SAAS,CAAC,CAAC,MAAM,SACjB,0BAA0B,MAAM,qBAAqB,GACrD,aAAa,qBAAqB,OAAO,MAAM,GAE/C,WAAW,QAAQ,MAAM;AAC7B,QAAIA,YAAW,0BACX,SAAS;AAAA,MAAI,MAAM;AAAA,MAAU,CAAC,UAC5B,aAAa,OAAO,EAAG,sBAAuB,GAAK,CAAC;AAAA,IACtD,IACA,MAAM;AAEV,QAAI;AACF,UAAI;AACF,cAAM,SAAS,KAAKA,SAAQ,GAC5BA,YAAW,aAAaA,WAAU,EAAE,IAAI,CAAC;AAAA,MAC3C,QAAQ;AAAA,MAER;AAGF,WAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,UAAU,gBAClBA,YACE,oBAAC,cAAW,YAAwB,YAAY,OAC7C,UAAAA,WACH,IAKCA;AAAA,EACT,GAAG,CAAC,MAAM,UAAU,uBAAuB,CAAC;AAE5C,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D,CAAC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["children"]
|
|
6
6
|
}
|
|
@@ -29,6 +29,7 @@ const Theme = forwardRef(function(props, ref) {
|
|
|
29
29
|
}, [props.children, disableDirectChildTheme]);
|
|
30
30
|
return useThemedChildren(themeState, children, props, isRoot);
|
|
31
31
|
});
|
|
32
|
+
Theme.displayName = "Theme";
|
|
32
33
|
Theme.avoidForwardRef = !0;
|
|
33
34
|
function useThemedChildren(themeState, children, props, isRoot = !1, avoidWrap = !1) {
|
|
34
35
|
const { themeManager, isNewTheme } = themeState, { shallow, forceClassName } = props, hasEverThemed = useRef(!1);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Theme.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa;AACtB,OAAO;AAAA,EACL;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,wBAAwB;AACjC,SAAS,2BAA2B;AACpC,SAA+B,4BAA4B;AAE3D,SAAS,kBAAkB;AA+BjB;AA7BH,MAAM,QAAQ,WAAW,SAAe,OAAmB,KAAK;AAErE,MAAI,MAAM;AACR,WAAO,MAAM;AAGf,QAAM,SAAS,CAAC,CAAC,MAAM,SACjB,0BAA0B,MAAM,qBAAqB,GACrD,aAAa,qBAAqB,OAAO,MAAM,GAE/C,WAAW,QAAQ,MAAM;AAC7B,QAAIA,YAAW,0BACX,SAAS;AAAA,MAAI,MAAM;AAAA,MAAU,CAAC,UAC5B,aAAa,OAAO,EAAG,sBAAuB,GAAK,CAAC;AAAA,IACtD,IACA,MAAM;AAEV,QAAI;AACF,UAAI;AACF,cAAM,SAAS,KAAKA,SAAQ,GAC5BA,YAAW,aAAaA,WAAU,EAAE,IAAI,CAAC;AAAA,MAC3C,QAAQ;AAAA,MAER;AAGF,WAAI,QAAQ,IAAI,aAAa,iBACvB,MAAM,UAAU,gBAClBA,YACE,oBAAC,cAAW,YAAwB,YAAY,OAC7C,UAAAA,WACH,IAKCA;AAAA,EACT,GAAG,CAAC,MAAM,UAAU,uBAAuB,CAAC;AAE5C,SAAO,kBAAkB,YAAY,UAAU,OAAO,MAAM;AAC9D,CAAC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["children"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeDebug.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AA6DvB,mBA+BE,KA7BE,YAFJ;AAxDN,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAED,MAAI,WAAW,qBAAqB;AAClC,WAAO;AAGT,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC,GAC9C,WAAW,eAAe,GAC1B,KAAK,MAAM;AAEjB,WAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,WAAa,QAC3D,SACH,OAAO,SAAS,cAAc,KAAK,GACnC,KAAK,MAAM,SAAS,SACpB,KAAK,MAAM,YAAY,UACvB,KAAK,MAAM,WAAW,SACtB,KAAK,MAAM,SAAS,KACpB,KAAK,MAAM,SAAS,QACpB,KAAK,MAAM,OAAO,QAClB,KAAK,MAAM,QAAQ,QACnB,KAAK,MAAM,UAAU,QACrB,KAAK,MAAM,SAAS,kBACpB,KAAK,MAAM,gBAAgB,OAC3B,KAAK,MAAM,aAAa,qBACxB,SAAS,KAAK,YAAY,IAAI,KAIlC,UAAU,MAAM;AACd,iBAAW,cAAc,eAAe,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC,GAC3B,QAAQ;AAAA,UACN,qBAAqB,WAAW,cAAc,EAAE,gBAAgB,WAAW,cAAc,eAAe,EAAE;AAAA,UAC1G;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH,GAAG,CAAC,WAAW,YAAY,CAAC,GAE5B,UAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAI;AACrC,aAAO,MAAM,aAAa,EAAS;AAAA,IACrC,GAAG,CAAC,CAAC,GAGH,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,YACd;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,YAAY,OAAO;AAAA,kBACzB,WAAW,YAAY,OAAO;AAAA,kBAC9B,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,QAAQ,WAAW,cAAc,MAAM;AAAA,kBACvC,IAAI,WAAW,cAAc;AAAA,kBAC7B,UAAU,WAAW,cAAc,eAAe;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,GAAI,WAAW,cAAe,iBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,sBAAsB,WAAW,cAAe;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;",
|
|
4
|
+
"mappings": "AAAA,SAAS,sBAAsB;AAC/B,SAAS,WAAW,OAAO,gBAAgB;AAC3C,SAAS,oBAAoB;AA6DvB,mBA+BE,KA7BE,YAFJ;AAxDN,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAED,MAAI,WAAW,qBAAqB;AAClC,WAAO;AAGT,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAS,CAAC,GAC9C,WAAW,eAAe,GAC1B,KAAK,MAAM;AAEjB,WAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,WAAa,QAC3D,SACH,OAAO,SAAS,cAAc,KAAK,GACnC,KAAK,MAAM,SAAS,SACpB,KAAK,MAAM,YAAY,UACvB,KAAK,MAAM,WAAW,SACtB,KAAK,MAAM,SAAS,KACpB,KAAK,MAAM,SAAS,QACpB,KAAK,MAAM,OAAO,QAClB,KAAK,MAAM,QAAQ,QACnB,KAAK,MAAM,UAAU,QACrB,KAAK,MAAM,SAAS,kBACpB,KAAK,MAAM,gBAAgB,OAC3B,KAAK,MAAM,aAAa,qBACxB,SAAS,KAAK,YAAY,IAAI,KAIlC,UAAU,MAAM;AACd,iBAAW,cAAc,eAAe,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC,GAC3B,QAAQ;AAAA,UACN,qBAAqB,WAAW,cAAc,EAAE,gBAAgB,WAAW,cAAc,eAAe,EAAE;AAAA,UAC1G;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH,GAAG,CAAC,WAAW,YAAY,CAAC,GAE5B,UAAU,MAAM;AAEd,YAAM,KAAK,YAAY,UAAU,GAAI;AACrC,aAAO,MAAM,aAAa,EAAS;AAAA,IACrC,GAAG,CAAC,CAAC,GAGH,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,YACd;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,YAAY,OAAO;AAAA,kBACzB,WAAW,YAAY,OAAO;AAAA,kBAC9B,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,QAAQ,WAAW,cAAc,MAAM;AAAA,kBACvC,IAAI,WAAW,cAAc;AAAA,kBAC7B,UAAU,WAAW,cAAc,eAAe;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,GAAI,WAAW,cAAe,iBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,sBAAsB,WAAW,cAAe;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;AAEA,WAAW,cAAiB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/ThemeDebug.native.tsx"],
|
|
4
|
-
"mappings": "AAGO,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAGD,SAAO;AACT;",
|
|
4
|
+
"mappings": "AAGO,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AAGD,SAAO;AACT;AAEA,WAAW,cAAiB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.82.1",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,20 +27,20 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.
|
|
31
|
-
"@tamagui/constants": "1.
|
|
32
|
-
"@tamagui/helpers": "1.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.
|
|
34
|
-
"@tamagui/timer": "1.
|
|
35
|
-
"@tamagui/use-did-finish-ssr": "1.
|
|
36
|
-
"@tamagui/use-event": "1.
|
|
37
|
-
"@tamagui/use-force-update": "1.
|
|
30
|
+
"@tamagui/compose-refs": "1.82.1",
|
|
31
|
+
"@tamagui/constants": "1.82.1",
|
|
32
|
+
"@tamagui/helpers": "1.82.1",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.82.1",
|
|
34
|
+
"@tamagui/timer": "1.82.1",
|
|
35
|
+
"@tamagui/use-did-finish-ssr": "1.82.1",
|
|
36
|
+
"@tamagui/use-event": "1.82.1",
|
|
37
|
+
"@tamagui/use-force-update": "1.82.1"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": "*"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.
|
|
43
|
+
"@tamagui/build": "1.82.1",
|
|
44
44
|
"@testing-library/react": "^14.0.0",
|
|
45
45
|
"csstype": "^3.0.10",
|
|
46
46
|
"react": "^18.2.0",
|
|
@@ -53,16 +53,19 @@
|
|
|
53
53
|
".": {
|
|
54
54
|
"types": "./types/index.d.ts",
|
|
55
55
|
"import": "./dist/esm/index.js",
|
|
56
|
-
"require": "./dist/cjs/index.js"
|
|
56
|
+
"require": "./dist/cjs/index.js",
|
|
57
|
+
"react-native": "./dist/cjs/index.native.js"
|
|
57
58
|
},
|
|
58
59
|
"./native": {
|
|
59
60
|
"import": "./dist/esm/index.native.js",
|
|
60
|
-
"require": "./dist/cjs/index.native.js"
|
|
61
|
+
"require": "./dist/cjs/index.native.js",
|
|
62
|
+
"react-native": "./dist/cjs/index.native.native.js"
|
|
61
63
|
},
|
|
62
64
|
"./inject-styles": {
|
|
63
65
|
"types": "./types/inject-styles.d.ts",
|
|
64
66
|
"import": "./dist/esm/inject-styles.js",
|
|
65
|
-
"require": "./dist/cjs/inject-styles.js"
|
|
67
|
+
"require": "./dist/cjs/inject-styles.js",
|
|
68
|
+
"react-native": "./dist/cjs/inject-styles.native.js"
|
|
66
69
|
}
|
|
67
70
|
},
|
|
68
71
|
"repository": {
|
package/src/createComponent.tsx
CHANGED
|
@@ -967,8 +967,6 @@ export function createComponent<
|
|
|
967
967
|
const isHoverable =
|
|
968
968
|
isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave)
|
|
969
969
|
|
|
970
|
-
const handlesPressEvents = !(isWeb || asChild)
|
|
971
|
-
|
|
972
970
|
// check presence rather than value to prevent reparenting bugs
|
|
973
971
|
// allows for onPress={x ? function : undefined} without re-ordering dom
|
|
974
972
|
const shouldAttach = Boolean(
|
|
@@ -1276,7 +1274,6 @@ export function createComponent<
|
|
|
1276
1274
|
defaultProps,
|
|
1277
1275
|
splitStyles,
|
|
1278
1276
|
animationStyles,
|
|
1279
|
-
handlesPressEvents,
|
|
1280
1277
|
willBeAnimated,
|
|
1281
1278
|
isStringElement,
|
|
1282
1279
|
classNamesIn: props.className?.split(' '),
|
|
@@ -24,8 +24,8 @@ export function fixStyles(style: Record<string, any>) {
|
|
|
24
24
|
// TODO could be native-only
|
|
25
25
|
// ensure border style set by default to solid
|
|
26
26
|
for (const key in borderDefaults) {
|
|
27
|
-
if (key in style
|
|
28
|
-
style[borderDefaults[key]]
|
|
27
|
+
if (key in style) {
|
|
28
|
+
style[borderDefaults[key]] ||= 'solid'
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { getVariableValue } from '../createVariable'
|
|
2
2
|
import { GenericFonts, GetStyleState } from '../types'
|
|
3
3
|
import { LanguageContextType } from '../views/FontLanguage.types'
|
|
4
|
-
import { createProxy } from './createProxy'
|
|
5
4
|
|
|
6
5
|
export function getVariantExtras(styleState: GetStyleState) {
|
|
7
6
|
const { curProps, conf, context, theme } = styleState
|
|
@@ -23,7 +22,7 @@ export function getVariantExtras(styleState: GetStyleState) {
|
|
|
23
22
|
font: fonts[fontFamily] || fonts[styleState.conf.defaultFont!],
|
|
24
23
|
// TODO do this in splitstlye
|
|
25
24
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
26
|
-
props:
|
|
25
|
+
props: new Proxy(curProps, {
|
|
27
26
|
// handles shorthands
|
|
28
27
|
get(target, key) {
|
|
29
28
|
const shorthand = conf.inverseShorthands[key as any]
|
|
@@ -5,51 +5,32 @@ import type { GenericVariantDefinitions } from '../types'
|
|
|
5
5
|
|
|
6
6
|
export const mergeVariants = (
|
|
7
7
|
parentVariants: GenericVariantDefinitions,
|
|
8
|
-
ourVariants: GenericVariantDefinitions
|
|
8
|
+
ourVariants: GenericVariantDefinitions,
|
|
9
|
+
level = 0
|
|
9
10
|
) => {
|
|
10
11
|
const variants = {}
|
|
11
12
|
|
|
12
13
|
for (const key in ourVariants) {
|
|
13
14
|
const parentVariant = parentVariants?.[key]
|
|
14
15
|
const ourVariant = ourVariants[key]
|
|
15
|
-
|
|
16
|
-
// do some early checks to avoid bad merges
|
|
17
16
|
if (!parentVariant || typeof ourVariant === 'function') {
|
|
18
17
|
variants[key] = ourVariant
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
// do some early checks to avoid bad merges
|
|
23
|
-
if (parentVariant && !ourVariant) {
|
|
18
|
+
} else if (parentVariant && !ourVariant) {
|
|
24
19
|
variants[key] = parentVariant[key]
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const parentVal = parentVariant?.[subKey]
|
|
33
|
-
if (typeof val === 'function') {
|
|
34
|
-
variants[key][subKey] = val
|
|
35
|
-
} else if (!parentVal || typeof parentVal === 'function') {
|
|
36
|
-
variants[key][subKey] = val
|
|
20
|
+
} else {
|
|
21
|
+
if (level === 0) {
|
|
22
|
+
variants[key] = mergeVariants(
|
|
23
|
+
parentVariant as Record<string, any>,
|
|
24
|
+
ourVariant as Record<string, any>,
|
|
25
|
+
level + 1
|
|
26
|
+
)
|
|
37
27
|
} else {
|
|
38
|
-
variants[key]
|
|
39
|
-
|
|
40
|
-
...
|
|
41
|
-
...val,
|
|
28
|
+
variants[key] = {
|
|
29
|
+
...parentVariant,
|
|
30
|
+
...ourVariant,
|
|
42
31
|
}
|
|
43
32
|
}
|
|
44
33
|
}
|
|
45
|
-
|
|
46
|
-
// merge parent variant keys that are superset
|
|
47
|
-
if (parentVariant) {
|
|
48
|
-
variants[key] = {
|
|
49
|
-
...parentVariant,
|
|
50
|
-
...variants[key],
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
34
|
}
|
|
54
35
|
|
|
55
36
|
return {
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import { isWeb } from '@tamagui/constants'
|
|
2
1
|
import { normalizeCSSColor, rgba } from '@tamagui/normalize-css-color'
|
|
3
2
|
|
|
4
3
|
export { rgba } from '@tamagui/normalize-css-color'
|
|
5
4
|
|
|
6
5
|
export const normalizeColor = (color?: string | null, opacity?: number) => {
|
|
7
6
|
if (!color) return
|
|
8
|
-
if (color[0] === '$' ||
|
|
9
|
-
return color
|
|
10
|
-
}
|
|
11
|
-
if (isWeb && opacity === 1) {
|
|
7
|
+
if (color[0] === '$' || color.startsWith('var(')) {
|
|
12
8
|
return color
|
|
13
9
|
}
|
|
14
10
|
const colorProcessed = normalizeCSSColor(color)
|
|
@@ -19,6 +19,8 @@ import { isObj } from './isObj'
|
|
|
19
19
|
import { pseudoDescriptors } from './pseudoDescriptors'
|
|
20
20
|
|
|
21
21
|
export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) => {
|
|
22
|
+
lastFontFamilyToken = null
|
|
23
|
+
|
|
22
24
|
if (!(process.env.TAMAGUI_TARGET === 'native' && isAndroid)) {
|
|
23
25
|
// this shouldnt be necessary and handled in the outer loop
|
|
24
26
|
if (key === 'elevationAndroid') return
|
|
@@ -99,7 +101,7 @@ export const propMapper: PropMapper = (key, value, styleStateIn, subPropsIn) =>
|
|
|
99
101
|
[key, value],
|
|
100
102
|
]
|
|
101
103
|
|
|
102
|
-
if (key === 'fontFamily') {
|
|
104
|
+
if (key === 'fontFamily' && lastFontFamilyToken) {
|
|
103
105
|
fontFamilyCache.set(result, lastFontFamilyToken)
|
|
104
106
|
}
|
|
105
107
|
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'
|
|
1
|
+
import { getTokenObject } from '../config'
|
|
3
2
|
import { DedupedThemes, ThemeParsed } from '../types'
|
|
4
3
|
|
|
5
|
-
|
|
4
|
+
const themesRaw: Record<string, ThemeParsed> = {}
|
|
6
5
|
|
|
7
6
|
// this seems expensive but its necessary to do two loops unless we want to refactor a variety of things again
|
|
8
7
|
// not *too* much work but not a big cost doing the two loops
|
|
@@ -50,9 +49,8 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
|
50
49
|
// proxy fallback values to parent theme values
|
|
51
50
|
return new Proxy(theme, {
|
|
52
51
|
get(target, key) {
|
|
53
|
-
if (key === GetThemeUnwrapped) return theme
|
|
54
52
|
if (
|
|
55
|
-
key
|
|
53
|
+
!key ||
|
|
56
54
|
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
57
55
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
|
58
56
|
key == 'undefined' ||
|
|
@@ -63,12 +61,11 @@ export function proxyThemeToParents(themeName: string, theme: ThemeParsed) {
|
|
|
63
61
|
// check parents
|
|
64
62
|
for (let i = numParents - 1; i >= 0; i--) {
|
|
65
63
|
const parent = themesRaw[parents[i]]
|
|
66
|
-
if (
|
|
67
|
-
if (Reflect.has(parent, key)) {
|
|
64
|
+
if (parent && Reflect.has(parent, key)) {
|
|
68
65
|
return Reflect.get(parent, key)
|
|
69
66
|
}
|
|
70
67
|
}
|
|
71
|
-
return getTokenObject(key as any)
|
|
68
|
+
return getTokenObject(key as any)
|
|
72
69
|
},
|
|
73
70
|
})
|
|
74
71
|
}
|
package/src/helpers/themes.ts
CHANGED
|
@@ -4,19 +4,18 @@ import { createVariable, isVariable } from '../createVariable'
|
|
|
4
4
|
// shared by createTamagui so extracted here
|
|
5
5
|
export function ensureThemeVariable(theme: any, key: string) {
|
|
6
6
|
const val = theme[key]
|
|
7
|
-
const themeKey = key
|
|
8
7
|
if (!isVariable(val)) {
|
|
9
8
|
theme[key] = createVariable({
|
|
10
|
-
key
|
|
11
|
-
name:
|
|
9
|
+
key,
|
|
10
|
+
name: key,
|
|
12
11
|
val,
|
|
13
12
|
})
|
|
14
13
|
} else {
|
|
15
|
-
if (val.name !==
|
|
14
|
+
if (val.name !== key) {
|
|
16
15
|
// rename to theme name
|
|
17
16
|
theme[key] = createVariable({
|
|
18
17
|
key: val.name,
|
|
19
|
-
name:
|
|
18
|
+
name: key,
|
|
20
19
|
val: val.val,
|
|
21
20
|
})
|
|
22
21
|
}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
-
import { useContext } from 'react'
|
|
2
|
-
|
|
3
1
|
import { getConfig } from '../config'
|
|
4
|
-
import { ComponentContext } from '../contexts/ComponentContext'
|
|
5
2
|
import { ComponentContextI } from '../types'
|
|
6
3
|
|
|
7
|
-
export function
|
|
8
|
-
|
|
9
|
-
return getDisableSSR(componentContext)
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
export function getDisableSSR(componentContext: ComponentContextI) {
|
|
13
|
-
return componentContext.disableSSR ?? getConfig().disableSSR
|
|
4
|
+
export function getDisableSSR(componentContext?: ComponentContextI) {
|
|
5
|
+
return componentContext?.disableSSR ?? getConfig().disableSSR
|
|
14
6
|
}
|
package/src/hooks/useMedia.tsx
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { isServer, isWeb
|
|
1
|
+
import { isServer, isWeb } from '@tamagui/constants'
|
|
2
2
|
import { useRef, useSyncExternalStore } from 'react'
|
|
3
3
|
|
|
4
4
|
import { getConfig } from '../config'
|
|
5
|
-
import { createProxy } from '../helpers/createProxy'
|
|
6
5
|
import { matchMedia } from '../helpers/matchMedia'
|
|
7
6
|
import { pseudoDescriptors } from '../helpers/pseudoDescriptors'
|
|
8
7
|
import type {
|
|
@@ -15,12 +14,12 @@ import type {
|
|
|
15
14
|
TamaguiInternalConfig,
|
|
16
15
|
UseMediaState,
|
|
17
16
|
} from '../types'
|
|
18
|
-
import { getDisableSSR
|
|
17
|
+
import { getDisableSSR } from './useDisableSSR'
|
|
19
18
|
|
|
20
19
|
export let mediaState: MediaQueryState =
|
|
21
20
|
// development only safeguard
|
|
22
21
|
process.env.NODE_ENV === 'development'
|
|
23
|
-
?
|
|
22
|
+
? new Proxy(
|
|
24
23
|
{},
|
|
25
24
|
{
|
|
26
25
|
get(target, key) {
|
|
@@ -191,7 +190,7 @@ function subscribe(subscriber: any) {
|
|
|
191
190
|
export function useMedia(uid?: any, componentContext?: ComponentContextI): UseMediaState {
|
|
192
191
|
const internal = useRef<UseMediaInternalState | undefined>()
|
|
193
192
|
// performance boost to avoid using context twice
|
|
194
|
-
const disableSSR =
|
|
193
|
+
const disableSSR = getDisableSSR(componentContext)
|
|
195
194
|
const initialState = (disableSSR || !isWeb ? mediaState : initState) || {}
|
|
196
195
|
|
|
197
196
|
const state = useSyncExternalStore<MediaQueryState>(
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -3,7 +3,6 @@ import { useContext, useEffect, useMemo, useRef, useState } from 'react'
|
|
|
3
3
|
|
|
4
4
|
import { getConfig } from '../config'
|
|
5
5
|
import { Variable, getVariable } from '../createVariable'
|
|
6
|
-
import { createProxy } from '../helpers/createProxy'
|
|
7
6
|
import { isEqualShallow } from '../helpers/createShallowSetState'
|
|
8
7
|
import {
|
|
9
8
|
ThemeManager,
|
|
@@ -19,7 +18,6 @@ import type {
|
|
|
19
18
|
VariableVal,
|
|
20
19
|
VariableValGeneric,
|
|
21
20
|
} from '../types'
|
|
22
|
-
import { GetThemeUnwrapped } from './getThemeUnwrapped'
|
|
23
21
|
|
|
24
22
|
export type ChangedThemeResponse = {
|
|
25
23
|
state?: ThemeManagerState
|
|
@@ -156,7 +154,7 @@ export function getThemeProxied(
|
|
|
156
154
|
}
|
|
157
155
|
}
|
|
158
156
|
|
|
159
|
-
return
|
|
157
|
+
return new Proxy(theme, {
|
|
160
158
|
has(_, key) {
|
|
161
159
|
if (Reflect.has(theme, key)) {
|
|
162
160
|
return true
|
|
@@ -167,10 +165,6 @@ export function getThemeProxied(
|
|
|
167
165
|
}
|
|
168
166
|
},
|
|
169
167
|
get(_, key) {
|
|
170
|
-
if (key === GetThemeUnwrapped) {
|
|
171
|
-
return theme
|
|
172
|
-
}
|
|
173
|
-
|
|
174
168
|
if (
|
|
175
169
|
// dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
|
|
176
170
|
// if someone is crazy enough to use "undefined" as a theme key then this not working is on them
|
package/src/types.tsx
CHANGED
package/src/views/Slot.tsx
CHANGED
|
@@ -32,6 +32,8 @@ export const Slot = forwardRef<any, SlotProps>(function Slot(props, forwardedRef
|
|
|
32
32
|
return Children.count(children) > 1 ? Children.only(null) : null
|
|
33
33
|
})
|
|
34
34
|
|
|
35
|
+
Slot['displayName'] = 'Slot'
|
|
36
|
+
|
|
35
37
|
/* -------------------------------------------------------------------------------------------------
|
|
36
38
|
* Slottable
|
|
37
39
|
* -----------------------------------------------------------------------------------------------*/
|
|
@@ -40,6 +42,8 @@ export const Slottable = ({ children }: { children: ReactNode }) => {
|
|
|
40
42
|
return <>{children}</>
|
|
41
43
|
}
|
|
42
44
|
|
|
45
|
+
Slottable['displayName'] = 'Slottable'
|
|
46
|
+
|
|
43
47
|
/* ---------------------------------------------------------------------------------------------- */
|
|
44
48
|
|
|
45
49
|
const pressMap = isWeb
|
package/src/views/Stack.tsx
CHANGED