react-native-skia-gesture 0.2.0 → 0.3.2

package/lib/commonjs/utils/get-rect-path.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.getRoundedRectPath = exports.getRectPath = void 0;
 var _reactNativeSkia = require("@shopify/react-native-skia");
 const getRectPath = params => {
+  'worklet';
+
   const skPath = _reactNativeSkia.Skia.Path.Make();
   if ('rect' in params) {
-    // eslint-disable-next-line @typescript-eslint/no-shadow
     const {
       rect
     } = params;
@@ -21,21 +22,22 @@ const getRectPath = params => {
     width,
     height
   } = params;
-  skPath.addRect((0, _reactNativeSkia.rect)(x, y, width, height));
+  skPath.addRect(_reactNativeSkia.Skia.XYWHRect(x, y, width, height));
   return skPath;
 };
 exports.getRectPath = getRectPath;
 const getRoundedRectPath = params => {
+  'worklet';
+
   const {
     r
   } = params;
   const skPath = _reactNativeSkia.Skia.Path.Make();
   if ('rect' in params) {
-    // eslint-disable-next-line @typescript-eslint/no-shadow
     const {
       rect
     } = params;
-    skPath.addRRect((0, _reactNativeSkia.rrect)(rect, r, r));
+    skPath.addRRect(_reactNativeSkia.Skia.RRectXY(rect, r, r));
     return skPath;
   }
   const {
@@ -44,7 +46,8 @@ const getRoundedRectPath = params => {
     width,
     height
   } = params;
-  skPath.addRRect((0, _reactNativeSkia.rrect)((0, _reactNativeSkia.rect)(x, y, width, height), r, r));
+  const roundedRect = _reactNativeSkia.Skia.RRectXY(_reactNativeSkia.Skia.XYWHRect(x, y, width, height), r, r);
+  skPath.addRRect(roundedRect);
   return skPath;
 };
 exports.getRoundedRectPath = getRoundedRectPath;

package/lib/commonjs/utils/get-rect-path.js.map

@@ -1 +1 @@
-{"version":3,"names":["getRectPath","params","skPath","Skia","Path","Make","rect","addRect","x","y","width","height","getRoundedRectPath","r","addRRect","rrect"],"sourceRoot":"../../src","sources":["get-rect-path.ts"],"mappings":";;;;;;AAAA;AAWA,MAAMA,WAAW,GAAIC,MAAyB,IAAK;EACjD,MAAMC,MAAM,GAAGC,qBAAI,CAACC,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIJ,MAAM,EAAE;IACpB;IACA,MAAM;MAAEK;IAAK,CAAC,GAAGL,MAAM;IAEvBC,MAAM,CAACK,OAAO,CAACD,IAAI,CAAC;IACpB,OAAOJ,MAAM;EACf;EACA,MAAM;IAAEM,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGV,MAAM;EACtCC,MAAM,CAACK,OAAO,CAAC,IAAAD,qBAAI,EAACE,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC;EACzC,OAAOT,MAAM;AACf,CAAC;AAAC;AAMF,MAAMU,kBAAkB,GAAIX,MAAgC,IAAK;EAC/D,MAAM;IAAEY;EAAE,CAAC,GAAGZ,MAAM;EACpB,MAAMC,MAAM,GAAGC,qBAAI,CAACC,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIJ,MAAM,EAAE;IACpB;IACA,MAAM;MAAEK;IAAK,CAAC,GAAGL,MAAM;IACvBC,MAAM,CAACY,QAAQ,CAAC,IAAAC,sBAAK,EAACT,IAAI,EAAEO,CAAC,EAAEA,CAAC,CAAC,CAAC;IAClC,OAAOX,MAAM;EACf;EACA,MAAM;IAAEM,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGV,MAAM;EAEtCC,MAAM,CAACY,QAAQ,CAAC,IAAAC,sBAAK,EAAC,IAAAT,qBAAI,EAACE,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,EAAEE,CAAC,EAAEA,CAAC,CAAC,CAAC;EACvD,OAAOX,MAAM;AACf,CAAC;AAAC"}
+{"version":3,"names":["getRectPath","params","skPath","Skia","Path","Make","rect","addRect","x","y","width","height","XYWHRect","getRoundedRectPath","r","addRRect","RRectXY","roundedRect"],"sourceRoot":"../../src","sources":["get-rect-path.ts"],"mappings":";;;;;;AAAA;AAWA,MAAMA,WAAW,GAAIC,MAAyB,IAAK;EACjD,SAAS;;EAET,MAAMC,MAAM,GAAGC,qBAAI,CAACC,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIJ,MAAM,EAAE;IACpB,MAAM;MAAEK;IAAK,CAAC,GAAGL,MAAM;IAEvBC,MAAM,CAACK,OAAO,CAACD,IAAI,CAAC;IACpB,OAAOJ,MAAM;EACf;EACA,MAAM;IAAEM,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGV,MAAM;EAEtCC,MAAM,CAACK,OAAO,CAACJ,qBAAI,CAACS,QAAQ,CAACJ,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC;EAClD,OAAOT,MAAM;AACf,CAAC;AAAC;AAMF,MAAMW,kBAAkB,GAAIZ,MAAgC,IAAK;EAC/D,SAAS;;EAET,MAAM;IAAEa;EAAE,CAAC,GAAGb,MAAM;EACpB,MAAMC,MAAM,GAAGC,qBAAI,CAACC,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIJ,MAAM,EAAE;IACpB,MAAM;MAAEK;IAAK,CAAC,GAAGL,MAAM;IAEvBC,MAAM,CAACa,QAAQ,CAACZ,qBAAI,CAACa,OAAO,CAACV,IAAI,EAAEQ,CAAC,EAAEA,CAAC,CAAC,CAAC;IACzC,OAAOZ,MAAM;EACf;EACA,MAAM;IAAEM,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGV,MAAM;EAEtC,MAAMgB,WAAW,GAAGd,qBAAI,CAACa,OAAO,CAACb,qBAAI,CAACS,QAAQ,CAACJ,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,EAAEG,CAAC,EAAEA,CAAC,CAAC;EAC1EZ,MAAM,CAACa,QAAQ,CAACE,WAAW,CAAC;EAC5B,OAAOf,MAAM;AACf,CAAC;AAAC"}

package/lib/commonjs/utils/unwrap-animated-value.js

@@ -5,6 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unwrapAnimatedValueObject = exports.unwrapAnimatedValue = void 0;
 const unwrapAnimatedValue = value => {
+  'worklet';
+
+  if (value.value != null) {
+    return value.value;
+  }
   if (value.current != null) {
     return value.current;
   }
@@ -16,6 +21,8 @@ const unwrapAnimatedValue = value => {
 };
 exports.unwrapAnimatedValue = unwrapAnimatedValue;
 const unwrapAnimatedValueObject = value => {
+  'worklet';
+
   return Object.keys(value).reduce((acc, key) => {
     return {
       ...acc,

package/lib/commonjs/utils/unwrap-animated-value.js.map

@@ -1 +1 @@
-{"version":3,"names":["unwrapAnimatedValue","value","current","selector","skiaValueWithSelector","unwrapAnimatedValueObject","Object","keys","reduce","acc","key"],"sourceRoot":"../../src","sources":["unwrap-animated-value.ts"],"mappings":";;;;;;AAMA,MAAMA,mBAAmB,GACvBC,KAAkD,IAC5C;EACN,IAAKA,KAAK,CAAkBC,OAAO,IAAI,IAAI,EAAE;IAC3C,OAAQD,KAAK,CAAkBC,OAAO;EACxC;EAEA,IAAKD,KAAK,CAA8BE,QAAQ,IAAI,IAAI,EAAE;IACxD,MAAMC,qBAAqB,GAAGH,KAAiC;IAC/D,OAAOG,qBAAqB,CAACD,QAAQ,CAACC,qBAAqB,CAACH,KAAK,CAACC,OAAO,CAAC;EAC5E;EAEA,OAAOD,KAAK;AACd,CAAC;AAAC;AAEF,MAAMI,yBAAyB,GAC7BJ,KAAoC,IACjB;EACnB,OAAOK,MAAM,CAACC,IAAI,CAACN,KAAK,CAAC,CAACO,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAK;IAC7C,OAAO;MAAE,GAAGD,GAAG;MAAE,CAACC,GAAG,GAAGV,mBAAmB,CAACC,KAAK,CAACS,GAAG,CAAC;IAAE,CAAC;EAC3D,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAAC"}
+{"version":3,"names":["unwrapAnimatedValue","value","current","selector","skiaValueWithSelector","unwrapAnimatedValueObject","Object","keys","reduce","acc","key"],"sourceRoot":"../../src","sources":["unwrap-animated-value.ts"],"mappings":";;;;;;AAOA,MAAMA,mBAAmB,GACvBC,KAA4E,IACtE;EACN,SAAS;;EAET,IAAKA,KAAK,CAA6BA,KAAK,IAAI,IAAI,EAAE;IACpD,OAAQA,KAAK,CAA6BA,KAAK;EACjD;EAEA,IAAKA,KAAK,CAAkBC,OAAO,IAAI,IAAI,EAAE;IAC3C,OAAQD,KAAK,CAAkBC,OAAO;EACxC;EAEA,IAAKD,KAAK,CAA8BE,QAAQ,IAAI,IAAI,EAAE;IACxD,MAAMC,qBAAqB,GAAGH,KAAiC;IAC/D,OAAOG,qBAAqB,CAACD,QAAQ,CAACC,qBAAqB,CAACH,KAAK,CAACC,OAAO,CAAC;EAC5E;EAEA,OAAOD,KAAK;AACd,CAAC;AAAC;AAEF,MAAMI,yBAAyB,GAC7BJ,KAAoC,IACjB;EACnB,SAAS;;EACT,OAAOK,MAAM,CAACC,IAAI,CAACN,KAAK,CAAC,CAACO,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAK;IAC7C,OAAO;MAAE,GAAGD,GAAG;MAAE,CAACC,GAAG,GAAGV,mBAAmB,CAACC,KAAK,CAACS,GAAG,CAAC;IAAE,CAAC;EAC3D,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAAC"}

package/lib/module/canvas/canvas.js

@@ -1,72 +1,84 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-import { Canvas as SkiaCanvas, useMultiTouchHandler, useValue } from '@shopify/react-native-skia';
-import React, { useEffect } from 'react';
+import { Canvas as SkiaCanvas } from '@shopify/react-native-skia';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { Gesture, GestureDetector } from 'react-native-gesture-handler';
+import Animated, { useSharedValue } from 'react-native-reanimated';
 import { TouchHandlerContext } from './context';
-const Canvas = /*#__PURE__*/React.forwardRef((_ref, ref) => {
+const AnimatedSkiaCanvas = Animated.createAnimatedComponent(SkiaCanvas);
+const Canvas = _ref => {
   let {
     children,
-    onTouch,
+    panGesture = Gesture.Pan(),
+    timeoutBeforeCollectingRefs = 100,
     ...props
   } = _ref;
-  const touchableRefs = useValue({});
-  const activeKey = useValue([]);
-  const touchHandler = useMultiTouchHandler({
-    onStart: event => {
-      const keys = Object.keys(touchableRefs.current);
-      for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-        const touchableItem = touchableRefs.current[key];
-        if (touchableItem !== null && touchableItem !== void 0 && touchableItem.isPointInPath(event)) {
-          var _touchableItem$onStar;
-          activeKey.current.push(`${key}__${event.id}`);
-          (_touchableItem$onStar = touchableItem.onStart) === null || _touchableItem$onStar === void 0 ? void 0 : _touchableItem$onStar.call(touchableItem, event);
-          return;
-        }
-      }
-    },
-    onActive: event => {
-      var _activatedKey$split, _touchableItem$onActi;
-      const activatedKey = activeKey.current.find(key => key.includes(event.id.toString()));
-      if (!activatedKey) {
-        return;
-      }
-      const indexedKey = (_activatedKey$split = activatedKey.split('__')) === null || _activatedKey$split === void 0 ? void 0 : _activatedKey$split[0];
-      if (!indexedKey) {
-        return;
-      }
-      const touchableItem = touchableRefs.current[indexedKey];
-      return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onActi = touchableItem.onActive) === null || _touchableItem$onActi === void 0 ? void 0 : _touchableItem$onActi.call(touchableItem, event);
-    },
-    onEnd: event => {
-      var _activatedKey$split2, _touchableItem$onEnd;
-      const activatedKey = activeKey.current.find(key => key.includes(event.id.toString()));
-      if (!activatedKey) {
-        return;
-      }
-      const indexedKey = (_activatedKey$split2 = activatedKey.split('__')) === null || _activatedKey$split2 === void 0 ? void 0 : _activatedKey$split2[0];
-      if (!indexedKey) {
-        return;
+  // Instead of value, provide a subscribe method and reload the refs
+  const touchableRefs = useMemo(() => {
+    return {
+      value: {}
+    };
+  }, []);
+  const activeKey = useSharedValue([]);
+
+  // This must be improved, it's a hack to wait for the refs to be loaded
+  const [loadedRefs, prepareLoadedRefs] = useState({});
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = setTimeout(() => {
+      prepareLoadedRefs(touchableRefs.value);
+    }, timeoutBeforeCollectingRefs);
+    return () => {
+      clearTimeout(ref.current);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [timeoutBeforeCollectingRefs]);
+  const mainGesture = panGesture.onBegin(event => {
+    const keys = Object.keys(loadedRefs);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const touchableItem = loadedRefs[key];
+      const isPointInPath = touchableItem === null || touchableItem === void 0 ? void 0 : touchableItem.isPointInPath(event);
+      if (isPointInPath && touchableItem !== null && touchableItem !== void 0 && touchableItem.onStart) {
+        var _touchableItem$onStar;
+        activeKey.value.push(`${key}__${event.handlerTag}`);
+        (_touchableItem$onStar = touchableItem.onStart) === null || _touchableItem$onStar === void 0 ? void 0 : _touchableItem$onStar.call(touchableItem, event);
       }
-      const touchableItem = touchableRefs.current[indexedKey];
-      activeKey.current = activeKey.current.filter(key => !key.includes(event.id.toString()));
-      return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onEnd = touchableItem.onEnd) === null || _touchableItem$onEnd === void 0 ? void 0 : _touchableItem$onEnd.call(touchableItem, event);
     }
-  }, [touchableRefs, activeKey]);
+  }).onUpdate(event => {
+    var _activatedKey$split, _touchableItem$onActi;
+    const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
+    if (!activatedKey) {
+      return;
+    }
+    const indexedKey = (_activatedKey$split = activatedKey.split('__')) === null || _activatedKey$split === void 0 ? void 0 : _activatedKey$split[0];
+    if (!indexedKey) {
+      return;
+    }
+    const touchableItem = loadedRefs[indexedKey];
+    return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onActi = touchableItem.onActive) === null || _touchableItem$onActi === void 0 ? void 0 : _touchableItem$onActi.call(touchableItem, event);
+  }).onFinalize(event => {
+    var _activatedKey$split2, _touchableItem$onEnd;
+    const activatedKey = activeKey.value.find(key => key.includes(event.handlerTag.toString()));
+    if (!activatedKey) {
+      return;
+    }
+    const indexedKey = (_activatedKey$split2 = activatedKey.split('__')) === null || _activatedKey$split2 === void 0 ? void 0 : _activatedKey$split2[0];
+    if (!indexedKey) {
+      return;
+    }
+    const touchableItem = loadedRefs[indexedKey];
+    activeKey.value = activeKey.value.filter(key => !key.includes(event.handlerTag.toString()));
+    return touchableItem === null || touchableItem === void 0 ? void 0 : (_touchableItem$onEnd = touchableItem.onEnd) === null || _touchableItem$onEnd === void 0 ? void 0 : _touchableItem$onEnd.call(touchableItem, event);
+  });
   useEffect(() => {
     return () => {
-      touchableRefs.current = {};
+      touchableRefs.value = {};
     };
   }, [touchableRefs]);
-  return /*#__PURE__*/React.createElement(SkiaCanvas, _extends({
-    ref: ref
-  }, props, {
-    onTouch: touchInfo => {
-      touchHandler(touchInfo);
-      return onTouch === null || onTouch === void 0 ? void 0 : onTouch(touchInfo);
-    }
-  }), /*#__PURE__*/React.createElement(TouchHandlerContext.Provider, {
+  return /*#__PURE__*/React.createElement(GestureDetector, {
+    gesture: mainGesture
+  }, /*#__PURE__*/React.createElement(AnimatedSkiaCanvas, props, /*#__PURE__*/React.createElement(TouchHandlerContext.Provider, {
     value: touchableRefs
-  }, children));
-});
+  }, children)));
+};
 export { Canvas };
 //# sourceMappingURL=canvas.js.map

package/lib/module/canvas/canvas.js.map

@@ -1 +1 @@
-{"version":3,"names":["Canvas","SkiaCanvas","useMultiTouchHandler","useValue","React","useEffect","TouchHandlerContext","forwardRef","ref","children","onTouch","props","touchableRefs","activeKey","touchHandler","onStart","event","keys","Object","current","i","length","key","touchableItem","isPointInPath","push","id","onActive","activatedKey","find","includes","toString","indexedKey","split","onEnd","filter","touchInfo"],"sourceRoot":"../../src","sources":["canvas.tsx"],"mappings":"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"}
+{"version":3,"names":["Canvas","SkiaCanvas","React","useEffect","useMemo","useRef","useState","Gesture","GestureDetector","Animated","useSharedValue","TouchHandlerContext","AnimatedSkiaCanvas","createAnimatedComponent","children","panGesture","Pan","timeoutBeforeCollectingRefs","props","touchableRefs","value","activeKey","loadedRefs","prepareLoadedRefs","ref","current","setTimeout","clearTimeout","mainGesture","onBegin","event","keys","Object","i","length","key","touchableItem","isPointInPath","onStart","push","handlerTag","onUpdate","activatedKey","find","includes","toString","indexedKey","split","onActive","onFinalize","filter","onEnd"],"sourceRoot":"../../src","sources":["canvas.tsx"],"mappings":"AAAA,SAASA,MAAM,IAAIC,UAAU,QAAQ,4BAA4B;AACjE,OAAOC,KAAK,IAAIC,SAAS,EAAEC,OAAO,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AACnE,SACEC,OAAO,EACPC,eAAe,QAEV,8BAA8B;AACrC,OAAOC,QAAQ,IAAIC,cAAc,QAAQ,yBAAyB;AAElE,SACEC,mBAAmB,QAEd,WAAW;AASlB,MAAMC,kBAAkB,GAAGH,QAAQ,CAACI,uBAAuB,CAACZ,UAAU,CAAC;AAEvE,MAAMD,MAAsC,GAAG,QAKzC;EAAA,IAL0C;IAC9Cc,QAAQ;IACRC,UAAU,GAAGR,OAAO,CAACS,GAAG,EAAE;IAC1BC,2BAA2B,GAAG,GAAG;IACjC,GAAGC;EACL,CAAC;EACC;EACA,MAAMC,aAA0C,GAAGf,OAAO,CAAC,MAAM;IAC/D,OAAO;MAAEgB,KAAK,EAAE,CAAC;IAAE,CAAC;EACtB,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,SAAS,GAAGX,cAAc,CAAW,EAAE,CAAC;;EAE9C;EACA,MAAM,CAACY,UAAU,EAAEC,iBAAiB,CAAC,GAAGjB,QAAQ,CAE9C,CAAC,CAAC,CAAC;EAEL,MAAMkB,GAAG,GAAGnB,MAAM,EAAkB;EAEpCF,SAAS,CAAC,MAAM;IACdqB,GAAG,CAACC,OAAO,GAAGC,UAAU,CAAC,MAAM;MAC7BH,iBAAiB,CAACJ,aAAa,CAACC,KAAK,CAAC;IACxC,CAAC,EAAEH,2BAA2B,CAAC;IAE/B,OAAO,MAAM;MACXU,YAAY,CAACH,GAAG,CAACC,OAAO,CAAC;IAC3B,CAAC;IACD;EACF,CAAC,EAAE,CAACR,2BAA2B,CAAC,CAAC;EAEjC,MAAMW,WAAW,GAAGb,UAAU,CAC3Bc,OAAO,CAAEC,KAAK,IAAK;IAClB,MAAMC,IAAI,GAAGC,MAAM,CAACD,IAAI,CAACT,UAAU,CAAC;IACpC,KAAK,IAAIW,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,IAAI,CAACG,MAAM,EAAED,CAAC,EAAE,EAAE;MACpC,MAAME,GAAG,GAAGJ,IAAI,CAACE,CAAC,CAAW;MAC7B,MAAMG,aAAa,GAAGd,UAAU,CAACa,GAAG,CAAC;MACrC,MAAME,aAAa,GAAGD,aAAa,aAAbA,aAAa,uBAAbA,aAAa,CAAEC,aAAa,CAACP,KAAK,CAAC;MACzD,IAAIO,aAAa,IAAID,aAAa,aAAbA,aAAa,eAAbA,aAAa,CAAEE,OAAO,EAAE;QAAA;QAC3CjB,SAAS,CAACD,KAAK,CAACmB,IAAI,CAAE,GAAEJ,GAAI,KAAIL,KAAK,CAACU,UAAW,EAAC,CAAC;QACnD,yBAAAJ,aAAa,CAACE,OAAO,0DAArB,2BAAAF,aAAa,EAAWN,KAAK,CAAC;MAChC;IACF;EACF,CAAC,CAAC,CACDW,QAAQ,CAAEX,KAAK,IAAK;IAAA;IACnB,MAAMY,YAAY,GAAGrB,SAAS,CAACD,KAAK,CAACuB,IAAI,CAAER,GAAG,IAC5CA,GAAG,CAACS,QAAQ,CAACd,KAAK,CAACU,UAAU,CAACK,QAAQ,EAAE,CAAC,CAC1C;IAED,IAAI,CAACH,YAAY,EAAE;MACjB;IACF;IACA,MAAMI,UAAU,0BAAGJ,YAAY,CAACK,KAAK,CAAC,IAAI,CAAC,wDAAxB,oBAA2B,CAAC,CAAC;IAEhD,IAAI,CAACD,UAAU,EAAE;MACf;IACF;IACA,MAAMV,aAAa,GAAGd,UAAU,CAACwB,UAAU,CAAC;IAE5C,OAAOV,aAAa,aAAbA,aAAa,gDAAbA,aAAa,CAAEY,QAAQ,0DAAvB,2BAAAZ,aAAa,EAAaN,KAAK,CAAC;EACzC,CAAC,CAAC,CACDmB,UAAU,CAAEnB,KAAK,IAAK;IAAA;IACrB,MAAMY,YAAY,GAAGrB,SAAS,CAACD,KAAK,CAACuB,IAAI,CAAER,GAAG,IAC5CA,GAAG,CAACS,QAAQ,CAACd,KAAK,CAACU,UAAU,CAACK,QAAQ,EAAE,CAAC,CAC1C;IACD,IAAI,CAACH,YAAY,EAAE;MACjB;IACF;IACA,MAAMI,UAAU,2BAAGJ,YAAY,CAACK,KAAK,CAAC,IAAI,CAAC,yDAAxB,qBAA2B,CAAC,CAAC;IAChD,IAAI,CAACD,UAAU,EAAE;MACf;IACF;IACA,MAAMV,aAAa,GAAGd,UAAU,CAACwB,UAAU,CAAC;IAC5CzB,SAAS,CAACD,KAAK,GAAGC,SAAS,CAACD,KAAK,CAAC8B,MAAM,CACrCf,GAAG,IAAK,CAACA,GAAG,CAACS,QAAQ,CAACd,KAAK,CAACU,UAAU,CAACK,QAAQ,EAAE,CAAC,CACpD;IACD,OAAOT,aAAa,aAAbA,aAAa,+CAAbA,aAAa,CAAEe,KAAK,yDAApB,0BAAAf,aAAa,EAAUN,KAAK,CAAQ;EAC7C,CAAC,CAAC;EAEJ3B,SAAS,CAAC,MAAM;IACd,OAAO,MAAM;MACXgB,aAAa,CAACC,KAAK,GAAG,CAAC,CAAC;IAC1B,CAAC;EACH,CAAC,EAAE,CAACD,aAAa,CAAC,CAAC;EAEnB,oBACE,oBAAC,eAAe;IAAC,OAAO,EAAES;EAAY,gBACpC,oBAAC,kBAAkB,EAAKV,KAAK,eAC3B,oBAAC,mBAAmB,CAAC,QAAQ;IAAC,KAAK,EAAEC;EAAc,GAChDL,QAAQ,CACoB,CACZ,CACL;AAEtB,CAAC;AAED,SAASd,MAAM"}

package/lib/module/canvas/context.js

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 const TouchHandlerContext = /*#__PURE__*/React.createContext({
-  current: {}
+  value: {}
 });
 const useTouchHandlerContext = () => {
   return useContext(TouchHandlerContext);

package/lib/module/canvas/context.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useContext","TouchHandlerContext","createContext","current","useTouchHandlerContext"],"sourceRoot":"../../src","sources":["context.tsx"],"mappings":"AAKA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AAazC,MAAMC,mBAAmB,gBAAGF,KAAK,CAACG,aAAa,CAA8B;EAC3EC,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAMC,sBAAsB,GAAG,MAAM;EACnC,OAAOJ,UAAU,CAACC,mBAAmB,CAAC;AACxC,CAAC;AAED,SAASA,mBAAmB,EAAEG,sBAAsB"}
+{"version":3,"names":["React","useContext","TouchHandlerContext","createContext","value","useTouchHandlerContext"],"sourceRoot":"../../src","sources":["context.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,UAAU,QAAQ,OAAO;AA2BzC,MAAMC,mBAAmB,gBAAGF,KAAK,CAACG,aAAa,CAA8B;EAC3EC,KAAK,EAAE,CAAC;AACV,CAAC,CAAC;AAEF,MAAMC,sBAAsB,GAAG,MAAM;EACnC,OAAOJ,UAAU,CAACC,mBAAmB,CAAC;AACxC,CAAC;AAED,SAASA,mBAAmB,EAAEG,sBAAsB"}

package/lib/module/components/index.js

@@ -1,8 +1,8 @@
 import { Circle as SkiaCircle, RoundedRect as SkiaRoundedRect, Rect as SkiaRect, Path as SkiaPath } from '@shopify/react-native-skia';
 import { withTouchableHandler } from '../hoc';
 export { Canvas } from '../canvas';
-export const Circle = withTouchableHandler(SkiaCircle);
-export const RoundedRect = withTouchableHandler(SkiaRoundedRect);
-export const Rect = withTouchableHandler(SkiaRect);
-export const Path = withTouchableHandler(SkiaPath);
+export const Circle = withTouchableHandler(SkiaCircle, 'Circle');
+export const RoundedRect = withTouchableHandler(SkiaRoundedRect, 'RoundedRect');
+export const Rect = withTouchableHandler(SkiaRect, 'Rect');
+export const Path = withTouchableHandler(SkiaPath, 'Path');
 //# sourceMappingURL=index.js.map

package/lib/module/components/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Circle","SkiaCircle","RoundedRect","SkiaRoundedRect","Rect","SkiaRect","Path","SkiaPath","withTouchableHandler","Canvas"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SACEA,MAAM,IAAIC,UAAU,EACpBC,WAAW,IAAIC,eAAe,EAC9BC,IAAI,IAAIC,QAAQ,EAChBC,IAAI,IAAIC,QAAQ,QACX,4BAA4B;AACnC,SAASC,oBAAoB,QAAQ,QAAQ;AAE7C,SAASC,MAAM,QAAQ,WAAW;AAElC,OAAO,MAAMT,MAAM,GAAGQ,oBAAoB,CAACP,UAAU,CAAC;AACtD,OAAO,MAAMC,WAAW,GAAGM,oBAAoB,CAACL,eAAe,CAAC;AAChE,OAAO,MAAMC,IAAI,GAAGI,oBAAoB,CAACH,QAAQ,CAAC;AAClD,OAAO,MAAMC,IAAI,GAAGE,oBAAoB,CAACD,QAAQ,CAAC"}
+{"version":3,"names":["Circle","SkiaCircle","RoundedRect","SkiaRoundedRect","Rect","SkiaRect","Path","SkiaPath","withTouchableHandler","Canvas"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SACEA,MAAM,IAAIC,UAAU,EACpBC,WAAW,IAAIC,eAAe,EAC9BC,IAAI,IAAIC,QAAQ,EAChBC,IAAI,IAAIC,QAAQ,QACX,4BAA4B;AAEnC,SAASC,oBAAoB,QAAQ,QAAQ;AAE7C,SAASC,MAAM,QAAQ,WAAW;AAElC,OAAO,MAAMT,MAAM,GAAGQ,oBAAoB,CAACP,UAAU,EAAE,QAAQ,CAAC;AAChE,OAAO,MAAMC,WAAW,GAAGM,oBAAoB,CAACL,eAAe,EAAE,aAAa,CAAC;AAC/E,OAAO,MAAMC,IAAI,GAAGI,oBAAoB,CAACH,QAAQ,EAAE,MAAM,CAAC;AAC1D,OAAO,MAAMC,IAAI,GAAGE,oBAAoB,CAACD,QAAQ,EAAE,MAAM,CAAC"}

package/lib/module/hoc/with-touchable-handler.js

@@ -1,10 +1,11 @@
-import { useValue } from '@shopify/react-native-skia';
 import { useCallback, useEffect, useId } from 'react';
+import { useTouchHandlerContext } from '../canvas/context';
 import { getCirclePath } from '../utils/get-circle-path';
 import { getRectPath, getRoundedRectPath } from '../utils/get-rect-path';
 import { unwrapAnimatedValue, unwrapAnimatedValueObject } from '../utils/unwrap-animated-value';
-import { useTouchHandlerContext } from '../canvas/context';
-const getSkiaPath = (key, props) => {
+export const getSkiaPath = (key, props) => {
+  'worklet';
+
   const unwrappedProps = unwrapAnimatedValueObject(props);
   switch (key) {
     case 'Circle':
@@ -19,7 +20,7 @@ const getSkiaPath = (key, props) => {
       return null;
   }
 };
-const withTouchableHandler = Component => {
+const withTouchableHandler = (Component, componentName) => {
   return _ref => {
     let {
       onStart: onStartProp,
@@ -30,59 +31,52 @@ const withTouchableHandler = Component => {
     } = _ref;
     const id = useId();
     const ref = useTouchHandlerContext();
-    const startingPoint = useValue(null);
     const onStart = useCallback(event => {
-      startingPoint.current = {
-        x: event.x,
-        y: event.y
-      };
+      'worklet';
+
       return onStartProp === null || onStartProp === void 0 ? void 0 : onStartProp(event);
-    }, [onStartProp, startingPoint]);
+    }, [onStartProp]);
     const onActive = useCallback(event => {
-      var _startingPoint$curren, _startingPoint$curren2;
-      const translationX = event.x - (((_startingPoint$curren = startingPoint.current) === null || _startingPoint$curren === void 0 ? void 0 : _startingPoint$curren.x) ?? 0);
-      const translationY = event.y - (((_startingPoint$curren2 = startingPoint.current) === null || _startingPoint$curren2 === void 0 ? void 0 : _startingPoint$curren2.y) ?? 0);
-      return onActiveProp === null || onActiveProp === void 0 ? void 0 : onActiveProp({
-        ...event,
-        translationX,
-        translationY
-      });
-    }, [onActiveProp, startingPoint]);
+      'worklet';
+
+      return onActiveProp === null || onActiveProp === void 0 ? void 0 : onActiveProp(event);
+    }, [onActiveProp]);
     const onEnd = useCallback(event => {
-      var _startingPoint$curren3, _startingPoint$curren4;
-      const translationX = event.x - (((_startingPoint$curren3 = startingPoint.current) === null || _startingPoint$curren3 === void 0 ? void 0 : _startingPoint$curren3.x) ?? 0);
-      const translationY = event.y - (((_startingPoint$curren4 = startingPoint.current) === null || _startingPoint$curren4 === void 0 ? void 0 : _startingPoint$curren4.y) ?? 0);
-      return onEndProp === null || onEndProp === void 0 ? void 0 : onEndProp({
-        ...event,
-        translationX,
-        translationY
-      });
-    }, [onEndProp, startingPoint]);
+      'worklet';
+
+      return onEndProp === null || onEndProp === void 0 ? void 0 : onEndProp(event);
+    }, [onEndProp]);
     const isPointInPath = useCallback(point => {
+      'worklet';
+
       if (touchablePath) {
         return unwrapAnimatedValue(touchablePath).contains(point.x, point.y);
       }
-      const path = getSkiaPath(Component.name, props);
+      if (!componentName) return false;
+      const path = getSkiaPath(componentName, props);
       if (!path) {
         throw Error('No touchablePath provided');
       }
       return path.contains(point.x, point.y);
     }, [props, touchablePath]);
     useEffect(() => {
-      ref.current = {
+      ref.value = {
         [`id:${id}`]: {
           isPointInPath,
           onStart,
           onActive,
           onEnd
         },
-        ...ref.current
+        ...ref.value
       };
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [id, isPointInPath, onActive, onEnd, onStart]);
+    useEffect(() => {
       return () => {
-        var _ref$current;
-        (_ref$current = ref.current) === null || _ref$current === void 0 ? true : delete _ref$current[id];
+        var _ref$value;
+        (_ref$value = ref.value) === null || _ref$value === void 0 ? true : delete _ref$value[`id:${id}`];
       };
-    }, [id, isPointInPath, onActive, onEnd, onStart, ref, touchablePath]);
+    }, [id, props, ref, touchablePath]);
     return Component(props);
   };
 };

package/lib/module/hoc/with-touchable-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":["useValue","useCallback","useEffect","useId","getCirclePath","getRectPath","getRoundedRectPath","unwrapAnimatedValue","unwrapAnimatedValueObject","useTouchHandlerContext","getSkiaPath","key","props","unwrappedProps","path","withTouchableHandler","Component","onStart","onStartProp","onActive","onActiveProp","onEnd","onEndProp","touchablePath","id","ref","startingPoint","event","current","x","y","translationX","translationY","isPointInPath","point","contains","name","Error"],"sourceRoot":"../../src","sources":["with-touchable-handler.tsx"],"mappings":"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"}
+{"version":3,"names":["useCallback","useEffect","useId","useTouchHandlerContext","getCirclePath","getRectPath","getRoundedRectPath","unwrapAnimatedValue","unwrapAnimatedValueObject","getSkiaPath","key","props","unwrappedProps","path","withTouchableHandler","Component","componentName","onStart","onStartProp","onActive","onActiveProp","onEnd","onEndProp","touchablePath","id","ref","event","isPointInPath","point","contains","x","y","Error","value"],"sourceRoot":"../../src","sources":["with-touchable-handler.tsx"],"mappings":"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"}

package/lib/module/hooks/use-gesture-handler.js

@@ -1,23 +1,29 @@
-import { useValue } from '@shopify/react-native-skia';
 import { useCallback } from 'react';
+import { useSharedValue } from 'react-native-reanimated';
 const useGestureHandler = gestureHandlers => {
   const {
     onStart,
     onActive,
     onEnd
   } = gestureHandlers;
-  const context = useValue({});
+  const context = useSharedValue({});
   const handleStart = useCallback(touchInfo => {
+    'worklet';
+
     if (!onStart) return;
-    return onStart(touchInfo, context.current);
+    return onStart(touchInfo, context.value);
   }, [context, onStart]);
   const handleActive = useCallback(extendedTouchInfo => {
+    'worklet';
+
     if (!onActive) return;
-    return onActive(extendedTouchInfo, context.current);
+    return onActive(extendedTouchInfo, context.value);
   }, [context, onActive]);
   const handleEnd = useCallback(extendedTouchInfo => {
+    'worklet';
+
     if (!onEnd) return;
-    return onEnd(extendedTouchInfo, context.current);
+    return onEnd(extendedTouchInfo, context.value);
   }, [context, onEnd]);
   return {
     onStart: handleStart,

package/lib/module/hooks/use-gesture-handler.js.map

@@ -1 +1 @@
-{"version":3,"names":["useValue","useCallback","useGestureHandler","gestureHandlers","onStart","onActive","onEnd","context","handleStart","touchInfo","current","handleActive","extendedTouchInfo","handleEnd"],"sourceRoot":"../../src","sources":["use-gesture-handler.ts"],"mappings":"AAAA,SAGEA,QAAQ,QACH,4BAA4B;AACnC,SAASC,WAAW,QAAQ,OAAO;AAenC,MAAMC,iBAAiB,GACrBC,eAAqD,IAClD;EACH,MAAM;IAAEC,OAAO;IAAEC,QAAQ;IAAEC;EAAM,CAAC,GAAGH,eAAe;EAEpD,MAAMI,OAAO,GAAGP,QAAQ,CAAc,CAAC,CAAC,CAAQ;EAEhD,MAAMQ,WAAW,GAAGP,WAAW,CAC5BQ,SAAoB,IAAK;IACxB,IAAI,CAACL,OAAO,EAAE;IACd,OAAOA,OAAO,CAACK,SAAS,EAAEF,OAAO,CAACG,OAAO,CAAC;EAC5C,CAAC,EACD,CAACH,OAAO,EAAEH,OAAO,CAAC,CACnB;EAED,MAAMO,YAAY,GAAGV,WAAW,CAC7BW,iBAAsD,IAAK;IAC1D,IAAI,CAACP,QAAQ,EAAE;IACf,OAAOA,QAAQ,CAACO,iBAAiB,EAAEL,OAAO,CAACG,OAAO,CAAC;EACrD,CAAC,EACD,CAACH,OAAO,EAAEF,QAAQ,CAAC,CACpB;EAED,MAAMQ,SAAS,GAAGZ,WAAW,CAC1BW,iBAAsD,IAAK;IAC1D,IAAI,CAACN,KAAK,EAAE;IACZ,OAAOA,KAAK,CAACM,iBAAiB,EAAEL,OAAO,CAACG,OAAO,CAAC;EAClD,CAAC,EACD,CAACH,OAAO,EAAED,KAAK,CAAC,CACjB;EAED,OAAO;IACLF,OAAO,EAAEI,WAAW;IACpBH,QAAQ,EAAEM,YAAY;IACtBL,KAAK,EAAEO;EACT,CAAC;AACH,CAAC;AAED,SAASX,iBAAiB"}
+{"version":3,"names":["useCallback","useSharedValue","useGestureHandler","gestureHandlers","onStart","onActive","onEnd","context","handleStart","touchInfo","value","handleActive","extendedTouchInfo","handleEnd"],"sourceRoot":"../../src","sources":["use-gesture-handler.ts"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,cAAc,QAAQ,yBAAyB;AAuBxD,MAAMC,iBAAiB,GACrBC,eAAqD,IAClD;EACH,MAAM;IAAEC,OAAO;IAAEC,QAAQ;IAAEC;EAAM,CAAC,GAAGH,eAAe;EAEpD,MAAMI,OAAO,GAAGN,cAAc,CAAc,CAAC,CAAC,CAAQ;EAEtD,MAAMO,WAAW,GAAGR,WAAW,CAC5BS,SAAiE,IAAK;IACrE,SAAS;;IACT,IAAI,CAACL,OAAO,EAAE;IACd,OAAOA,OAAO,CAACK,SAAS,EAAEF,OAAO,CAACG,KAAK,CAAC;EAC1C,CAAC,EACD,CAACH,OAAO,EAAEH,OAAO,CAAC,CACnB;EAED,MAAMO,YAAY,GAAGX,WAAW,CAC7BY,iBAAoE,IAAK;IACxE,SAAS;;IACT,IAAI,CAACP,QAAQ,EAAE;IACf,OAAOA,QAAQ,CAACO,iBAAiB,EAAEL,OAAO,CAACG,KAAK,CAAC;EACnD,CAAC,EACD,CAACH,OAAO,EAAEF,QAAQ,CAAC,CACpB;EAED,MAAMQ,SAAS,GAAGb,WAAW,CAEzBY,iBAAyE,IACtE;IACH,SAAS;;IACT,IAAI,CAACN,KAAK,EAAE;IACZ,OAAOA,KAAK,CAACM,iBAAiB,EAAEL,OAAO,CAACG,KAAK,CAAC;EAChD,CAAC,EACD,CAACH,OAAO,EAAED,KAAK,CAAC,CACjB;EAED,OAAO;IACLF,OAAO,EAAEI,WAAW;IACpBH,QAAQ,EAAEM,YAAY;IACtBL,KAAK,EAAEO;EACT,CAAC;AACH,CAAC;AAED,SAASX,iBAAiB"}

package/lib/module/index.js

@@ -1,5 +1,5 @@
+import * as Touchable from './components';
 export * from './hoc';
 export * from './hooks/use-gesture-handler';
-import * as Touchable from './components';
 export default Touchable;
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Touchable"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,cAAc,OAAO;AACrB,cAAc,6BAA6B;AAC3C,OAAO,KAAKA,SAAS,MAAM,cAAc;AAEzC,eAAeA,SAAS"}
+{"version":3,"names":["Touchable"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,OAAO,KAAKA,SAAS,MAAM,cAAc;AACzC,cAAc,OAAO;AACrB,cAAc,6BAA6B;AAE3C,eAAeA,SAAS"}

package/lib/module/utils/get-circle-path.js

@@ -1,5 +1,7 @@
 import { Skia } from '@shopify/react-native-skia';
 export const getCirclePath = _ref => {
+  'worklet';
+
   let {
     cx,
     cy,

package/lib/module/utils/get-circle-path.js.map

@@ -1 +1 @@
-{"version":3,"names":["Skia","getCirclePath","cx","cy","r","Path","Make","addCircle"],"sourceRoot":"../../src","sources":["get-circle-path.ts"],"mappings":"AAAA,SAASA,IAAI,QAAQ,4BAA4B;AAIjD,OAAO,MAAMC,aAAa,GAAG,QAAwC;EAAA,IAAvC;IAAEC,EAAE;IAAEC,EAAE;IAAEC;EAAuB,CAAC;EAC9D,OAAOJ,IAAI,CAACK,IAAI,CAACC,IAAI,EAAE,CAACC,SAAS,CAACL,EAAE,EAAEC,EAAE,EAAEC,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"names":["Skia","getCirclePath","cx","cy","r","Path","Make","addCircle"],"sourceRoot":"../../src","sources":["get-circle-path.ts"],"mappings":"AAAA,SAASA,IAAI,QAAQ,4BAA4B;AAIjD,OAAO,MAAMC,aAAa,GAAG,QAAwC;EACnE,SAAS;;EAAC,IADkB;IAAEC,EAAE;IAAEC,EAAE;IAAEC;EAAuB,CAAC;EAE9D,OAAOJ,IAAI,CAACK,IAAI,CAACC,IAAI,EAAE,CAACC,SAAS,CAACL,EAAE,EAAEC,EAAE,EAAEC,CAAC,CAAC;AAC9C,CAAC"}

package/lib/module/utils/get-rect-path.js

@@ -1,8 +1,9 @@
-import { rect, rrect, Skia } from '@shopify/react-native-skia';
+import { Skia } from '@shopify/react-native-skia';
 const getRectPath = params => {
+  'worklet';
+
   const skPath = Skia.Path.Make();
   if ('rect' in params) {
-    // eslint-disable-next-line @typescript-eslint/no-shadow
     const {
       rect
     } = params;
@@ -15,20 +16,21 @@ const getRectPath = params => {
     width,
     height
   } = params;
-  skPath.addRect(rect(x, y, width, height));
+  skPath.addRect(Skia.XYWHRect(x, y, width, height));
   return skPath;
 };
 const getRoundedRectPath = params => {
+  'worklet';
+
   const {
     r
   } = params;
   const skPath = Skia.Path.Make();
   if ('rect' in params) {
-    // eslint-disable-next-line @typescript-eslint/no-shadow
     const {
       rect
     } = params;
-    skPath.addRRect(rrect(rect, r, r));
+    skPath.addRRect(Skia.RRectXY(rect, r, r));
     return skPath;
   }
   const {
@@ -37,7 +39,8 @@ const getRoundedRectPath = params => {
     width,
     height
   } = params;
-  skPath.addRRect(rrect(rect(x, y, width, height), r, r));
+  const roundedRect = Skia.RRectXY(Skia.XYWHRect(x, y, width, height), r, r);
+  skPath.addRRect(roundedRect);
   return skPath;
 };
 export { getRectPath, getRoundedRectPath };

package/lib/module/utils/get-rect-path.js.map

@@ -1 +1 @@
-{"version":3,"names":["rect","rrect","Skia","getRectPath","params","skPath","Path","Make","addRect","x","y","width","height","getRoundedRectPath","r","addRRect"],"sourceRoot":"../../src","sources":["get-rect-path.ts"],"mappings":"AAAA,SAASA,IAAI,EAAEC,KAAK,EAAEC,IAAI,QAAqB,4BAA4B;AAW3E,MAAMC,WAAW,GAAIC,MAAyB,IAAK;EACjD,MAAMC,MAAM,GAAGH,IAAI,CAACI,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIH,MAAM,EAAE;IACpB;IACA,MAAM;MAAEJ;IAAK,CAAC,GAAGI,MAAM;IAEvBC,MAAM,CAACG,OAAO,CAACR,IAAI,CAAC;IACpB,OAAOK,MAAM;EACf;EACA,MAAM;IAAEI,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGR,MAAM;EACtCC,MAAM,CAACG,OAAO,CAACR,IAAI,CAACS,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC;EACzC,OAAOP,MAAM;AACf,CAAC;AAMD,MAAMQ,kBAAkB,GAAIT,MAAgC,IAAK;EAC/D,MAAM;IAAEU;EAAE,CAAC,GAAGV,MAAM;EACpB,MAAMC,MAAM,GAAGH,IAAI,CAACI,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIH,MAAM,EAAE;IACpB;IACA,MAAM;MAAEJ;IAAK,CAAC,GAAGI,MAAM;IACvBC,MAAM,CAACU,QAAQ,CAACd,KAAK,CAACD,IAAI,EAAEc,CAAC,EAAEA,CAAC,CAAC,CAAC;IAClC,OAAOT,MAAM;EACf;EACA,MAAM;IAAEI,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGR,MAAM;EAEtCC,MAAM,CAACU,QAAQ,CAACd,KAAK,CAACD,IAAI,CAACS,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,EAAEE,CAAC,EAAEA,CAAC,CAAC,CAAC;EACvD,OAAOT,MAAM;AACf,CAAC;AAED,SAASF,WAAW,EAAEU,kBAAkB"}
+{"version":3,"names":["Skia","getRectPath","params","skPath","Path","Make","rect","addRect","x","y","width","height","XYWHRect","getRoundedRectPath","r","addRRect","RRectXY","roundedRect"],"sourceRoot":"../../src","sources":["get-rect-path.ts"],"mappings":"AAAA,SAASA,IAAI,QAAqB,4BAA4B;AAW9D,MAAMC,WAAW,GAAIC,MAAyB,IAAK;EACjD,SAAS;;EAET,MAAMC,MAAM,GAAGH,IAAI,CAACI,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIH,MAAM,EAAE;IACpB,MAAM;MAAEI;IAAK,CAAC,GAAGJ,MAAM;IAEvBC,MAAM,CAACI,OAAO,CAACD,IAAI,CAAC;IACpB,OAAOH,MAAM;EACf;EACA,MAAM;IAAEK,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGT,MAAM;EAEtCC,MAAM,CAACI,OAAO,CAACP,IAAI,CAACY,QAAQ,CAACJ,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,CAAC;EAClD,OAAOR,MAAM;AACf,CAAC;AAMD,MAAMU,kBAAkB,GAAIX,MAAgC,IAAK;EAC/D,SAAS;;EAET,MAAM;IAAEY;EAAE,CAAC,GAAGZ,MAAM;EACpB,MAAMC,MAAM,GAAGH,IAAI,CAACI,IAAI,CAACC,IAAI,EAAE;EAC/B,IAAI,MAAM,IAAIH,MAAM,EAAE;IACpB,MAAM;MAAEI;IAAK,CAAC,GAAGJ,MAAM;IAEvBC,MAAM,CAACY,QAAQ,CAACf,IAAI,CAACgB,OAAO,CAACV,IAAI,EAAEQ,CAAC,EAAEA,CAAC,CAAC,CAAC;IACzC,OAAOX,MAAM;EACf;EACA,MAAM;IAAEK,CAAC;IAAEC,CAAC;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGT,MAAM;EAEtC,MAAMe,WAAW,GAAGjB,IAAI,CAACgB,OAAO,CAAChB,IAAI,CAACY,QAAQ,CAACJ,CAAC,EAAEC,CAAC,EAAEC,KAAK,EAAEC,MAAM,CAAC,EAAEG,CAAC,EAAEA,CAAC,CAAC;EAC1EX,MAAM,CAACY,QAAQ,CAACE,WAAW,CAAC;EAC5B,OAAOd,MAAM;AACf,CAAC;AAED,SAASF,WAAW,EAAEY,kBAAkB"}

package/lib/module/utils/unwrap-animated-value.js

@@ -1,4 +1,9 @@
 const unwrapAnimatedValue = value => {
+  'worklet';
+
+  if (value.value != null) {
+    return value.value;
+  }
   if (value.current != null) {
     return value.current;
   }
@@ -9,6 +14,8 @@ const unwrapAnimatedValue = value => {
   return value;
 };
 const unwrapAnimatedValueObject = value => {
+  'worklet';
+
   return Object.keys(value).reduce((acc, key) => {
     return {
       ...acc,

package/lib/module/utils/unwrap-animated-value.js.map

@@ -1 +1 @@
-{"version":3,"names":["unwrapAnimatedValue","value","current","selector","skiaValueWithSelector","unwrapAnimatedValueObject","Object","keys","reduce","acc","key"],"sourceRoot":"../../src","sources":["unwrap-animated-value.ts"],"mappings":"AAMA,MAAMA,mBAAmB,GACvBC,KAAkD,IAC5C;EACN,IAAKA,KAAK,CAAkBC,OAAO,IAAI,IAAI,EAAE;IAC3C,OAAQD,KAAK,CAAkBC,OAAO;EACxC;EAEA,IAAKD,KAAK,CAA8BE,QAAQ,IAAI,IAAI,EAAE;IACxD,MAAMC,qBAAqB,GAAGH,KAAiC;IAC/D,OAAOG,qBAAqB,CAACD,QAAQ,CAACC,qBAAqB,CAACH,KAAK,CAACC,OAAO,CAAC;EAC5E;EAEA,OAAOD,KAAK;AACd,CAAC;AAED,MAAMI,yBAAyB,GAC7BJ,KAAoC,IACjB;EACnB,OAAOK,MAAM,CAACC,IAAI,CAACN,KAAK,CAAC,CAACO,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAK;IAC7C,OAAO;MAAE,GAAGD,GAAG;MAAE,CAACC,GAAG,GAAGV,mBAAmB,CAACC,KAAK,CAACS,GAAG,CAAC;IAAE,CAAC;EAC3D,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAASV,mBAAmB,EAAEK,yBAAyB"}
+{"version":3,"names":["unwrapAnimatedValue","value","current","selector","skiaValueWithSelector","unwrapAnimatedValueObject","Object","keys","reduce","acc","key"],"sourceRoot":"../../src","sources":["unwrap-animated-value.ts"],"mappings":"AAOA,MAAMA,mBAAmB,GACvBC,KAA4E,IACtE;EACN,SAAS;;EAET,IAAKA,KAAK,CAA6BA,KAAK,IAAI,IAAI,EAAE;IACpD,OAAQA,KAAK,CAA6BA,KAAK;EACjD;EAEA,IAAKA,KAAK,CAAkBC,OAAO,IAAI,IAAI,EAAE;IAC3C,OAAQD,KAAK,CAAkBC,OAAO;EACxC;EAEA,IAAKD,KAAK,CAA8BE,QAAQ,IAAI,IAAI,EAAE;IACxD,MAAMC,qBAAqB,GAAGH,KAAiC;IAC/D,OAAOG,qBAAqB,CAACD,QAAQ,CAACC,qBAAqB,CAACH,KAAK,CAACC,OAAO,CAAC;EAC5E;EAEA,OAAOD,KAAK;AACd,CAAC;AAED,MAAMI,yBAAyB,GAC7BJ,KAAoC,IACjB;EACnB,SAAS;;EACT,OAAOK,MAAM,CAACC,IAAI,CAACN,KAAK,CAAC,CAACO,MAAM,CAAC,CAACC,GAAG,EAAEC,GAAG,KAAK;IAC7C,OAAO;MAAE,GAAGD,GAAG;MAAE,CAACC,GAAG,GAAGV,mBAAmB,CAACC,KAAK,CAACS,GAAG,CAAC;IAAE,CAAC;EAC3D,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAASV,mBAAmB,EAAEK,yBAAyB"}

package/lib/typescript/canvas/canvas.d.ts

@@ -1,5 +1,10 @@
-import { type CanvasProps, SkiaDomView } from '@shopify/react-native-skia';
 import React from 'react';
-declare const Canvas: React.ForwardRefExoticComponent<Pick<CanvasProps, "children" | "onTouch" | "mode" | "debug" | "onSize" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "style" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerUp" | "onPointerUpCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<SkiaDomView>>;
+import { PanGesture } from 'react-native-gesture-handler';
+import type { CanvasProps } from '@shopify/react-native-skia';
+type TouchableCanvasProps = CanvasProps & {
+    panGesture?: PanGesture;
+    timeoutBeforeCollectingRefs?: number;
+};
+declare const Canvas: React.FC<TouchableCanvasProps>;
 export { Canvas };
 //# sourceMappingURL=canvas.d.ts.map

package/lib/typescript/canvas/canvas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../../src/canvas/canvas.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAGhB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAoB,MAAM,OAAO,CAAC;AAMzC,QAAA,MAAM,MAAM,2kDA4EX,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../../src/canvas/canvas.tsx"],"names":[],"mappings":"AACA,OAAO,KAA+C,MAAM,OAAO,CAAC;AACpE,OAAO,EAGL,UAAU,EACX,MAAM,8BAA8B,CAAC;AAQtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,KAAK,oBAAoB,GAAG,WAAW,GAAG;IACxC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA8F1C,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC"}