react-native-skia-gesture 0.4.0 → 0.4.5-beta.1
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/README.md +3 -9
- package/lib/commonjs/canvas/canvas.js +15 -72
- package/lib/commonjs/canvas/canvas.js.map +1 -1
- package/lib/commonjs/canvas/context.js +6 -4
- package/lib/commonjs/canvas/context.js.map +1 -1
- package/lib/commonjs/canvas/ref-manager.js +35 -0
- package/lib/commonjs/canvas/ref-manager.js.map +1 -0
- package/lib/commonjs/hoc/with-touchable-handler.js +16 -15
- package/lib/commonjs/hoc/with-touchable-handler.js.map +1 -1
- package/lib/commonjs/hooks/use-gesture-handler.js +10 -2
- package/lib/commonjs/hooks/use-gesture-handler.js.map +1 -1
- package/lib/commonjs/hooks/use-touchable-gestures.js +106 -0
- package/lib/commonjs/hooks/use-touchable-gestures.js.map +1 -0
- package/lib/commonjs/index.js +12 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/canvas/canvas.js +16 -73
- package/lib/module/canvas/canvas.js.map +1 -1
- package/lib/module/canvas/context.js +6 -4
- package/lib/module/canvas/context.js.map +1 -1
- package/lib/module/canvas/ref-manager.js +28 -0
- package/lib/module/canvas/ref-manager.js.map +1 -0
- package/lib/module/hoc/with-touchable-handler.js +16 -15
- package/lib/module/hoc/with-touchable-handler.js.map +1 -1
- package/lib/module/hooks/use-gesture-handler.js +10 -2
- package/lib/module/hooks/use-gesture-handler.js.map +1 -1
- package/lib/module/hooks/use-touchable-gestures.js +99 -0
- package/lib/module/hooks/use-touchable-gestures.js.map +1 -0
- package/lib/module/index.js +1 -0
- package/lib/module/index.js.map +1 -1
- package/lib/typescript/canvas/canvas.d.ts +2 -2
- package/lib/typescript/canvas/canvas.d.ts.map +1 -1
- package/lib/typescript/canvas/context.d.ts +3 -12
- package/lib/typescript/canvas/context.d.ts.map +1 -1
- package/lib/typescript/canvas/ref-manager.d.ts +19 -0
- package/lib/typescript/canvas/ref-manager.d.ts.map +1 -0
- package/lib/typescript/components/index.d.ts +5 -4
- package/lib/typescript/components/index.d.ts.map +1 -1
- package/lib/typescript/hoc/with-touchable-handler.d.ts +5 -2
- package/lib/typescript/hoc/with-touchable-handler.d.ts.map +1 -1
- package/lib/typescript/hooks/use-gesture-handler.d.ts +3 -1
- package/lib/typescript/hooks/use-gesture-handler.d.ts.map +1 -1
- package/lib/typescript/hooks/use-touchable-gestures.d.ts +22 -0
- package/lib/typescript/hooks/use-touchable-gestures.d.ts.map +1 -0
- package/lib/typescript/index.d.ts +1 -0
- package/lib/typescript/index.d.ts.map +1 -1
- package/package.json +9 -7
- package/src/canvas/canvas.tsx +23 -88
- package/src/canvas/context.tsx +11 -29
- package/src/canvas/ref-manager.ts +50 -0
- package/src/hoc/with-touchable-handler.tsx +23 -15
- package/src/hooks/use-gesture-handler.ts +13 -1
- package/src/hooks/use-touchable-gestures.ts +122 -0
- package/src/index.ts +1 -0
package/README.md
CHANGED
|
@@ -11,12 +11,10 @@ Therefore direct interactions with individual Skia components can only be achiev
|
|
|
11
11
|
|
|
12
12
|
This package, simply provides a set of APIs to be able to interact directly with individual components.
|
|
13
13
|
|
|
14
|
-
|
|
15
14
|
<a href="https://github.com/enzomanuelmangano/react-native-skia-gesture">
|
|
16
15
|
<img src="https://raw.githubusercontent.com/enzomanuelmangano/react-native-skia-gesture/main/.assets/demo.gif" title="react-native-skia-gesture">
|
|
17
16
|
</a>
|
|
18
17
|
|
|
19
|
-
|
|
20
18
|
## Installation
|
|
21
19
|
|
|
22
20
|
**You need to have already installed [@shopify/react-native-skia (>= 0.1.221)](https://shopify.github.io/react-native-skia/docs/getting-started/installation)**
|
|
@@ -40,13 +38,9 @@ yarn add react-native-skia-gesture
|
|
|
40
38
|
## Usage
|
|
41
39
|
|
|
42
40
|
```jsx
|
|
43
|
-
import {
|
|
44
|
-
useSharedValue,
|
|
45
|
-
} from 'react-native-reanimated';
|
|
41
|
+
import { useSharedValue } from 'react-native-reanimated';
|
|
46
42
|
|
|
47
|
-
import Touchable, {
|
|
48
|
-
useGestureHandler,
|
|
49
|
-
} from 'react-native-skia-gesture';
|
|
43
|
+
import Touchable, { useGestureHandler } from 'react-native-skia-gesture';
|
|
50
44
|
|
|
51
45
|
export default function App() {
|
|
52
46
|
const cx = useSharedValue(100);
|
|
@@ -60,7 +54,7 @@ export default function App() {
|
|
|
60
54
|
context.value = {
|
|
61
55
|
x: cx.value,
|
|
62
56
|
y: cy.value,
|
|
63
|
-
}
|
|
57
|
+
};
|
|
64
58
|
},
|
|
65
59
|
onActive: ({ translationX, translationY }) => {
|
|
66
60
|
'worklet';
|
|
@@ -9,88 +9,31 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
9
9
|
var _reactNativeGestureHandler = require("react-native-gesture-handler");
|
|
10
10
|
var _reactNativeReanimated = require("react-native-reanimated");
|
|
11
11
|
var _context = require("./context");
|
|
12
|
+
var _refManager = require("./ref-manager");
|
|
13
|
+
var _useTouchableGestures = require("../hooks/use-touchable-gestures");
|
|
12
14
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
13
15
|
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; }
|
|
14
16
|
const Canvas = _ref => {
|
|
15
17
|
let {
|
|
16
18
|
children,
|
|
17
19
|
panGesture = _reactNativeGestureHandler.Gesture.Pan(),
|
|
18
|
-
|
|
20
|
+
tapGesture = _reactNativeGestureHandler.Gesture.Tap(),
|
|
19
21
|
...props
|
|
20
22
|
} = _ref;
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const ref = (0, _react.useRef)();
|
|
32
|
-
(0, _react.useEffect)(() => {
|
|
33
|
-
ref.current = setTimeout(() => {
|
|
34
|
-
prepareLoadedRefs(touchableRefs.value);
|
|
35
|
-
}, timeoutBeforeCollectingRefs);
|
|
36
|
-
return () => {
|
|
37
|
-
clearTimeout(ref.current);
|
|
38
|
-
};
|
|
39
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
40
|
-
}, [timeoutBeforeCollectingRefs]);
|
|
41
|
-
const mainGesture = panGesture.onBegin(event => {
|
|
42
|
-
'worklet';
|
|
43
|
-
|
|
44
|
-
const keys = Object.keys(loadedRefs);
|
|
45
|
-
for (let i = 0; i < keys.length; i++) {
|
|
46
|
-
const key = keys[i];
|
|
47
|
-
const touchableItem = loadedRefs[key];
|
|
48
|
-
const isPointInPath = touchableItem === null || touchableItem === void 0 ? void 0 : touchableItem.isPointInPath(event);
|
|
49
|
-
if (isPointInPath && touchableItem !== null && touchableItem !== void 0 && touchableItem.onStart) {
|
|
50
|
-
var _touchableItem$onStar;
|
|
51
|
-
activeKey.value = [`${key}__${event.handlerTag}`];
|
|
52
|
-
(_touchableItem$onStar = touchableItem.onStart) === null || _touchableItem$onStar === void 0 ? void 0 : _touchableItem$onStar.call(touchableItem, event);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
}).onUpdate(event => {
|
|
56
|
-
'worklet';
|
|
57
|
-
|
|
58
|
-
var _activatedKey$split, _touchableItem$onActi;
|
|
59
|
-
const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
|
|
60
|
-
if (!activatedKey) {
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
const indexedKey = (_activatedKey$split = activatedKey.split('__')) === null || _activatedKey$split === void 0 ? void 0 : _activatedKey$split[0];
|
|
64
|
-
if (!indexedKey) {
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
const touchableItem = loadedRefs[indexedKey];
|
|
68
|
-
return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onActi = touchableItem.onActive) === null || _touchableItem$onActi === void 0 ? void 0 : _touchableItem$onActi.call(touchableItem, event);
|
|
69
|
-
}).onFinalize(event => {
|
|
70
|
-
'worklet';
|
|
71
|
-
|
|
72
|
-
var _activatedKey$split2, _touchableItem$onEnd;
|
|
73
|
-
const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
|
|
74
|
-
if (!activatedKey) {
|
|
75
|
-
return;
|
|
76
|
-
}
|
|
77
|
-
const indexedKey = (_activatedKey$split2 = activatedKey.split('__')) === null || _activatedKey$split2 === void 0 ? void 0 : _activatedKey$split2[0];
|
|
78
|
-
if (!indexedKey) {
|
|
79
|
-
return;
|
|
80
|
-
}
|
|
81
|
-
const touchableItem = loadedRefs[indexedKey];
|
|
82
|
-
activeKey.value = activeKey.value.filter(key => !key.includes(event.handlerTag.toString()));
|
|
83
|
-
return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onEnd = touchableItem.onEnd) === null || _touchableItem$onEnd === void 0 ? void 0 : _touchableItem$onEnd.call(touchableItem, event);
|
|
84
|
-
});
|
|
85
|
-
(0, _react.useEffect)(() => {
|
|
86
|
-
return () => {
|
|
87
|
-
touchableRefs.value = {};
|
|
88
|
-
};
|
|
89
|
-
}, [touchableRefs]);
|
|
23
|
+
const touchableRefs = (0, _reactNativeReanimated.useSharedValue)({});
|
|
24
|
+
const refManager = (0, _react.useMemo)(() => new _refManager.TouchableRefManager(touchableRefs), [touchableRefs]);
|
|
25
|
+
const gestureProps = (0, _react.useMemo)(() => ({
|
|
26
|
+
touchableRefs,
|
|
27
|
+
panGesture,
|
|
28
|
+
tapGesture
|
|
29
|
+
}), [touchableRefs, panGesture, tapGesture]);
|
|
30
|
+
const {
|
|
31
|
+
gesture
|
|
32
|
+
} = (0, _useTouchableGestures.useTouchableGestures)(gestureProps);
|
|
90
33
|
return /*#__PURE__*/_react.default.createElement(_reactNativeGestureHandler.GestureDetector, {
|
|
91
|
-
gesture:
|
|
34
|
+
gesture: gesture
|
|
92
35
|
}, /*#__PURE__*/_react.default.createElement(_reactNativeSkia.Canvas, props, /*#__PURE__*/_react.default.createElement(_context.TouchHandlerContext.Provider, {
|
|
93
|
-
value:
|
|
36
|
+
value: refManager
|
|
94
37
|
}, children)));
|
|
95
38
|
};
|
|
96
39
|
exports.Canvas = Canvas;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Canvas","children","panGesture","Gesture","Pan","
|
|
1
|
+
{"version":3,"names":["Canvas","children","panGesture","Gesture","Pan","tapGesture","Tap","props","touchableRefs","useSharedValue","refManager","useMemo","TouchableRefManager","gestureProps","gesture","useTouchableGestures"],"sourceRoot":"../../src","sources":["canvas.tsx"],"mappings":";;;;;;AAAA;AACA;AACA;AAMA;AAEA;AACA;AACA;AAAuE;AAAA;AASvE,MAAMA,MAAsC,GAAG,QAKzC;EAAA,IAL0C;IAC9CC,QAAQ;IACRC,UAAU,GAAGC,kCAAO,CAACC,GAAG,EAAE;IAC1BC,UAAU,GAAGF,kCAAO,CAACG,GAAG,EAAE;IAC1B,GAAGC;EACL,CAAC;EACC,MAAMC,aAAa,GAAG,IAAAC,qCAAc,EAA+B,CAAC,CAAC,CAAC;EACtE,MAAMC,UAAU,GAAG,IAAAC,cAAO,EACxB,MAAM,IAAIC,+BAAmB,CAACJ,aAAa,CAAC,EAC5C,CAACA,aAAa,CAAC,CAChB;EAED,MAAMK,YAAY,GAAG,IAAAF,cAAO,EAC1B,OAAO;IACLH,aAAa;IACbN,UAAU;IACVG;EACF,CAAC,CAAC,EACF,CAACG,aAAa,EAAEN,UAAU,EAAEG,UAAU,CAAC,CACxC;EAED,MAAM;IAAES;EAAQ,CAAC,GAAG,IAAAC,0CAAoB,EAACF,YAAY,CAAC;EAEtD,oBACE,6BAAC,0CAAe;IAAC,OAAO,EAAEC;EAAQ,gBAChC,6BAAC,uBAAU,EAAKP,KAAK,eACnB,6BAAC,4BAAmB,CAAC,QAAQ;IAAC,KAAK,EAAEG;EAAW,GAC7CT,QAAQ,CACoB,CACpB,CACG;AAEtB,CAAC;AAAC"}
|
|
@@ -7,12 +7,14 @@ exports.useTouchHandlerContext = exports.TouchHandlerContext = void 0;
|
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
8
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
9
9
|
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; }
|
|
10
|
-
const TouchHandlerContext = /*#__PURE__*/_react.default.createContext(
|
|
11
|
-
value: {}
|
|
12
|
-
});
|
|
10
|
+
const TouchHandlerContext = /*#__PURE__*/_react.default.createContext(null);
|
|
13
11
|
exports.TouchHandlerContext = TouchHandlerContext;
|
|
14
12
|
const useTouchHandlerContext = () => {
|
|
15
|
-
|
|
13
|
+
const context = (0, _react.useContext)(TouchHandlerContext);
|
|
14
|
+
if (!context) {
|
|
15
|
+
throw new Error('useTouchHandlerContext must be used within TouchHandlerContext.Provider');
|
|
16
|
+
}
|
|
17
|
+
return context;
|
|
16
18
|
};
|
|
17
19
|
exports.useTouchHandlerContext = useTouchHandlerContext;
|
|
18
20
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["TouchHandlerContext","React","createContext","
|
|
1
|
+
{"version":3,"names":["TouchHandlerContext","React","createContext","useTouchHandlerContext","context","useContext","Error"],"sourceRoot":"../../src","sources":["context.tsx"],"mappings":";;;;;;AAAA;AAA0C;AAAA;AAG1C,MAAMA,mBAAmB,gBAAGC,cAAK,CAACC,aAAa,CAC7C,IAAI,CACL;AAAC;AAEF,MAAMC,sBAAsB,GAAG,MAAM;EACnC,MAAMC,OAAO,GAAG,IAAAC,iBAAU,EAACL,mBAAmB,CAAC;EAC/C,IAAI,CAACI,OAAO,EAAE;IACZ,MAAM,IAAIE,KAAK,CACb,yEAAyE,CAC1E;EACH;EACA,OAAOF,OAAO;AAChB,CAAC;AAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.TouchableRefManager = void 0;
|
|
7
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
8
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
9
|
+
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
10
|
+
class TouchableRefManager {
|
|
11
|
+
constructor(sharedRefs) {
|
|
12
|
+
_defineProperty(this, "refs", new Map());
|
|
13
|
+
_defineProperty(this, "sharedRefs", void 0);
|
|
14
|
+
this.sharedRefs = sharedRefs;
|
|
15
|
+
}
|
|
16
|
+
register(id, ref) {
|
|
17
|
+
this.refs.set(id, ref);
|
|
18
|
+
this.updateSharedRefs();
|
|
19
|
+
}
|
|
20
|
+
unregister(id) {
|
|
21
|
+
this.refs.delete(id);
|
|
22
|
+
this.updateSharedRefs();
|
|
23
|
+
}
|
|
24
|
+
updateSharedRefs() {
|
|
25
|
+
'worklet';
|
|
26
|
+
|
|
27
|
+
const refsObject = {};
|
|
28
|
+
this.refs.forEach((value, key) => {
|
|
29
|
+
refsObject[key] = value;
|
|
30
|
+
});
|
|
31
|
+
this.sharedRefs.value = refsObject;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.TouchableRefManager = TouchableRefManager;
|
|
35
|
+
//# sourceMappingURL=ref-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["TouchableRefManager","constructor","sharedRefs","Map","register","id","ref","refs","set","updateSharedRefs","unregister","delete","refsObject","forEach","value","key"],"sourceRoot":"../../src","sources":["ref-manager.ts"],"mappings":";;;;;;;;;AAuBO,MAAMA,mBAAmB,CAAC;EAI/BC,WAAW,CAACC,UAAqD,EAAE;IAAA,8BAHpD,IAAIC,GAAG,EAAwB;IAAA;IAI5C,IAAI,CAACD,UAAU,GAAGA,UAAU;EAC9B;EAEAE,QAAQ,CAACC,EAAU,EAAEC,GAAiB,EAAE;IACtC,IAAI,CAACC,IAAI,CAACC,GAAG,CAACH,EAAE,EAAEC,GAAG,CAAC;IACtB,IAAI,CAACG,gBAAgB,EAAE;EACzB;EAEAC,UAAU,CAACL,EAAU,EAAE;IACrB,IAAI,CAACE,IAAI,CAACI,MAAM,CAACN,EAAE,CAAC;IACpB,IAAI,CAACI,gBAAgB,EAAE;EACzB;EAEQA,gBAAgB,GAAG;IACzB,SAAS;;IACT,MAAMG,UAAwC,GAAG,CAAC,CAAC;IACnD,IAAI,CAACL,IAAI,CAACM,OAAO,CAAC,CAACC,KAAK,EAAEC,GAAG,KAAK;MAChCH,UAAU,CAACG,GAAG,CAAC,GAAGD,KAAK;IACzB,CAAC,CAAC;IACF,IAAI,CAACZ,UAAU,CAACY,KAAK,GAAGF,UAAU;EACpC;AACF;AAAC"}
|
|
@@ -33,11 +33,12 @@ const withTouchableHandler = (Component, componentName) => {
|
|
|
33
33
|
onStart: onStartProp,
|
|
34
34
|
onActive: onActiveProp,
|
|
35
35
|
onEnd: onEndProp,
|
|
36
|
+
onTap: onTapProp,
|
|
36
37
|
touchablePath,
|
|
37
38
|
...props
|
|
38
39
|
} = _ref;
|
|
39
40
|
const id = (0, _react.useId)();
|
|
40
|
-
const
|
|
41
|
+
const refManager = (0, _context.useTouchHandlerContext)();
|
|
41
42
|
const onStart = (0, _react.useCallback)(event => {
|
|
42
43
|
'worklet';
|
|
43
44
|
|
|
@@ -53,6 +54,11 @@ const withTouchableHandler = (Component, componentName) => {
|
|
|
53
54
|
|
|
54
55
|
return onEndProp === null || onEndProp === void 0 ? void 0 : onEndProp(event);
|
|
55
56
|
}, [onEndProp]);
|
|
57
|
+
const onTap = (0, _react.useCallback)(event => {
|
|
58
|
+
'worklet';
|
|
59
|
+
|
|
60
|
+
return onTapProp === null || onTapProp === void 0 ? void 0 : onTapProp(event);
|
|
61
|
+
}, [onTapProp]);
|
|
56
62
|
const isPointInPath = (0, _react.useCallback)(point => {
|
|
57
63
|
'worklet';
|
|
58
64
|
|
|
@@ -67,23 +73,18 @@ const withTouchableHandler = (Component, componentName) => {
|
|
|
67
73
|
return path.contains(point.x, point.y);
|
|
68
74
|
}, [props, touchablePath]);
|
|
69
75
|
(0, _react.useEffect)(() => {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
},
|
|
77
|
-
...ref.value
|
|
76
|
+
const refData = {
|
|
77
|
+
isPointInPath,
|
|
78
|
+
onStart,
|
|
79
|
+
onActive,
|
|
80
|
+
onEnd,
|
|
81
|
+
onTap
|
|
78
82
|
};
|
|
79
|
-
|
|
80
|
-
}, [id, isPointInPath, onActive, onEnd, onStart]);
|
|
81
|
-
(0, _react.useEffect)(() => {
|
|
83
|
+
refManager.register(`id:${id}`, refData);
|
|
82
84
|
return () => {
|
|
83
|
-
|
|
84
|
-
(_ref$value = ref.value) === null || _ref$value === void 0 ? true : delete _ref$value[`id:${id}`];
|
|
85
|
+
refManager.unregister(`id:${id}`);
|
|
85
86
|
};
|
|
86
|
-
}, [id,
|
|
87
|
+
}, [id, refManager, isPointInPath, onStart, onActive, onEnd, onTap]);
|
|
87
88
|
return Component(props);
|
|
88
89
|
};
|
|
89
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getSkiaPath","key","props","unwrappedProps","unwrapAnimatedValueObject","getCirclePath","getRectPath","getRoundedRectPath","path","withTouchableHandler","Component","componentName","onStart","onStartProp","onActive","onActiveProp","onEnd","onEndProp","touchablePath","id","useId","
|
|
1
|
+
{"version":3,"names":["getSkiaPath","key","props","unwrappedProps","unwrapAnimatedValueObject","getCirclePath","getRectPath","getRoundedRectPath","path","withTouchableHandler","Component","componentName","onStart","onStartProp","onActive","onActiveProp","onEnd","onEndProp","onTap","onTapProp","touchablePath","id","useId","refManager","useTouchHandlerContext","useCallback","event","isPointInPath","point","unwrapAnimatedValue","contains","x","y","Error","useEffect","refData","register","unregister"],"sourceRoot":"../../src","sources":["with-touchable-handler.tsx"],"mappings":"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"}
|
|
@@ -9,7 +9,8 @@ const useGestureHandler = gestureHandlers => {
|
|
|
9
9
|
const {
|
|
10
10
|
onStart,
|
|
11
11
|
onActive,
|
|
12
|
-
onEnd
|
|
12
|
+
onEnd,
|
|
13
|
+
onTap
|
|
13
14
|
} = gestureHandlers;
|
|
14
15
|
const handleStart = (0, _react.useCallback)(touchInfo => {
|
|
15
16
|
'worklet';
|
|
@@ -29,10 +30,17 @@ const useGestureHandler = gestureHandlers => {
|
|
|
29
30
|
if (!onEnd) return;
|
|
30
31
|
return onEnd(extendedTouchInfo);
|
|
31
32
|
}, [onEnd]);
|
|
33
|
+
const handleTap = (0, _react.useCallback)(touchInfo => {
|
|
34
|
+
'worklet';
|
|
35
|
+
|
|
36
|
+
if (!onTap) return;
|
|
37
|
+
return onTap(touchInfo);
|
|
38
|
+
}, [onTap]);
|
|
32
39
|
return {
|
|
33
40
|
onStart: handleStart,
|
|
34
41
|
onActive: handleActive,
|
|
35
|
-
onEnd: handleEnd
|
|
42
|
+
onEnd: handleEnd,
|
|
43
|
+
onTap: handleTap
|
|
36
44
|
};
|
|
37
45
|
};
|
|
38
46
|
exports.useGestureHandler = useGestureHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useGestureHandler","gestureHandlers","onStart","onActive","onEnd","handleStart","useCallback","touchInfo","handleActive","extendedTouchInfo","handleEnd"],"sourceRoot":"../../src","sources":["use-gesture-handler.ts"],"mappings":";;;;;;AAAA;
|
|
1
|
+
{"version":3,"names":["useGestureHandler","gestureHandlers","onStart","onActive","onEnd","onTap","handleStart","useCallback","touchInfo","handleActive","extendedTouchInfo","handleEnd","handleTap"],"sourceRoot":"../../src","sources":["use-gesture-handler.ts"],"mappings":";;;;;;AAAA;AAsBA,MAAMA,iBAAiB,GAAIC,eAAwC,IAAK;EACtE,MAAM;IAAEC,OAAO;IAAEC,QAAQ;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGJ,eAAe;EAE3D,MAAMK,WAAW,GAAG,IAAAC,kBAAW,EAC5BC,SAAiE,IAAK;IACrE,SAAS;;IACT,IAAI,CAACN,OAAO,EAAE;IACd,OAAOA,OAAO,CAACM,SAAS,CAAC;EAC3B,CAAC,EACD,CAACN,OAAO,CAAC,CACV;EAED,MAAMO,YAAY,GAAG,IAAAF,kBAAW,EAC7BG,iBAAoE,IAAK;IACxE,SAAS;;IACT,IAAI,CAACP,QAAQ,EAAE;IACf,OAAOA,QAAQ,CAACO,iBAAiB,CAAC;EACpC,CAAC,EACD,CAACP,QAAQ,CAAC,CACX;EAED,MAAMQ,SAAS,GAAG,IAAAJ,kBAAW,EAEzBG,iBAAyE,IACtE;IACH,SAAS;;IACT,IAAI,CAACN,KAAK,EAAE;IACZ,OAAOA,KAAK,CAACM,iBAAiB,CAAC;EACjC,CAAC,EACD,CAACN,KAAK,CAAC,CACR;EAED,MAAMQ,SAAS,GAAG,IAAAL,kBAAW,EAC1BC,SAA4B,IAAK;IAChC,SAAS;;IACT,IAAI,CAACH,KAAK,EAAE;IACZ,OAAOA,KAAK,CAACG,SAAS,CAAC;EACzB,CAAC,EACD,CAACH,KAAK,CAAC,CACR;EAED,OAAO;IACLH,OAAO,EAAEI,WAAW;IACpBH,QAAQ,EAAEM,YAAY;IACtBL,KAAK,EAAEO,SAAS;IAChBN,KAAK,EAAEO;EACT,CAAC;AACH,CAAC;AAAC"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.useTouchableGestures = void 0;
|
|
7
|
+
var _react = require("react");
|
|
8
|
+
var _reactNativeGestureHandler = require("react-native-gesture-handler");
|
|
9
|
+
var _reactNativeReanimated = require("react-native-reanimated");
|
|
10
|
+
const useTouchableGestures = _ref => {
|
|
11
|
+
let {
|
|
12
|
+
touchableRefs,
|
|
13
|
+
panGesture = _reactNativeGestureHandler.Gesture.Pan(),
|
|
14
|
+
tapGesture = _reactNativeGestureHandler.Gesture.Tap()
|
|
15
|
+
} = _ref;
|
|
16
|
+
const activeKey = (0, _reactNativeReanimated.useSharedValue)([]);
|
|
17
|
+
|
|
18
|
+
// Helper function to find the first matching touchable item
|
|
19
|
+
const findTouchableItem = (0, _react.useCallback)((point, handlerCallback) => {
|
|
20
|
+
'worklet';
|
|
21
|
+
|
|
22
|
+
const refs = touchableRefs.value;
|
|
23
|
+
const keys = Object.keys(refs);
|
|
24
|
+
for (let i = 0; i < keys.length; i++) {
|
|
25
|
+
const key = keys[i];
|
|
26
|
+
if (!key) continue;
|
|
27
|
+
const touchableItem = refs[key];
|
|
28
|
+
if (!touchableItem) continue;
|
|
29
|
+
const isPointInPath = touchableItem.isPointInPath(point);
|
|
30
|
+
if (isPointInPath && touchableItem[handlerCallback]) {
|
|
31
|
+
return {
|
|
32
|
+
key,
|
|
33
|
+
touchableItem
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return null;
|
|
38
|
+
}, [touchableRefs]);
|
|
39
|
+
|
|
40
|
+
// Helper function to get active touchable item by handler tag
|
|
41
|
+
const getActiveTouchableItem = (0, _react.useCallback)(handlerTag => {
|
|
42
|
+
'worklet';
|
|
43
|
+
|
|
44
|
+
var _activatedKey$split;
|
|
45
|
+
const activatedKey = activeKey.value.find(key => key.includes(handlerTag.toString()));
|
|
46
|
+
if (!activatedKey) return null;
|
|
47
|
+
const indexedKey = (_activatedKey$split = activatedKey.split('__')) === null || _activatedKey$split === void 0 ? void 0 : _activatedKey$split[0];
|
|
48
|
+
if (!indexedKey) return null;
|
|
49
|
+
const touchableItem = touchableRefs.value[indexedKey];
|
|
50
|
+
if (!touchableItem) return null;
|
|
51
|
+
return {
|
|
52
|
+
key: indexedKey,
|
|
53
|
+
touchableItem
|
|
54
|
+
};
|
|
55
|
+
}, [activeKey, touchableRefs]);
|
|
56
|
+
const mainPanGesture = (0, _react.useMemo)(() => panGesture.onBegin(event => {
|
|
57
|
+
'worklet';
|
|
58
|
+
|
|
59
|
+
const result = findTouchableItem(event, 'onStart');
|
|
60
|
+
if (result) {
|
|
61
|
+
var _result$touchableItem, _result$touchableItem2;
|
|
62
|
+
activeKey.value = [`${result.key}__${event.handlerTag}`];
|
|
63
|
+
(_result$touchableItem = (_result$touchableItem2 = result.touchableItem).onStart) === null || _result$touchableItem === void 0 ? void 0 : _result$touchableItem.call(_result$touchableItem2, event);
|
|
64
|
+
}
|
|
65
|
+
}).onUpdate(event => {
|
|
66
|
+
'worklet';
|
|
67
|
+
|
|
68
|
+
const result = getActiveTouchableItem(event.handlerTag);
|
|
69
|
+
if (result) {
|
|
70
|
+
var _result$touchableItem3, _result$touchableItem4;
|
|
71
|
+
(_result$touchableItem3 = (_result$touchableItem4 = result.touchableItem).onActive) === null || _result$touchableItem3 === void 0 ? void 0 : _result$touchableItem3.call(_result$touchableItem4, event);
|
|
72
|
+
}
|
|
73
|
+
}).onFinalize(event => {
|
|
74
|
+
'worklet';
|
|
75
|
+
|
|
76
|
+
const result = getActiveTouchableItem(event.handlerTag);
|
|
77
|
+
if (result) {
|
|
78
|
+
var _result$touchableItem5, _result$touchableItem6;
|
|
79
|
+
activeKey.value = activeKey.value.filter(key => !key.includes(event.handlerTag.toString()));
|
|
80
|
+
(_result$touchableItem5 = (_result$touchableItem6 = result.touchableItem).onEnd) === null || _result$touchableItem5 === void 0 ? void 0 : _result$touchableItem5.call(_result$touchableItem6, event);
|
|
81
|
+
}
|
|
82
|
+
}), [panGesture, findTouchableItem, getActiveTouchableItem, activeKey]);
|
|
83
|
+
const mainTapGesture = (0, _react.useMemo)(() => tapGesture.onTouchesUp(event => {
|
|
84
|
+
'worklet';
|
|
85
|
+
|
|
86
|
+
// TODO: consider handling multiple touches
|
|
87
|
+
var _event$allTouches$, _event$allTouches$2;
|
|
88
|
+
const point = {
|
|
89
|
+
x: ((_event$allTouches$ = event.allTouches[0]) === null || _event$allTouches$ === void 0 ? void 0 : _event$allTouches$.x) || 0,
|
|
90
|
+
y: ((_event$allTouches$2 = event.allTouches[0]) === null || _event$allTouches$2 === void 0 ? void 0 : _event$allTouches$2.y) || 0
|
|
91
|
+
};
|
|
92
|
+
const result = findTouchableItem(point, 'onTap');
|
|
93
|
+
if (result) {
|
|
94
|
+
var _result$touchableItem7, _result$touchableItem8;
|
|
95
|
+
(_result$touchableItem7 = (_result$touchableItem8 = result.touchableItem).onTap) === null || _result$touchableItem7 === void 0 ? void 0 : _result$touchableItem7.call(_result$touchableItem8, event);
|
|
96
|
+
}
|
|
97
|
+
}), [tapGesture, findTouchableItem]);
|
|
98
|
+
const gesture = (0, _react.useMemo)(() => _reactNativeGestureHandler.Gesture.Simultaneous(mainPanGesture, mainTapGesture), [mainPanGesture, mainTapGesture]);
|
|
99
|
+
return {
|
|
100
|
+
gesture,
|
|
101
|
+
findTouchableItem,
|
|
102
|
+
getActiveTouchableItem
|
|
103
|
+
};
|
|
104
|
+
};
|
|
105
|
+
exports.useTouchableGestures = useTouchableGestures;
|
|
106
|
+
//# sourceMappingURL=use-touchable-gestures.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useTouchableGestures","touchableRefs","panGesture","Gesture","Pan","tapGesture","Tap","activeKey","useSharedValue","findTouchableItem","useCallback","point","handlerCallback","refs","value","keys","Object","i","length","key","touchableItem","isPointInPath","getActiveTouchableItem","handlerTag","activatedKey","find","includes","toString","indexedKey","split","mainPanGesture","useMemo","onBegin","event","result","onStart","onUpdate","onActive","onFinalize","filter","onEnd","mainTapGesture","onTouchesUp","x","allTouches","y","onTap","gesture","Simultaneous"],"sourceRoot":"../../src","sources":["use-touchable-gestures.ts"],"mappings":"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"}
|
package/lib/commonjs/index.js
CHANGED
|
@@ -30,6 +30,18 @@ Object.keys(_useGestureHandler).forEach(function (key) {
|
|
|
30
30
|
}
|
|
31
31
|
});
|
|
32
32
|
});
|
|
33
|
+
var _useTouchableGestures = require("./hooks/use-touchable-gestures");
|
|
34
|
+
Object.keys(_useTouchableGestures).forEach(function (key) {
|
|
35
|
+
if (key === "default" || key === "__esModule") return;
|
|
36
|
+
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
37
|
+
if (key in exports && exports[key] === _useTouchableGestures[key]) return;
|
|
38
|
+
Object.defineProperty(exports, key, {
|
|
39
|
+
enumerable: true,
|
|
40
|
+
get: function () {
|
|
41
|
+
return _useTouchableGestures[key];
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
});
|
|
33
45
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
34
46
|
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; }
|
|
35
47
|
var _default = Touchable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Touchable"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;
|
|
1
|
+
{"version":3,"names":["Touchable"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAA+C;AAAA;AAAA,eAEhCA,SAAS;AAAA"}
|
|
@@ -1,88 +1,31 @@
|
|
|
1
1
|
import { Canvas as SkiaCanvas } from '@shopify/react-native-skia';
|
|
2
|
-
import React, {
|
|
2
|
+
import React, { useMemo } from 'react';
|
|
3
3
|
import { Gesture, GestureDetector } from 'react-native-gesture-handler';
|
|
4
4
|
import { useSharedValue } from 'react-native-reanimated';
|
|
5
5
|
import { TouchHandlerContext } from './context';
|
|
6
|
+
import { TouchableRefManager } from './ref-manager';
|
|
7
|
+
import { useTouchableGestures } from '../hooks/use-touchable-gestures';
|
|
6
8
|
const Canvas = _ref => {
|
|
7
9
|
let {
|
|
8
10
|
children,
|
|
9
11
|
panGesture = Gesture.Pan(),
|
|
10
|
-
|
|
12
|
+
tapGesture = Gesture.Tap(),
|
|
11
13
|
...props
|
|
12
14
|
} = _ref;
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const ref = useRef();
|
|
24
|
-
useEffect(() => {
|
|
25
|
-
ref.current = setTimeout(() => {
|
|
26
|
-
prepareLoadedRefs(touchableRefs.value);
|
|
27
|
-
}, timeoutBeforeCollectingRefs);
|
|
28
|
-
return () => {
|
|
29
|
-
clearTimeout(ref.current);
|
|
30
|
-
};
|
|
31
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
32
|
-
}, [timeoutBeforeCollectingRefs]);
|
|
33
|
-
const mainGesture = panGesture.onBegin(event => {
|
|
34
|
-
'worklet';
|
|
35
|
-
|
|
36
|
-
const keys = Object.keys(loadedRefs);
|
|
37
|
-
for (let i = 0; i < keys.length; i++) {
|
|
38
|
-
const key = keys[i];
|
|
39
|
-
const touchableItem = loadedRefs[key];
|
|
40
|
-
const isPointInPath = touchableItem === null || touchableItem === void 0 ? void 0 : touchableItem.isPointInPath(event);
|
|
41
|
-
if (isPointInPath && touchableItem !== null && touchableItem !== void 0 && touchableItem.onStart) {
|
|
42
|
-
var _touchableItem$onStar;
|
|
43
|
-
activeKey.value = [`${key}__${event.handlerTag}`];
|
|
44
|
-
(_touchableItem$onStar = touchableItem.onStart) === null || _touchableItem$onStar === void 0 ? void 0 : _touchableItem$onStar.call(touchableItem, event);
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}).onUpdate(event => {
|
|
48
|
-
'worklet';
|
|
49
|
-
|
|
50
|
-
var _activatedKey$split, _touchableItem$onActi;
|
|
51
|
-
const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
|
|
52
|
-
if (!activatedKey) {
|
|
53
|
-
return;
|
|
54
|
-
}
|
|
55
|
-
const indexedKey = (_activatedKey$split = activatedKey.split('__')) === null || _activatedKey$split === void 0 ? void 0 : _activatedKey$split[0];
|
|
56
|
-
if (!indexedKey) {
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
const touchableItem = loadedRefs[indexedKey];
|
|
60
|
-
return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onActi = touchableItem.onActive) === null || _touchableItem$onActi === void 0 ? void 0 : _touchableItem$onActi.call(touchableItem, event);
|
|
61
|
-
}).onFinalize(event => {
|
|
62
|
-
'worklet';
|
|
63
|
-
|
|
64
|
-
var _activatedKey$split2, _touchableItem$onEnd;
|
|
65
|
-
const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
|
|
66
|
-
if (!activatedKey) {
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
69
|
-
const indexedKey = (_activatedKey$split2 = activatedKey.split('__')) === null || _activatedKey$split2 === void 0 ? void 0 : _activatedKey$split2[0];
|
|
70
|
-
if (!indexedKey) {
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const touchableItem = loadedRefs[indexedKey];
|
|
74
|
-
activeKey.value = activeKey.value.filter(key => !key.includes(event.handlerTag.toString()));
|
|
75
|
-
return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onEnd = touchableItem.onEnd) === null || _touchableItem$onEnd === void 0 ? void 0 : _touchableItem$onEnd.call(touchableItem, event);
|
|
76
|
-
});
|
|
77
|
-
useEffect(() => {
|
|
78
|
-
return () => {
|
|
79
|
-
touchableRefs.value = {};
|
|
80
|
-
};
|
|
81
|
-
}, [touchableRefs]);
|
|
15
|
+
const touchableRefs = useSharedValue({});
|
|
16
|
+
const refManager = useMemo(() => new TouchableRefManager(touchableRefs), [touchableRefs]);
|
|
17
|
+
const gestureProps = useMemo(() => ({
|
|
18
|
+
touchableRefs,
|
|
19
|
+
panGesture,
|
|
20
|
+
tapGesture
|
|
21
|
+
}), [touchableRefs, panGesture, tapGesture]);
|
|
22
|
+
const {
|
|
23
|
+
gesture
|
|
24
|
+
} = useTouchableGestures(gestureProps);
|
|
82
25
|
return /*#__PURE__*/React.createElement(GestureDetector, {
|
|
83
|
-
gesture:
|
|
26
|
+
gesture: gesture
|
|
84
27
|
}, /*#__PURE__*/React.createElement(SkiaCanvas, props, /*#__PURE__*/React.createElement(TouchHandlerContext.Provider, {
|
|
85
|
-
value:
|
|
28
|
+
value: refManager
|
|
86
29
|
}, children)));
|
|
87
30
|
};
|
|
88
31
|
export { Canvas };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Canvas","SkiaCanvas","React","
|
|
1
|
+
{"version":3,"names":["Canvas","SkiaCanvas","React","useMemo","Gesture","GestureDetector","useSharedValue","TouchHandlerContext","TouchableRefManager","useTouchableGestures","children","panGesture","Pan","tapGesture","Tap","props","touchableRefs","refManager","gestureProps","gesture"],"sourceRoot":"../../src","sources":["canvas.tsx"],"mappings":"AAAA,SAASA,MAAM,IAAIC,UAAU,QAAQ,4BAA4B;AACjE,OAAOC,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SACEC,OAAO,EACPC,eAAe,QAGV,8BAA8B;AACrC,SAASC,cAAc,QAAQ,yBAAyB;AAExD,SAASC,mBAAmB,QAAQ,WAAW;AAC/C,SAASC,mBAAmB,QAA2B,eAAe;AACtE,SAASC,oBAAoB,QAAQ,iCAAiC;AAStE,MAAMT,MAAsC,GAAG,QAKzC;EAAA,IAL0C;IAC9CU,QAAQ;IACRC,UAAU,GAAGP,OAAO,CAACQ,GAAG,EAAE;IAC1BC,UAAU,GAAGT,OAAO,CAACU,GAAG,EAAE;IAC1B,GAAGC;EACL,CAAC;EACC,MAAMC,aAAa,GAAGV,cAAc,CAA+B,CAAC,CAAC,CAAC;EACtE,MAAMW,UAAU,GAAGd,OAAO,CACxB,MAAM,IAAIK,mBAAmB,CAACQ,aAAa,CAAC,EAC5C,CAACA,aAAa,CAAC,CAChB;EAED,MAAME,YAAY,GAAGf,OAAO,CAC1B,OAAO;IACLa,aAAa;IACbL,UAAU;IACVE;EACF,CAAC,CAAC,EACF,CAACG,aAAa,EAAEL,UAAU,EAAEE,UAAU,CAAC,CACxC;EAED,MAAM;IAAEM;EAAQ,CAAC,GAAGV,oBAAoB,CAACS,YAAY,CAAC;EAEtD,oBACE,oBAAC,eAAe;IAAC,OAAO,EAAEC;EAAQ,gBAChC,oBAAC,UAAU,EAAKJ,KAAK,eACnB,oBAAC,mBAAmB,CAAC,QAAQ;IAAC,KAAK,EAAEE;EAAW,GAC7CP,QAAQ,CACoB,CACpB,CACG;AAEtB,CAAC;AAED,SAASV,MAAM"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import React, { useContext } from 'react';
|
|
2
|
-
const TouchHandlerContext = /*#__PURE__*/React.createContext(
|
|
3
|
-
value: {}
|
|
4
|
-
});
|
|
2
|
+
const TouchHandlerContext = /*#__PURE__*/React.createContext(null);
|
|
5
3
|
const useTouchHandlerContext = () => {
|
|
6
|
-
|
|
4
|
+
const context = useContext(TouchHandlerContext);
|
|
5
|
+
if (!context) {
|
|
6
|
+
throw new Error('useTouchHandlerContext must be used within TouchHandlerContext.Provider');
|
|
7
|
+
}
|
|
8
|
+
return context;
|
|
7
9
|
};
|
|
8
10
|
export { TouchHandlerContext, useTouchHandlerContext };
|
|
9
11
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useContext","TouchHandlerContext","createContext","
|
|
1
|
+
{"version":3,"names":["React","useContext","TouchHandlerContext","createContext","useTouchHandlerContext","context","Error"],"sourceRoot":"../../src","sources":["context.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AAGzC,MAAMC,mBAAmB,gBAAGF,KAAK,CAACG,aAAa,CAC7C,IAAI,CACL;AAED,MAAMC,sBAAsB,GAAG,MAAM;EACnC,MAAMC,OAAO,GAAGJ,UAAU,CAACC,mBAAmB,CAAC;EAC/C,IAAI,CAACG,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CACb,yEAAyE,CAC1E;EACH;EACA,OAAOD,OAAO;AAChB,CAAC;AAED,SAASH,mBAAmB,EAAEE,sBAAsB"}
|