@shopify/react-native-skia 0.1.130 → 0.1.133

package/cpp/api/JsiSkPath.h

@@ -31,18 +31,19 @@ using namespace facebook;
 
 
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
+
 public:
-    // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-    JSI_PROPERTY_GET(__typename__) {
-      return jsi::String::createFromUtf8(runtime, "Path");
-    }
+  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
+  JSI_PROPERTY_GET(__typename__) {
+    return jsi::String::createFromUtf8(runtime, "Path");
+  }
 
-    JSI_HOST_FUNCTION(addArc) {
+  JSI_HOST_FUNCTION(addArc) {
     auto rect = JsiSkRect::fromValue(runtime, arguments[0]).get();
     auto start = arguments[1].asNumber();
     auto sweep = arguments[2].asNumber();
     getObject()->addArc(*rect, start, sweep);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addOval) {
@@ -52,8 +53,8 @@ public:
       direction = SkPathDirection::kCCW;
     }
     unsigned startIndex = count < 3 ? 0 : arguments[2].asNumber();
-    getObject()->addOval(*rect, direction, startIndex);
-    return jsi::Value::undefined();
+    auto result = getObject()->addOval(*rect, direction, startIndex);
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addPoly) {
@@ -68,7 +69,7 @@ public:
       points.push_back(*point.get());
     }
     getObject()->addPoly(points.data(), (int)points.size(), close);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addRect) {
@@ -88,7 +89,7 @@ public:
       direction = SkPathDirection::kCCW;
     }
     getObject()->addRRect(*rrect, direction);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(arcToOval) {
@@ -97,7 +98,7 @@ public:
     auto sweep = arguments[2].asNumber();
     auto forceMoveTo = arguments[3].getBool();
     getObject()->arcTo(*rect, start, sweep, forceMoveTo);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(arcToRotated) {
@@ -112,7 +113,7 @@ public:
     auto x = arguments[5].asNumber();
     auto y = arguments[6].asNumber();
     getObject()->arcTo(rx, ry, xAxisRotate, arcSize, sweep, x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(rArcTo) {
@@ -127,7 +128,7 @@ public:
     auto x = arguments[5].asNumber();
     auto y = arguments[6].asNumber();
     getObject()->rArcTo(rx, ry, xAxisRotate, arcSize, sweep, x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(arcToTangent) {
@@ -137,7 +138,7 @@ public:
     auto y2 = arguments[3].asNumber();
     auto r = arguments[4].asNumber();
     getObject()->arcTo(x1, y1, x2, y2, r);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(computeTightBounds) {
@@ -160,7 +161,7 @@ public:
     auto y2 = arguments[3].asNumber();
     auto w = arguments[4].asNumber();
     getObject()->conicTo(x1, y1, x2, y2, w);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(rConicTo) {
@@ -170,7 +171,7 @@ public:
     auto y2 = arguments[3].asNumber();
     auto w = arguments[4].asNumber();
     getObject()->rConicTo(x1, y1, x2, y2, w);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(contains) {
@@ -270,7 +271,7 @@ public:
     auto precision = jsiPrecision.isUndefined() ? 1 : jsiPrecision.asNumber();
     auto result = p.getFillPath(path, &path, nullptr, precision);
     getObject()->swap(path);
-    return jsi::Value(result);
+    return result ? thisValue.getObject(runtime) : jsi::Value::null();
   }
 
   JSI_HOST_FUNCTION(trim) {
@@ -284,15 +285,15 @@ public:
     if (!pe) {
       // SkDebugf("Invalid args to trim(): startT and stopT must be in
       // [0,1]\n");
-      return jsi::Value(false);
+      return jsi::Value::null();
     }
     SkStrokeRec rec(SkStrokeRec::InitStyle::kHairline_InitStyle);
     if (pe->filterPath(&path, path, &rec, nullptr)) {
       getObject()->swap(path);
-      return jsi::Value(true);
+      return thisValue.getObject(runtime);
     }
     SkDebugf("Could not trim path\n");
-    return jsi::Value(false);
+    return jsi::Value::null();
   }
 
   JSI_HOST_FUNCTION(getPoint) {
@@ -312,8 +313,8 @@ public:
   JSI_HOST_FUNCTION(makeAsWinding) {
     SkPath out;
     if (AsWinding(*getObject(), &out)) {
-      return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkPath>(getContext(), std::move(out)));
+        getObject()->swap(out);
+        return thisValue.getObject(runtime);
     }
     return jsi::Value::null();
   }
@@ -324,34 +325,34 @@ public:
     SkScalar dx = arguments[0].asNumber();
     SkScalar dy = arguments[1].asNumber();
     getObject()->offset(dx, dy);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(moveTo) {
     SkScalar x = arguments[0].asNumber();
     SkScalar y = arguments[1].asNumber();
     getObject()->moveTo(x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(rMoveTo) {
     SkScalar x = arguments[0].asNumber();
     SkScalar y = arguments[1].asNumber();
     getObject()->rMoveTo(x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
   JSI_HOST_FUNCTION(lineTo) {
     SkScalar x = arguments[0].asNumber();
     SkScalar y = arguments[1].asNumber();
     getObject()->lineTo(x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(rlineTo) {
     SkScalar x = arguments[0].asNumber();
     SkScalar y = arguments[1].asNumber();
     getObject()->rLineTo(x, y);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(cubicTo) {
@@ -362,7 +363,7 @@ public:
     auto x3 = arguments[4].asNumber();
     auto y3 = arguments[5].asNumber();
     getObject()->cubicTo(x1, y1, x2, y2, x3, y3);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(rCubicTo) {
@@ -373,7 +374,7 @@ public:
     auto x3 = arguments[4].asNumber();
     auto y3 = arguments[5].asNumber();
     getObject()->rCubicTo(x1, y1, x2, y2, x3, y3);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(reset) {
@@ -401,7 +402,7 @@ public:
     auto x2 = arguments[2].asNumber();
     auto y2 = arguments[3].asNumber();
     getObject()->rQuadTo(x1, y1, x2, y2);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addCircle) {
@@ -409,7 +410,7 @@ public:
     auto y = arguments[1].asNumber();
     auto r = arguments[2].asNumber();
     getObject()->addCircle(x, y, r);
-    return jsi::Value::undefined();
+    return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(getLastPt) {
@@ -446,19 +447,6 @@ public:
         runtime, std::make_shared<JsiSkPath>(getContext(), SkPath(*path)));
   }
 
-  JSI_HOST_FUNCTION(fromText) {
-    auto text = arguments[0].asString(runtime).utf8(runtime);
-    auto x = arguments[1].asNumber();
-    auto y = arguments[2].asNumber();
-    auto font = JsiSkFont::fromValue(runtime, arguments[3]);
-    SkPath result;
-    SkTextUtils::GetPath(text.c_str(), strlen(text.c_str()),
-                         SkTextEncoding::kUTF8, x, y, *font, &result);
-
-    getObject()->swap(result);
-    return jsi::Value::undefined();
-  }
-
   JSI_HOST_FUNCTION(op) {
     auto path2 = JsiSkPath::fromValue(runtime, arguments[0]);
     int pathOp = arguments[1].asNumber();
@@ -479,7 +467,10 @@ public:
     auto path2 = JsiSkPath::fromValue(runtime, arguments[0]);
     auto weight = arguments[1].asNumber();
     SkPath result;
-    getObject()->interpolate(*path2, weight, &result);
+    auto succeed = getObject()->interpolate(*path2, weight, &result);
+    if (!succeed) {
+      return nullptr;
+    }
     return jsi::Object::createFromHostObject(
             runtime, std::make_shared<JsiSkPath>(getContext(), std::move(result)));
   }
@@ -489,8 +480,8 @@ public:
     auto cmds = jsi::Array(runtime, path.countVerbs());
     auto it = SkPath::Iter(path, false);
     //                       { "Move", "Line", "Quad", "Conic", "Cubic", "Close", "Done" };
-    const int pointCount[] = {     1 ,     2 ,     3 ,      3 ,      4 ,      1 ,     0  };
-    const int cmdCount[] =   {     3 ,     5 ,     7 ,      8 ,      9 ,      3 ,     0  };
+    const int pointCount[] = {     1 ,     1 ,     2 ,      2 ,      3 ,      0 ,     0  };
+    const int cmdCount[] =   {     3 ,     3 ,     5 ,      6 ,      7 ,      1 ,     0  };
     SkPoint points[4];
     SkPath::Verb verb;
     auto k = 0;
@@ -500,8 +491,8 @@ public:
       auto j = 0;
       cmd.setValueAtIndex(runtime, j++, jsi::Value(verbVal));
       for (int i = 0; i < pointCount[verbVal]; ++i) {
-        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fX)));
-        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[i].fY)));
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[1 + i].fX)));
+        cmd.setValueAtIndex(runtime, j++, jsi::Value(static_cast<double>(points[1 + i].fY)));
       }
       if (SkPath::kConic_Verb == verb) {
         cmd.setValueAtIndex(runtime, j, jsi::Value(static_cast<double>(it.conicWeight())));
@@ -514,8 +505,10 @@ public:
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPath, __typename__))
 
   JSI_EXPORT_FUNCTIONS(
-    JSI_EXPORT_FUNC(JsiSkPath, addArc), JSI_EXPORT_FUNC(JsiSkPath, addOval),
-    JSI_EXPORT_FUNC(JsiSkPath, addPoly), JSI_EXPORT_FUNC(JsiSkPath, addRect),
+    JSI_EXPORT_FUNC(JsiSkPath, addArc),
+    JSI_EXPORT_FUNC(JsiSkPath, addOval),
+    JSI_EXPORT_FUNC(JsiSkPath, addPoly),
+    JSI_EXPORT_FUNC(JsiSkPath, addRect),
     JSI_EXPORT_FUNC(JsiSkPath, addRRect),
     JSI_EXPORT_FUNC(JsiSkPath, arcToOval),
     JSI_EXPORT_FUNC(JsiSkPath, arcToRotated),
@@ -523,28 +516,40 @@ public:
     JSI_EXPORT_FUNC(JsiSkPath, arcToTangent),
     JSI_EXPORT_FUNC(JsiSkPath, computeTightBounds),
     JSI_EXPORT_FUNC(JsiSkPath, getBounds),
-    JSI_EXPORT_FUNC(JsiSkPath, conicTo), JSI_EXPORT_FUNC(JsiSkPath, rConicTo),
-    JSI_EXPORT_FUNC(JsiSkPath, contains), JSI_EXPORT_FUNC(JsiSkPath, dash),
+    JSI_EXPORT_FUNC(JsiSkPath, conicTo),
+    JSI_EXPORT_FUNC(JsiSkPath, rConicTo),
+    JSI_EXPORT_FUNC(JsiSkPath, contains),
+    JSI_EXPORT_FUNC(JsiSkPath, dash),
     JSI_EXPORT_FUNC(JsiSkPath, equals),
     JSI_EXPORT_FUNC(JsiSkPath, getFillType),
     JSI_EXPORT_FUNC(JsiSkPath, setFillType),
     JSI_EXPORT_FUNC(JsiSkPath, setIsVolatile),
     JSI_EXPORT_FUNC(JsiSkPath, isVolatile),
-    JSI_EXPORT_FUNC(JsiSkPath, transform), JSI_EXPORT_FUNC(JsiSkPath, stroke),
-    JSI_EXPORT_FUNC(JsiSkPath, trim), JSI_EXPORT_FUNC(JsiSkPath, getPoint),
+    JSI_EXPORT_FUNC(JsiSkPath, transform),
+    JSI_EXPORT_FUNC(JsiSkPath, stroke),
+    JSI_EXPORT_FUNC(JsiSkPath, trim),
+    JSI_EXPORT_FUNC(JsiSkPath, getPoint),
     JSI_EXPORT_FUNC(JsiSkPath, toSVGString),
     JSI_EXPORT_FUNC(JsiSkPath, makeAsWinding),
-    JSI_EXPORT_FUNC(JsiSkPath, isEmpty), JSI_EXPORT_FUNC(JsiSkPath, offset),
-    JSI_EXPORT_FUNC(JsiSkPath, moveTo), JSI_EXPORT_FUNC(JsiSkPath, rMoveTo),
-    JSI_EXPORT_FUNC(JsiSkPath, lineTo), JSI_EXPORT_FUNC(JsiSkPath, rlineTo),
-    JSI_EXPORT_FUNC(JsiSkPath, cubicTo), JSI_EXPORT_FUNC(JsiSkPath, rCubicTo),
-    JSI_EXPORT_FUNC(JsiSkPath, reset), JSI_EXPORT_FUNC(JsiSkPath, rewind),
-    JSI_EXPORT_FUNC(JsiSkPath, quadTo), JSI_EXPORT_FUNC(JsiSkPath, rQuadTo),
+    JSI_EXPORT_FUNC(JsiSkPath, isEmpty),
+    JSI_EXPORT_FUNC(JsiSkPath, offset),
+    JSI_EXPORT_FUNC(JsiSkPath, moveTo),
+    JSI_EXPORT_FUNC(JsiSkPath, rMoveTo),
+    JSI_EXPORT_FUNC(JsiSkPath, lineTo),
+    JSI_EXPORT_FUNC(JsiSkPath, rlineTo),
+    JSI_EXPORT_FUNC(JsiSkPath, cubicTo),
+    JSI_EXPORT_FUNC(JsiSkPath, rCubicTo),
+    JSI_EXPORT_FUNC(JsiSkPath, reset),
+    JSI_EXPORT_FUNC(JsiSkPath, rewind),
+    JSI_EXPORT_FUNC(JsiSkPath, quadTo),
+    JSI_EXPORT_FUNC(JsiSkPath, rQuadTo),
     JSI_EXPORT_FUNC(JsiSkPath, addCircle),
-    JSI_EXPORT_FUNC(JsiSkPath, getLastPt), JSI_EXPORT_FUNC(JsiSkPath, close),
+    JSI_EXPORT_FUNC(JsiSkPath, getLastPt),
+    JSI_EXPORT_FUNC(JsiSkPath, close),
     JSI_EXPORT_FUNC(JsiSkPath, simplify),
-    JSI_EXPORT_FUNC(JsiSkPath, countPoints), JSI_EXPORT_FUNC(JsiSkPath, copy),
-    JSI_EXPORT_FUNC(JsiSkPath, fromText), JSI_EXPORT_FUNC(JsiSkPath, op),
+    JSI_EXPORT_FUNC(JsiSkPath, countPoints),
+    JSI_EXPORT_FUNC(JsiSkPath, copy),
+    JSI_EXPORT_FUNC(JsiSkPath, op),
     JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
     JSI_EXPORT_FUNC(JsiSkPath, interpolate),
     JSI_EXPORT_FUNC(JsiSkPath, toCmds),
@@ -552,7 +557,8 @@ public:
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPath path)
       : JsiSkWrappingSharedPtrHostObject<SkPath>(
-            std::move(context), std::make_shared<SkPath>(std::move(path))){}
+            std::move(context), std::make_shared<SkPath>(std::move(path))) {
+  }
 
   /**
     Returns the underlying object from a host object of this type

package/cpp/api/JsiSkPathFactory.h

@@ -147,10 +147,23 @@ public:
             runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
   }
 
+  JSI_HOST_FUNCTION(MakeFromText) {
+    auto text = arguments[0].asString(runtime).utf8(runtime);
+    auto x = arguments[1].asNumber();
+    auto y = arguments[2].asNumber();
+    auto font = JsiSkFont::fromValue(runtime, arguments[3]);
+    SkPath path;
+    SkTextUtils::GetPath(text.c_str(), strlen(text.c_str()),
+                         SkTextEncoding::kUTF8, x, y, *font, &path);
+    return jsi::Object::createFromHostObject(
+            runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));;
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathFactory, Make),
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromSVGString),
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromOp),
-                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromCmds))
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromCmds),
+                       JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromText))
 
   JsiSkPathFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -29,6 +29,24 @@ namespace RNSkia {
                 : JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder>(
                 std::move(context), std::make_shared<SkRuntimeShaderBuilder>(rt)){}
 
+        JSI_HOST_FUNCTION(setUniform) {
+            auto name = arguments[0].asString(runtime).utf8(runtime);
+            auto jsiValue = arguments[1].asObject(runtime).asArray(runtime);
+            auto size = jsiValue.size(runtime);
+            std::vector<SkScalar> value;
+            value.reserve(size);
+            for (int i = 0; i < size; i++) {
+                auto e = jsiValue.getValueAtIndex(runtime, i).asNumber();
+                value.push_back(e);
+            }
+            getObject()->uniform(name.c_str()).set(value.data(), static_cast<int>(size));
+            return jsi::Value::undefined();
+        }
+
+        JSI_EXPORT_FUNCTIONS(
+            JSI_EXPORT_FUNC(JsiSkRuntimeShaderBuilder, setUniform)
+        )
+
         /**
           Returns the underlying object from a host object of this type
          */

package/cpp/api/JsiSkTypeface.h

@@ -6,6 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
+#include <RNSkLog.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -21,8 +22,16 @@ using namespace facebook;
 
 class JsiSkTypeface : public JsiSkWrappingSkPtrHostObject<SkTypeface> {
 public:
-  JSI_PROPERTY_GET(bold) { return jsi::Value(getObject()->isBold()); }
-  JSI_PROPERTY_GET(italic) { return jsi::Value(getObject()->isItalic()); }
+  JSI_PROPERTY_GET(bold) {
+    RNSkLogger::warnToJavascriptConsole(runtime, "Typeface.bold is deprecated and will be removed in a future release.");
+    return jsi::Value(getObject()->isBold());
+  }
+  
+  JSI_PROPERTY_GET(italic) {
+    RNSkLogger::warnToJavascriptConsole(runtime, "Typeface.italic is deprecated and will be removed in a future release.");
+    return jsi::Value(getObject()->isItalic());
+  }
+  
   // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
   JSI_PROPERTY_GET(__typename__) {
     return jsi::String::createFromUtf8(runtime, "Typeface");

package/cpp/api/JsiSkTypefaceFactory.h

@@ -17,8 +17,12 @@ namespace RNSkia {
     public:
         JSI_HOST_FUNCTION(MakeFreeTypeFaceFromData) {
             auto data = JsiSkData::fromValue(runtime, arguments[0]);
+            auto typeface = SkFontMgr::RefDefault()->makeFromData(std::move(data));
+            if(typeface == nullptr) {
+              return jsi::Value::null();
+            }
             return jsi::Object::createFromHostObject(
-                runtime, std::make_shared<JsiSkTypeface>(getContext(), SkFontMgr::RefDefault()->makeFromData(std::move(data))));
+                runtime, std::make_shared<JsiSkTypeface>(getContext(), typeface));
         }
 
         JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTypefaceFactory, MakeFreeTypeFaceFromData))

package/cpp/rnskia/RNSkInfoParameter.h

@@ -23,6 +23,7 @@ using RNSkTouchPoint = struct {
   double y;
   double force;
   RNSkTouchType type;
+  size_t id;
   long timestamp;
 };
 
@@ -45,6 +46,7 @@ public:
         touchObj.setProperty(runtime, "force", t.force);
         touchObj.setProperty(runtime, "type", (double)t.type);
         touchObj.setProperty(runtime, "timestamp", (double)t.timestamp / 1000.0);
+        touchObj.setProperty(runtime, "id", (double)t.id);
         touches.setValueAtIndex(runtime, n, touchObj);
       }
       ops.setValueAtIndex(runtime, i, touches);

package/cpp/utils/RNSkLog.h

@@ -5,6 +5,8 @@
 #pragma once
 
 #include <string>
+#include <jsi/jsi.h>
+
 #ifdef ANDROID
 #include <android/log.h>
 #endif
@@ -14,6 +16,9 @@
 #endif
 
 namespace RNSkia {
+
+using namespace facebook;
+
 class RNSkLogger {
 public:
   /**
@@ -49,5 +54,27 @@ public:
 #endif
     va_end(args);
   }
+  
+  static void logToJavascriptConsole(jsi::Runtime& runtime, const std::string& message) {
+    auto console = RNSkLogger::getJavascriptConsole(runtime).asObject(runtime);
+    auto log = console.getPropertyAsFunction(runtime, "log");
+    log.call(runtime, jsi::String::createFromUtf8(runtime, message));
+  }
+  
+  static void warnToJavascriptConsole(jsi::Runtime& runtime, const std::string& message) {
+    auto console = RNSkLogger::getJavascriptConsole(runtime).asObject(runtime);
+    auto warn = console.getPropertyAsFunction(runtime, "warn");
+    warn.call(runtime, jsi::String::createFromUtf8(runtime, message));
+  }
+  
+private:
+  static jsi::Value getJavascriptConsole(jsi::Runtime& runtime) {
+    auto console = runtime.global().getProperty(runtime, "console");
+    if(console.isUndefined() || console.isNull()) {
+      jsi::detail::throwJSError(runtime, "Could not find console object.");
+      return jsi::Value::undefined();
+    }
+    return console;
+  }
 };
 } // namespace RNSkia

package/ios/RNSkia-iOS/SkiaDrawView.mm

@@ -137,7 +137,8 @@
       RNSkia::RNSkTouchPoint nextTouch;
       nextTouch.x = position.x;
       nextTouch.y = position.y;
-      nextTouch.force = [touch force];
+      nextTouch.force = [touch force];    
+      nextTouch.id = [touch hash];
       auto phase = [touch phase];
       switch(phase) {
         case UITouchPhaseBegan:

package/lib/commonjs/animation/functions/index.js

@@ -3,26 +3,56 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "interpolate", {
-  enumerable: true,
-  get: function () {
-    return _interpolate.interpolate;
-  }
+
+var _interpolate = require("./interpolate");
+
+Object.keys(_interpolate).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _interpolate[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _interpolate[key];
+    }
+  });
 });
-Object.defineProperty(exports, "interpolateColors", {
-  enumerable: true,
-  get: function () {
-    return _interpolateColors.interpolateColors;
-  }
+
+var _interpolateColors = require("./interpolateColors");
+
+Object.keys(_interpolateColors).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _interpolateColors[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _interpolateColors[key];
+    }
+  });
 });
-Object.defineProperty(exports, "mixColors", {
-  enumerable: true,
-  get: function () {
-    return _interpolateColors.mixColors;
-  }
+
+var _interpolateVector = require("./interpolateVector");
+
+Object.keys(_interpolateVector).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _interpolateVector[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _interpolateVector[key];
+    }
+  });
 });
 
-var _interpolate = require("./interpolate");
+var _interpolatePaths = require("./interpolatePaths");
 
-var _interpolateColors = require("./interpolateColors");
+Object.keys(_interpolatePaths).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _interpolatePaths[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _interpolatePaths[key];
+    }
+  });
+});
 //# sourceMappingURL=index.js.map

package/lib/commonjs/animation/functions/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA","sourcesContent":["export { interpolate } from \"./interpolate\";\nexport { interpolateColors, mixColors } from \"./interpolateColors\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["export * from \"./interpolate\";\nexport * from \"./interpolateColors\";\nexport * from \"./interpolateVector\";\nexport * from \"./interpolatePaths\";\n"]}

package/lib/commonjs/animation/functions/interpolatePaths.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.interpolatePaths = void 0;
+
+/**
+ * Maps an input value within a range to an output path within a path range.
+ * @param value - The input value.
+ * @param inputRange - The range of the input value.
+ * @param outputRange - The range of the output path.
+ * @returns The output path.
+ * @example <caption>Map a value between 0 and 1 to a path between two paths.</caption>
+ * const path1 = new Path();
+ * path1.moveTo(0, 0);
+ * path1.lineTo(100, 0);
+ * const path2 = new Path();
+ * path2.moveTo(0, 0);
+ * path2.lineTo(0, 100);
+ * const path = interpolatePath(0.5, [0, 1], [path1, path2]);
+ */
+const interpolatePaths = (value, input, outputRange) => {
+  let i = 0;
+
+  for (; i <= input.length - 1; i++) {
+    if (value >= input[i] && value <= input[i + 1]) {
+      break;
+    }
+
+    if (i === input.length - 1) {
+      if (value < input[0]) {
+        return outputRange[0];
+      } else {
+        return outputRange[i];
+      }
+    }
+  }
+
+  const t = (value - input[i]) / (input[i + 1] - input[i]);
+  return outputRange[i + 1].interpolate(outputRange[i], t);
+};
+
+exports.interpolatePaths = interpolatePaths;
+//# sourceMappingURL=interpolatePaths.js.map

package/lib/commonjs/animation/functions/interpolatePaths.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["interpolatePaths.ts"],"names":["interpolatePaths","value","input","outputRange","i","length","t","interpolate"],"mappings":";;;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMA,gBAAgB,GAAG,CAC9BC,KAD8B,EAE9BC,KAF8B,EAG9BC,WAH8B,KAI3B;AACH,MAAIC,CAAC,GAAG,CAAR;;AACA,SAAOA,CAAC,IAAIF,KAAK,CAACG,MAAN,GAAe,CAA3B,EAA8BD,CAAC,EAA/B,EAAmC;AACjC,QAAIH,KAAK,IAAIC,KAAK,CAACE,CAAD,CAAd,IAAqBH,KAAK,IAAIC,KAAK,CAACE,CAAC,GAAG,CAAL,CAAvC,EAAgD;AAC9C;AACD;;AACD,QAAIA,CAAC,KAAKF,KAAK,CAACG,MAAN,GAAe,CAAzB,EAA4B;AAC1B,UAAIJ,KAAK,GAAGC,KAAK,CAAC,CAAD,CAAjB,EAAsB;AACpB,eAAOC,WAAW,CAAC,CAAD,CAAlB;AACD,OAFD,MAEO;AACL,eAAOA,WAAW,CAACC,CAAD,CAAlB;AACD;AACF;AACF;;AACD,QAAME,CAAC,GAAG,CAACL,KAAK,GAAGC,KAAK,CAACE,CAAD,CAAd,KAAsBF,KAAK,CAACE,CAAC,GAAG,CAAL,CAAL,GAAeF,KAAK,CAACE,CAAD,CAA1C,CAAV;AACA,SAAOD,WAAW,CAACC,CAAC,GAAG,CAAL,CAAX,CAAmBG,WAAnB,CAA+BJ,WAAW,CAACC,CAAD,CAA1C,EAA+CE,CAA/C,CAAP;AACD,CApBM","sourcesContent":["import type { SkPath } from \"../../skia/types\";\n\n/**\n * Maps an input value within a range to an output path within a path range.\n * @param value - The input value.\n * @param inputRange - The range of the input value.\n * @param outputRange - The range of the output path.\n * @returns The output path.\n * @example <caption>Map a value between 0 and 1 to a path between two paths.</caption>\n * const path1 = new Path();\n * path1.moveTo(0, 0);\n * path1.lineTo(100, 0);\n * const path2 = new Path();\n * path2.moveTo(0, 0);\n * path2.lineTo(0, 100);\n * const path = interpolatePath(0.5, [0, 1], [path1, path2]);\n */\nexport const interpolatePaths = (\n  value: number,\n  input: number[],\n  outputRange: SkPath[]\n) => {\n  let i = 0;\n  for (; i <= input.length - 1; i++) {\n    if (value >= input[i] && value <= input[i + 1]) {\n      break;\n    }\n    if (i === input.length - 1) {\n      if (value < input[0]) {\n        return outputRange[0];\n      } else {\n        return outputRange[i];\n      }\n    }\n  }\n  const t = (value - input[i]) / (input[i + 1] - input[i]);\n  return outputRange[i + 1].interpolate(outputRange[i], t)!;\n};\n"]}

package/lib/commonjs/animation/functions/interpolateVector.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mixVector = exports.interpolateVector = void 0;
+
+var _interpolate = require("./interpolate");
+
+const interpolateVector = (value, inputRange, outputRange, options) => ({
+  x: (0, _interpolate.interpolate)(value, inputRange, outputRange.map(v => v.x), options),
+  y: (0, _interpolate.interpolate)(value, inputRange, outputRange.map(v => v.y), options)
+});
+
+exports.interpolateVector = interpolateVector;
+
+const mixVector = (value, from, to) => interpolateVector(value, [0, 1], [from, to]);
+
+exports.mixVector = mixVector;
+//# sourceMappingURL=interpolateVector.js.map

package/lib/commonjs/animation/functions/interpolateVector.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["interpolateVector.ts"],"names":["interpolateVector","value","inputRange","outputRange","options","x","map","v","y","mixVector","from","to"],"mappings":";;;;;;;AAEA;;AAEO,MAAMA,iBAAiB,GAAG,CAC/BC,KAD+B,EAE/BC,UAF+B,EAG/BC,WAH+B,EAI/BC,OAJ+B,MAK3B;AACJC,EAAAA,CAAC,EAAE,8BACDJ,KADC,EAEDC,UAFC,EAGDC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAACF,CAAzB,CAHC,EAIDD,OAJC,CADC;AAOJI,EAAAA,CAAC,EAAE,8BACDP,KADC,EAEDC,UAFC,EAGDC,WAAW,CAACG,GAAZ,CAAiBC,CAAD,IAAOA,CAAC,CAACC,CAAzB,CAHC,EAIDJ,OAJC;AAPC,CAL2B,CAA1B;;;;AAoBA,MAAMK,SAAS,GAAG,CAACR,KAAD,EAAgBS,IAAhB,EAA8BC,EAA9B,KACvBX,iBAAiB,CAACC,KAAD,EAAQ,CAAC,CAAD,EAAI,CAAJ,CAAR,EAAgB,CAACS,IAAD,EAAOC,EAAP,CAAhB,CADZ","sourcesContent":["import type { Vector } from \"../../skia/types\";\n\nimport { interpolate } from \"./interpolate\";\n\nexport const interpolateVector = (\n  value: number,\n  inputRange: readonly number[],\n  outputRange: readonly Vector[],\n  options?: Parameters<typeof interpolate>[3]\n) => ({\n  x: interpolate(\n    value,\n    inputRange,\n    outputRange.map((v) => v.x),\n    options\n  ),\n  y: interpolate(\n    value,\n    inputRange,\n    outputRange.map((v) => v.y),\n    options\n  ),\n});\n\nexport const mixVector = (value: number, from: Vector, to: Vector) =>\n  interpolateVector(value, [0, 1], [from, to]);\n"]}