@shopify/react-native-skia 0.1.130 → 0.1.131

package/README.md

@@ -31,6 +31,14 @@ If the NDK is not installed, you can install it via Android Studio by going to t
 
 And then the _SDK Location_ section. It will show you the NDK path, or the option to download it if you don't have it installed.
 
+### Proguard
+
+If you're using Proguard, make sure to add the following rule:
+
+```
+-keep class com.shopify.reactnative.skia.** { *; }
+```
+
 ## Playground
 
 We have an example project you can play with [here](https://github.com/Shopify/react-native-skia/tree/main/example).

package/android/cpp/jni/JniSkiaDrawView.cpp

@@ -76,14 +76,15 @@ namespace RNSkia
         std::vector<RNSkia::RNSkTouchPoint> points;
         auto pin = touches.pin();
         auto scale = _drawView->getPixelDensity();
-        points.reserve(pin.size() / 4);
-        for (size_t i = 0; i < pin.size(); i += 4)
+        points.reserve(pin.size() / 5);
+        for (size_t i = 0; i < pin.size(); i += 5)
         {
             RNSkTouchPoint point;
             point.x = pin[i] / scale;
             point.y = pin[i + 1] / scale;
             point.force = pin[i + 2];
             point.type = (RNSkia::RNSkTouchType)pin[i + 3];
+            point.id = pin[i + 4];
             points.push_back(point);
         }
         _drawView->updateTouchState(std::move(points));

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDrawView.java

@@ -59,7 +59,7 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
         int action = ev.getAction();
         int count = ev.getPointerCount();
         MotionEvent.PointerCoords r = new MotionEvent.PointerCoords();
-        double[] points = new double[count*4];
+        double[] points = new double[count*5];
         for (int i = 0; i < count; i++) {
             ev.getPointerCoords(i, r);
             points[i] = r.x;
@@ -81,6 +81,7 @@ public class SkiaDrawView extends TextureView implements TextureView.SurfaceText
                     points[i+3] = 3;
                     break;
             }
+            points[i+4] = ev.getPointerId(i);
         }
         updateTouchPoints(points);
         return true;

package/cpp/api/JsiSkCanvas.h

@@ -456,7 +456,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(drawColor) {
-    SkColor cl = arguments[0].asNumber();
+    SkColor cl = JsiSkColor::fromValue(runtime, arguments[0]);
     if (count == 1) {
       _canvas->drawColor(cl);
     } else {
@@ -467,7 +467,7 @@ public:
   }
 
   JSI_HOST_FUNCTION(clear) {
-    SkColor cl = arguments[0].asNumber();
+    SkColor cl = JsiSkColor::fromValue(runtime, arguments[0]);
     _canvas->clear(cl);
     return jsi::Value::undefined();
   }

package/cpp/api/JsiSkMatrix.h

@@ -18,6 +18,7 @@ namespace RNSkia {
 
 using namespace facebook;
 
+
 class JsiSkMatrix : public JsiSkWrappingSharedPtrHostObject<SkMatrix> {
 public:
 
@@ -26,45 +27,64 @@ public:
             context, std::make_shared<SkMatrix>(std::move(m))) {}
 
 
-  JSI_HOST_FUNCTION(preConcat) {
+    static SkMatrix getMatrix(jsi::Runtime &runtime, const jsi::Value& value) {
+        const auto& object = value.asObject(runtime);
+        const auto& array = object.asArray(runtime);
+        auto scaleX = array.getValueAtIndex(runtime, 0).asNumber();
+        auto skewX = array.getValueAtIndex(runtime, 1).asNumber();
+        auto transX = array.getValueAtIndex(runtime, 2).asNumber();
+        auto skewY = array.getValueAtIndex(runtime, 3).asNumber();
+        auto scaleY = array.getValueAtIndex(runtime, 4).asNumber();
+        auto transY = array.getValueAtIndex(runtime, 5).asNumber();
+        auto pers0 = array.getValueAtIndex(runtime, 6).asNumber();
+        auto pers1 = array.getValueAtIndex(runtime, 7).asNumber();
+        auto pers2 = array.getValueAtIndex(runtime, 8).asNumber();
+        return SkMatrix::MakeAll(
+                scaleX, skewX, transX,
+                skewY,  scaleY, transY,
+                pers0,  pers1,  pers2
+        );
+    }
+
+  JSI_HOST_FUNCTION(concat) {
     auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
     getObject()->preConcat(*m3);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preTranslate) {
+  JSI_HOST_FUNCTION(translate) {
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     getObject()->preTranslate(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preScale) {
+  JSI_HOST_FUNCTION(scale) {
     auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
+    auto y = count > 1 ? arguments[1].asNumber() : 1;
     getObject()->preScale(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preSkew) {
+  JSI_HOST_FUNCTION(skew) {
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     getObject()->preSkew(x, y);
     return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(preRotate) {
+  JSI_HOST_FUNCTION(rotate) {
     auto a = arguments[0].asNumber();
-    getObject()->preRotate(a);
+    getObject()->preRotate(SkRadiansToDegrees(a));
     return jsi::Value::undefined();
   }
 
   JSI_EXPORT_FUNCTIONS(
-    JSI_EXPORT_FUNC(JsiSkMatrix, preConcat),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preTranslate),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preScale),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preSkew),
-    JSI_EXPORT_FUNC(JsiSkMatrix, preRotate),
+    JSI_EXPORT_FUNC(JsiSkMatrix, concat),
+    JSI_EXPORT_FUNC(JsiSkMatrix, translate),
+    JSI_EXPORT_FUNC(JsiSkMatrix, scale),
+    JSI_EXPORT_FUNC(JsiSkMatrix, skew),
+    JSI_EXPORT_FUNC(JsiSkMatrix, rotate),
   )
 
   /**
@@ -78,28 +98,21 @@ public:
               .asHostObject<JsiSkMatrix>(runtime)
               ->getObject();
     } else {
-      const auto& array = object.asArray(runtime);
-      auto scaleX = array.getValueAtIndex(runtime, 0).asNumber();
-      auto skewX = array.getValueAtIndex(runtime, 1).asNumber();
-      auto transX = array.getValueAtIndex(runtime, 2).asNumber();
-      auto skewY = array.getValueAtIndex(runtime, 3).asNumber();
-      auto scaleY = array.getValueAtIndex(runtime, 4).asNumber();
-      auto transY = array.getValueAtIndex(runtime, 5).asNumber();
-      auto pers0 = array.getValueAtIndex(runtime, 6).asNumber();
-      auto pers1 = array.getValueAtIndex(runtime, 7).asNumber();
-      auto pers2 = array.getValueAtIndex(runtime, 8).asNumber();
-      return std::make_shared<SkMatrix>(SkMatrix::MakeAll(
-        scaleX, skewX, transX,
-        skewY,  scaleY, transY,
-        pers0,  pers1,  pers2));
+      return std::make_shared<SkMatrix>(JsiSkMatrix::getMatrix(runtime, obj));
     }
   }
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
+      SkMatrix matrix;
+      if (count == 1) {
+        matrix = JsiSkMatrix::getMatrix(runtime, arguments[0]);
+      } else {
+        matrix = SkMatrix::I();
+      }
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkMatrix>(std::move(context), SkMatrix::I()));
+          runtime, std::make_shared<JsiSkMatrix>(std::move(context), matrix));
     };
   }
 };

package/cpp/api/JsiSkPaint.h

@@ -215,9 +215,11 @@ Returns the underlying object from a host object of this type
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
+      auto paint = SkPaint();
+      paint.setAntiAlias(true);
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkPaint>(std::move(context), SkPaint()));
+          runtime, std::make_shared<JsiSkPaint>(std::move(context), paint));
     };
   }
 };

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)));
   }
@@ -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

@@ -49,5 +49,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