@tamagui/web 1.99.0 → 1.100.0
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/_withStableStyle.native.js +2 -4
- package/dist/cjs/_withStableStyle.native.js.map +1 -1
- package/dist/cjs/config.native.js +6 -12
- package/dist/cjs/config.native.js.map +1 -1
- package/dist/cjs/constants/webToNativeProps.native.js +1 -2
- package/dist/cjs/constants/webToNativeProps.native.js.map +1 -1
- package/dist/cjs/createComponent.js +28 -12
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/createComponent.native.js +45 -32
- package/dist/cjs/createComponent.native.js.map +2 -2
- package/dist/cjs/createFont.js +1 -2
- package/dist/cjs/createFont.js.map +1 -1
- package/dist/cjs/createFont.native.js +9 -18
- package/dist/cjs/createFont.native.js.map +1 -1
- package/dist/cjs/createTamagui.native.js +8 -16
- package/dist/cjs/createTamagui.native.js.map +1 -1
- package/dist/cjs/createVariable.js +15 -10
- package/dist/cjs/createVariable.js.map +1 -1
- package/dist/cjs/createVariable.native.js +22 -18
- package/dist/cjs/createVariable.native.js.map +2 -2
- package/dist/cjs/createVariables.js +1 -2
- package/dist/cjs/createVariables.js.map +1 -1
- package/dist/cjs/createVariables.native.js +1 -2
- package/dist/cjs/createVariables.native.js.map +1 -1
- package/dist/cjs/helpers/ThemeManager.native.js +8 -16
- package/dist/cjs/helpers/ThemeManager.native.js.map +1 -1
- package/dist/cjs/helpers/createShallowSetState.js +8 -2
- package/dist/cjs/helpers/createShallowSetState.js.map +1 -1
- package/dist/cjs/helpers/createShallowSetState.native.js +10 -3
- package/dist/cjs/helpers/createShallowSetState.native.js.map +2 -2
- package/dist/cjs/helpers/createStyledContext.native.js +2 -4
- package/dist/cjs/helpers/createStyledContext.native.js.map +1 -1
- package/dist/cjs/helpers/expandStyle.native.js +1 -2
- package/dist/cjs/helpers/expandStyle.native.js.map +1 -1
- package/dist/cjs/helpers/getExpandedShorthands.js +1 -2
- package/dist/cjs/helpers/getExpandedShorthands.js.map +1 -1
- package/dist/cjs/helpers/getExpandedShorthands.native.js +1 -2
- package/dist/cjs/helpers/getExpandedShorthands.native.js.map +1 -1
- package/dist/cjs/helpers/getGroupPropParts.native.js +6 -12
- package/dist/cjs/helpers/getGroupPropParts.native.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.js +10 -15
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +13 -23
- package/dist/cjs/helpers/getSplitStyles.native.js.map +2 -2
- package/dist/cjs/helpers/getStylesAtomic.js +2 -4
- package/dist/cjs/helpers/getStylesAtomic.js.map +1 -1
- package/dist/cjs/helpers/getThemeCSSRules.js +1 -2
- package/dist/cjs/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/cjs/helpers/getVariantExtras.js +14 -9
- package/dist/cjs/helpers/getVariantExtras.js.map +1 -1
- package/dist/cjs/helpers/getVariantExtras.native.js +18 -19
- package/dist/cjs/helpers/getVariantExtras.native.js.map +2 -2
- package/dist/cjs/helpers/insertStyleRule.js +37 -30
- package/dist/cjs/helpers/insertStyleRule.js.map +1 -1
- package/dist/cjs/helpers/insertStyleRule.native.js +44 -31
- package/dist/cjs/helpers/insertStyleRule.native.js.map +2 -2
- package/dist/cjs/helpers/log.native.js +6 -12
- package/dist/cjs/helpers/log.native.js.map +1 -1
- package/dist/cjs/helpers/matchMedia.native.js +6 -12
- package/dist/cjs/helpers/matchMedia.native.js.map +1 -1
- package/dist/cjs/helpers/normalizeColor.js +1 -2
- package/dist/cjs/helpers/normalizeColor.js.map +1 -1
- package/dist/cjs/helpers/normalizeColor.native.js +1 -2
- package/dist/cjs/helpers/normalizeColor.native.js.map +1 -1
- package/dist/cjs/helpers/normalizeStyle.js +1 -2
- package/dist/cjs/helpers/normalizeStyle.js.map +1 -1
- package/dist/cjs/helpers/propMapper.js +4 -8
- package/dist/cjs/helpers/propMapper.js.map +1 -1
- package/dist/cjs/helpers/propMapper.native.js +8 -16
- package/dist/cjs/helpers/propMapper.native.js.map +1 -1
- package/dist/cjs/helpers/themeable.native.js +2 -4
- package/dist/cjs/helpers/themeable.native.js.map +1 -1
- package/dist/cjs/hooks/useConfiguration.native.js +2 -4
- package/dist/cjs/hooks/useConfiguration.native.js.map +1 -1
- package/dist/cjs/hooks/useMedia.js +4 -8
- package/dist/cjs/hooks/useMedia.js.map +1 -1
- package/dist/cjs/hooks/useMedia.native.js +13 -26
- package/dist/cjs/hooks/useMedia.native.js.map +1 -1
- package/dist/cjs/hooks/useProps.native.js +8 -16
- package/dist/cjs/hooks/useProps.native.js.map +1 -1
- package/dist/cjs/hooks/useTheme.js +5 -10
- package/dist/cjs/hooks/useTheme.js.map +1 -1
- package/dist/cjs/hooks/useTheme.native.js +13 -26
- package/dist/cjs/hooks/useTheme.native.js.map +1 -1
- package/dist/cjs/hooks/useThemeName.native.js +6 -12
- package/dist/cjs/hooks/useThemeName.native.js.map +1 -1
- package/dist/cjs/styled.native.js +2 -4
- package/dist/cjs/styled.native.js.map +1 -1
- package/dist/cjs/views/FontLanguage.native.js +2 -4
- package/dist/cjs/views/FontLanguage.native.js.map +1 -1
- package/dist/cjs/views/Slot.native.js +2 -4
- package/dist/cjs/views/Slot.native.js.map +1 -1
- package/dist/cjs/views/TamaguiProvider.native.js +2 -4
- package/dist/cjs/views/TamaguiProvider.native.js.map +1 -1
- package/dist/cjs/views/Theme.native.js +2 -4
- package/dist/cjs/views/Theme.native.js.map +1 -1
- package/dist/cjs/views/ThemeProvider.js +1 -2
- package/dist/cjs/views/ThemeProvider.js.map +1 -1
- package/dist/esm/_withStableStyle.native.js +2 -4
- package/dist/esm/_withStableStyle.native.js.map +1 -1
- package/dist/esm/config.native.js +6 -12
- package/dist/esm/config.native.js.map +1 -1
- package/dist/esm/constants/accessibilityDirectMap.native.mjs +6 -0
- package/dist/esm/constants/webToNativeProps.native.js +1 -2
- package/dist/esm/constants/webToNativeProps.native.js.map +1 -1
- package/dist/esm/constants/webToNativeProps.native.mjs +77 -0
- package/dist/esm/createComponent.js +30 -15
- package/dist/esm/createComponent.js.map +2 -2
- package/dist/esm/createComponent.mjs +31 -19
- package/dist/esm/createComponent.native.js +47 -35
- package/dist/esm/createComponent.native.js.map +2 -2
- package/dist/esm/createFont.js +1 -2
- package/dist/esm/createFont.js.map +1 -1
- package/dist/esm/createFont.native.js +9 -18
- package/dist/esm/createFont.native.js.map +1 -1
- package/dist/esm/createTamagui.native.js +8 -16
- package/dist/esm/createTamagui.native.js.map +1 -1
- package/dist/esm/createVariable.js +15 -10
- package/dist/esm/createVariable.js.map +1 -1
- package/dist/esm/createVariable.mjs +12 -8
- package/dist/esm/createVariable.native.js +22 -18
- package/dist/esm/createVariable.native.js.map +2 -2
- package/dist/esm/createVariables.js +1 -2
- package/dist/esm/createVariables.js.map +1 -1
- package/dist/esm/createVariables.native.js +1 -2
- package/dist/esm/createVariables.native.js.map +1 -1
- package/dist/esm/helpers/ThemeManager.native.js +8 -16
- package/dist/esm/helpers/ThemeManager.native.js.map +1 -1
- package/dist/esm/helpers/createShallowSetState.js +8 -2
- package/dist/esm/helpers/createShallowSetState.js.map +1 -1
- package/dist/esm/helpers/createShallowSetState.mjs +8 -2
- package/dist/esm/helpers/createShallowSetState.native.js +10 -3
- package/dist/esm/helpers/createShallowSetState.native.js.map +2 -2
- package/dist/esm/helpers/createStyledContext.native.js +2 -4
- package/dist/esm/helpers/createStyledContext.native.js.map +1 -1
- package/dist/esm/helpers/expandStyle.native.js +1 -2
- package/dist/esm/helpers/expandStyle.native.js.map +1 -1
- package/dist/esm/helpers/getExpandedShorthands.js +1 -2
- package/dist/esm/helpers/getExpandedShorthands.js.map +1 -1
- package/dist/esm/helpers/getExpandedShorthands.native.js +1 -2
- package/dist/esm/helpers/getExpandedShorthands.native.js.map +1 -1
- package/dist/esm/helpers/getGroupPropParts.native.js +6 -12
- package/dist/esm/helpers/getGroupPropParts.native.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.js +10 -15
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +4 -3
- package/dist/esm/helpers/getSplitStyles.native.js +13 -23
- package/dist/esm/helpers/getSplitStyles.native.js.map +2 -2
- package/dist/esm/helpers/getStylesAtomic.js +2 -4
- package/dist/esm/helpers/getStylesAtomic.js.map +1 -1
- package/dist/esm/helpers/getStylesAtomic.native.mjs +7 -0
- package/dist/esm/helpers/getThemeCSSRules.js +1 -2
- package/dist/esm/helpers/getThemeCSSRules.js.map +1 -1
- package/dist/esm/helpers/getThemeCSSRules.native.mjs +4 -0
- package/dist/esm/helpers/getVariantExtras.js +14 -9
- package/dist/esm/helpers/getVariantExtras.js.map +1 -1
- package/dist/esm/helpers/getVariantExtras.mjs +34 -29
- package/dist/esm/helpers/getVariantExtras.native.js +18 -19
- package/dist/esm/helpers/getVariantExtras.native.js.map +2 -2
- package/dist/esm/helpers/insertStyleRule.js +37 -30
- package/dist/esm/helpers/insertStyleRule.js.map +1 -1
- package/dist/esm/helpers/insertStyleRule.mjs +28 -20
- package/dist/esm/helpers/insertStyleRule.native.js +44 -31
- package/dist/esm/helpers/insertStyleRule.native.js.map +2 -2
- package/dist/esm/helpers/log.native.js +6 -12
- package/dist/esm/helpers/log.native.js.map +1 -1
- package/dist/esm/helpers/matchMedia.native.js +6 -12
- package/dist/esm/helpers/matchMedia.native.js.map +1 -1
- package/dist/esm/helpers/matchMedia.native.mjs +14 -0
- 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/normalizeStyle.js +1 -2
- package/dist/esm/helpers/normalizeStyle.js.map +1 -1
- package/dist/esm/helpers/normalizeStylePropKeys.native.mjs +13 -0
- package/dist/esm/helpers/propMapper.js +4 -8
- package/dist/esm/helpers/propMapper.js.map +1 -1
- package/dist/esm/helpers/propMapper.native.js +8 -16
- package/dist/esm/helpers/propMapper.native.js.map +1 -1
- package/dist/esm/helpers/setElementProps.native.mjs +6 -0
- package/dist/esm/helpers/themeable.native.js +2 -4
- package/dist/esm/helpers/themeable.native.js.map +1 -1
- package/dist/esm/helpers/webPropsToSkip.native.mjs +55 -0
- package/dist/esm/hooks/useConfiguration.native.js +2 -4
- package/dist/esm/hooks/useConfiguration.native.js.map +1 -1
- package/dist/esm/hooks/useMedia.js +4 -8
- package/dist/esm/hooks/useMedia.js.map +1 -1
- package/dist/esm/hooks/useMedia.native.js +13 -26
- package/dist/esm/hooks/useMedia.native.js.map +1 -1
- package/dist/esm/hooks/useProps.native.js +8 -16
- package/dist/esm/hooks/useProps.native.js.map +1 -1
- package/dist/esm/hooks/useTheme.js +5 -10
- package/dist/esm/hooks/useTheme.js.map +1 -1
- package/dist/esm/hooks/useTheme.native.js +13 -26
- package/dist/esm/hooks/useTheme.native.js.map +1 -1
- package/dist/esm/hooks/useThemeName.native.js +6 -12
- package/dist/esm/hooks/useThemeName.native.js.map +1 -1
- package/dist/esm/styled.native.js +2 -4
- package/dist/esm/styled.native.js.map +1 -1
- package/dist/esm/views/FontLanguage.native.js +2 -4
- package/dist/esm/views/FontLanguage.native.js.map +1 -1
- package/dist/esm/views/FontLanguage.native.mjs +15 -0
- package/dist/esm/views/Slot.native.js +2 -4
- package/dist/esm/views/Slot.native.js.map +1 -1
- package/dist/esm/views/TamaguiProvider.native.js +2 -4
- package/dist/esm/views/TamaguiProvider.native.js.map +1 -1
- package/dist/esm/views/Theme.native.js +2 -4
- package/dist/esm/views/Theme.native.js.map +1 -1
- package/dist/esm/views/ThemeDebug.native.mjs +9 -0
- package/dist/esm/views/ThemeProvider.js +1 -2
- package/dist/esm/views/ThemeProvider.js.map +1 -1
- package/package.json +11 -11
- package/src/createComponent.tsx +59 -33
- package/src/createVariable.ts +22 -12
- package/src/helpers/createShallowSetState.tsx +10 -2
- package/src/helpers/getSplitStyles.tsx +11 -9
- package/src/helpers/getVariantExtras.tsx +19 -10
- package/src/helpers/insertStyleRule.tsx +84 -79
- package/src/hooks/useTheme.tsx +1 -2
- package/src/types.tsx +3 -1
- package/types/createComponent.d.ts +1 -1
- package/types/createComponent.d.ts.map +1 -1
- package/types/createVariable.d.ts +4 -4
- package/types/createVariable.d.ts.map +1 -1
- package/types/helpers/createShallowSetState.d.ts +1 -1
- package/types/helpers/createShallowSetState.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/getVariantExtras.d.ts +1 -1
- package/types/helpers/getVariantExtras.d.ts.map +1 -1
- package/types/helpers/insertStyleRule.d.ts.map +1 -1
- package/types/hooks/useConfiguration.d.ts +5 -5
- package/types/hooks/useTheme.d.ts.map +1 -1
- package/types/types.d.ts +2 -1
- package/types/types.d.ts.map +1 -1
package/src/createVariable.ts
CHANGED
|
@@ -2,16 +2,15 @@ import { isWeb } from '@tamagui/constants'
|
|
|
2
2
|
import { simpleHash } from '@tamagui/helpers'
|
|
3
3
|
|
|
4
4
|
import { getConfig } from './config'
|
|
5
|
+
import type { TokenCategories } from './types'
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* Should rename this to Token
|
|
8
9
|
* Moving to objects for React Server Components support
|
|
9
10
|
*/
|
|
10
11
|
|
|
11
|
-
const IS_VAR = 'isVar'
|
|
12
|
-
|
|
13
12
|
export interface Variable<A = any> {
|
|
14
|
-
|
|
13
|
+
isVar: true
|
|
15
14
|
variable?: string
|
|
16
15
|
val: A
|
|
17
16
|
name: string
|
|
@@ -25,18 +24,18 @@ function constructCSSVariableName(name: string) {
|
|
|
25
24
|
}
|
|
26
25
|
|
|
27
26
|
type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>
|
|
27
|
+
|
|
28
28
|
export const createVariable = <A extends string | number | Variable = any>(
|
|
29
29
|
props: VariableIn<A>,
|
|
30
30
|
skipHash = false
|
|
31
31
|
): Variable<A> => {
|
|
32
32
|
if (!skipHash && isVariable(props)) return props
|
|
33
|
-
|
|
34
33
|
const { key, name, val } = props
|
|
35
34
|
return {
|
|
36
|
-
|
|
37
|
-
key
|
|
38
|
-
name: skipHash ?
|
|
39
|
-
val
|
|
35
|
+
isVar: true,
|
|
36
|
+
key,
|
|
37
|
+
name: skipHash ? name : simpleHash(name, 40),
|
|
38
|
+
val,
|
|
40
39
|
variable: isWeb
|
|
41
40
|
? skipHash
|
|
42
41
|
? constructCSSVariableName(name)
|
|
@@ -57,27 +56,38 @@ export function variableToString(vrble?: any, getValue = false) {
|
|
|
57
56
|
}
|
|
58
57
|
|
|
59
58
|
export function isVariable(v: Variable | any): v is Variable {
|
|
60
|
-
return v && typeof v === 'object' &&
|
|
59
|
+
return v && typeof v === 'object' && 'isVar' in v
|
|
61
60
|
}
|
|
62
61
|
|
|
63
|
-
export function getVariable(
|
|
62
|
+
export function getVariable(
|
|
63
|
+
nameOrVariable: Variable | string | any,
|
|
64
|
+
group: TokenCategories = 'size'
|
|
65
|
+
) {
|
|
64
66
|
setDidGetVariableValue(true)
|
|
65
67
|
if (isVariable(nameOrVariable)) {
|
|
66
68
|
return variableToString(nameOrVariable)
|
|
67
69
|
}
|
|
68
70
|
const tokens = getConfig().tokensParsed
|
|
69
|
-
return variableToString(tokens[nameOrVariable] ?? nameOrVariable)
|
|
71
|
+
return variableToString(tokens[group]?.[nameOrVariable] ?? nameOrVariable)
|
|
70
72
|
}
|
|
71
73
|
|
|
72
74
|
let accessed = false
|
|
73
75
|
export const setDidGetVariableValue = (val: boolean) => (accessed = val)
|
|
74
76
|
export const didGetVariableValue = () => accessed
|
|
75
77
|
|
|
76
|
-
export function getVariableValue(v: Variable | any) {
|
|
78
|
+
export function getVariableValue(v: Variable | any, group?: TokenCategories) {
|
|
77
79
|
if (isVariable(v)) {
|
|
78
80
|
setDidGetVariableValue(true)
|
|
79
81
|
return v.val
|
|
80
82
|
}
|
|
83
|
+
if (group) {
|
|
84
|
+
const tokens = getConfig().tokensParsed
|
|
85
|
+
const token = tokens[group]?.[v]
|
|
86
|
+
if (token) {
|
|
87
|
+
setDidGetVariableValue(true)
|
|
88
|
+
return token.val
|
|
89
|
+
}
|
|
90
|
+
}
|
|
81
91
|
return v
|
|
82
92
|
}
|
|
83
93
|
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import type React from 'react'
|
|
2
2
|
import type { DebugProp } from '../types'
|
|
3
|
+
import { startTransition } from 'react'
|
|
4
|
+
|
|
5
|
+
const callImmediate = (cb) => cb()
|
|
3
6
|
|
|
4
7
|
export function createShallowSetState<State extends Object>(
|
|
5
8
|
setter: React.Dispatch<React.SetStateAction<State>>,
|
|
6
9
|
isDisabled?: boolean,
|
|
10
|
+
transition?: boolean,
|
|
7
11
|
debug?: DebugProp
|
|
8
12
|
) {
|
|
9
|
-
return (next?: Partial<State>) =>
|
|
10
|
-
|
|
13
|
+
return (next?: Partial<State>) => {
|
|
14
|
+
const wrap = transition ? startTransition : callImmediate
|
|
15
|
+
wrap(() => {
|
|
16
|
+
setter((prev) => mergeIfNotShallowEqual(prev, next, isDisabled, debug))
|
|
17
|
+
})
|
|
18
|
+
}
|
|
11
19
|
}
|
|
12
20
|
|
|
13
21
|
export function mergeIfNotShallowEqual(
|
|
@@ -739,11 +739,8 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
739
739
|
if (isExit) {
|
|
740
740
|
isDisabled = !styleProps.isExiting
|
|
741
741
|
}
|
|
742
|
-
if (isEnter) {
|
|
743
|
-
isDisabled =
|
|
744
|
-
componentState.unmounted === 'should-enter'
|
|
745
|
-
? true
|
|
746
|
-
: !componentState.unmounted
|
|
742
|
+
if (isEnter && componentState.unmounted === false) {
|
|
743
|
+
isDisabled = true
|
|
747
744
|
}
|
|
748
745
|
|
|
749
746
|
if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
|
|
@@ -1467,12 +1464,15 @@ const useInsertEffectCompat = isWeb
|
|
|
1467
1464
|
|
|
1468
1465
|
// perf: ...args a bit expensive on native
|
|
1469
1466
|
export const useSplitStyles: StyleSplitter = (a, b, c, d, e, f, g, h, i, j) => {
|
|
1467
|
+
conf = conf || getConfig()
|
|
1470
1468
|
const res = getSplitStyles(a, b, c, d, e, f, g, h, i, j)
|
|
1471
1469
|
|
|
1472
1470
|
if (process.env.TAMAGUI_TARGET !== 'native') {
|
|
1473
|
-
|
|
1474
|
-
|
|
1475
|
-
|
|
1471
|
+
if (!process.env.TAMAGUI_REACT_19) {
|
|
1472
|
+
useInsertEffectCompat(() => {
|
|
1473
|
+
insertStyleRules(res.rulesToInsert)
|
|
1474
|
+
}, [res.rulesToInsert])
|
|
1475
|
+
}
|
|
1476
1476
|
}
|
|
1477
1477
|
|
|
1478
1478
|
return res
|
|
@@ -1483,7 +1483,9 @@ function addStyleToInsertRules(rulesToInsert: RulesToInsert, styleObject: StyleO
|
|
|
1483
1483
|
if (!shouldInsertStyleRules(styleObject.identifier)) {
|
|
1484
1484
|
return
|
|
1485
1485
|
}
|
|
1486
|
-
|
|
1486
|
+
if (!process.env.TAMAGUI_REACT_19) {
|
|
1487
|
+
updateRules(styleObject.identifier, styleObject.rules)
|
|
1488
|
+
}
|
|
1487
1489
|
rulesToInsert.push(styleObject)
|
|
1488
1490
|
}
|
|
1489
1491
|
}
|
|
@@ -2,26 +2,33 @@ import { getVariableValue } from '../createVariable'
|
|
|
2
2
|
import type { GenericFonts, GetStyleState } from '../types'
|
|
3
3
|
import type { LanguageContextType } from '../views/FontLanguage.types'
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
const cache = new WeakMap()
|
|
6
|
+
|
|
7
|
+
export const getVariantExtras = (styleState: GetStyleState) => {
|
|
8
|
+
if (cache.has(styleState)) {
|
|
9
|
+
return cache.get(styleState)
|
|
10
|
+
}
|
|
11
|
+
|
|
6
12
|
const { curProps, props, conf, context, theme } = styleState
|
|
7
13
|
let fonts = conf.fontsParsed
|
|
8
14
|
if (context?.language) {
|
|
9
15
|
fonts = getFontsForLanguage(conf.fontsParsed, context.language)
|
|
10
16
|
}
|
|
11
17
|
|
|
12
|
-
// should be able to just use styleState.fontFamily but no time to test for now
|
|
13
|
-
const fontFamily = getVariableValue(
|
|
14
|
-
styleState.fontFamily || styleState.curProps.fontFamily || styleState.conf.defaultFont
|
|
15
|
-
)
|
|
16
|
-
|
|
17
|
-
const font = fonts[fontFamily] || fonts[styleState.conf.defaultFont!]
|
|
18
|
-
|
|
19
18
|
const next = {
|
|
20
19
|
fonts,
|
|
21
20
|
tokens: conf.tokensParsed,
|
|
22
21
|
theme,
|
|
23
|
-
fontFamily
|
|
24
|
-
|
|
22
|
+
get fontFamily() {
|
|
23
|
+
return getVariableValue(
|
|
24
|
+
styleState.fontFamily ||
|
|
25
|
+
styleState.curProps.fontFamily ||
|
|
26
|
+
styleState.conf.defaultFont
|
|
27
|
+
)
|
|
28
|
+
},
|
|
29
|
+
get font() {
|
|
30
|
+
return fonts[this.fontFamily] || fonts[styleState.conf.defaultFont!]
|
|
31
|
+
},
|
|
25
32
|
// TODO do this in splitstlye
|
|
26
33
|
// we avoid passing in default props for media queries because that would confuse things like SizableText.size:
|
|
27
34
|
props: new Proxy(props, {
|
|
@@ -36,6 +43,8 @@ export function getVariantExtras(styleState: GetStyleState) {
|
|
|
36
43
|
}),
|
|
37
44
|
}
|
|
38
45
|
|
|
46
|
+
cache.set(styleState, next)
|
|
47
|
+
|
|
39
48
|
return next as any
|
|
40
49
|
}
|
|
41
50
|
|
|
@@ -178,20 +178,22 @@ function updateSheetStyles(
|
|
|
178
178
|
continue
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
|
|
182
|
-
|
|
181
|
+
if (!process.env.TAMAGUI_REACT_19) {
|
|
182
|
+
// track references
|
|
183
|
+
const total = track(identifier, remove)
|
|
183
184
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
185
|
+
if (remove) {
|
|
186
|
+
if (total === 0) {
|
|
187
|
+
delete allSelectors[identifier]
|
|
188
|
+
}
|
|
189
|
+
} else if (!(identifier in allSelectors)) {
|
|
190
|
+
const isTransform = identifier.startsWith('_transform-')
|
|
191
|
+
const shouldInsert = isTransform
|
|
192
|
+
? addTransform(identifier, cssRule.cssText, cssRule)
|
|
193
|
+
: true
|
|
194
|
+
if (shouldInsert) {
|
|
195
|
+
allSelectors[identifier] = cssRule.cssText
|
|
196
|
+
}
|
|
195
197
|
}
|
|
196
198
|
}
|
|
197
199
|
}
|
|
@@ -206,7 +208,6 @@ let rootComputedStyle: CSSStyleDeclaration | null = null
|
|
|
206
208
|
|
|
207
209
|
function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
|
|
208
210
|
const selectors = cssStyleRule.selectorText.split(',')
|
|
209
|
-
|
|
210
211
|
if (!selectors.length) return
|
|
211
212
|
|
|
212
213
|
if (tokens && !colorVarToVal) {
|
|
@@ -218,9 +219,11 @@ function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
|
|
|
218
219
|
}
|
|
219
220
|
}
|
|
220
221
|
|
|
221
|
-
const rulesWithBraces = (cssStyleRule.cssText || '')
|
|
222
|
-
|
|
223
|
-
|
|
222
|
+
const rulesWithBraces = (cssStyleRule.cssText || '').slice(
|
|
223
|
+
cssStyleRule.selectorText.length + 2,
|
|
224
|
+
-1
|
|
225
|
+
)
|
|
226
|
+
|
|
224
227
|
const rules = rulesWithBraces.split(';')
|
|
225
228
|
|
|
226
229
|
// get theme object parsed
|
|
@@ -236,7 +239,7 @@ function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
|
|
|
236
239
|
}
|
|
237
240
|
const val = rule.slice(sepI + 2)
|
|
238
241
|
let value: string
|
|
239
|
-
if (val.startsWith('var(')) {
|
|
242
|
+
if (val[0] === 'v' && val.startsWith('var(')) {
|
|
240
243
|
// var()
|
|
241
244
|
const varName = val.slice(6, -1)
|
|
242
245
|
const tokenVal = colorVarToVal[varName]
|
|
@@ -260,31 +263,25 @@ function addThemesFromCSS(cssStyleRule: CSSStyleRule, tokens?: TokensParsed) {
|
|
|
260
263
|
) as any
|
|
261
264
|
}
|
|
262
265
|
|
|
263
|
-
const
|
|
264
|
-
names: [],
|
|
265
|
-
theme: values,
|
|
266
|
-
}
|
|
266
|
+
const names = new Set<string>()
|
|
267
267
|
|
|
268
268
|
// loop selectors and build deduped
|
|
269
269
|
for (const selector of selectors) {
|
|
270
|
-
const
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
const
|
|
274
|
-
const themeName =
|
|
275
|
-
|
|
276
|
-
if (
|
|
277
|
-
!themeName ||
|
|
278
|
-
dedupedEntry.names.includes(themeName) ||
|
|
279
|
-
themeName === 'light_dark' ||
|
|
280
|
-
themeName === 'dark_light'
|
|
281
|
-
) {
|
|
270
|
+
const lastThemeSelectorIndex = selector.lastIndexOf('.t_')
|
|
271
|
+
const name = selector.slice(lastThemeSelectorIndex).slice(3)
|
|
272
|
+
const [schemeChar] = selector[lastThemeSelectorIndex - 5]
|
|
273
|
+
const scheme = schemeChar === 'd' ? 'dark' : schemeChar === 'i' ? 'light' : ''
|
|
274
|
+
const themeName = scheme && scheme !== name ? `${scheme}_${name}` : name
|
|
275
|
+
if (!themeName || themeName === 'light_dark' || themeName === 'dark_light') {
|
|
282
276
|
continue
|
|
283
277
|
}
|
|
284
|
-
|
|
278
|
+
names.add(themeName)
|
|
285
279
|
}
|
|
286
280
|
|
|
287
|
-
return
|
|
281
|
+
return {
|
|
282
|
+
names: [...names],
|
|
283
|
+
theme: values,
|
|
284
|
+
} satisfies DedupedTheme
|
|
288
285
|
}
|
|
289
286
|
|
|
290
287
|
function getTamaguiSelector(
|
|
@@ -315,11 +312,11 @@ function getTamaguiSelector(
|
|
|
315
312
|
}
|
|
316
313
|
|
|
317
314
|
const getIdentifierFromTamaguiSelector = (selector: string) => {
|
|
318
|
-
|
|
319
|
-
if (
|
|
320
|
-
return
|
|
315
|
+
const dotIndex = selector.indexOf(':')
|
|
316
|
+
if (dotIndex > -1) {
|
|
317
|
+
return selector.slice(7, dotIndex)
|
|
321
318
|
}
|
|
322
|
-
return
|
|
319
|
+
return selector.slice(7)
|
|
323
320
|
}
|
|
324
321
|
|
|
325
322
|
const sheet = isClient
|
|
@@ -327,39 +324,43 @@ const sheet = isClient
|
|
|
327
324
|
: null
|
|
328
325
|
|
|
329
326
|
export function updateRules(identifier: string, rules: string[]) {
|
|
330
|
-
if (
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
327
|
+
if (!process.env.TAMAGUI_REACT_19) {
|
|
328
|
+
if (identifier in allRules) {
|
|
329
|
+
return false
|
|
330
|
+
}
|
|
331
|
+
allRules[identifier] = rules.join(' ')
|
|
332
|
+
if (identifier.startsWith('_transform-')) {
|
|
333
|
+
return addTransform(identifier, rules[0])
|
|
334
|
+
}
|
|
335
|
+
return true
|
|
336
336
|
}
|
|
337
|
-
return true
|
|
338
337
|
}
|
|
339
338
|
|
|
340
339
|
export function insertStyleRules(rulesToInsert: RulesToInsert) {
|
|
341
|
-
if (!
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
for (const { identifier, rules } of rulesToInsert) {
|
|
346
|
-
if (!shouldInsertStyleRules(identifier)) {
|
|
347
|
-
continue
|
|
340
|
+
if (!process.env.TAMAGUI_REACT_19) {
|
|
341
|
+
if (!rulesToInsert.length || !sheet) {
|
|
342
|
+
return
|
|
348
343
|
}
|
|
349
344
|
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
345
|
+
for (const { identifier, rules } of rulesToInsert) {
|
|
346
|
+
if (!shouldInsertStyleRules(identifier)) {
|
|
347
|
+
continue
|
|
348
|
+
}
|
|
353
349
|
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
350
|
+
allSelectors[identifier] = rules.join('\n')
|
|
351
|
+
track(identifier)
|
|
352
|
+
updateRules(identifier, rules)
|
|
353
|
+
|
|
354
|
+
for (const rule of rules) {
|
|
355
|
+
if (process.env.NODE_ENV === 'production') {
|
|
356
|
+
try {
|
|
357
|
+
sheet.insertRule(rule, sheet.cssRules.length)
|
|
358
|
+
} catch (err) {
|
|
359
|
+
console.error(`Error inserting CSS`, err)
|
|
360
|
+
}
|
|
361
|
+
} else {
|
|
357
362
|
sheet.insertRule(rule, sheet.cssRules.length)
|
|
358
|
-
} catch (err) {
|
|
359
|
-
console.error(`Error inserting CSS`, err)
|
|
360
363
|
}
|
|
361
|
-
} else {
|
|
362
|
-
sheet.insertRule(rule, sheet.cssRules.length)
|
|
363
364
|
}
|
|
364
365
|
}
|
|
365
366
|
}
|
|
@@ -374,22 +375,26 @@ const minInsertAmt = process.env.TAMAGUI_INSERT_SELECTOR_TRIES
|
|
|
374
375
|
: 2
|
|
375
376
|
|
|
376
377
|
export function shouldInsertStyleRules(identifier: string) {
|
|
377
|
-
if (process.env.
|
|
378
|
+
if (process.env.TAMAGUI_REACT_19) {
|
|
378
379
|
return true
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
if (
|
|
384
|
-
totalSelectorsInserted.size >
|
|
385
|
-
+(process.env.TAMAGUI_STYLE_INSERTION_WARNING_LIMIT || 10000)
|
|
386
|
-
) {
|
|
387
|
-
console.warn(
|
|
388
|
-
`Warning: inserting many CSS rules, you may be animating something and generating many CSS insertions, which can degrade performance. Instead, try using the "disableClassName" property on elements that change styles often. To disable this warning set TAMAGUI_STYLE_INSERTION_WARNING_LIMIT from 50000 to something higher`
|
|
389
|
-
)
|
|
380
|
+
// biome-ignore lint/style/noUselessElse: <explanation>
|
|
381
|
+
} else {
|
|
382
|
+
if (process.env.IS_STATIC === 'is_static') {
|
|
383
|
+
return true
|
|
390
384
|
}
|
|
391
|
-
|
|
385
|
+
const total = totalSelectorsInserted.get(identifier)
|
|
392
386
|
|
|
393
|
-
|
|
394
|
-
|
|
387
|
+
if (process.env.NODE_ENV === 'development') {
|
|
388
|
+
if (
|
|
389
|
+
totalSelectorsInserted.size >
|
|
390
|
+
+(process.env.TAMAGUI_STYLE_INSERTION_WARNING_LIMIT || 10000)
|
|
391
|
+
) {
|
|
392
|
+
console.warn(
|
|
393
|
+
`Warning: inserting many CSS rules, you may be animating something and generating many CSS insertions, which can degrade performance. Instead, try using the "disableClassName" property on elements that change styles often. To disable this warning set TAMAGUI_STYLE_INSERTION_WARNING_LIMIT from 50000 to something higher`
|
|
394
|
+
)
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
// note we are being conservative allowing duplicates
|
|
398
|
+
return total === undefined || total < minInsertAmt
|
|
399
|
+
}
|
|
395
400
|
}
|
package/src/hooks/useTheme.tsx
CHANGED
|
@@ -318,8 +318,7 @@ export const useChangeThemeEffect = (
|
|
|
318
318
|
}
|
|
319
319
|
}
|
|
320
320
|
|
|
321
|
-
//
|
|
322
|
-
// i found most of the cost was just having a useState at all, at least 30%
|
|
321
|
+
// to test performance: uncomment
|
|
323
322
|
// if (!disable && parentManager) {
|
|
324
323
|
// return {
|
|
325
324
|
// isNewTheme: false,
|
package/src/types.tsx
CHANGED
|
@@ -160,11 +160,13 @@ export type CreateTokens<Val extends VariableVal = VariableVal> = Record<
|
|
|
160
160
|
zIndex: { [key: GenericKey]: Val }
|
|
161
161
|
}
|
|
162
162
|
|
|
163
|
+
export type TokenCategories = 'color' | 'space' | 'size' | 'radius' | 'zIndex'
|
|
164
|
+
|
|
163
165
|
type Tokenify<A extends GenericTokens> = Omit<
|
|
164
166
|
{
|
|
165
167
|
[Key in keyof A]: TokenifyRecord<A[Key]>
|
|
166
168
|
},
|
|
167
|
-
|
|
169
|
+
TokenCategories
|
|
168
170
|
> & {
|
|
169
171
|
color: TokenifyRecord<A['color']>
|
|
170
172
|
space: TokenifyRecord<A['space']>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import type { ComponentContextI, DebugProp, SpaceDirection, SpaceValue, SpacerProps, SpacerStyleProps, StackNonStyleProps, StackProps, StaticConfig, TamaguiComponent, TamaguiComponentStateRef, TamaguiElement, TamaguiInternalConfig, TextProps } from './types';
|
|
3
2
|
import type { TamaguiComponentState } from './interfaces/TamaguiComponentState';
|
|
3
|
+
import type { ComponentContextI, DebugProp, SpaceDirection, SpaceValue, SpacerProps, SpacerStyleProps, StackNonStyleProps, StackProps, StaticConfig, TamaguiComponent, TamaguiComponentStateRef, TamaguiElement, TamaguiInternalConfig, TextProps } from './types';
|
|
4
4
|
type ComponentSetState = React.Dispatch<React.SetStateAction<TamaguiComponentState>>;
|
|
5
5
|
export declare const componentSetStates: Set<ComponentSetState>;
|
|
6
6
|
export declare const useComponentState: (props: StackProps | TextProps | Record<string, any>, { animationDriver, groups }: ComponentContextI, staticConfig: StaticConfig, config: TamaguiInternalConfig) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,KAYN,MAAM,OAAO,CAAA;AAyBd,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAG/E,OAAO,KAAK,EACV,iBAAiB,EACjB,SAAS,EAKT,cAAc,EACd,UAAU,EACV,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,EACV,YAAY,EAEZ,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,qBAAqB,EACrB,SAAS,EAIV,MAAM,SAAS,CAAA;AAchB,KAAK,iBAAiB,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAEpF,eAAO,MAAM,kBAAkB,wBAA+B,CAAA;AAkE9D,eAAO,MAAM,iBAAiB,UACrB,UAAU,GAAG,SAAS,GAAG,OAAO,MAAM,EAAE,GAAG,CAAC,+BACtB,iBAAiB,gBAChC,YAAY,UAClB,qBAAqB;;;;;;;;;;;;;;;;;;;CAqL9B,CAAA;AAuBD,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,EACnD,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,SAAS,GAAG,KAAK,EACjB,UAAU,SAAS,MAAM,GAAG,KAAK,EACjC,YAAY,EAAE,YAAY,wEAyjC3B;AAsBD,wBAAgB,QAAQ,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;CAAE,OAEjD;yBAFe,QAAQ;;;AAkBxB,eAAO,MAAM,MAAM,yFA0CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IACpC,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAiGxD;AAwDD,eAAO,MAAM,UAAU,UAAW,GAAG,QAQpC,CAAA;AAED,eAAO,MAAM,uBAAuB,uFAOjC;IACD,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,qBAAqB,CAAC,GAAG,SAAS,KAAK,IAAI,CAAA;IAC5E,YAAY,CAAC,EAAE,IAAI,MAAM,CAAC,CAAA;IAC1B,WAAW,CAAC,EAAE,IAAI,MAAM,CAAC,CAAA;IACzB,gBAAgB,EAAE,iBAAiB,CAAA;IACnC,KAAK,EAAE,qBAAqB,CAAA;CAC7B,4CAqCA,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
+
import type { TokenCategories } from './types';
|
|
1
2
|
/**
|
|
2
3
|
* Should rename this to Token
|
|
3
4
|
* Moving to objects for React Server Components support
|
|
4
5
|
*/
|
|
5
|
-
declare const IS_VAR = "isVar";
|
|
6
6
|
export interface Variable<A = any> {
|
|
7
|
-
|
|
7
|
+
isVar: true;
|
|
8
8
|
variable?: string;
|
|
9
9
|
val: A;
|
|
10
10
|
name: string;
|
|
@@ -15,10 +15,10 @@ type VariableIn<A = any> = Pick<Variable<A>, 'key' | 'name' | 'val'>;
|
|
|
15
15
|
export declare const createVariable: <A extends string | number | Variable<any> = any>(props: VariableIn<A>, skipHash?: boolean) => Variable<A>;
|
|
16
16
|
export declare function variableToString(vrble?: any, getValue?: boolean): string;
|
|
17
17
|
export declare function isVariable(v: Variable | any): v is Variable;
|
|
18
|
-
export declare function getVariable(nameOrVariable: Variable | string | any): string;
|
|
18
|
+
export declare function getVariable(nameOrVariable: Variable | string | any, group?: TokenCategories): string;
|
|
19
19
|
export declare const setDidGetVariableValue: (val: boolean) => boolean;
|
|
20
20
|
export declare const didGetVariableValue: () => boolean;
|
|
21
|
-
export declare function getVariableValue(v: Variable | any): any;
|
|
21
|
+
export declare function getVariableValue(v: Variable | any, group?: TokenCategories): any;
|
|
22
22
|
export declare function getVariableName(v: Variable | any): any;
|
|
23
23
|
export declare function getVariableVariable(v: Variable | any): any;
|
|
24
24
|
export declare const createCSSVariable: (nameProp: string, includeVar?: boolean) => any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVariable.d.ts","sourceRoot":"","sources":["../src/createVariable.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createVariable.d.ts","sourceRoot":"","sources":["../src/createVariable.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C;;;GAGG;AAEH,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,GAAG;IAC/B,KAAK,EAAE,IAAI,CAAA;IACX,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,CAAC,CAAA;IACN,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAM/E,KAAK,UAAU,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC,CAAA;AAEpE,eAAO,MAAM,cAAc,2DAClB,WAAW,CAAC,CAAC,yBAEnB,SAAS,CAAC,CAcZ,CAAA;AAGD,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,QAAQ,UAAQ,UAQ7D;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,QAAQ,GAAG,GAAG,GAAG,CAAC,IAAI,QAAQ,CAE3D;AAED,wBAAgB,WAAW,CACzB,cAAc,EAAE,QAAQ,GAAG,MAAM,GAAG,GAAG,EACvC,KAAK,GAAE,eAAwB,UAQhC;AAGD,eAAO,MAAM,sBAAsB,QAAS,OAAO,YAAqB,CAAA;AACxE,eAAO,MAAM,mBAAmB,eAAiB,CAAA;AAEjD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,CAAC,EAAE,eAAe,OAc1E;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,QAAQ,GAAG,GAAG,OAGhD;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,QAAQ,GAAG,GAAG,OAGpD;AAGD,eAAO,MAAM,iBAAiB,aAAc,MAAM,8BAQjD,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type React from 'react';
|
|
2
2
|
import type { DebugProp } from '../types';
|
|
3
|
-
export declare function createShallowSetState<State extends Object>(setter: React.Dispatch<React.SetStateAction<State>>, isDisabled?: boolean, debug?: DebugProp): (next?: Partial<State>) => void;
|
|
3
|
+
export declare function createShallowSetState<State extends Object>(setter: React.Dispatch<React.SetStateAction<State>>, isDisabled?: boolean, transition?: boolean, debug?: DebugProp): (next?: Partial<State>) => void;
|
|
4
4
|
export declare function mergeIfNotShallowEqual(prev: any, next: any, isDisabled?: boolean, debug?: DebugProp): any;
|
|
5
5
|
export declare function isEqualShallow(prev: any, next: any): boolean;
|
|
6
6
|
//# sourceMappingURL=createShallowSetState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createShallowSetState.d.ts","sourceRoot":"","sources":["../../src/helpers/createShallowSetState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"createShallowSetState.d.ts","sourceRoot":"","sources":["../../src/helpers/createShallowSetState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAKzC,wBAAgB,qBAAqB,CAAC,KAAK,SAAS,MAAM,EACxD,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EACnD,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,OAAO,EACpB,KAAK,CAAC,EAAE,SAAS,WAEF,QAAQ,KAAK,CAAC,UAM9B;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,GAAG,EACT,IAAI,EAAE,GAAG,EACT,UAAU,CAAC,EAAE,OAAO,EACpB,KAAK,CAAC,EAAE,SAAS,OAgBlB;AAED,wBAAgB,cAAc,CAAC,IAAI,KAAA,EAAE,IAAI,KAAA,WAOxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AAyBjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,wBAAwB,CAAC,EAAE,OAAO,KAC/B,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA8B7B,eAAO,MAAM,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,KAAK,EAEV,iBAAiB,EACjB,SAAS,EACT,cAAc,EACd,aAAa,EAOb,eAAe,EACf,YAAY,EAGZ,SAAS,EACT,WAAW,EAEZ,MAAM,UAAU,CAAA;AAyBjB,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,eAAe,EAC3B,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,OAAO,CAAC,EAAE,iBAAiB,EAE3B,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,wBAAwB,CAAC,EAAE,OAAO,KAC/B,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AA8B7B,eAAO,MAAM,cAAc,EAAE,aAmtC5B,CAAA;AAgED,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,wBACO,OAAO,KAC5B,SA2BF,CAAA;AAQD,eAAO,MAAM,cAAc,EAAE,aAa5B,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { GenericFonts, GetStyleState } from '../types';
|
|
2
2
|
import type { LanguageContextType } from '../views/FontLanguage.types';
|
|
3
|
-
export declare
|
|
3
|
+
export declare const getVariantExtras: (styleState: GetStyleState) => any;
|
|
4
4
|
export declare function getFontsForLanguage(fonts: GenericFonts, language: LanguageContextType): any;
|
|
5
5
|
//# sourceMappingURL=getVariantExtras.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAItE,eAAO,MAAM,gBAAgB,eAAgB,aAAa,QA0CzD,CAAA;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA6BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;
|
|
1
|
+
{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA6BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AA4ND,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAW9D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QA4B5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAuBxD"}
|
|
@@ -68,7 +68,7 @@ export declare const useConfiguration: () => {
|
|
|
68
68
|
autocompleteSpecificTokens?: (boolean | "except-special") | undefined;
|
|
69
69
|
mediaPropOrder?: boolean | undefined;
|
|
70
70
|
fastSchemeChange?: boolean | undefined;
|
|
71
|
-
webContainerType?: "
|
|
71
|
+
webContainerType?: "size" | "unset" | "inherit" | "initial" | "revert" | "revert-layer" | "normal" | "inline-size" | undefined;
|
|
72
72
|
} & Omit<{
|
|
73
73
|
allowedStyleValues?: ((boolean | "strict" | "somewhat-strict" | "strict-web" | "somewhat-strict-web") | {
|
|
74
74
|
space?: ("number" | (boolean | "strict" | "somewhat-strict" | "strict-web" | "somewhat-strict-web") | "percent") | undefined;
|
|
@@ -80,7 +80,7 @@ export declare const useConfiguration: () => {
|
|
|
80
80
|
autocompleteSpecificTokens?: (boolean | "except-special") | undefined;
|
|
81
81
|
mediaPropOrder?: boolean | undefined;
|
|
82
82
|
fastSchemeChange?: boolean | undefined;
|
|
83
|
-
webContainerType?: "
|
|
83
|
+
webContainerType?: "size" | "unset" | "inherit" | "initial" | "revert" | "revert-layer" | "normal" | "inline-size" | undefined;
|
|
84
84
|
}, keyof {
|
|
85
85
|
allowedStyleValues?: ((boolean | "strict" | "somewhat-strict" | "strict-web" | "somewhat-strict-web") | {
|
|
86
86
|
space?: ("number" | (boolean | "strict" | "somewhat-strict" | "strict-web" | "somewhat-strict-web") | "percent") | undefined;
|
|
@@ -92,7 +92,7 @@ export declare const useConfiguration: () => {
|
|
|
92
92
|
autocompleteSpecificTokens?: (boolean | "except-special") | undefined;
|
|
93
93
|
mediaPropOrder?: boolean | undefined;
|
|
94
94
|
fastSchemeChange?: boolean | undefined;
|
|
95
|
-
webContainerType?: "
|
|
95
|
+
webContainerType?: "size" | "unset" | "inherit" | "initial" | "revert" | "revert-layer" | "normal" | "inline-size" | undefined;
|
|
96
96
|
}>;
|
|
97
97
|
tokens: Omit<{
|
|
98
98
|
[x: string]: {
|
|
@@ -113,7 +113,7 @@ export declare const useConfiguration: () => {
|
|
|
113
113
|
zIndex: {
|
|
114
114
|
[x: string]: import("..").Variable<any> | import("..").Variable<string> | import("..").Variable<number> | import("..").Variable<import("..").VariableValGeneric>;
|
|
115
115
|
};
|
|
116
|
-
}, "
|
|
116
|
+
}, import("..").TokenCategories> & {
|
|
117
117
|
color: {
|
|
118
118
|
[x: string]: import("..").Variable<any> | import("..").Variable<string> | import("..").Variable<number> | import("..").Variable<import("..").VariableValGeneric>;
|
|
119
119
|
};
|
|
@@ -149,7 +149,7 @@ export declare const useConfiguration: () => {
|
|
|
149
149
|
zIndex: {
|
|
150
150
|
[x: string]: import("..").Variable<any> | import("..").Variable<string> | import("..").Variable<number> | import("..").Variable<import("..").VariableValGeneric>;
|
|
151
151
|
};
|
|
152
|
-
}, "
|
|
152
|
+
}, import("..").TokenCategories> & {
|
|
153
153
|
color: {
|
|
154
154
|
[x: string]: import("..").Variable<any> | import("..").Variable<string> | import("..").Variable<number> | import("..").Variable<import("..").VariableValGeneric>;
|
|
155
155
|
};
|
|
@@ -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,EACT,WAAW,EACX,UAAU,EACV,MAAM,EACN,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,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAYD,eAAO,MAAM,QAAQ,WAAW,UAAU,mBAIzC,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,sBAAsB,KAC5B,CAAC,oBAAoB,EAAE,WAAW,CA8DpC,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,
|
|
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,EACT,WAAW,EACX,UAAU,EACV,MAAM,EACN,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,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAYD,eAAO,MAAM,QAAQ,WAAW,UAAU,mBAIzC,CAAA;AAED,eAAO,MAAM,iBAAiB,UACrB,sBAAsB,KAC5B,CAAC,oBAAoB,EAAE,WAAW,CA8DpC,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,oBA8RF,CAAA"}
|
package/types/types.d.ts
CHANGED
|
@@ -109,9 +109,10 @@ export type CreateTokens<Val extends VariableVal = VariableVal> = Record<string,
|
|
|
109
109
|
[key: GenericKey]: Val;
|
|
110
110
|
};
|
|
111
111
|
};
|
|
112
|
+
export type TokenCategories = 'color' | 'space' | 'size' | 'radius' | 'zIndex';
|
|
112
113
|
type Tokenify<A extends GenericTokens> = Omit<{
|
|
113
114
|
[Key in keyof A]: TokenifyRecord<A[Key]>;
|
|
114
|
-
},
|
|
115
|
+
}, TokenCategories> & {
|
|
115
116
|
color: TokenifyRecord<A['color']>;
|
|
116
117
|
space: TokenifyRecord<A['space']>;
|
|
117
118
|
size: TokenifyRecord<A['size']>;
|