@ray-js/framework-shared 0.3.30 → 0.3.31
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/lib/useTouch/index.android.js +1 -1
- package/lib/useTouch/index.d.ts +1 -1
- package/lib/useTouch/index.ios.js +1 -1
- package/lib/useTouch/index.js +37 -18
- package/lib/useTouch/index.tuya.js +33 -14
- package/lib/useTouch/index.web.js +37 -18
- package/lib/useTouch/index.wechat.js +33 -14
- package/package.json +4 -4
@@ -1 +1 @@
|
|
1
|
-
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.useTouch=useTouch;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var React=_interopRequireWildcard(require("react"));function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function _getRequireWildcardCache(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj.default=obj;if(cache){cache.set(obj,newObj);}return newObj;}function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var isMiniProgram=false;var isWechat=false;var isWeb=false;var LONG_TAP_DURATION=350;function useTouch(_ref){var hoverDuration=_ref.hoverDuration,hoverDelay=_ref.hoverDelay,
|
1
|
+
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.useTouch=useTouch;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var React=_interopRequireWildcard(require("react"));var _excluded=["hoverDuration","hoverDelay"];function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function _getRequireWildcardCache(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj.default=obj;if(cache){cache.set(obj,newObj);}return newObj;}function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var isMiniProgram=false;var isWechat=false;var isWeb=false;var LONG_TAP_DURATION=350;function useTouch(_ref){var hoverDuration=_ref.hoverDuration,hoverDelay=_ref.hoverDelay,handles=(0,_objectWithoutProperties2.default)(_ref,_excluded);var _React$useState=React.useState(false),_React$useState2=(0,_slicedToArray2.default)(_React$useState,2),touching=_React$useState2[0],setTouching=_React$useState2[1];var hoveringRef=React.useRef(false);var timers=React.useRef([]);function executeTimeout(callback,time){var timer=setTimeout(function(){callback();timers.current.filter(function(t){return t!==timer;});},time);timers.current.push(timer);}function formatTouches(touchs){if(Array.isArray(touchs)){return touchs&&touchs.map(function(item){return{identifier:item.identifier,pageX:item.pageX,pageY:item.pageY};});}else{return[_objectSpread({},touchs)];}}function formatRayEvent(e,touchType){return{type:(e===null||e===void 0?void 0:e.type)||touchType||'',touches:formatTouches(e.touches),changedTouches:formatTouches(e.changedTouches),timeStamp:e.timeStamp||e.timestamp,origin:e};}function formatRayClickEvent(e,clickType){return{type:(e===null||e===void 0?void 0:e.type)||clickType||'',timeStamp:e.timeStamp,pageX:e.pageX,pageY:e.pageY,origin:e};}React.useEffect(function(){return function(){timers.current.forEach(function(t){return clearTimeout(t);});};},[]);var processedHandles={onTouchStart:function(e){var _handles$onTouchStart;hoveringRef.current=true;executeTimeout(function(){if(hoveringRef.current){setTouching(true);}},hoverDelay);return(_handles$onTouchStart=handles.onTouchStart)===null||_handles$onTouchStart===void 0?void 0:_handles$onTouchStart.call(handles,formatRayEvent(e,'touchstart'));},onTouchMove:function(e){var _handles$onTouchMove;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchMove=handles.onTouchMove)===null||_handles$onTouchMove===void 0?void 0:_handles$onTouchMove.call(handles,formatRayEvent(e,'touchmove'));},onTouchEnd:function(e){var _handles$onTouchEnd;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchEnd=handles.onTouchEnd)===null||_handles$onTouchEnd===void 0?void 0:_handles$onTouchEnd.call(handles,formatRayEvent(e,'touchend'));},onTouchCancel:function(e){var _handles$onTouchCance;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchCance=handles.onTouchCancel)===null||_handles$onTouchCance===void 0?void 0:_handles$onTouchCance.call(handles,formatRayEvent(e,'touchcancel'));},onClick:function(e){var _handles$onClick;return(_handles$onClick=handles.onClick)===null||_handles$onClick===void 0?void 0:_handles$onClick.call(handles,formatRayClickEvent(e,'click'));},onLongClick:function(e){var _handles$onLongClick;return(_handles$onLongClick=handles.onLongClick)===null||_handles$onLongClick===void 0?void 0:_handles$onLongClick.call(handles,formatRayClickEvent(e,'longclick'));}};var finalRes=Object.keys(processedHandles).reduce(function(o,k){if(handles[k]){o[k]=processedHandles[k];}return o;},{});return[touching,finalRes];}
|
package/lib/useTouch/index.d.ts
CHANGED
@@ -39,5 +39,5 @@ declare type Handle<T> = ((event: React.TouchEvent<T> & React.MouseEvent<T>) =>
|
|
39
39
|
interface TouchHandlers<T> {
|
40
40
|
[key: string]: Handle<T>;
|
41
41
|
}
|
42
|
-
export declare function useTouch<T extends HTMLDivElement>({ hoverDuration, hoverDelay,
|
42
|
+
export declare function useTouch<T extends HTMLDivElement>({ hoverDuration, hoverDelay, ...handles }: UseWebTouchParams): [boolean, TouchHandlers<T>];
|
43
43
|
export {};
|
@@ -1 +1 @@
|
|
1
|
-
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.useTouch=useTouch;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var React=_interopRequireWildcard(require("react"));function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function _getRequireWildcardCache(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj.default=obj;if(cache){cache.set(obj,newObj);}return newObj;}function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var isMiniProgram=false;var isWechat=false;var isWeb=false;var LONG_TAP_DURATION=350;function useTouch(_ref){var hoverDuration=_ref.hoverDuration,hoverDelay=_ref.hoverDelay,
|
1
|
+
var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.useTouch=useTouch;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var React=_interopRequireWildcard(require("react"));var _excluded=["hoverDuration","hoverDelay"];function _getRequireWildcardCache(nodeInterop){if(typeof WeakMap!=="function")return null;var cacheBabelInterop=new WeakMap();var cacheNodeInterop=new WeakMap();return(_getRequireWildcardCache=function _getRequireWildcardCache(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule){return obj;}if(obj===null||typeof obj!=="object"&&typeof obj!=="function"){return{default:obj};}var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj)){return cache.get(obj);}var newObj={};var hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj){if(key!=="default"&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;if(desc&&(desc.get||desc.set)){Object.defineProperty(newObj,key,desc);}else{newObj[key]=obj[key];}}}newObj.default=obj;if(cache){cache.set(obj,newObj);}return newObj;}function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var isMiniProgram=false;var isWechat=false;var isWeb=false;var LONG_TAP_DURATION=350;function useTouch(_ref){var hoverDuration=_ref.hoverDuration,hoverDelay=_ref.hoverDelay,handles=(0,_objectWithoutProperties2.default)(_ref,_excluded);var _React$useState=React.useState(false),_React$useState2=(0,_slicedToArray2.default)(_React$useState,2),touching=_React$useState2[0],setTouching=_React$useState2[1];var hoveringRef=React.useRef(false);var timers=React.useRef([]);function executeTimeout(callback,time){var timer=setTimeout(function(){callback();timers.current.filter(function(t){return t!==timer;});},time);timers.current.push(timer);}function formatTouches(touchs){if(Array.isArray(touchs)){return touchs&&touchs.map(function(item){return{identifier:item.identifier,pageX:item.pageX,pageY:item.pageY};});}else{return[_objectSpread({},touchs)];}}function formatRayEvent(e,touchType){return{type:(e===null||e===void 0?void 0:e.type)||touchType||'',touches:formatTouches(e.touches),changedTouches:formatTouches(e.changedTouches),timeStamp:e.timeStamp||e.timestamp,origin:e};}function formatRayClickEvent(e,clickType){return{type:(e===null||e===void 0?void 0:e.type)||clickType||'',timeStamp:e.timeStamp,pageX:e.pageX,pageY:e.pageY,origin:e};}React.useEffect(function(){return function(){timers.current.forEach(function(t){return clearTimeout(t);});};},[]);var processedHandles={onTouchStart:function(e){var _handles$onTouchStart;hoveringRef.current=true;executeTimeout(function(){if(hoveringRef.current){setTouching(true);}},hoverDelay);return(_handles$onTouchStart=handles.onTouchStart)===null||_handles$onTouchStart===void 0?void 0:_handles$onTouchStart.call(handles,formatRayEvent(e,'touchstart'));},onTouchMove:function(e){var _handles$onTouchMove;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchMove=handles.onTouchMove)===null||_handles$onTouchMove===void 0?void 0:_handles$onTouchMove.call(handles,formatRayEvent(e,'touchmove'));},onTouchEnd:function(e){var _handles$onTouchEnd;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchEnd=handles.onTouchEnd)===null||_handles$onTouchEnd===void 0?void 0:_handles$onTouchEnd.call(handles,formatRayEvent(e,'touchend'));},onTouchCancel:function(e){var _handles$onTouchCance;hoveringRef.current=false;executeTimeout(function(){if(touching){setTouching(false);}},hoverDuration);return(_handles$onTouchCance=handles.onTouchCancel)===null||_handles$onTouchCance===void 0?void 0:_handles$onTouchCance.call(handles,formatRayEvent(e,'touchcancel'));},onClick:function(e){var _handles$onClick;return(_handles$onClick=handles.onClick)===null||_handles$onClick===void 0?void 0:_handles$onClick.call(handles,formatRayClickEvent(e,'click'));},onLongClick:function(e){var _handles$onLongClick;return(_handles$onLongClick=handles.onLongClick)===null||_handles$onLongClick===void 0?void 0:_handles$onLongClick.call(handles,formatRayClickEvent(e,'longclick'));}};var finalRes=Object.keys(processedHandles).reduce(function(o,k){if(handles[k]){o[k]=processedHandles[k];}return o;},{});return[touching,finalRes];}
|
package/lib/useTouch/index.js
CHANGED
@@ -1,21 +1,20 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
+
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
4
|
+
var _excluded = ["hoverDuration", "hoverDelay"];
|
3
5
|
import "core-js/modules/es.array.filter.js";
|
4
6
|
import "core-js/modules/es.object.to-string.js";
|
5
7
|
import "core-js/modules/es.array.map.js";
|
6
8
|
import "core-js/modules/web.dom-collections.for-each.js";
|
9
|
+
import "core-js/modules/es.array.reduce.js";
|
10
|
+
import "core-js/modules/es.object.keys.js";
|
7
11
|
import * as React from 'react';
|
8
12
|
import { isWeb } from '@ray-js/env';
|
9
13
|
var LONG_TAP_DURATION = 350;
|
10
14
|
export function useTouch(_ref) {
|
11
15
|
var hoverDuration = _ref.hoverDuration,
|
12
16
|
hoverDelay = _ref.hoverDelay,
|
13
|
-
|
14
|
-
onTouchCancel = _ref.onTouchCancel,
|
15
|
-
onTouchEnd = _ref.onTouchEnd,
|
16
|
-
onTouchMove = _ref.onTouchMove,
|
17
|
-
onTouchStart = _ref.onTouchStart,
|
18
|
-
onClick = _ref.onClick;
|
17
|
+
handles = _objectWithoutProperties(_ref, _excluded);
|
19
18
|
|
20
19
|
var _React$useState = React.useState(false),
|
21
20
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
@@ -77,12 +76,16 @@ export function useTouch(_ref) {
|
|
77
76
|
};
|
78
77
|
}, []);
|
79
78
|
|
80
|
-
function
|
81
|
-
|
79
|
+
function onLongClick(e) {
|
80
|
+
var _handles$onLongClick;
|
81
|
+
|
82
|
+
return (_handles$onLongClick = handles.onLongClick) === null || _handles$onLongClick === void 0 ? void 0 : _handles$onLongClick.call(handles, formatRayClickEvent(e, 'longclick'));
|
82
83
|
}
|
83
84
|
|
84
|
-
|
85
|
+
var processedHandles = {
|
85
86
|
onTouchStart: function (e) {
|
87
|
+
var _handles$onTouchStart;
|
88
|
+
|
86
89
|
hoveringRef.current = true;
|
87
90
|
executeTimeout(function () {
|
88
91
|
if (hoveringRef.current) {
|
@@ -91,47 +94,63 @@ export function useTouch(_ref) {
|
|
91
94
|
}, hoverDelay);
|
92
95
|
|
93
96
|
if (isWeb) {
|
94
|
-
if (typeof onLongClick === 'function') {
|
97
|
+
if (typeof handles.onLongClick === 'function') {
|
95
98
|
executeTimeout(function () {
|
96
99
|
if (hoveringRef.current) {
|
97
|
-
|
100
|
+
onLongClick(e);
|
98
101
|
}
|
99
102
|
}, LONG_TAP_DURATION);
|
100
103
|
}
|
101
104
|
}
|
102
105
|
|
103
|
-
return onTouchStart === null || onTouchStart === void 0 ? void 0 : onTouchStart(formatRayEvent(e, 'touchstart'));
|
106
|
+
return (_handles$onTouchStart = handles.onTouchStart) === null || _handles$onTouchStart === void 0 ? void 0 : _handles$onTouchStart.call(handles, formatRayEvent(e, 'touchstart'));
|
104
107
|
},
|
105
108
|
onTouchMove: function (e) {
|
109
|
+
var _handles$onTouchMove;
|
110
|
+
|
106
111
|
hoveringRef.current = false;
|
107
112
|
executeTimeout(function () {
|
108
113
|
if (touching) {
|
109
114
|
setTouching(false);
|
110
115
|
}
|
111
116
|
}, hoverDuration);
|
112
|
-
return onTouchMove === null || onTouchMove === void 0 ? void 0 : onTouchMove(formatRayEvent(e, 'touchmove'));
|
117
|
+
return (_handles$onTouchMove = handles.onTouchMove) === null || _handles$onTouchMove === void 0 ? void 0 : _handles$onTouchMove.call(handles, formatRayEvent(e, 'touchmove'));
|
113
118
|
},
|
114
119
|
onTouchEnd: function (e) {
|
120
|
+
var _handles$onTouchEnd;
|
121
|
+
|
115
122
|
hoveringRef.current = false;
|
116
123
|
executeTimeout(function () {
|
117
124
|
if (touching) {
|
118
125
|
setTouching(false);
|
119
126
|
}
|
120
127
|
}, hoverDuration);
|
121
|
-
return onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(formatRayEvent(e, 'touchend'));
|
128
|
+
return (_handles$onTouchEnd = handles.onTouchEnd) === null || _handles$onTouchEnd === void 0 ? void 0 : _handles$onTouchEnd.call(handles, formatRayEvent(e, 'touchend'));
|
122
129
|
},
|
123
130
|
onTouchCancel: function (e) {
|
131
|
+
var _handles$onTouchCance;
|
132
|
+
|
124
133
|
hoveringRef.current = false;
|
125
134
|
executeTimeout(function () {
|
126
135
|
if (touching) {
|
127
136
|
setTouching(false);
|
128
137
|
}
|
129
138
|
}, hoverDuration);
|
130
|
-
return onTouchCancel === null ||
|
139
|
+
return (_handles$onTouchCance = handles.onTouchCancel) === null || _handles$onTouchCance === void 0 ? void 0 : _handles$onTouchCance.call(handles, formatRayEvent(e, 'touchcancel'));
|
131
140
|
},
|
132
141
|
onClick: function (e) {
|
133
|
-
|
142
|
+
var _handles$onClick;
|
143
|
+
|
144
|
+
return (_handles$onClick = handles.onClick) === null || _handles$onClick === void 0 ? void 0 : _handles$onClick.call(handles, formatRayClickEvent(e, 'click'));
|
134
145
|
},
|
135
|
-
onLongClick:
|
136
|
-
}
|
146
|
+
onLongClick: onLongClick
|
147
|
+
};
|
148
|
+
var finalRes = Object.keys(processedHandles).reduce(function (o, k) {
|
149
|
+
if (handles[k]) {
|
150
|
+
o[k] = processedHandles[k];
|
151
|
+
}
|
152
|
+
|
153
|
+
return o;
|
154
|
+
}, {});
|
155
|
+
return [touching, finalRes];
|
137
156
|
}
|
@@ -1,9 +1,13 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
+
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
4
|
+
var _excluded = ["hoverDuration", "hoverDelay"];
|
3
5
|
import "core-js/modules/es.array.filter.js";
|
4
6
|
import "core-js/modules/es.object.to-string.js";
|
5
7
|
import "core-js/modules/es.array.map.js";
|
6
8
|
import "core-js/modules/web.dom-collections.for-each.js";
|
9
|
+
import "core-js/modules/es.array.reduce.js";
|
10
|
+
import "core-js/modules/es.object.keys.js";
|
7
11
|
import * as React from 'react';
|
8
12
|
var isMiniProgram = true;
|
9
13
|
var isWechat = false;
|
@@ -12,12 +16,7 @@ var LONG_TAP_DURATION = 350;
|
|
12
16
|
export function useTouch(_ref) {
|
13
17
|
var hoverDuration = _ref.hoverDuration,
|
14
18
|
hoverDelay = _ref.hoverDelay,
|
15
|
-
|
16
|
-
onTouchCancel = _ref.onTouchCancel,
|
17
|
-
onTouchEnd = _ref.onTouchEnd,
|
18
|
-
onTouchMove = _ref.onTouchMove,
|
19
|
-
onTouchStart = _ref.onTouchStart,
|
20
|
-
onClick = _ref.onClick;
|
19
|
+
handles = _objectWithoutProperties(_ref, _excluded);
|
21
20
|
|
22
21
|
var _React$useState = React.useState(false),
|
23
22
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
@@ -78,48 +77,68 @@ export function useTouch(_ref) {
|
|
78
77
|
});
|
79
78
|
};
|
80
79
|
}, []);
|
81
|
-
|
80
|
+
var processedHandles = {
|
82
81
|
onTouchStart: function (e) {
|
82
|
+
var _handles$onTouchStart;
|
83
|
+
|
83
84
|
hoveringRef.current = true;
|
84
85
|
executeTimeout(function () {
|
85
86
|
if (hoveringRef.current) {
|
86
87
|
setTouching(true);
|
87
88
|
}
|
88
89
|
}, hoverDelay);
|
89
|
-
return onTouchStart === null || onTouchStart === void 0 ? void 0 : onTouchStart(formatRayEvent(e, 'touchstart'));
|
90
|
+
return (_handles$onTouchStart = handles.onTouchStart) === null || _handles$onTouchStart === void 0 ? void 0 : _handles$onTouchStart.call(handles, formatRayEvent(e, 'touchstart'));
|
90
91
|
},
|
91
92
|
onTouchMove: function (e) {
|
93
|
+
var _handles$onTouchMove;
|
94
|
+
|
92
95
|
hoveringRef.current = false;
|
93
96
|
executeTimeout(function () {
|
94
97
|
if (touching) {
|
95
98
|
setTouching(false);
|
96
99
|
}
|
97
100
|
}, hoverDuration);
|
98
|
-
return onTouchMove === null || onTouchMove === void 0 ? void 0 : onTouchMove(formatRayEvent(e, 'touchmove'));
|
101
|
+
return (_handles$onTouchMove = handles.onTouchMove) === null || _handles$onTouchMove === void 0 ? void 0 : _handles$onTouchMove.call(handles, formatRayEvent(e, 'touchmove'));
|
99
102
|
},
|
100
103
|
onTouchEnd: function (e) {
|
104
|
+
var _handles$onTouchEnd;
|
105
|
+
|
101
106
|
hoveringRef.current = false;
|
102
107
|
executeTimeout(function () {
|
103
108
|
if (touching) {
|
104
109
|
setTouching(false);
|
105
110
|
}
|
106
111
|
}, hoverDuration);
|
107
|
-
return onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(formatRayEvent(e, 'touchend'));
|
112
|
+
return (_handles$onTouchEnd = handles.onTouchEnd) === null || _handles$onTouchEnd === void 0 ? void 0 : _handles$onTouchEnd.call(handles, formatRayEvent(e, 'touchend'));
|
108
113
|
},
|
109
114
|
onTouchCancel: function (e) {
|
115
|
+
var _handles$onTouchCance;
|
116
|
+
|
110
117
|
hoveringRef.current = false;
|
111
118
|
executeTimeout(function () {
|
112
119
|
if (touching) {
|
113
120
|
setTouching(false);
|
114
121
|
}
|
115
122
|
}, hoverDuration);
|
116
|
-
return onTouchCancel === null ||
|
123
|
+
return (_handles$onTouchCance = handles.onTouchCancel) === null || _handles$onTouchCance === void 0 ? void 0 : _handles$onTouchCance.call(handles, formatRayEvent(e, 'touchcancel'));
|
117
124
|
},
|
118
125
|
onClick: function (e) {
|
119
|
-
|
126
|
+
var _handles$onClick;
|
127
|
+
|
128
|
+
return (_handles$onClick = handles.onClick) === null || _handles$onClick === void 0 ? void 0 : _handles$onClick.call(handles, formatRayClickEvent(e, 'click'));
|
120
129
|
},
|
121
130
|
onLongClick: function (e) {
|
122
|
-
|
131
|
+
var _handles$onLongClick;
|
132
|
+
|
133
|
+
return (_handles$onLongClick = handles.onLongClick) === null || _handles$onLongClick === void 0 ? void 0 : _handles$onLongClick.call(handles, formatRayClickEvent(e, 'longclick'));
|
123
134
|
}
|
124
|
-
}
|
135
|
+
};
|
136
|
+
var finalRes = Object.keys(processedHandles).reduce(function (o, k) {
|
137
|
+
if (handles[k]) {
|
138
|
+
o[k] = processedHandles[k];
|
139
|
+
}
|
140
|
+
|
141
|
+
return o;
|
142
|
+
}, {});
|
143
|
+
return [touching, finalRes];
|
125
144
|
}
|
@@ -1,9 +1,13 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
+
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
4
|
+
var _excluded = ["hoverDuration", "hoverDelay"];
|
3
5
|
import "core-js/modules/es.array.filter.js";
|
4
6
|
import "core-js/modules/es.object.to-string.js";
|
5
7
|
import "core-js/modules/es.array.map.js";
|
6
8
|
import "core-js/modules/web.dom-collections.for-each.js";
|
9
|
+
import "core-js/modules/es.array.reduce.js";
|
10
|
+
import "core-js/modules/es.object.keys.js";
|
7
11
|
import * as React from 'react';
|
8
12
|
var isMiniProgram = false;
|
9
13
|
var isWechat = false;
|
@@ -12,12 +16,7 @@ var LONG_TAP_DURATION = 350;
|
|
12
16
|
export function useTouch(_ref) {
|
13
17
|
var hoverDuration = _ref.hoverDuration,
|
14
18
|
hoverDelay = _ref.hoverDelay,
|
15
|
-
|
16
|
-
onTouchCancel = _ref.onTouchCancel,
|
17
|
-
onTouchEnd = _ref.onTouchEnd,
|
18
|
-
onTouchMove = _ref.onTouchMove,
|
19
|
-
onTouchStart = _ref.onTouchStart,
|
20
|
-
onClick = _ref.onClick;
|
19
|
+
handles = _objectWithoutProperties(_ref, _excluded);
|
21
20
|
|
22
21
|
var _React$useState = React.useState(false),
|
23
22
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
@@ -79,12 +78,16 @@ export function useTouch(_ref) {
|
|
79
78
|
};
|
80
79
|
}, []);
|
81
80
|
|
82
|
-
function
|
83
|
-
|
81
|
+
function onLongClick(e) {
|
82
|
+
var _handles$onLongClick;
|
83
|
+
|
84
|
+
return (_handles$onLongClick = handles.onLongClick) === null || _handles$onLongClick === void 0 ? void 0 : _handles$onLongClick.call(handles, formatRayClickEvent(e, 'longclick'));
|
84
85
|
}
|
85
86
|
|
86
|
-
|
87
|
+
var processedHandles = {
|
87
88
|
onTouchStart: function (e) {
|
89
|
+
var _handles$onTouchStart;
|
90
|
+
|
88
91
|
hoveringRef.current = true;
|
89
92
|
executeTimeout(function () {
|
90
93
|
if (hoveringRef.current) {
|
@@ -92,46 +95,62 @@ export function useTouch(_ref) {
|
|
92
95
|
}
|
93
96
|
}, hoverDelay);
|
94
97
|
|
95
|
-
if (typeof onLongClick === 'function') {
|
98
|
+
if (typeof handles.onLongClick === 'function') {
|
96
99
|
executeTimeout(function () {
|
97
100
|
if (hoveringRef.current) {
|
98
|
-
|
101
|
+
onLongClick(e);
|
99
102
|
}
|
100
103
|
}, LONG_TAP_DURATION);
|
101
104
|
}
|
102
105
|
|
103
|
-
return onTouchStart === null || onTouchStart === void 0 ? void 0 : onTouchStart(formatRayEvent(e, 'touchstart'));
|
106
|
+
return (_handles$onTouchStart = handles.onTouchStart) === null || _handles$onTouchStart === void 0 ? void 0 : _handles$onTouchStart.call(handles, formatRayEvent(e, 'touchstart'));
|
104
107
|
},
|
105
108
|
onTouchMove: function (e) {
|
109
|
+
var _handles$onTouchMove;
|
110
|
+
|
106
111
|
hoveringRef.current = false;
|
107
112
|
executeTimeout(function () {
|
108
113
|
if (touching) {
|
109
114
|
setTouching(false);
|
110
115
|
}
|
111
116
|
}, hoverDuration);
|
112
|
-
return onTouchMove === null || onTouchMove === void 0 ? void 0 : onTouchMove(formatRayEvent(e, 'touchmove'));
|
117
|
+
return (_handles$onTouchMove = handles.onTouchMove) === null || _handles$onTouchMove === void 0 ? void 0 : _handles$onTouchMove.call(handles, formatRayEvent(e, 'touchmove'));
|
113
118
|
},
|
114
119
|
onTouchEnd: function (e) {
|
120
|
+
var _handles$onTouchEnd;
|
121
|
+
|
115
122
|
hoveringRef.current = false;
|
116
123
|
executeTimeout(function () {
|
117
124
|
if (touching) {
|
118
125
|
setTouching(false);
|
119
126
|
}
|
120
127
|
}, hoverDuration);
|
121
|
-
return onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(formatRayEvent(e, 'touchend'));
|
128
|
+
return (_handles$onTouchEnd = handles.onTouchEnd) === null || _handles$onTouchEnd === void 0 ? void 0 : _handles$onTouchEnd.call(handles, formatRayEvent(e, 'touchend'));
|
122
129
|
},
|
123
130
|
onTouchCancel: function (e) {
|
131
|
+
var _handles$onTouchCance;
|
132
|
+
|
124
133
|
hoveringRef.current = false;
|
125
134
|
executeTimeout(function () {
|
126
135
|
if (touching) {
|
127
136
|
setTouching(false);
|
128
137
|
}
|
129
138
|
}, hoverDuration);
|
130
|
-
return onTouchCancel === null ||
|
139
|
+
return (_handles$onTouchCance = handles.onTouchCancel) === null || _handles$onTouchCance === void 0 ? void 0 : _handles$onTouchCance.call(handles, formatRayEvent(e, 'touchcancel'));
|
131
140
|
},
|
132
141
|
onClick: function (e) {
|
133
|
-
|
142
|
+
var _handles$onClick;
|
143
|
+
|
144
|
+
return (_handles$onClick = handles.onClick) === null || _handles$onClick === void 0 ? void 0 : _handles$onClick.call(handles, formatRayClickEvent(e, 'click'));
|
134
145
|
},
|
135
|
-
onLongClick:
|
136
|
-
}
|
146
|
+
onLongClick: onLongClick
|
147
|
+
};
|
148
|
+
var finalRes = Object.keys(processedHandles).reduce(function (o, k) {
|
149
|
+
if (handles[k]) {
|
150
|
+
o[k] = processedHandles[k];
|
151
|
+
}
|
152
|
+
|
153
|
+
return o;
|
154
|
+
}, {});
|
155
|
+
return [touching, finalRes];
|
137
156
|
}
|
@@ -1,9 +1,13 @@
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
3
|
+
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
4
|
+
var _excluded = ["hoverDuration", "hoverDelay"];
|
3
5
|
import "core-js/modules/es.array.filter.js";
|
4
6
|
import "core-js/modules/es.object.to-string.js";
|
5
7
|
import "core-js/modules/es.array.map.js";
|
6
8
|
import "core-js/modules/web.dom-collections.for-each.js";
|
9
|
+
import "core-js/modules/es.array.reduce.js";
|
10
|
+
import "core-js/modules/es.object.keys.js";
|
7
11
|
import * as React from 'react';
|
8
12
|
var isMiniProgram = true;
|
9
13
|
var isWechat = true;
|
@@ -12,12 +16,7 @@ var LONG_TAP_DURATION = 350;
|
|
12
16
|
export function useTouch(_ref) {
|
13
17
|
var hoverDuration = _ref.hoverDuration,
|
14
18
|
hoverDelay = _ref.hoverDelay,
|
15
|
-
|
16
|
-
onTouchCancel = _ref.onTouchCancel,
|
17
|
-
onTouchEnd = _ref.onTouchEnd,
|
18
|
-
onTouchMove = _ref.onTouchMove,
|
19
|
-
onTouchStart = _ref.onTouchStart,
|
20
|
-
onClick = _ref.onClick;
|
19
|
+
handles = _objectWithoutProperties(_ref, _excluded);
|
21
20
|
|
22
21
|
var _React$useState = React.useState(false),
|
23
22
|
_React$useState2 = _slicedToArray(_React$useState, 2),
|
@@ -78,48 +77,68 @@ export function useTouch(_ref) {
|
|
78
77
|
});
|
79
78
|
};
|
80
79
|
}, []);
|
81
|
-
|
80
|
+
var processedHandles = {
|
82
81
|
onTouchStart: function (e) {
|
82
|
+
var _handles$onTouchStart;
|
83
|
+
|
83
84
|
hoveringRef.current = true;
|
84
85
|
executeTimeout(function () {
|
85
86
|
if (hoveringRef.current) {
|
86
87
|
setTouching(true);
|
87
88
|
}
|
88
89
|
}, hoverDelay);
|
89
|
-
return onTouchStart === null || onTouchStart === void 0 ? void 0 : onTouchStart(formatRayEvent(e, 'touchstart'));
|
90
|
+
return (_handles$onTouchStart = handles.onTouchStart) === null || _handles$onTouchStart === void 0 ? void 0 : _handles$onTouchStart.call(handles, formatRayEvent(e, 'touchstart'));
|
90
91
|
},
|
91
92
|
onTouchMove: function (e) {
|
93
|
+
var _handles$onTouchMove;
|
94
|
+
|
92
95
|
hoveringRef.current = false;
|
93
96
|
executeTimeout(function () {
|
94
97
|
if (touching) {
|
95
98
|
setTouching(false);
|
96
99
|
}
|
97
100
|
}, hoverDuration);
|
98
|
-
return onTouchMove === null || onTouchMove === void 0 ? void 0 : onTouchMove(formatRayEvent(e, 'touchmove'));
|
101
|
+
return (_handles$onTouchMove = handles.onTouchMove) === null || _handles$onTouchMove === void 0 ? void 0 : _handles$onTouchMove.call(handles, formatRayEvent(e, 'touchmove'));
|
99
102
|
},
|
100
103
|
onTouchEnd: function (e) {
|
104
|
+
var _handles$onTouchEnd;
|
105
|
+
|
101
106
|
hoveringRef.current = false;
|
102
107
|
executeTimeout(function () {
|
103
108
|
if (touching) {
|
104
109
|
setTouching(false);
|
105
110
|
}
|
106
111
|
}, hoverDuration);
|
107
|
-
return onTouchEnd === null || onTouchEnd === void 0 ? void 0 : onTouchEnd(formatRayEvent(e, 'touchend'));
|
112
|
+
return (_handles$onTouchEnd = handles.onTouchEnd) === null || _handles$onTouchEnd === void 0 ? void 0 : _handles$onTouchEnd.call(handles, formatRayEvent(e, 'touchend'));
|
108
113
|
},
|
109
114
|
onTouchCancel: function (e) {
|
115
|
+
var _handles$onTouchCance;
|
116
|
+
|
110
117
|
hoveringRef.current = false;
|
111
118
|
executeTimeout(function () {
|
112
119
|
if (touching) {
|
113
120
|
setTouching(false);
|
114
121
|
}
|
115
122
|
}, hoverDuration);
|
116
|
-
return onTouchCancel === null ||
|
123
|
+
return (_handles$onTouchCance = handles.onTouchCancel) === null || _handles$onTouchCance === void 0 ? void 0 : _handles$onTouchCance.call(handles, formatRayEvent(e, 'touchcancel'));
|
117
124
|
},
|
118
125
|
onClick: function (e) {
|
119
|
-
|
126
|
+
var _handles$onClick;
|
127
|
+
|
128
|
+
return (_handles$onClick = handles.onClick) === null || _handles$onClick === void 0 ? void 0 : _handles$onClick.call(handles, formatRayClickEvent(e, 'click'));
|
120
129
|
},
|
121
130
|
onLongClick: function (e) {
|
122
|
-
|
131
|
+
var _handles$onLongClick;
|
132
|
+
|
133
|
+
return (_handles$onLongClick = handles.onLongClick) === null || _handles$onLongClick === void 0 ? void 0 : _handles$onLongClick.call(handles, formatRayClickEvent(e, 'longclick'));
|
123
134
|
}
|
124
|
-
}
|
135
|
+
};
|
136
|
+
var finalRes = Object.keys(processedHandles).reduce(function (o, k) {
|
137
|
+
if (handles[k]) {
|
138
|
+
o[k] = processedHandles[k];
|
139
|
+
}
|
140
|
+
|
141
|
+
return o;
|
142
|
+
}, {});
|
143
|
+
return [touching, finalRes];
|
125
144
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@ray-js/framework-shared",
|
3
|
-
"version": "0.3.
|
3
|
+
"version": "0.3.31",
|
4
4
|
"description": "Ray shared for framework",
|
5
5
|
"keywords": [
|
6
6
|
"ray"
|
@@ -20,12 +20,12 @@
|
|
20
20
|
"watch": "ray start --type=component"
|
21
21
|
},
|
22
22
|
"dependencies": {
|
23
|
-
"@ray-js/env": "^0.3.
|
23
|
+
"@ray-js/env": "^0.3.31",
|
24
24
|
"@remax/wechat": "2.15.6",
|
25
25
|
"react-native": "0.59.10"
|
26
26
|
},
|
27
27
|
"devDependencies": {
|
28
|
-
"@ray-js/cli": "^0.3.
|
28
|
+
"@ray-js/cli": "^0.3.31"
|
29
29
|
},
|
30
30
|
"maintainers": [
|
31
31
|
{
|
@@ -33,6 +33,6 @@
|
|
33
33
|
"email": "tuyafe@tuya.com"
|
34
34
|
}
|
35
35
|
],
|
36
|
-
"gitHead": "
|
36
|
+
"gitHead": "0e8f60742f2e5a397e15c41b56c4465234b2ca15",
|
37
37
|
"repository": {}
|
38
38
|
}
|