@shopify/react-native-skia 2.6.0 → 2.6.2

package/cpp/api/JsiSkPath.h

@@ -54,7 +54,8 @@ inline void warnDeprecatedPathMethod(jsi::Runtime &runtime,
   warnings.insert(methodName);
   std::string message =
       std::string("[react-native-skia] SkPath.") + methodName +
-      "() is deprecated and will be removed in a future release. " + suggestion +
+      "() is deprecated and will be removed in a future release. " +
+      suggestion +
       " See migration guide: "
       "https://shopify.github.io/react-native-skia/docs/shapes/path-migration";
   RNSkLogger::warnToJavascriptConsole(runtime, message);
@@ -213,8 +214,8 @@ public:
             ? JsiSkMatrix::fromValue(runtime, arguments[1])
             : nullptr;
     auto extend = count > 2 && arguments[2].getBool();
-    auto mode = extend ? SkPath::kExtend_AddPathMode
-                       : SkPath::kAppend_AddPathMode;
+    auto mode =
+        extend ? SkPath::kExtend_AddPathMode : SkPath::kAppend_AddPathMode;
     if (matrix) {
       getObject()->addPath(srcPath, *matrix, mode);
     } else {
@@ -234,45 +235,43 @@ public:
   }
 
   JSI_HOST_FUNCTION(addOval) {
-    warnDeprecatedPathMethod(runtime,
-        "addOval",
+    warnDeprecatedPathMethod(
+        runtime, "addOval",
         "Use Skia.Path.Oval() or Skia.PathBuilder.Make().addOval() instead.");
     auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto isCCW = count > 1 && arguments[1].getBool();
-    auto startIndex = count > 2 ? static_cast<unsigned>(arguments[2].asNumber()) : 1;
-    auto direction =
-        isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
+    auto startIndex =
+        count > 2 ? static_cast<unsigned>(arguments[2].asNumber()) : 1;
+    auto direction = isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
     getObject()->addOval(*rect, direction, startIndex);
     return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addRect) {
-    warnDeprecatedPathMethod(runtime,
-        "addRect",
+    warnDeprecatedPathMethod(
+        runtime, "addRect",
         "Use Skia.Path.Rect() or Skia.PathBuilder.Make().addRect() instead.");
     auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto isCCW = count > 1 && arguments[1].getBool();
-    auto direction =
-        isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
+    auto direction = isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
     getObject()->addRect(*rect, direction);
     return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addRRect) {
-    warnDeprecatedPathMethod(runtime,
-        "addRRect",
+    warnDeprecatedPathMethod(
+        runtime, "addRRect",
         "Use Skia.Path.RRect() or Skia.PathBuilder.Make().addRRect() instead.");
     auto rrect = JsiSkRRect::fromValue(runtime, arguments[0]);
     auto isCCW = count > 1 && arguments[1].getBool();
-    auto direction =
-        isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
+    auto direction = isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
     getObject()->addRRect(*rrect, direction);
     return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(addCircle) {
-    warnDeprecatedPathMethod(runtime,
-        "addCircle",
+    warnDeprecatedPathMethod(
+        runtime, "addCircle",
         "Use Skia.Path.Circle() or Skia.PathBuilder.Make().addCircle() "
         "instead.");
     SkScalar x = arguments[0].asNumber();
@@ -283,8 +282,8 @@ public:
   }
 
   JSI_HOST_FUNCTION(addPoly) {
-    warnDeprecatedPathMethod(runtime,
-        "addPoly",
+    warnDeprecatedPathMethod(
+        runtime, "addPoly",
         "Use Skia.Path.Polygon() or Skia.PathBuilder.Make().addPoly() "
         "instead.");
     auto jsiPoints = arguments[0].asObject(runtime).asArray(runtime);
@@ -293,8 +292,8 @@ public:
     std::vector<SkPoint> points;
     points.reserve(pointsSize);
     for (int i = 0; i < pointsSize; i++) {
-      auto pt = JsiSkPoint::fromValue(
-          runtime, jsiPoints.getValueAtIndex(runtime, i));
+      auto pt =
+          JsiSkPoint::fromValue(runtime, jsiPoints.getValueAtIndex(runtime, i));
       points.push_back(*pt);
     }
     getObject()->addPolygon(SkSpan<const SkPoint>(points.data(), points.size()),
@@ -303,8 +302,9 @@ public:
   }
 
   JSI_HOST_FUNCTION(arcToOval) {
-    warnDeprecatedPathMethod(runtime,
-        "arcToOval", "Use Skia.PathBuilder.Make().arcToOval() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "arcToOval",
+        "Use Skia.PathBuilder.Make().arcToOval() instead.");
     auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     auto start = arguments[1].asNumber();
     auto sweep = arguments[2].asNumber();
@@ -314,8 +314,9 @@ public:
   }
 
   JSI_HOST_FUNCTION(arcToRotated) {
-    warnDeprecatedPathMethod(runtime,
-        "arcToRotated", "Use Skia.PathBuilder.Make().arcToRotated() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "arcToRotated",
+        "Use Skia.PathBuilder.Make().arcToRotated() instead.");
     SkScalar rx = arguments[0].asNumber();
     SkScalar ry = arguments[1].asNumber();
     SkScalar xAxisRotate = arguments[2].asNumber();
@@ -325,8 +326,7 @@ public:
     SkScalar y = arguments[6].asNumber();
     auto arcSize = useSmallArc ? SkPathBuilder::kSmall_ArcSize
                                : SkPathBuilder::kLarge_ArcSize;
-    auto sweep =
-        isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
+    auto sweep = isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
     getObject()->arcTo(SkPoint::Make(rx, ry), xAxisRotate, arcSize, sweep,
                        SkPoint::Make(x, y));
     return thisValue.getObject(runtime);
@@ -344,8 +344,7 @@ public:
     SkScalar dy = arguments[6].asNumber();
     auto arcSize = useSmallArc ? SkPathBuilder::kSmall_ArcSize
                                : SkPathBuilder::kLarge_ArcSize;
-    auto sweep =
-        isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
+    auto sweep = isCCW ? SkPathDirection::kCCW : SkPathDirection::kCW;
     SkVector dxdy(dx, dy);
     SkPoint r(rx, ry);
     getObject()->rArcTo(r, xAxisRotate, arcSize, sweep, dxdy);
@@ -353,8 +352,9 @@ public:
   }
 
   JSI_HOST_FUNCTION(arcToTangent) {
-    warnDeprecatedPathMethod(runtime,
-        "arcToTangent", "Use Skia.PathBuilder.Make().arcToTangent() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "arcToTangent",
+        "Use Skia.PathBuilder.Make().arcToTangent() instead.");
     SkScalar x1 = arguments[0].asNumber();
     SkScalar y1 = arguments[1].asNumber();
     SkScalar x2 = arguments[2].asNumber();
@@ -365,16 +365,18 @@ public:
   }
 
   JSI_HOST_FUNCTION(setFillType) {
-    warnDeprecatedPathMethod(runtime,
-        "setFillType", "Use Skia.PathBuilder.Make().setFillType() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "setFillType",
+        "Use Skia.PathBuilder.Make().setFillType() instead.");
     auto ft = arguments[0].asNumber();
     getObject()->setFillType(static_cast<SkPathFillType>(static_cast<int>(ft)));
     return thisValue.getObject(runtime);
   }
 
   JSI_HOST_FUNCTION(setIsVolatile) {
-    warnDeprecatedPathMethod(runtime,
-        "setIsVolatile", "Use Skia.PathBuilder.Make().setIsVolatile() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "setIsVolatile",
+        "Use Skia.PathBuilder.Make().setIsVolatile() instead.");
     auto v = arguments[0].getBool();
     getObject()->setIsVolatile(v);
     return thisValue.getObject(runtime);
@@ -383,8 +385,9 @@ public:
   // Mutable transform methods (deprecated)
 
   JSI_HOST_FUNCTION(transform) {
-    warnDeprecatedPathMethod(runtime,
-        "transform", "Use Skia.PathBuilder.Make().transform() instead.");
+    warnDeprecatedPathMethod(
+        runtime, "transform",
+        "Use Skia.PathBuilder.Make().transform() instead.");
     auto m3 = *JsiSkMatrix::fromValue(runtime, arguments[0]);
     getObject()->transform(m3);
     return thisValue.getObject(runtime);
@@ -413,9 +416,11 @@ public:
   }
 
   JSI_HOST_FUNCTION(op) {
-    warnDeprecatedPathMethod(runtime, "op", "Use Skia.Path.MakeFromOp() instead.");
+    warnDeprecatedPathMethod(runtime, "op",
+                             "Use Skia.Path.MakeFromOp() instead.");
     auto path2 = JsiSkPath::fromValue(runtime, arguments[0]);
-    auto pathOp = static_cast<SkPathOp>(static_cast<int>(arguments[1].asNumber()));
+    auto pathOp =
+        static_cast<SkPathOp>(static_cast<int>(arguments[1].asNumber()));
     auto p1 = asPath();
     auto p2 = path2->snapshot();
     auto result = ::Op(p1, p2, pathOp);
@@ -437,8 +442,8 @@ public:
   }
 
   JSI_HOST_FUNCTION(dash) {
-    warnDeprecatedPathMethod(runtime, "dash",
-                             "Use Skia.Path.Dash(path, on, off, phase) instead.");
+    warnDeprecatedPathMethod(
+        runtime, "dash", "Use Skia.Path.Dash(path, on, off, phase) instead.");
     auto path = asPath();
     SkScalar on = arguments[0].asNumber();
     SkScalar off = arguments[1].asNumber();
@@ -467,12 +472,14 @@ public:
 
       auto jsiCap = opts.getProperty(runtime, "cap");
       if (!jsiCap.isUndefined()) {
-        p.setStrokeCap(static_cast<SkPaint::Cap>(static_cast<int>(jsiCap.asNumber())));
+        p.setStrokeCap(
+            static_cast<SkPaint::Cap>(static_cast<int>(jsiCap.asNumber())));
       }
 
       auto jsiJoin = opts.getProperty(runtime, "join");
       if (!jsiJoin.isUndefined()) {
-        p.setStrokeJoin(static_cast<SkPaint::Join>(static_cast<int>(jsiJoin.asNumber())));
+        p.setStrokeJoin(
+            static_cast<SkPaint::Join>(static_cast<int>(jsiJoin.asNumber())));
       }
 
       auto jsiWidth = opts.getProperty(runtime, "width");
@@ -495,8 +502,9 @@ public:
   }
 
   JSI_HOST_FUNCTION(trim) {
-    warnDeprecatedPathMethod(runtime,
-        "trim", "Use Skia.Path.Trim(path, start, end, isComplement) instead.");
+    warnDeprecatedPathMethod(
+        runtime, "trim",
+        "Use Skia.Path.Trim(path, start, end, isComplement) instead.");
     auto path = asPath();
     float start =
         std::clamp(static_cast<float>(arguments[0].asNumber()), 0.0f, 1.0f);
@@ -544,9 +552,7 @@ public:
     return jsi::Value(static_cast<int>(fillType));
   }
 
-  JSI_HOST_FUNCTION(isVolatile) {
-    return jsi::Value(asPath().isVolatile());
-  }
+  JSI_HOST_FUNCTION(isVolatile) { return jsi::Value(asPath().isVolatile()); }
 
   JSI_HOST_FUNCTION(getPoint) {
     auto index = arguments[0].asNumber();
@@ -590,8 +596,7 @@ public:
 
   JSI_HOST_FUNCTION(copy) {
     auto path = asPath();
-    auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), path);
+    auto hostObjectInstance = std::make_shared<JsiSkPath>(getContext(), path);
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -702,24 +707,15 @@ public:
 
   JSI_EXPORT_FUNCTIONS(
       // Mutable building methods
-      JSI_EXPORT_FUNC(JsiSkPath, moveTo),
-      JSI_EXPORT_FUNC(JsiSkPath, rMoveTo),
-      JSI_EXPORT_FUNC(JsiSkPath, lineTo),
-      JSI_EXPORT_FUNC(JsiSkPath, rLineTo),
-      JSI_EXPORT_FUNC(JsiSkPath, quadTo),
-      JSI_EXPORT_FUNC(JsiSkPath, rQuadTo),
-      JSI_EXPORT_FUNC(JsiSkPath, conicTo),
-      JSI_EXPORT_FUNC(JsiSkPath, rConicTo),
-      JSI_EXPORT_FUNC(JsiSkPath, cubicTo),
-      JSI_EXPORT_FUNC(JsiSkPath, rCubicTo),
-      JSI_EXPORT_FUNC(JsiSkPath, close),
-      JSI_EXPORT_FUNC(JsiSkPath, reset),
-      JSI_EXPORT_FUNC(JsiSkPath, rewind),
-      JSI_EXPORT_FUNC(JsiSkPath, addPath),
-      JSI_EXPORT_FUNC(JsiSkPath, addArc),
-      JSI_EXPORT_FUNC(JsiSkPath, addOval),
-      JSI_EXPORT_FUNC(JsiSkPath, addRect),
-      JSI_EXPORT_FUNC(JsiSkPath, addRRect),
+      JSI_EXPORT_FUNC(JsiSkPath, moveTo), JSI_EXPORT_FUNC(JsiSkPath, rMoveTo),
+      JSI_EXPORT_FUNC(JsiSkPath, lineTo), JSI_EXPORT_FUNC(JsiSkPath, rLineTo),
+      JSI_EXPORT_FUNC(JsiSkPath, quadTo), JSI_EXPORT_FUNC(JsiSkPath, rQuadTo),
+      JSI_EXPORT_FUNC(JsiSkPath, conicTo), JSI_EXPORT_FUNC(JsiSkPath, rConicTo),
+      JSI_EXPORT_FUNC(JsiSkPath, cubicTo), JSI_EXPORT_FUNC(JsiSkPath, rCubicTo),
+      JSI_EXPORT_FUNC(JsiSkPath, close), JSI_EXPORT_FUNC(JsiSkPath, reset),
+      JSI_EXPORT_FUNC(JsiSkPath, rewind), JSI_EXPORT_FUNC(JsiSkPath, addPath),
+      JSI_EXPORT_FUNC(JsiSkPath, addArc), JSI_EXPORT_FUNC(JsiSkPath, addOval),
+      JSI_EXPORT_FUNC(JsiSkPath, addRect), JSI_EXPORT_FUNC(JsiSkPath, addRRect),
       JSI_EXPORT_FUNC(JsiSkPath, addCircle),
       JSI_EXPORT_FUNC(JsiSkPath, addPoly),
       JSI_EXPORT_FUNC(JsiSkPath, arcToOval),
@@ -729,14 +725,11 @@ public:
       JSI_EXPORT_FUNC(JsiSkPath, setFillType),
       JSI_EXPORT_FUNC(JsiSkPath, setIsVolatile),
       // Mutable transform methods
-      JSI_EXPORT_FUNC(JsiSkPath, transform),
-      JSI_EXPORT_FUNC(JsiSkPath, offset),
+      JSI_EXPORT_FUNC(JsiSkPath, transform), JSI_EXPORT_FUNC(JsiSkPath, offset),
       // Mutable path operations
-      JSI_EXPORT_FUNC(JsiSkPath, simplify),
-      JSI_EXPORT_FUNC(JsiSkPath, op),
+      JSI_EXPORT_FUNC(JsiSkPath, simplify), JSI_EXPORT_FUNC(JsiSkPath, op),
       JSI_EXPORT_FUNC(JsiSkPath, makeAsWinding),
-      JSI_EXPORT_FUNC(JsiSkPath, dash),
-      JSI_EXPORT_FUNC(JsiSkPath, stroke),
+      JSI_EXPORT_FUNC(JsiSkPath, dash), JSI_EXPORT_FUNC(JsiSkPath, stroke),
       JSI_EXPORT_FUNC(JsiSkPath, trim),
       // Query methods
       JSI_EXPORT_FUNC(JsiSkPath, computeTightBounds),
@@ -744,17 +737,14 @@ public:
       JSI_EXPORT_FUNC(JsiSkPath, contains),
       JSI_EXPORT_FUNC(JsiSkPath, getFillType),
       JSI_EXPORT_FUNC(JsiSkPath, isVolatile),
-      JSI_EXPORT_FUNC(JsiSkPath, getPoint),
-      JSI_EXPORT_FUNC(JsiSkPath, isEmpty),
+      JSI_EXPORT_FUNC(JsiSkPath, getPoint), JSI_EXPORT_FUNC(JsiSkPath, isEmpty),
       JSI_EXPORT_FUNC(JsiSkPath, countPoints),
       JSI_EXPORT_FUNC(JsiSkPath, getLastPt),
       JSI_EXPORT_FUNC(JsiSkPath, toSVGString),
-      JSI_EXPORT_FUNC(JsiSkPath, equals),
-      JSI_EXPORT_FUNC(JsiSkPath, copy),
+      JSI_EXPORT_FUNC(JsiSkPath, equals), JSI_EXPORT_FUNC(JsiSkPath, copy),
       JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
       JSI_EXPORT_FUNC(JsiSkPath, interpolate),
-      JSI_EXPORT_FUNC(JsiSkPath, toCmds),
-      JSI_EXPORT_FUNC(JsiSkPath, dispose))
+      JSI_EXPORT_FUNC(JsiSkPath, toCmds), JSI_EXPORT_FUNC(JsiSkPath, dispose))
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPathBuilder builder)
       : JsiSkWrappingSharedPtrHostObject<SkPathBuilder>(

package/cpp/api/JsiSkPathEffectFactory.h

@@ -92,7 +92,8 @@ public:
     auto style =
         static_cast<SkPath1DPathEffect::Style>(arguments[3].asNumber());
     auto pathEffect = std::make_shared<JsiSkPathEffect>(
-        getContext(), SkPath1DPathEffect::Make(path->snapshot(), advance, phase, style));
+        getContext(),
+        SkPath1DPathEffect::Make(path->snapshot(), advance, phase, style));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, pathEffect,
                                                        getContext());
   }

package/cpp/api/JsiSkPathFactory.h

@@ -52,36 +52,33 @@ public:
 
   JSI_HOST_FUNCTION(MakeFromSVGString) {
     auto svgString = arguments[0].asString(runtime).utf8(runtime);
-    SkPath result;
-
-    if (!SkParsePath::FromSVGString(svgString.c_str(), &result)) {
+    auto result = SkParsePath::FromSVGString(svgString.c_str());
+    if (!result.has_value()) {
       throw jsi::JSError(runtime, "Could not parse Svg path");
       return jsi::Value(nullptr);
     }
-
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(result));
+        std::make_shared<JsiSkPath>(getContext(), std::move(result.value()));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
 
   JSI_HOST_FUNCTION(MakeFromOp) {
-    SkPath one = JsiSkPath::fromValue(runtime, arguments[0])->snapshot();
-    SkPath two = JsiSkPath::fromValue(runtime, arguments[1])->snapshot();
+    auto one = JsiSkPath::fromValue(runtime, arguments[0])->snapshot();
+    auto two = JsiSkPath::fromValue(runtime, arguments[1])->snapshot();
     SkPathOp op = (SkPathOp)arguments[2].asNumber();
-    SkPath result;
-    bool success = Op(one, two, op, &result);
-    if (!success) {
+    auto result = Op(one, two, op);
+    if (!result.has_value()) {
       return jsi::Value(nullptr);
     }
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(result));
+        std::make_shared<JsiSkPath>(getContext(), std::move(result.value()));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
 
   JSI_HOST_FUNCTION(MakeFromCmds) {
-    SkPath path;
+    SkPathBuilder builder;
     auto cmds = arguments[0].asObject(runtime).asArray(runtime);
     auto cmdCount = cmds.size(runtime);
     for (int i = 0; i < cmdCount; i++) {
@@ -100,7 +97,7 @@ public:
         }
         auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
         auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
-        path.moveTo(x, y);
+        builder.moveTo(x, y);
         break;
       }
       case LINE: {
@@ -110,7 +107,7 @@ public:
         }
         auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
         auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
-        path.lineTo(x, y);
+        builder.lineTo(x, y);
         break;
       }
       case QUAD: {
@@ -122,7 +119,7 @@ public:
         auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
         auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
         auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
-        path.quadTo(x1, y1, x2, y2);
+        builder.quadTo(x1, y1, x2, y2);
         break;
       }
       case CONIC: {
@@ -135,7 +132,7 @@ public:
         auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
         auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
         auto w = cmd.getValueAtIndex(runtime, 5).asNumber();
-        path.conicTo(x1, y1, x2, y2, w);
+        builder.conicTo(x1, y1, x2, y2, w);
         break;
       }
       case CUBIC: {
@@ -149,11 +146,11 @@ public:
         auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
         auto x3 = cmd.getValueAtIndex(runtime, 5).asNumber();
         auto y3 = cmd.getValueAtIndex(runtime, 6).asNumber();
-        path.cubicTo(x1, y1, x2, y2, x3, y3);
+        builder.cubicTo(x1, y1, x2, y2, x3, y3);
         break;
       }
       case CLOSE: {
-        path.close();
+        builder.close();
         break;
       }
       default: {
@@ -163,7 +160,7 @@ public:
       }
     }
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -189,10 +186,10 @@ public:
     if (count >= 2 && arguments[1].getBool()) {
       direction = SkPathDirection::kCCW;
     }
-    SkPath path;
-    path.addRect(*rect, direction);
+    SkPathBuilder builder;
+    builder.addRect(*rect, direction);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -204,10 +201,10 @@ public:
       direction = SkPathDirection::kCCW;
     }
     unsigned startIndex = count < 3 ? 0 : arguments[2].asNumber();
-    SkPath path;
-    path.addOval(*rect, direction, startIndex);
+    SkPathBuilder builder;
+    builder.addOval(*rect, direction, startIndex);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -216,10 +213,10 @@ public:
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     auto r = arguments[2].asNumber();
-    SkPath path;
-    path.addCircle(x, y, r);
+    SkPathBuilder builder;
+    builder.addCircle(x, y, r);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -230,24 +227,22 @@ public:
     if (count >= 2 && arguments[1].getBool()) {
       direction = SkPathDirection::kCCW;
     }
-    SkPath path;
-    path.addRRect(*rrect, direction);
+    SkPathBuilder builder;
+    builder.addRRect(*rrect, direction);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
 
   JSI_HOST_FUNCTION(Line) {
-    auto p1 = JsiSkPoint::fromValue(
-        runtime, arguments[0].asObject(runtime));
-    auto p2 = JsiSkPoint::fromValue(
-        runtime, arguments[1].asObject(runtime));
-    SkPath path;
-    path.moveTo(*p1);
-    path.lineTo(*p2);
+    auto p1 = JsiSkPoint::fromValue(runtime, arguments[0].asObject(runtime));
+    auto p2 = JsiSkPoint::fromValue(runtime, arguments[1].asObject(runtime));
+    SkPathBuilder builder;
+    builder.moveTo(*p1);
+    builder.lineTo(*p2);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -263,11 +258,10 @@ public:
           runtime, jsiPoints.getValueAtIndex(runtime, i).asObject(runtime));
       points.push_back(*point.get());
     }
-    SkPath path;
-    auto p = SkSpan(points.data(), points.size());
-    path.addPoly(p, close);
+    SkPathBuilder builder;
+    builder.addPolygon(SkSpan(points), close);
     auto hostObjectInstance =
-        std::make_shared<JsiSkPath>(getContext(), std::move(path));
+        std::make_shared<JsiSkPath>(getContext(), builder.snapshot());
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
         runtime, hostObjectInstance, getContext());
   }
@@ -308,22 +302,22 @@ public:
 
       auto jsiPrecision = opts.getProperty(runtime, "precision");
       auto precision = jsiPrecision.isUndefined() ? 1 : jsiPrecision.asNumber();
-      SkPath result;
+      SkPathBuilder resultBuilder;
+      auto ctm = SkMatrix::Scale(precision, precision);
       auto success =
-          skpathutils::FillPathWithPaint(path, p, &result, nullptr, precision);
+          skpathutils::FillPathWithPaint(path, p, &resultBuilder, nullptr, ctm);
       if (success) {
         auto hostObjectInstance =
-            std::make_shared<JsiSkPath>(getContext(), std::move(result));
+            std::make_shared<JsiSkPath>(getContext(), resultBuilder.snapshot());
         return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
             runtime, hostObjectInstance, getContext());
       }
     } else {
-      SkPath result;
-      auto success =
-          skpathutils::FillPathWithPaint(path, p, &result, nullptr, 1);
+      SkPathBuilder resultBuilder;
+      auto success = skpathutils::FillPathWithPaint(path, p, &resultBuilder);
       if (success) {
         auto hostObjectInstance =
-            std::make_shared<JsiSkPath>(getContext(), std::move(result));
+            std::make_shared<JsiSkPath>(getContext(), resultBuilder.snapshot());
         return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
             runtime, hostObjectInstance, getContext());
       }
@@ -333,8 +327,10 @@ public:
 
   JSI_HOST_FUNCTION(Trim) {
     auto srcPath = JsiSkPath::fromValue(runtime, arguments[0]);
-    float start = std::clamp(static_cast<float>(arguments[1].asNumber()), 0.0f, 1.0f);
-    float end = std::clamp(static_cast<float>(arguments[2].asNumber()), 0.0f, 1.0f);
+    float start =
+        std::clamp(static_cast<float>(arguments[1].asNumber()), 0.0f, 1.0f);
+    float end =
+        std::clamp(static_cast<float>(arguments[2].asNumber()), 0.0f, 1.0f);
     auto isComplement = arguments[3].getBool();
     // If requesting the full path in normal mode, just return a copy
     if (start <= 0 && end >= 1 && !isComplement) {

package/cpp/api/JsiSkShader.h

@@ -11,7 +11,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/core/SkShader.h"
-#include "include/effects/SkGradientShader.h"
+#include "include/effects/SkGradient.h"
 
 #pragma clang diagnostic pop