@tamagui/web 1.89.23 → 1.89.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/createTamagui.js +1 -1
- package/dist/cjs/createTamagui.js.map +1 -1
- package/dist/cjs/createTamagui.native.js +1 -1
- package/dist/cjs/createTamagui.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.js +3 -3
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +2 -2
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/cjs/helpers/getStylesAtomic.js +35 -27
- package/dist/cjs/helpers/getStylesAtomic.js.map +1 -1
- package/dist/cjs/helpers/getStylesAtomic.native.js +3 -5
- package/dist/cjs/helpers/getStylesAtomic.native.js.map +1 -1
- package/dist/cjs/helpers/getThemeCSSRules.js +1 -1
- package/dist/cjs/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/hooks/useTheme.native.js.map +1 -1
- package/dist/esm/createTamagui.js +1 -1
- package/dist/esm/createTamagui.js.map +1 -1
- package/dist/esm/createTamagui.mjs +1 -1
- package/dist/esm/createTamagui.native.js +1 -1
- package/dist/esm/createTamagui.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +4 -4
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +4 -4
- package/dist/esm/helpers/getSplitStyles.native.js +3 -3
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.js +36 -28
- package/dist/esm/helpers/getStylesAtomic.js.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.mjs +36 -33
- package/dist/esm/helpers/getStylesAtomic.native.js +2 -3
- package/dist/esm/helpers/getStylesAtomic.native.js.map +1 -1
- package/dist/esm/helpers/getThemeCSSRules.js +1 -1
- package/dist/esm/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/esm/helpers/getThemeCSSRules.mjs +1 -1
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/hooks/useTheme.native.js.map +1 -1
- package/package.json +11 -11
- package/src/createTamagui.ts +1 -3
- package/src/helpers/getSplitStyles.tsx +4 -4
- package/src/helpers/getStylesAtomic.native.ts +1 -2
- package/src/helpers/getStylesAtomic.ts +49 -44
- package/src/helpers/getThemeCSSRules.ts +1 -1
- package/src/hooks/useTheme.tsx +13 -6
- package/types/createTamagui.d.ts.map +1 -1
- package/types/helpers/getStylesAtomic.d.ts +3 -3
- package/types/helpers/getStylesAtomic.d.ts.map +1 -1
- package/types/helpers/getStylesAtomic.native.d.ts +1 -2
- package/types/helpers/getStylesAtomic.native.d.ts.map +1 -1
- package/types/hooks/useTheme.d.ts +2 -4
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/internalWithTheme.d.ts +0 -4
- package/types/internalWithTheme.d.ts.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/hooks/useTheme.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,UAAU,OAAO,gBAAgB;AAC1C,SAAS,YAAY,WAAW,SAAS,QAAQ,gBAAgB;AAEjE,SAAS,iBAAiB;AAE1B,SAAS,mBAAmB;AAE5B,SAAS,cAAc,gCAAgC;AACvD,SAAS,6BAA6B;AACtC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.89.
|
|
3
|
+
"version": "1.89.25",
|
|
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.89.
|
|
31
|
-
"@tamagui/constants": "1.89.
|
|
32
|
-
"@tamagui/helpers": "1.89.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.89.
|
|
34
|
-
"@tamagui/timer": "1.89.
|
|
35
|
-
"@tamagui/types": "1.89.
|
|
36
|
-
"@tamagui/use-did-finish-ssr": "1.89.
|
|
37
|
-
"@tamagui/use-event": "1.89.
|
|
38
|
-
"@tamagui/use-force-update": "1.89.
|
|
30
|
+
"@tamagui/compose-refs": "1.89.25",
|
|
31
|
+
"@tamagui/constants": "1.89.25",
|
|
32
|
+
"@tamagui/helpers": "1.89.25",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.89.25",
|
|
34
|
+
"@tamagui/timer": "1.89.25",
|
|
35
|
+
"@tamagui/types": "1.89.25",
|
|
36
|
+
"@tamagui/use-did-finish-ssr": "1.89.25",
|
|
37
|
+
"@tamagui/use-event": "1.89.25",
|
|
38
|
+
"@tamagui/use-force-update": "1.89.25",
|
|
39
39
|
"react": "^18.2.0",
|
|
40
40
|
"react-dom": "^18.2.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@tamagui/build": "1.89.
|
|
43
|
+
"@tamagui/build": "1.89.25",
|
|
44
44
|
"@testing-library/react": "^14.0.0",
|
|
45
45
|
"csstype": "^3.0.10",
|
|
46
46
|
"typescript": "^5.3.3",
|
package/src/createTamagui.ts
CHANGED
|
@@ -143,9 +143,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
const sep =
|
|
147
|
-
process.env.NODE_ENV === 'development' ? configIn.cssStyleSeparator || ' ' : ''
|
|
148
|
-
|
|
146
|
+
const sep = configIn.cssStyleSeparator || ''
|
|
149
147
|
function declarationsToRuleSet(decs: string[], selector = '') {
|
|
150
148
|
return `:root${selector} {${sep}${[...decs].join(`;${sep}`)}${sep}}`
|
|
151
149
|
}
|
|
@@ -56,7 +56,7 @@ import type {
|
|
|
56
56
|
import { createMediaStyle } from './createMediaStyle'
|
|
57
57
|
import { fixStyles } from './expandStyles'
|
|
58
58
|
import { getGroupPropParts } from './getGroupPropParts'
|
|
59
|
-
import {
|
|
59
|
+
import { getStyleAtomic, getStylesAtomic, styleToCSS } from './getStylesAtomic'
|
|
60
60
|
import {
|
|
61
61
|
insertStyleRules,
|
|
62
62
|
insertedTransforms,
|
|
@@ -726,7 +726,7 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
726
726
|
|
|
727
727
|
// on server only generate classes for enterStyle
|
|
728
728
|
if (shouldDoClasses && !isExit) {
|
|
729
|
-
const pseudoStyles =
|
|
729
|
+
const pseudoStyles = getStyleAtomic(pseudoStyleObject, descriptor)
|
|
730
730
|
|
|
731
731
|
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
732
732
|
// prettier-ignore
|
|
@@ -904,7 +904,7 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
904
904
|
}
|
|
905
905
|
}
|
|
906
906
|
|
|
907
|
-
const mediaStyles = getStylesAtomic(mediaStyle
|
|
907
|
+
const mediaStyles = getStylesAtomic(mediaStyle)
|
|
908
908
|
const priority = mediaStylesSeen
|
|
909
909
|
mediaStylesSeen += 1
|
|
910
910
|
|
|
@@ -1152,7 +1152,7 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
1152
1152
|
if (styleState.style['$$css']) {
|
|
1153
1153
|
// avoid re-processing for rnw
|
|
1154
1154
|
} else {
|
|
1155
|
-
const atomic = getStylesAtomic(styleState.style
|
|
1155
|
+
const atomic = getStylesAtomic(styleState.style)
|
|
1156
1156
|
|
|
1157
1157
|
for (const atomicStyle of atomic) {
|
|
1158
1158
|
const key = atomicStyle.property
|
|
@@ -17,64 +17,69 @@ import { transformsToString } from './transformsToString'
|
|
|
17
17
|
|
|
18
18
|
// refactor this file away next...
|
|
19
19
|
|
|
20
|
-
export function getStylesAtomic(
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
export function getStylesAtomic(style: ViewStyleWithPseudos) {
|
|
21
|
+
styleToCSS(style)
|
|
22
|
+
const out: StyleObject[] = []
|
|
23
|
+
for (const key in style) {
|
|
24
|
+
const val = style[key]
|
|
25
|
+
if (key in pseudoDescriptors) {
|
|
26
|
+
if (val) {
|
|
27
|
+
out.push(...getStyleAtomic(val, pseudoDescriptors[key]))
|
|
28
|
+
}
|
|
29
|
+
} else {
|
|
30
|
+
const so = getStyleObject(style, key)
|
|
31
|
+
if (so) {
|
|
32
|
+
out.push(so)
|
|
33
|
+
}
|
|
26
34
|
}
|
|
27
35
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
31
|
-
console.info(` 🪮 getStylesAtomic`, { stylesIn, res })
|
|
32
|
-
}
|
|
33
|
-
return res
|
|
36
|
+
return out
|
|
34
37
|
}
|
|
35
38
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
export const generateAtomicStyles = (
|
|
39
|
+
export const getStyleAtomic = (
|
|
39
40
|
style: ViewStyleWithPseudos,
|
|
40
41
|
pseudo?: PseudoDescriptor
|
|
41
42
|
): StyleObject[] => {
|
|
42
|
-
if (!style) return []
|
|
43
|
-
|
|
44
|
-
conf = conf || getConfig()
|
|
45
|
-
|
|
46
43
|
styleToCSS(style)
|
|
47
|
-
|
|
48
44
|
const out: StyleObject[] = []
|
|
49
45
|
for (const key in style) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
// transform
|
|
55
|
-
if (key === 'transform' && Array.isArray(style.transform)) {
|
|
56
|
-
val = transformsToString(val)
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
const value = normalizeValueWithProperty(val, key)
|
|
60
|
-
const hash = simpleHash(`${value}`)
|
|
61
|
-
const pseudoPrefix = pseudo ? `0${pseudo.name}-` : ''
|
|
62
|
-
const shortProp = conf.inverseShorthands[key] || key
|
|
63
|
-
const identifier = `_${shortProp}-${pseudoPrefix}${hash}`
|
|
64
|
-
const rules = createAtomicRules(identifier, key, value, pseudo)
|
|
65
|
-
const styleObject: StyleObject = {
|
|
66
|
-
property: key,
|
|
67
|
-
pseudo: pseudo?.name as any,
|
|
68
|
-
identifier,
|
|
69
|
-
rules,
|
|
70
|
-
value,
|
|
46
|
+
const so = getStyleObject(style, key, pseudo)
|
|
47
|
+
if (so) {
|
|
48
|
+
out.push(so)
|
|
71
49
|
}
|
|
72
|
-
out.push(styleObject)
|
|
73
50
|
}
|
|
74
|
-
|
|
75
51
|
return out
|
|
76
52
|
}
|
|
77
53
|
|
|
54
|
+
let conf: TamaguiInternalConfig
|
|
55
|
+
|
|
56
|
+
const getStyleObject = (
|
|
57
|
+
style: ViewStyleWithPseudos,
|
|
58
|
+
key: string,
|
|
59
|
+
pseudo?: PseudoDescriptor
|
|
60
|
+
): StyleObject | undefined => {
|
|
61
|
+
let val = style[key]
|
|
62
|
+
if (val == null) return
|
|
63
|
+
// transform
|
|
64
|
+
if (key === 'transform' && Array.isArray(style.transform)) {
|
|
65
|
+
val = transformsToString(val)
|
|
66
|
+
}
|
|
67
|
+
const value = normalizeValueWithProperty(val, key)
|
|
68
|
+
const hash = simpleHash(`${value}`)
|
|
69
|
+
const pseudoPrefix = pseudo ? `0${pseudo.name}-` : ''
|
|
70
|
+
conf ||= getConfig()
|
|
71
|
+
const shortProp = conf.inverseShorthands[key] || key
|
|
72
|
+
const identifier = `_${shortProp}-${pseudoPrefix}${hash}`
|
|
73
|
+
const rules = createAtomicRules(identifier, key, value, pseudo)
|
|
74
|
+
return {
|
|
75
|
+
property: key,
|
|
76
|
+
pseudo: pseudo?.name as any,
|
|
77
|
+
identifier,
|
|
78
|
+
rules,
|
|
79
|
+
value,
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
78
83
|
export function styleToCSS(style: Record<string, any>) {
|
|
79
84
|
// box-shadow
|
|
80
85
|
const { shadowOffset, shadowRadius, shadowColor, shadowOpacity } = style
|
|
@@ -216,7 +221,7 @@ function createAtomicRules(
|
|
|
216
221
|
// WEIRD SYNTAX, SEE:
|
|
217
222
|
// https://stackoverflow.com/questions/40532204/media-query-for-devices-supporting-hover
|
|
218
223
|
if (pseudo?.name === 'hover') {
|
|
219
|
-
rules = rules.map((r) => `@media (hover) {
|
|
224
|
+
rules = rules.map((r) => `@media (hover) {${r}}`)
|
|
220
225
|
}
|
|
221
226
|
|
|
222
227
|
return rules
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import type {
|
|
|
13
13
|
NonSpecificTokens,
|
|
14
14
|
ThemeParsed,
|
|
15
15
|
ThemeProps,
|
|
16
|
+
ThemeValueGet,
|
|
16
17
|
UseThemeWithStateProps,
|
|
17
18
|
VariableVal,
|
|
18
19
|
VariableValGeneric,
|
|
@@ -64,16 +65,22 @@ export type ThemeGettable<Val> = Val & {
|
|
|
64
65
|
: unknown)
|
|
65
66
|
}
|
|
66
67
|
|
|
67
|
-
type SimpleTokens = NonSpecificTokens extends `$${infer Token}` ? Token : never
|
|
68
|
-
|
|
69
68
|
export type UseThemeResult = {
|
|
70
|
-
[Key in keyof ThemeParsed |
|
|
71
|
-
Key extends keyof ThemeParsed
|
|
72
|
-
? ThemeParsed[Key]
|
|
73
|
-
: VariableValGeneric | string | number
|
|
69
|
+
[Key in keyof ThemeParsed | (string & {})]: ThemeGettable<
|
|
70
|
+
Key extends keyof ThemeParsed ? ThemeParsed[Key] : Variable<any>
|
|
74
71
|
>
|
|
75
72
|
}
|
|
76
73
|
|
|
74
|
+
// not used by anything but its technically more correct type, but its annoying to have in intellisense so leaving it
|
|
75
|
+
// type SimpleTokens = NonSpecificTokens extends `$${infer Token}` ? Token : never
|
|
76
|
+
// export type UseThemeWithTokens = {
|
|
77
|
+
// [Key in keyof ThemeParsed | keyof SimpleTokens]: ThemeGettable<
|
|
78
|
+
// Key extends keyof ThemeParsed
|
|
79
|
+
// ? ThemeParsed[Key]
|
|
80
|
+
// : Variable<ThemeValueGet<`$${Key}`> extends never ? any : ThemeValueGet<`$${Key}`>>
|
|
81
|
+
// >
|
|
82
|
+
// }
|
|
83
|
+
|
|
77
84
|
export const useTheme = (props: ThemeProps = emptyProps) => {
|
|
78
85
|
const [_, theme] = useThemeWithState(props)
|
|
79
86
|
const res = theme || getDefaultThemeProxied()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAMnB,MAAM,SAAS,CAAA;AAKhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAwQ1B"}
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
* Copyright (c) Nicolas Gallagher licensed under the MIT license.
|
|
4
4
|
*/
|
|
5
5
|
import type { StyleObject } from '@tamagui/helpers';
|
|
6
|
-
import type {
|
|
6
|
+
import type { ViewStyleWithPseudos } from '../types';
|
|
7
7
|
import type { PseudoDescriptor } from './pseudoDescriptors';
|
|
8
|
-
export declare function getStylesAtomic(
|
|
9
|
-
export declare const
|
|
8
|
+
export declare function getStylesAtomic(style: ViewStyleWithPseudos): StyleObject[];
|
|
9
|
+
export declare const getStyleAtomic: (style: ViewStyleWithPseudos, pseudo?: PseudoDescriptor) => StyleObject[];
|
|
10
10
|
export declare function styleToCSS(style: Record<string, any>): void;
|
|
11
11
|
//# sourceMappingURL=getStylesAtomic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"getStylesAtomic.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAInD,OAAO,KAAK,EAAoC,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAGtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAO3D,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,iBAiB1D;AAED,eAAO,MAAM,cAAc,UAClB,oBAAoB,WAClB,gBAAgB,KACxB,WAAW,EAUb,CAAA;AA+BD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAiCpD"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export declare const getStylesAtomic: () => void;
|
|
2
|
-
export declare const
|
|
3
|
-
export declare const getAtomicStyle: () => void;
|
|
2
|
+
export declare const getStyleAtomic: () => void;
|
|
4
3
|
export declare const styleToCSS: () => void;
|
|
5
4
|
//# sourceMappingURL=getStylesAtomic.native.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getStylesAtomic.native.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.native.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,YAAQ,CAAA;AACpC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"getStylesAtomic.native.d.ts","sourceRoot":"","sources":["../../src/helpers/getStylesAtomic.native.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,YAAQ,CAAA;AACpC,eAAO,MAAM,cAAc,YAAQ,CAAA;AACnC,eAAO,MAAM,UAAU,YAAQ,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Variable } from '../createVariable';
|
|
2
2
|
import type { ThemeManagerState } from '../helpers/ThemeManager';
|
|
3
3
|
import { ThemeManager } from '../helpers/ThemeManager';
|
|
4
|
-
import type { DebugProp,
|
|
4
|
+
import type { DebugProp, ThemeParsed, ThemeProps, UseThemeWithStateProps, VariableVal, VariableValGeneric } from '../types';
|
|
5
5
|
export type ChangedThemeResponse = {
|
|
6
6
|
state?: ThemeManagerState;
|
|
7
7
|
themeManager?: ThemeManager | null;
|
|
@@ -22,9 +22,8 @@ export type ThemeGettable<Val> = Val & {
|
|
|
22
22
|
*/
|
|
23
23
|
get: (platform?: 'web') => string | (Val extends Variable<infer X> ? X extends VariableValGeneric ? any : Exclude<X, Variable> : Val extends VariableVal ? string | number : unknown);
|
|
24
24
|
};
|
|
25
|
-
type SimpleTokens = NonSpecificTokens extends `$${infer Token}` ? Token : never;
|
|
26
25
|
export type UseThemeResult = {
|
|
27
|
-
[Key in keyof ThemeParsed |
|
|
26
|
+
[Key in keyof ThemeParsed | (string & {})]: ThemeGettable<Key extends keyof ThemeParsed ? ThemeParsed[Key] : Variable<any>>;
|
|
28
27
|
};
|
|
29
28
|
export declare const useTheme: (props?: ThemeProps) => UseThemeResult;
|
|
30
29
|
export declare const useThemeWithState: (props: UseThemeWithStateProps) => [ChangedThemeResponse, ThemeParsed];
|
|
@@ -32,5 +31,4 @@ export declare function getThemeProxied({ theme, name, scheme }: ThemeManagerSta
|
|
|
32
31
|
export declare const activeThemeManagers: Set<ThemeManager>;
|
|
33
32
|
export declare const getThemeManager: (id: number) => ThemeManager | undefined;
|
|
34
33
|
export declare const useChangeThemeEffect: (props: UseThemeWithStateProps, isRoot?: boolean, keys?: string[], shouldUpdate?: () => boolean | undefined) => ChangedThemeResponse;
|
|
35
|
-
export {};
|
|
36
34
|
//# sourceMappingURL=useTheme.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,YAAY,EAA4B,MAAM,yBAAyB,CAAA;AAGhF,OAAO,KAAK,EACV,SAAS,
|
|
1
|
+
{"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,YAAY,EAA4B,MAAM,yBAAyB,CAAA;AAGhF,OAAO,KAAK,EACV,SAAS,EAET,WAAW,EACX,UAAU,EAEV,sBAAsB,EACtB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,OAAO,CAAA;IAGnB,QAAQ,CAAC,EAAE,IAAI,GAAG,OAAO,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAcD,MAAM,MAAM,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IACrC;;;;;;;;;OASG;IACH,GAAG,EAAE,CACH,QAAQ,CAAC,EAAE,KAAK,KAEd,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACrB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;KAC1B,GAAG,IAAI,MAAM,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,aAAa,CACvD,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,CAAA;AAYD,eAAO,MAAM,QAAQ,WAAW,UAAU,mBAIzC,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,sBAAsB,KAC5B,CAAC,oBAAoB,EAAE,WAAW,CA6DpC,CAAA;AAED,wBAAgB,eAAe,CAC7B,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAC1C,KAAK,UAAQ,EACb,YAAY,CAAC,EAAE,YAAY,EAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,EACf,KAAK,CAAC,EAAE,SAAS,GAChB,cAAc,CA0GhB;AAeD,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAO1D,eAAO,MAAM,eAAe,OAAQ,MAAM,6BAEzC,CAAA;AASD,eAAO,MAAM,oBAAoB,UACxB,sBAAsB,2BAEtB,MAAM,EAAE,iBACA,MAAM,OAAO,GAAG,SAAS,KACvC,oBAsRF,CAAA"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
|
-
/** internal: this is for tamagui babel plugin usage only */
|
|
3
|
-
export declare const _withStableStyle: (Component: any, styleProvider: (theme: any, expressions: any[]) => Object) => (props: any) => JSX.Element;
|
|
4
|
-
//# sourceMappingURL=internalWithTheme.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"internalWithTheme.d.ts","sourceRoot":"","sources":["../src/internalWithTheme.tsx"],"names":[],"mappings":";AAEA,4DAA4D;AAE5D,eAAO,MAAM,iBAAiB,cAChB,GAAG,yBAAyB,GAAG,eAAe,GAAG,EAAE,KAAK,MAAM,aAClE,GAAG,gBAIV,CAAA"}
|