@tamagui/core 1.55.2 → 1.56.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/index.js +9 -7
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +9 -8
- package/dist/esm/index.js.map +1 -1
- package/package.json +6 -6
- package/src/index.ts +12 -9
- package/types/index.d.ts.map +1 -1
package/dist/cjs/index.js
CHANGED
|
@@ -101,10 +101,10 @@ const Text = import_web.Text;
|
|
|
101
101
|
if (process.env.TAMAGUI_TARGET === "native") {
|
|
102
102
|
const attachFocus = !!(pseudos == null ? void 0 : pseudos.focusStyle);
|
|
103
103
|
if (attachFocus) {
|
|
104
|
-
viewProps.onFocus = (0, import_web.
|
|
104
|
+
viewProps.onFocus = (0, import_web.composeEventHandlers)(viewProps.onFocus, () => {
|
|
105
105
|
setStateShallow({ focus: true });
|
|
106
106
|
});
|
|
107
|
-
viewProps.onBlur = (0, import_web.
|
|
107
|
+
viewProps.onBlur = (0, import_web.composeEventHandlers)(viewProps.onBlur, () => {
|
|
108
108
|
setStateShallow({ focus: false });
|
|
109
109
|
});
|
|
110
110
|
}
|
|
@@ -112,11 +112,13 @@ const Text = import_web.Text;
|
|
|
112
112
|
events.hitSlop = viewProps.hitSlop;
|
|
113
113
|
}
|
|
114
114
|
const pressability = (0, import_Pressability.usePressability)(events || null);
|
|
115
|
-
if (events
|
|
116
|
-
|
|
117
|
-
const
|
|
118
|
-
|
|
119
|
-
|
|
115
|
+
if (events) {
|
|
116
|
+
if (events.onPress) {
|
|
117
|
+
for (const key in pressability) {
|
|
118
|
+
const og = viewProps[key];
|
|
119
|
+
const val = pressability[key];
|
|
120
|
+
viewProps[key] = og && !dontComposePressabilityKeys[key] ? (0, import_web.composeEventHandlers)(og, val) : val;
|
|
121
|
+
}
|
|
120
122
|
}
|
|
121
123
|
}
|
|
122
124
|
}
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,+CAAmC;AAUnC,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,+CAAmC;AAUnC,iBAKO;AAGP,0BAA6B;AAC7B,8BAAiC;AACjC,gCAAmC;AAEnC,0BAAgC;AAGhC,wBAAc,yBAzBd;AA6BO,MAAM,QAAQ,WAAAA;AAMd,MAAM,OAAO,WAAAC;AAAA,IAQpB,uBAAW;AAAA,EACT;AAAA,EAEA,kBAAkB,aAAa,SAAS,SAAS;AAE/C,UAAM;AAAA;AAAA,MAEJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,MAGA;AAAA,MACA;AAAA;AAAA,MAGA;AAAA,MACA;AAAA,MAEA;AAAA,MACA;AAAA,MAEA,GAAG;AAAA,IACL,IAAI;AAEJ,sDAAmB,OAA6B;AAChD,kDAAiB,SAA+B,QAAe;AAC/D,qEAAmB,SAAS;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAQ;AAIR,QAAI,UAAU,SAAS,UAAa,cAAc,QAAW;AAC3D,YAAM,EAAE,UAAU,KAAK,OAAO,IAAI;AAClC,UAAI,YAAY,MAAM;AACpB,kBAAU,WAAW;AAAA,MACvB;AACA,UAAI,OAAO,MAAM;AACf,kBAAU,MAAM;AAAA,MAClB;AACA,UAAI,OAAO,WAAW,UAAU;AAC9B,kBAAU,SAAS,OAAO,OAAO,CAAC,MAAM,MAAM,IAAI,MAAM,KAAK;AAAA,MAC/D;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,WAAW,QAAQ,EAAE,QAAQ,GAAG,iBAAiB;AACzD,QAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,YAAM,cAAc,CAAC,EAAC,mCAAS;AAC/B,UAAI,aAAa;AACf,kBAAU,cAAU,iCAAqB,UAAU,SAAS,MAAM;AAChE,0BAAgB,EAAE,OAAO,KAAK,CAAC;AAAA,QACjC,CAAC;AACD,kBAAU,aAAS,iCAAqB,UAAU,QAAQ,MAAM;AAC9D,0BAAgB,EAAE,OAAO,MAAM,CAAC;AAAA,QAClC,CAAC;AAAA,MACH;AAIA,UAAI,UAAU,UAAU,SAAS;AAC/B,eAAO,UAAU,UAAU;AAAA,MAC7B;AAEA,YAAM,mBAAe,qCAAgB,UAAU,IAAI;AAEnD,UAAI,QAAQ;AACV,YAAI,OAAO,SAAS;AAClB,qBAAW,OAAO,cAAc;AAC9B,kBAAM,KAAK,UAAU,GAAG;AACxB,kBAAM,MAAM,aAAa,GAAG;AAC5B,sBAAU,GAAG,IACX,MAAM,CAAC,4BAA4B,GAAG,QAClC,iCAAqB,IAAI,GAAG,IAC5B;AAAA,UACR;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;AAED,MAAM,8BAA8B;AAAA,EAClC,SAAS;AACX;",
|
|
5
5
|
"names": ["WebStack", "WebText"]
|
|
6
6
|
}
|
package/dist/esm/index.js
CHANGED
|
@@ -3,7 +3,6 @@ import {
|
|
|
3
3
|
Stack as WebStack,
|
|
4
4
|
Text as WebText,
|
|
5
5
|
composeEventHandlers,
|
|
6
|
-
mergeEvent,
|
|
7
6
|
setupHooks
|
|
8
7
|
} from "@tamagui/web";
|
|
9
8
|
import { getBaseViews } from "./getBaseViews";
|
|
@@ -82,10 +81,10 @@ setupHooks({
|
|
|
82
81
|
if (process.env.TAMAGUI_TARGET === "native") {
|
|
83
82
|
const attachFocus = !!(pseudos == null ? void 0 : pseudos.focusStyle);
|
|
84
83
|
if (attachFocus) {
|
|
85
|
-
viewProps.onFocus =
|
|
84
|
+
viewProps.onFocus = composeEventHandlers(viewProps.onFocus, () => {
|
|
86
85
|
setStateShallow({ focus: true });
|
|
87
86
|
});
|
|
88
|
-
viewProps.onBlur =
|
|
87
|
+
viewProps.onBlur = composeEventHandlers(viewProps.onBlur, () => {
|
|
89
88
|
setStateShallow({ focus: false });
|
|
90
89
|
});
|
|
91
90
|
}
|
|
@@ -93,11 +92,13 @@ setupHooks({
|
|
|
93
92
|
events.hitSlop = viewProps.hitSlop;
|
|
94
93
|
}
|
|
95
94
|
const pressability = usePressability(events || null);
|
|
96
|
-
if (events
|
|
97
|
-
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
95
|
+
if (events) {
|
|
96
|
+
if (events.onPress) {
|
|
97
|
+
for (const key in pressability) {
|
|
98
|
+
const og = viewProps[key];
|
|
99
|
+
const val = pressability[key];
|
|
100
|
+
viewProps[key] = og && !dontComposePressabilityKeys[key] ? composeEventHandlers(og, val) : val;
|
|
101
|
+
}
|
|
101
102
|
}
|
|
102
103
|
}
|
|
103
104
|
}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AAUnC;AAAA,EACE,SAAS;AAAA,EACT,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "AAAA,SAAS,0BAA0B;AAUnC;AAAA,EACE,SAAS;AAAA,EACT,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,OACK;AAGP,SAAS,oBAAoB;AAC7B,SAAS,wBAAwB;AACjC,SAAS,0BAA0B;AAEnC,SAAS,uBAAuB;AAGhC,cAAc;AAIP,MAAM,QAAQ;AAMd,MAAM,OAAO;AAQpB,WAAW;AAAA,EACT;AAAA,EAEA,kBAAkB,aAAa,SAAS,SAAS;AAE/C,UAAM;AAAA;AAAA,MAEJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,MAGA;AAAA,MACA;AAAA;AAAA,MAGA;AAAA,MACA;AAAA,MAEA;AAAA,MACA;AAAA,MAEA,GAAG;AAAA,IACL,IAAI;AAEJ,uBAAmB,OAA6B;AAChD,qBAAiB,SAA+B,QAAe;AAC/D,uBAAmB,SAAS;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAQ;AAIR,QAAI,UAAU,SAAS,UAAa,cAAc,QAAW;AAC3D,YAAM,EAAE,UAAU,KAAK,OAAO,IAAI;AAClC,UAAI,YAAY,MAAM;AACpB,kBAAU,WAAW;AAAA,MACvB;AACA,UAAI,OAAO,MAAM;AACf,kBAAU,MAAM;AAAA,MAClB;AACA,UAAI,OAAO,WAAW,UAAU;AAC9B,kBAAU,SAAS,OAAO,OAAO,CAAC,MAAM,MAAM,IAAI,MAAM,KAAK;AAAA,MAC/D;AAAA,IACF;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,WAAW,QAAQ,EAAE,QAAQ,GAAG,iBAAiB;AACzD,QAAI,QAAQ,IAAI,mBAAmB,UAAU;AAC3C,YAAM,cAAc,CAAC,EAAC,mCAAS;AAC/B,UAAI,aAAa;AACf,kBAAU,UAAU,qBAAqB,UAAU,SAAS,MAAM;AAChE,0BAAgB,EAAE,OAAO,KAAK,CAAC;AAAA,QACjC,CAAC;AACD,kBAAU,SAAS,qBAAqB,UAAU,QAAQ,MAAM;AAC9D,0BAAgB,EAAE,OAAO,MAAM,CAAC;AAAA,QAClC,CAAC;AAAA,MACH;AAIA,UAAI,UAAU,UAAU,SAAS;AAC/B,eAAO,UAAU,UAAU;AAAA,MAC7B;AAEA,YAAM,eAAe,gBAAgB,UAAU,IAAI;AAEnD,UAAI,QAAQ;AACV,YAAI,OAAO,SAAS;AAClB,qBAAW,OAAO,cAAc;AAC9B,kBAAM,KAAK,UAAU,GAAG;AACxB,kBAAM,MAAM,aAAa,GAAG;AAC5B,sBAAU,GAAG,IACX,MAAM,CAAC,4BAA4B,GAAG,IAClC,qBAAqB,IAAI,GAAG,IAC5B;AAAA,UACR;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;AAED,MAAM,8BAA8B;AAAA,EAClC,SAAS;AACX;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.56.0",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"main": "dist/cjs",
|
|
6
6
|
"module": "dist/esm",
|
|
@@ -28,16 +28,16 @@
|
|
|
28
28
|
"reset.css"
|
|
29
29
|
],
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@tamagui/react-native-use-pressable": "1.
|
|
32
|
-
"@tamagui/react-native-use-responder-events": "1.
|
|
33
|
-
"@tamagui/use-event": "1.
|
|
34
|
-
"@tamagui/web": "1.
|
|
31
|
+
"@tamagui/react-native-use-pressable": "1.56.0",
|
|
32
|
+
"@tamagui/react-native-use-responder-events": "1.56.0",
|
|
33
|
+
"@tamagui/use-event": "1.56.0",
|
|
34
|
+
"@tamagui/web": "1.56.0"
|
|
35
35
|
},
|
|
36
36
|
"peerDependencies": {
|
|
37
37
|
"react": "*"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@tamagui/build": "1.
|
|
40
|
+
"@tamagui/build": "1.56.0",
|
|
41
41
|
"@testing-library/react": "^13.4.0",
|
|
42
42
|
"csstype": "^3.0.10",
|
|
43
43
|
"react": "^18.2.0",
|
package/src/index.ts
CHANGED
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
Stack as WebStack,
|
|
13
13
|
Text as WebText,
|
|
14
14
|
composeEventHandlers,
|
|
15
|
-
mergeEvent,
|
|
16
15
|
setupHooks,
|
|
17
16
|
} from '@tamagui/web'
|
|
18
17
|
import type { RefObject } from 'react'
|
|
@@ -123,10 +122,10 @@ setupHooks({
|
|
|
123
122
|
if (process.env.TAMAGUI_TARGET === 'native') {
|
|
124
123
|
const attachFocus = !!pseudos?.focusStyle
|
|
125
124
|
if (attachFocus) {
|
|
126
|
-
viewProps.onFocus =
|
|
125
|
+
viewProps.onFocus = composeEventHandlers(viewProps.onFocus, () => {
|
|
127
126
|
setStateShallow({ focus: true })
|
|
128
127
|
})
|
|
129
|
-
viewProps.onBlur =
|
|
128
|
+
viewProps.onBlur = composeEventHandlers(viewProps.onBlur, () => {
|
|
130
129
|
setStateShallow({ focus: false })
|
|
131
130
|
})
|
|
132
131
|
}
|
|
@@ -139,12 +138,16 @@ setupHooks({
|
|
|
139
138
|
|
|
140
139
|
const pressability = usePressability(events || null)
|
|
141
140
|
|
|
142
|
-
if (events
|
|
143
|
-
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
141
|
+
if (events) {
|
|
142
|
+
if (events.onPress) {
|
|
143
|
+
for (const key in pressability) {
|
|
144
|
+
const og = viewProps[key]
|
|
145
|
+
const val = pressability[key]
|
|
146
|
+
viewProps[key] =
|
|
147
|
+
og && !dontComposePressabilityKeys[key]
|
|
148
|
+
? composeEventHandlers(og, val)
|
|
149
|
+
: val
|
|
150
|
+
}
|
|
148
151
|
}
|
|
149
152
|
}
|
|
150
153
|
}
|
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAGV,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAGnB,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAGV,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAGnB,MAAM,cAAc,CAAA;AAYrB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAIhD,cAAc,cAAc,CAAA;AAI5B,eAAO,MAAM,KAAK;;;;iOAIjB,CAAA;AAED,eAAO,MAAM,IAAI;;;;y6BAIhB,CAAA"}
|