@tamagui/web 1.22.10 → 1.22.12
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/constants/accessibilityDirectMap.js +76 -0
- package/dist/cjs/constants/accessibilityDirectMap.js.map +6 -0
- package/dist/cjs/createComponent.js +3 -2
- package/dist/cjs/createComponent.js.map +1 -1
- package/dist/cjs/helpers/accessibilityDirectMap.js +76 -0
- package/dist/cjs/helpers/accessibilityDirectMap.js.map +6 -0
- package/dist/cjs/helpers/createChainedWeakCache.js +63 -0
- package/dist/cjs/helpers/createChainedWeakCache.js.map +6 -0
- package/dist/cjs/helpers/getSplitStyles.js +46 -101
- package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
- package/dist/cjs/helpers/memoizeArgumentsWeak.js +57 -0
- package/dist/cjs/helpers/memoizeArgumentsWeak.js.map +6 -0
- package/dist/cjs/helpers/memoizeFunctionByArgumentsReference.js +1 -1
- package/dist/cjs/helpers/memoizeFunctionByArgumentsReference.js.map +1 -1
- package/dist/esm/constants/accessibilityDirectMap.js +52 -0
- package/dist/esm/constants/accessibilityDirectMap.js.map +6 -0
- package/dist/esm/constants/accessibilityDirectMap.mjs +52 -0
- package/dist/esm/constants/accessibilityDirectMap.mjs.map +6 -0
- package/dist/esm/createComponent.js +3 -2
- package/dist/esm/createComponent.js.map +1 -1
- package/dist/esm/createComponent.mjs +3 -2
- package/dist/esm/createComponent.mjs.map +1 -1
- package/dist/esm/helpers/accessibilityDirectMap.js +52 -0
- package/dist/esm/helpers/accessibilityDirectMap.js.map +6 -0
- package/dist/esm/helpers/accessibilityDirectMap.mjs +52 -0
- package/dist/esm/helpers/accessibilityDirectMap.mjs.map +6 -0
- package/dist/esm/helpers/createChainedWeakCache.js +39 -0
- package/dist/esm/helpers/createChainedWeakCache.js.map +6 -0
- package/dist/esm/helpers/createChainedWeakCache.mjs +39 -0
- package/dist/esm/helpers/createChainedWeakCache.mjs.map +6 -0
- package/dist/esm/helpers/getSplitStyles.js +43 -98
- package/dist/esm/helpers/getSplitStyles.js.map +1 -1
- package/dist/esm/helpers/getSplitStyles.mjs +43 -98
- package/dist/esm/helpers/getSplitStyles.mjs.map +1 -1
- package/dist/esm/helpers/memoizeArgumentsWeak.js +33 -0
- package/dist/esm/helpers/memoizeArgumentsWeak.js.map +6 -0
- package/dist/esm/helpers/memoizeArgumentsWeak.mjs +33 -0
- package/dist/esm/helpers/memoizeArgumentsWeak.mjs.map +6 -0
- package/dist/esm/helpers/memoizeFunctionByArgumentsReference.js +1 -1
- package/dist/esm/helpers/memoizeFunctionByArgumentsReference.js.map +1 -1
- package/dist/esm/helpers/memoizeFunctionByArgumentsReference.mjs +1 -1
- package/dist/esm/helpers/memoizeFunctionByArgumentsReference.mjs.map +1 -1
- package/package.json +9 -9
- package/src/constants/accessibilityDirectMap.tsx +51 -0
- package/src/createComponent.tsx +9 -5
- package/src/helpers/createChainedWeakCache.tsx +39 -0
- package/src/helpers/getSplitStyles.tsx +85 -114
- package/src/types.tsx +1 -1
- package/types/constants/accessibilityDirectMap.d.ts +2 -0
- package/types/constants/accessibilityDirectMap.d.ts.map +1 -0
- package/types/createComponent.d.ts.map +1 -1
- package/types/helpers/accessibilityDirectMap.d.ts +2 -0
- package/types/helpers/accessibilityDirectMap.d.ts.map +1 -0
- package/types/helpers/createChainedWeakCache.d.ts +5 -0
- package/types/helpers/createChainedWeakCache.d.ts.map +1 -0
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
- package/types/helpers/memoizeArgumentsWeak.d.ts +5 -0
- package/types/helpers/memoizeArgumentsWeak.d.ts.map +1 -0
- package/types/helpers/memoizeFunctionByArgumentsReference.d.ts +1 -1
- package/types/helpers/memoizeFunctionByArgumentsReference.d.ts.map +1 -1
- package/types/types.d.ts +1 -1
- package/types/types.d.ts.map +1 -1
- package/src/helpers/memoizeFunctionByArgumentsReference.ts +0 -38
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/helpers/memoizeFunctionByArgumentsReference.ts"],
|
|
4
|
-
"mappings": "AAIA,SAAS,SAAS,KAAK;AACrB,QAAM,IAAI,OAAO;AACjB,UAAQ,MAAM,YAAY,MAAM,eAAe,QAAQ;AACzD;AAEA,MAAM,sBAAsB;AAAA,EAA5B;AACE,eAAM,oBAAI,IAAI;AACd,mBAAU,oBAAI,QAAQ;AAAA;AAAA,EAEtB,IAAI,MAAkB;AACpB,QAAI,QAAQ;AACZ,aAAS,SAAS,MAAM;AACtB,YAAM,MAAM,MAAM,SAAS,KAAK,IAAI,YAAY,KAAK;AACrD,cAAQ,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,sBAAsB,CAAC,EAAE,IAAI,KAAK;AAAA,IACjF;AACA,WAAO;AAAA,EACT;AACF;AAEA,SAAS,
|
|
4
|
+
"mappings": "AAIA,SAAS,SAAS,KAAK;AACrB,QAAM,IAAI,OAAO;AACjB,UAAQ,MAAM,YAAY,MAAM,eAAe,QAAQ;AACzD;AAEA,MAAM,sBAAsB;AAAA,EAA5B;AACE,eAAM,oBAAI,IAAI;AACd,mBAAU,oBAAI,QAAQ;AAAA;AAAA,EAEtB,IAAI,MAAkB;AACpB,QAAI,QAAQ;AACZ,aAAS,SAAS,MAAM;AACtB,YAAM,MAAM,MAAM,SAAS,KAAK,IAAI,YAAY,KAAK;AACrD,cAAQ,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,sBAAsB,CAAC,EAAE,IAAI,KAAK;AAAA,IACjF;AACA,WAAO;AAAA,EACT;AACF;AAEA,SAAS,qBAA0C,IAAY;AAC7D,QAAM,QAAQ,IAAI,sBAAsB;AAExC,SAAO,YAAwB,MAAa;AAE1C,UAAM,OAAO,MAAM,IAAI,IAAI;AAE3B,QAAI,KAAK,eAAe,OAAO,GAAG;AAChC,cAAQ,KAAK,QAAQ;AACrB,aAAO,KAAK;AAAA,IACd;AAEA,WAAQ,KAAK,QAAQ,GAAG,MAAM,MAAM,IAAI;AAAA,EAC1C;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/web",
|
|
3
|
-
"version": "1.22.
|
|
3
|
+
"version": "1.22.12",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -27,19 +27,19 @@
|
|
|
27
27
|
"reset.css"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@tamagui/compose-refs": "1.22.
|
|
31
|
-
"@tamagui/constants": "1.22.
|
|
32
|
-
"@tamagui/helpers": "1.22.
|
|
33
|
-
"@tamagui/normalize-css-color": "1.22.
|
|
34
|
-
"@tamagui/use-did-finish-ssr": "1.22.
|
|
35
|
-
"@tamagui/use-event": "1.22.
|
|
36
|
-
"@tamagui/use-force-update": "1.22.
|
|
30
|
+
"@tamagui/compose-refs": "1.22.12",
|
|
31
|
+
"@tamagui/constants": "1.22.12",
|
|
32
|
+
"@tamagui/helpers": "1.22.12",
|
|
33
|
+
"@tamagui/normalize-css-color": "1.22.12",
|
|
34
|
+
"@tamagui/use-did-finish-ssr": "1.22.12",
|
|
35
|
+
"@tamagui/use-event": "1.22.12",
|
|
36
|
+
"@tamagui/use-force-update": "1.22.12"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"react": "*"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@tamagui/build": "1.22.
|
|
42
|
+
"@tamagui/build": "1.22.12",
|
|
43
43
|
"@testing-library/react": "^13.4.0",
|
|
44
44
|
"csstype": "^3.0.10",
|
|
45
45
|
"react": "^18.2.0",
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
// web only maps accessibility to aria props
|
|
2
|
+
export const accessibilityDirectMap: Record<string, string> = {}
|
|
3
|
+
|
|
4
|
+
if (process.env.TAMAGUI_TARGET === 'web') {
|
|
5
|
+
// bundle size shave
|
|
6
|
+
const items = {
|
|
7
|
+
Hidden: true,
|
|
8
|
+
ActiveDescendant: true,
|
|
9
|
+
Atomic: true,
|
|
10
|
+
AutoComplete: true,
|
|
11
|
+
Busy: true,
|
|
12
|
+
Checked: true,
|
|
13
|
+
ColumnCount: 'colcount',
|
|
14
|
+
ColumnIndex: 'colindex',
|
|
15
|
+
ColumnSpan: 'colspan',
|
|
16
|
+
Current: true,
|
|
17
|
+
Details: true,
|
|
18
|
+
ErrorMessage: true,
|
|
19
|
+
Expanded: true,
|
|
20
|
+
HasPopup: true,
|
|
21
|
+
Invalid: true,
|
|
22
|
+
Label: true,
|
|
23
|
+
Level: true,
|
|
24
|
+
Modal: true,
|
|
25
|
+
Multiline: true,
|
|
26
|
+
MultiSelectable: true,
|
|
27
|
+
Orientation: true,
|
|
28
|
+
Owns: true,
|
|
29
|
+
Placeholder: true,
|
|
30
|
+
PosInSet: true,
|
|
31
|
+
Pressed: true,
|
|
32
|
+
RoleDescription: true,
|
|
33
|
+
RowCount: true,
|
|
34
|
+
RowIndex: true,
|
|
35
|
+
RowSpan: true,
|
|
36
|
+
Selected: true,
|
|
37
|
+
SetSize: true,
|
|
38
|
+
Sort: true,
|
|
39
|
+
ValueMax: true,
|
|
40
|
+
ValueMin: true,
|
|
41
|
+
ValueNow: true,
|
|
42
|
+
ValueText: true,
|
|
43
|
+
}
|
|
44
|
+
for (const key in items) {
|
|
45
|
+
let val = items[key]
|
|
46
|
+
if (val === true) {
|
|
47
|
+
val = key.toLowerCase()
|
|
48
|
+
}
|
|
49
|
+
accessibilityDirectMap[`accessibility${key}`] = `aria-${val}`
|
|
50
|
+
}
|
|
51
|
+
}
|
package/src/createComponent.tsx
CHANGED
|
@@ -295,7 +295,8 @@ export function createComponent<
|
|
|
295
295
|
const noClassNames = shouldAvoidClasses || shouldForcePseudo
|
|
296
296
|
|
|
297
297
|
// internal use only
|
|
298
|
-
const
|
|
298
|
+
const disableThemeProp = props['data-disable-theme']
|
|
299
|
+
const disableTheme = (disableThemeProp && !willBeAnimated) || isHOC
|
|
299
300
|
|
|
300
301
|
const themeStateProps = {
|
|
301
302
|
name: props.theme,
|
|
@@ -777,10 +778,13 @@ export function createComponent<
|
|
|
777
778
|
|
|
778
779
|
content = createElement(elementType, viewProps, content)
|
|
779
780
|
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
781
|
+
// disable theme prop is deterministic so conditional hook ok here
|
|
782
|
+
content = disableThemeProp
|
|
783
|
+
? content
|
|
784
|
+
: useThemedChildren(themeState, content, {
|
|
785
|
+
shallow: stateRef.current.themeShallow,
|
|
786
|
+
// passPropsToChildren: true,
|
|
787
|
+
})
|
|
784
788
|
|
|
785
789
|
if (process.env.NODE_ENV === 'development') {
|
|
786
790
|
if (props['debug'] === 'visualize') {
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
export const createChainedWeakCache = () => {
|
|
2
|
+
const baseMap = new WeakMap()
|
|
3
|
+
|
|
4
|
+
return {
|
|
5
|
+
get: (args: any[]) => {
|
|
6
|
+
let cur = baseMap
|
|
7
|
+
for (let arg of args) {
|
|
8
|
+
if (cur.has(arg)) {
|
|
9
|
+
cur = cur.get(arg)
|
|
10
|
+
} else {
|
|
11
|
+
return
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return cur
|
|
15
|
+
},
|
|
16
|
+
|
|
17
|
+
set(args: any[], result: any) {
|
|
18
|
+
const len = args.length
|
|
19
|
+
let cur = baseMap
|
|
20
|
+
|
|
21
|
+
for (let i = 0; i < len; i++) {
|
|
22
|
+
const arg = args[i]
|
|
23
|
+
const isLast = i === len - 1
|
|
24
|
+
|
|
25
|
+
if (isLast) {
|
|
26
|
+
cur!.set(arg, result)
|
|
27
|
+
} else {
|
|
28
|
+
if (cur.has(arg)) {
|
|
29
|
+
cur = cur.get(arg)
|
|
30
|
+
} else {
|
|
31
|
+
const next = new WeakMap()
|
|
32
|
+
cur.set(arg, next)
|
|
33
|
+
cur = next
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
},
|
|
38
|
+
}
|
|
39
|
+
}
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
import { useInsertionEffect } from 'react'
|
|
18
18
|
|
|
19
19
|
import { getConfig, getFont } from '../config'
|
|
20
|
+
import { accessibilityDirectMap } from '../constants/accessibilityDirectMap'
|
|
20
21
|
import { isDevTools } from '../constants/isDevTools'
|
|
21
22
|
import {
|
|
22
23
|
getMediaImportanceIfMoreImportant,
|
|
@@ -42,10 +43,7 @@ import type {
|
|
|
42
43
|
ThemeParsed,
|
|
43
44
|
ViewStyleWithPseudos,
|
|
44
45
|
} from '../types'
|
|
45
|
-
import type {
|
|
46
|
-
FontLanguageProps,
|
|
47
|
-
LanguageContextType,
|
|
48
|
-
} from '../views/FontLanguage.types'
|
|
46
|
+
import type { FontLanguageProps, LanguageContextType } from '../views/FontLanguage.types'
|
|
49
47
|
import { createMediaStyle } from './createMediaStyle'
|
|
50
48
|
import { getPropMappedFontFamily } from './createPropMapper'
|
|
51
49
|
import { fixStyles } from './expandStyles'
|
|
@@ -82,90 +80,6 @@ export type SplitStyles = ReturnType<typeof getSplitStyles>
|
|
|
82
80
|
|
|
83
81
|
export type SplitStyleResult = ReturnType<typeof getSplitStyles>
|
|
84
82
|
|
|
85
|
-
const skipProps = {
|
|
86
|
-
animation: true,
|
|
87
|
-
space: true,
|
|
88
|
-
animateOnly: true,
|
|
89
|
-
debug: true,
|
|
90
|
-
componentName: true,
|
|
91
|
-
tag: true,
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
if (process.env.NODE_ENV === 'test') {
|
|
95
|
-
skipProps['data-test-renders'] = true
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
const IS_STATIC = process.env.IS_STATIC === 'is_static'
|
|
99
|
-
|
|
100
|
-
// native only skips
|
|
101
|
-
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
102
|
-
Object.assign(skipProps, {
|
|
103
|
-
whiteSpace: true,
|
|
104
|
-
wordWrap: true,
|
|
105
|
-
textOverflow: true,
|
|
106
|
-
textDecorationDistance: true,
|
|
107
|
-
cursor: true,
|
|
108
|
-
contain: true,
|
|
109
|
-
boxSizing: true,
|
|
110
|
-
boxShadow: true,
|
|
111
|
-
outlineStyle: true,
|
|
112
|
-
outlineOffset: true,
|
|
113
|
-
outlineWidth: true,
|
|
114
|
-
outlineColor: true,
|
|
115
|
-
})
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
// web only maps accessibility to aria props
|
|
119
|
-
const accessibilityDirectMap: Record<string, string> = {}
|
|
120
|
-
if (process.env.TAMAGUI_TARGET === 'web') {
|
|
121
|
-
// bundle size shave
|
|
122
|
-
const items = {
|
|
123
|
-
Hidden: true,
|
|
124
|
-
ActiveDescendant: true,
|
|
125
|
-
Atomic: true,
|
|
126
|
-
AutoComplete: true,
|
|
127
|
-
Busy: true,
|
|
128
|
-
Checked: true,
|
|
129
|
-
ColumnCount: 'colcount',
|
|
130
|
-
ColumnIndex: 'colindex',
|
|
131
|
-
ColumnSpan: 'colspan',
|
|
132
|
-
Current: true,
|
|
133
|
-
Details: true,
|
|
134
|
-
ErrorMessage: true,
|
|
135
|
-
Expanded: true,
|
|
136
|
-
HasPopup: true,
|
|
137
|
-
Invalid: true,
|
|
138
|
-
Label: true,
|
|
139
|
-
Level: true,
|
|
140
|
-
Modal: true,
|
|
141
|
-
Multiline: true,
|
|
142
|
-
MultiSelectable: true,
|
|
143
|
-
Orientation: true,
|
|
144
|
-
Owns: true,
|
|
145
|
-
Placeholder: true,
|
|
146
|
-
PosInSet: true,
|
|
147
|
-
Pressed: true,
|
|
148
|
-
RoleDescription: true,
|
|
149
|
-
RowCount: true,
|
|
150
|
-
RowIndex: true,
|
|
151
|
-
RowSpan: true,
|
|
152
|
-
Selected: true,
|
|
153
|
-
SetSize: true,
|
|
154
|
-
Sort: true,
|
|
155
|
-
ValueMax: true,
|
|
156
|
-
ValueMin: true,
|
|
157
|
-
ValueNow: true,
|
|
158
|
-
ValueText: true,
|
|
159
|
-
}
|
|
160
|
-
for (const key in items) {
|
|
161
|
-
let val = items[key]
|
|
162
|
-
if (val === true) {
|
|
163
|
-
val = key.toLowerCase()
|
|
164
|
-
}
|
|
165
|
-
accessibilityDirectMap[`accessibility${key}`] = `aria-${val}`
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
|
|
169
83
|
type TransformNamespaceKey = 'transform' | PseudoPropKeys | MediaQueryKey
|
|
170
84
|
|
|
171
85
|
let conf: TamaguiInternalConfig
|
|
@@ -184,15 +98,6 @@ type StyleSplitter = (
|
|
|
184
98
|
|
|
185
99
|
export const PROP_SPLIT = '-'
|
|
186
100
|
|
|
187
|
-
const accessibilityRoleToWebRole = {
|
|
188
|
-
adjustable: 'slider',
|
|
189
|
-
header: 'heading',
|
|
190
|
-
image: 'img',
|
|
191
|
-
link: 'link',
|
|
192
|
-
none: 'presentation',
|
|
193
|
-
summary: 'region',
|
|
194
|
-
}
|
|
195
|
-
|
|
196
101
|
// loop props backwards
|
|
197
102
|
// track used keys:
|
|
198
103
|
// const keys = new Set<string>()
|
|
@@ -213,10 +118,6 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
213
118
|
elementType,
|
|
214
119
|
debug
|
|
215
120
|
) => {
|
|
216
|
-
if (cache.has(props)) {
|
|
217
|
-
return cache.get(props)
|
|
218
|
-
}
|
|
219
|
-
|
|
220
121
|
conf = conf || getConfig()
|
|
221
122
|
const { shorthands } = conf
|
|
222
123
|
const { variants, propMapper, isReactNative, inlineProps, inlineWhenUnflattened } =
|
|
@@ -1043,11 +944,12 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
1043
944
|
nextViewProps[ks[i]] = viewProps[ks[i]]
|
|
1044
945
|
}
|
|
1045
946
|
|
|
1046
|
-
const result = {
|
|
947
|
+
const result: GetStyleResult = {
|
|
1047
948
|
space,
|
|
1048
949
|
hasMedia,
|
|
1049
950
|
fontFamily,
|
|
1050
951
|
viewProps: nextViewProps,
|
|
952
|
+
// @ts-expect-error
|
|
1051
953
|
style,
|
|
1052
954
|
pseudos,
|
|
1053
955
|
classNames,
|
|
@@ -1071,11 +973,43 @@ export const getSplitStyles: StyleSplitter = (
|
|
|
1071
973
|
}
|
|
1072
974
|
}
|
|
1073
975
|
|
|
1074
|
-
cache.set(props, result)
|
|
1075
|
-
|
|
1076
976
|
return result
|
|
1077
977
|
}
|
|
1078
978
|
|
|
979
|
+
// not ever hitting cache?
|
|
980
|
+
// const cache = createChainedWeakCache()
|
|
981
|
+
// export const getSplitStyles: StyleSplitter = (
|
|
982
|
+
// props,
|
|
983
|
+
// staticConfig,
|
|
984
|
+
// theme,
|
|
985
|
+
// state,
|
|
986
|
+
// parentSplitStyles,
|
|
987
|
+
// languageContext,
|
|
988
|
+
// elementType,
|
|
989
|
+
// debug
|
|
990
|
+
// ) => {
|
|
991
|
+
// const cacheProps = [props, theme, state]
|
|
992
|
+
// const cached = cache.get(cacheProps)
|
|
993
|
+
// if (cached) {
|
|
994
|
+
// return cached as any
|
|
995
|
+
// }
|
|
996
|
+
|
|
997
|
+
// const res = getSplitStylesWithoutMemo(
|
|
998
|
+
// props,
|
|
999
|
+
// staticConfig,
|
|
1000
|
+
// theme,
|
|
1001
|
+
// state,
|
|
1002
|
+
// parentSplitStyles,
|
|
1003
|
+
// languageContext,
|
|
1004
|
+
// elementType,
|
|
1005
|
+
// debug
|
|
1006
|
+
// )
|
|
1007
|
+
|
|
1008
|
+
// cache.set(cacheProps, res)
|
|
1009
|
+
|
|
1010
|
+
// return res
|
|
1011
|
+
// }
|
|
1012
|
+
|
|
1079
1013
|
function mergeClassName(
|
|
1080
1014
|
transforms: Record<string, any[]>,
|
|
1081
1015
|
classNames: Record<string, string>,
|
|
@@ -1121,22 +1055,17 @@ function mergeClassName(
|
|
|
1121
1055
|
*
|
|
1122
1056
|
* and to avoid re-creating it over and over, use a WeakMap
|
|
1123
1057
|
*/
|
|
1124
|
-
|
|
1058
|
+
|
|
1125
1059
|
function getSubStyleProps(
|
|
1126
1060
|
defaultProps: Object,
|
|
1127
1061
|
baseProps: Object,
|
|
1128
1062
|
specificProps: Object
|
|
1129
1063
|
) {
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
...defaultProps,
|
|
1135
|
-
...baseProps,
|
|
1136
|
-
...specificProps,
|
|
1137
|
-
})
|
|
1064
|
+
return {
|
|
1065
|
+
...defaultProps,
|
|
1066
|
+
...baseProps,
|
|
1067
|
+
...specificProps,
|
|
1138
1068
|
}
|
|
1139
|
-
return cache.get(key)!
|
|
1140
1069
|
}
|
|
1141
1070
|
|
|
1142
1071
|
function mergeStyle(
|
|
@@ -1276,3 +1205,45 @@ const mapTransformKeys = {
|
|
|
1276
1205
|
x: 'translateX',
|
|
1277
1206
|
y: 'translateY',
|
|
1278
1207
|
}
|
|
1208
|
+
|
|
1209
|
+
const skipProps = {
|
|
1210
|
+
animation: true,
|
|
1211
|
+
space: true,
|
|
1212
|
+
animateOnly: true,
|
|
1213
|
+
debug: true,
|
|
1214
|
+
componentName: true,
|
|
1215
|
+
tag: true,
|
|
1216
|
+
}
|
|
1217
|
+
|
|
1218
|
+
if (process.env.NODE_ENV === 'test') {
|
|
1219
|
+
skipProps['data-test-renders'] = true
|
|
1220
|
+
}
|
|
1221
|
+
|
|
1222
|
+
const IS_STATIC = process.env.IS_STATIC === 'is_static'
|
|
1223
|
+
|
|
1224
|
+
// native only skips
|
|
1225
|
+
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
1226
|
+
Object.assign(skipProps, {
|
|
1227
|
+
whiteSpace: true,
|
|
1228
|
+
wordWrap: true,
|
|
1229
|
+
textOverflow: true,
|
|
1230
|
+
textDecorationDistance: true,
|
|
1231
|
+
cursor: true,
|
|
1232
|
+
contain: true,
|
|
1233
|
+
boxSizing: true,
|
|
1234
|
+
boxShadow: true,
|
|
1235
|
+
outlineStyle: true,
|
|
1236
|
+
outlineOffset: true,
|
|
1237
|
+
outlineWidth: true,
|
|
1238
|
+
outlineColor: true,
|
|
1239
|
+
})
|
|
1240
|
+
}
|
|
1241
|
+
|
|
1242
|
+
const accessibilityRoleToWebRole = {
|
|
1243
|
+
adjustable: 'slider',
|
|
1244
|
+
header: 'heading',
|
|
1245
|
+
image: 'img',
|
|
1246
|
+
link: 'link',
|
|
1247
|
+
none: 'presentation',
|
|
1248
|
+
summary: 'region',
|
|
1249
|
+
}
|
package/src/types.tsx
CHANGED
|
@@ -1619,7 +1619,7 @@ export type GestureReponderEvent = Exclude<
|
|
|
1619
1619
|
export type RulesToInsert = StyleObject[]
|
|
1620
1620
|
|
|
1621
1621
|
export type GetStyleResult = {
|
|
1622
|
-
pseudos?: PseudoStyles
|
|
1622
|
+
pseudos?: PseudoStyles | null
|
|
1623
1623
|
style: ViewStyle
|
|
1624
1624
|
classNames: ClassNamesObject
|
|
1625
1625
|
rulesToInsert: RulesToInsert
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessibilityDirectMap.d.ts","sourceRoot":"","sources":["../../src/constants/accessibilityDirectMap.tsx"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAUN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAUN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EACpD,eAAe,CAAC,EAAE,iBAAiB,wDA+zBpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accessibilityDirectMap.d.ts","sourceRoot":"","sources":["../../src/helpers/accessibilityDirectMap.tsx"],"names":[],"mappings":"AACA,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createChainedWeakCache.d.ts","sourceRoot":"","sources":["../../src/helpers/createChainedWeakCache.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB;gBAInB,GAAG,EAAE;cAYP,GAAG,EAAE,UAAU,GAAG;CAsB/B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAkBzF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,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,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAY7B,eAAO,MAAM,cAAc,EAAE,aAk2B5B,CAAA;AAuHD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cAkCF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memoizeArgumentsWeak.d.ts","sourceRoot":"","sources":["../../src/helpers/memoizeArgumentsWeak.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqBH,wBAAgB,oBAAoB,CAAC,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAcpE"}
|
|
@@ -7,5 +7,5 @@ declare class FunctionArgumentCache {
|
|
|
7
7
|
weakmap: WeakMap<object, any>;
|
|
8
8
|
get(args: any[]): any;
|
|
9
9
|
}
|
|
10
|
-
declare function
|
|
10
|
+
declare function memoizeArgumentsWeak<Fn extends Function>(fn: Fn): Fn;
|
|
11
11
|
//# sourceMappingURL=memoizeFunctionByArgumentsReference.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoizeFunctionByArgumentsReference.d.ts","sourceRoot":"","sources":["../../src/helpers/memoizeFunctionByArgumentsReference.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,iBAAS,QAAQ,CAAC,GAAG,KAAA,WAGpB;AAED,cAAM,qBAAqB;IACzB,GAAG,gBAAY;IACf,OAAO,uBAAgB;IAEvB,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG;CAQtB;AAED,iBAAS,
|
|
1
|
+
{"version":3,"file":"memoizeFunctionByArgumentsReference.d.ts","sourceRoot":"","sources":["../../src/helpers/memoizeFunctionByArgumentsReference.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,iBAAS,QAAQ,CAAC,GAAG,KAAA,WAGpB;AAED,cAAM,qBAAqB;IACzB,GAAG,gBAAY;IACf,OAAO,uBAAgB;IAEvB,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG;CAQtB;AAED,iBAAS,oBAAoB,CAAC,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAc7D"}
|
package/types/types.d.ts
CHANGED
|
@@ -763,7 +763,7 @@ export type UseAnimationHook = (props: {
|
|
|
763
763
|
export type GestureReponderEvent = Exclude<View['props']['onResponderMove'], void> extends (event: infer Event) => void ? Event : never;
|
|
764
764
|
export type RulesToInsert = StyleObject[];
|
|
765
765
|
export type GetStyleResult = {
|
|
766
|
-
pseudos?: PseudoStyles;
|
|
766
|
+
pseudos?: PseudoStyles | null;
|
|
767
767
|
style: ViewStyle;
|
|
768
768
|
classNames: ClassNamesObject;
|
|
769
769
|
rulesToInsert: RulesToInsert;
|