@react-aria/interactions 3.0.0-nightly.1386 → 3.0.0-nightly.1393
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/main.js +30 -22
- package/dist/main.js.map +1 -1
- package/dist/module.js +30 -22
- package/dist/module.js.map +1 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/useMove.ts +39 -24
package/dist/main.js
CHANGED
|
@@ -1093,33 +1093,45 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1093
1093
|
$875ab2ab6891a558$export$16a4697467175487();
|
|
1094
1094
|
state.current.didMove = false;
|
|
1095
1095
|
};
|
|
1096
|
-
let move = (pointerType, deltaX, deltaY)=>{
|
|
1096
|
+
let move = (originalEvent, pointerType, deltaX, deltaY)=>{
|
|
1097
1097
|
if (deltaX === 0 && deltaY === 0) return;
|
|
1098
1098
|
if (!state.current.didMove) {
|
|
1099
1099
|
state.current.didMove = true;
|
|
1100
1100
|
onMoveStart?.({
|
|
1101
1101
|
type: 'movestart',
|
|
1102
|
-
pointerType: pointerType
|
|
1102
|
+
pointerType: pointerType,
|
|
1103
|
+
shiftKey: originalEvent.shiftKey,
|
|
1104
|
+
metaKey: originalEvent.metaKey,
|
|
1105
|
+
ctrlKey: originalEvent.ctrlKey,
|
|
1106
|
+
altKey: originalEvent.altKey
|
|
1103
1107
|
});
|
|
1104
1108
|
}
|
|
1105
1109
|
onMove({
|
|
1106
1110
|
type: 'move',
|
|
1107
1111
|
pointerType: pointerType,
|
|
1108
1112
|
deltaX: deltaX,
|
|
1109
|
-
deltaY: deltaY
|
|
1113
|
+
deltaY: deltaY,
|
|
1114
|
+
shiftKey: originalEvent.shiftKey,
|
|
1115
|
+
metaKey: originalEvent.metaKey,
|
|
1116
|
+
ctrlKey: originalEvent.ctrlKey,
|
|
1117
|
+
altKey: originalEvent.altKey
|
|
1110
1118
|
});
|
|
1111
1119
|
};
|
|
1112
|
-
let end = (pointerType)=>{
|
|
1120
|
+
let end = (originalEvent, pointerType)=>{
|
|
1113
1121
|
$875ab2ab6891a558$export$b0d6fa1ab32e3295();
|
|
1114
1122
|
if (state.current.didMove) onMoveEnd?.({
|
|
1115
1123
|
type: 'moveend',
|
|
1116
|
-
pointerType: pointerType
|
|
1124
|
+
pointerType: pointerType,
|
|
1125
|
+
shiftKey: originalEvent.shiftKey,
|
|
1126
|
+
metaKey: originalEvent.metaKey,
|
|
1127
|
+
ctrlKey: originalEvent.ctrlKey,
|
|
1128
|
+
altKey: originalEvent.altKey
|
|
1117
1129
|
});
|
|
1118
1130
|
};
|
|
1119
1131
|
if (typeof PointerEvent === 'undefined') {
|
|
1120
1132
|
let onMouseMove = (e)=>{
|
|
1121
1133
|
if (e.button === 0) {
|
|
1122
|
-
move('mouse', e.pageX - state.current.lastPosition.pageX, e.pageY - state.current.lastPosition.pageY);
|
|
1134
|
+
move(e, 'mouse', e.pageX - state.current.lastPosition.pageX, e.pageY - state.current.lastPosition.pageY);
|
|
1123
1135
|
state.current.lastPosition = {
|
|
1124
1136
|
pageX: e.pageX,
|
|
1125
1137
|
pageY: e.pageY
|
|
@@ -1128,7 +1140,7 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1128
1140
|
};
|
|
1129
1141
|
let onMouseUp = (e)=>{
|
|
1130
1142
|
if (e.button === 0) {
|
|
1131
|
-
end('mouse');
|
|
1143
|
+
end(e, 'mouse');
|
|
1132
1144
|
removeGlobalListener(window, 'mousemove', onMouseMove, false);
|
|
1133
1145
|
removeGlobalListener(window, 'mouseup', onMouseUp, false);
|
|
1134
1146
|
}
|
|
@@ -1147,14 +1159,13 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1147
1159
|
}
|
|
1148
1160
|
};
|
|
1149
1161
|
let onTouchMove = (e)=>{
|
|
1150
|
-
// @ts-ignore
|
|
1151
1162
|
let touch = [
|
|
1152
1163
|
...e.changedTouches
|
|
1153
1164
|
].findIndex(({ identifier: identifier })=>identifier === state.current.id
|
|
1154
1165
|
);
|
|
1155
1166
|
if (touch >= 0) {
|
|
1156
1167
|
let { pageX: pageX , pageY: pageY } = e.changedTouches[touch];
|
|
1157
|
-
move('touch', pageX - state.current.lastPosition.pageX, pageY - state.current.lastPosition.pageY);
|
|
1168
|
+
move(e, 'touch', pageX - state.current.lastPosition.pageX, pageY - state.current.lastPosition.pageY);
|
|
1158
1169
|
state.current.lastPosition = {
|
|
1159
1170
|
pageX: pageX,
|
|
1160
1171
|
pageY: pageY
|
|
@@ -1162,13 +1173,12 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1162
1173
|
}
|
|
1163
1174
|
};
|
|
1164
1175
|
let onTouchEnd = (e)=>{
|
|
1165
|
-
// @ts-ignore
|
|
1166
1176
|
let touch = [
|
|
1167
1177
|
...e.changedTouches
|
|
1168
1178
|
].findIndex(({ identifier: identifier })=>identifier === state.current.id
|
|
1169
1179
|
);
|
|
1170
1180
|
if (touch >= 0) {
|
|
1171
|
-
end('touch');
|
|
1181
|
+
end(e, 'touch');
|
|
1172
1182
|
state.current.id = null;
|
|
1173
1183
|
removeGlobalListener(window, 'touchmove', onTouchMove);
|
|
1174
1184
|
removeGlobalListener(window, 'touchend', onTouchEnd);
|
|
@@ -1193,12 +1203,11 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1193
1203
|
} else {
|
|
1194
1204
|
let onPointerMove = (e)=>{
|
|
1195
1205
|
if (e.pointerId === state.current.id) {
|
|
1196
|
-
// @ts-ignore
|
|
1197
1206
|
let pointerType = e.pointerType || 'mouse';
|
|
1198
1207
|
// Problems with PointerEvent#movementX/movementY:
|
|
1199
1208
|
// 1. it is always 0 on macOS Safari.
|
|
1200
1209
|
// 2. On Chrome Android, it's scaled by devicePixelRatio, but not on Chrome macOS
|
|
1201
|
-
move(pointerType, e.pageX - state.current.lastPosition.pageX, e.pageY - state.current.lastPosition.pageY);
|
|
1210
|
+
move(e, pointerType, e.pageX - state.current.lastPosition.pageX, e.pageY - state.current.lastPosition.pageY);
|
|
1202
1211
|
state.current.lastPosition = {
|
|
1203
1212
|
pageX: e.pageX,
|
|
1204
1213
|
pageY: e.pageY
|
|
@@ -1207,9 +1216,8 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1207
1216
|
};
|
|
1208
1217
|
let onPointerUp = (e)=>{
|
|
1209
1218
|
if (e.pointerId === state.current.id) {
|
|
1210
|
-
// @ts-ignore
|
|
1211
1219
|
let pointerType = e.pointerType || 'mouse';
|
|
1212
|
-
end(pointerType);
|
|
1220
|
+
end(e, pointerType);
|
|
1213
1221
|
state.current.id = null;
|
|
1214
1222
|
removeGlobalListener(window, 'pointermove', onPointerMove, false);
|
|
1215
1223
|
removeGlobalListener(window, 'pointerup', onPointerUp, false);
|
|
@@ -1232,10 +1240,10 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1232
1240
|
}
|
|
1233
1241
|
};
|
|
1234
1242
|
}
|
|
1235
|
-
let triggerKeyboardMove = (deltaX, deltaY)=>{
|
|
1243
|
+
let triggerKeyboardMove = (e, deltaX, deltaY)=>{
|
|
1236
1244
|
start();
|
|
1237
|
-
move('keyboard', deltaX, deltaY);
|
|
1238
|
-
end('keyboard');
|
|
1245
|
+
move(e, 'keyboard', deltaX, deltaY);
|
|
1246
|
+
end(e, 'keyboard');
|
|
1239
1247
|
};
|
|
1240
1248
|
moveProps.onKeyDown = (e)=>{
|
|
1241
1249
|
switch(e.key){
|
|
@@ -1243,25 +1251,25 @@ function $19da64bce786a1e9$export$36da96379f79f245(props) {
|
|
|
1243
1251
|
case 'ArrowLeft':
|
|
1244
1252
|
e.preventDefault();
|
|
1245
1253
|
e.stopPropagation();
|
|
1246
|
-
triggerKeyboardMove(-1, 0);
|
|
1254
|
+
triggerKeyboardMove(e, -1, 0);
|
|
1247
1255
|
break;
|
|
1248
1256
|
case 'Right':
|
|
1249
1257
|
case 'ArrowRight':
|
|
1250
1258
|
e.preventDefault();
|
|
1251
1259
|
e.stopPropagation();
|
|
1252
|
-
triggerKeyboardMove(1, 0);
|
|
1260
|
+
triggerKeyboardMove(e, 1, 0);
|
|
1253
1261
|
break;
|
|
1254
1262
|
case 'Up':
|
|
1255
1263
|
case 'ArrowUp':
|
|
1256
1264
|
e.preventDefault();
|
|
1257
1265
|
e.stopPropagation();
|
|
1258
|
-
triggerKeyboardMove(0, -1);
|
|
1266
|
+
triggerKeyboardMove(e, 0, -1);
|
|
1259
1267
|
break;
|
|
1260
1268
|
case 'Down':
|
|
1261
1269
|
case 'ArrowDown':
|
|
1262
1270
|
e.preventDefault();
|
|
1263
1271
|
e.stopPropagation();
|
|
1264
|
-
triggerKeyboardMove(0, 1);
|
|
1272
|
+
triggerKeyboardMove(e, 0, 1);
|
|
1265
1273
|
break;
|
|
1266
1274
|
}
|
|
1267
1275
|
};
|