@shopify/react-native-skia 2.10.0 → 2.10.1

package/cpp/api/JsiSkPaint.h

@@ -7,6 +7,7 @@
 
 #include "CustomBlendModes.h"
 #include "JsiSkColor.h"
+#include "JsiSkConverters.h"
 #include "JsiSkColorFilter.h"
 #include "JsiSkImageFilter.h"
 #include "JsiSkMaskFilter.h"
@@ -29,188 +30,129 @@ class JsiSkPaint
 public:
   static constexpr const char *CLASS_NAME = "Paint";
 
-  JSI_HOST_FUNCTION(assign) {
-    SkPaint *paint = JsiSkPaint::fromValue(runtime, arguments[0]).get();
-    *getObject() = *paint;
-    return jsi::Value::undefined();
-  }
+  void assign(std::shared_ptr<SkPaint> paint) { *getObject() = *paint; }
 
-  JSI_HOST_FUNCTION(copy) {
+  std::shared_ptr<JsiSkPaint> copy() {
     const auto *paint = getObject().get();
-    return makeJsiObject(
-        runtime, std::make_shared<JsiSkPaint>(getContext(), SkPaint(*paint)));
+    return std::make_shared<JsiSkPaint>(getContext(), SkPaint(*paint));
   }
 
-  JSI_HOST_FUNCTION(reset) {
-    getObject()->reset();
-    return jsi::Value::undefined();
-  }
+  void reset() { getObject()->reset(); }
 
-  JSI_HOST_FUNCTION(getColor) {
-    return JsiSkColor::toValue(runtime, getObject()->getColor());
-  }
+  JsiColor getColor() { return {getObject()->getColor()}; }
 
-  JSI_HOST_FUNCTION(getStrokeCap) {
+  double getStrokeCap() {
     return static_cast<double>(getObject()->getStrokeCap());
   }
 
-  JSI_HOST_FUNCTION(getStrokeJoin) {
+  double getStrokeJoin() {
     return static_cast<double>(getObject()->getStrokeJoin());
   }
 
-  JSI_HOST_FUNCTION(getStrokeMiter) {
+  double getStrokeMiter() {
     return static_cast<double>(getObject()->getStrokeMiter());
   }
 
-  JSI_HOST_FUNCTION(getStrokeWidth) {
+  double getStrokeWidth() {
     return static_cast<double>(getObject()->getStrokeWidth());
   }
 
-  JSI_HOST_FUNCTION(getAlphaf) {
-    float alphaf = getObject()->getAlphaf();
-    return jsi::Value(SkScalarToDouble(alphaf));
-  }
+  double getAlphaf() { return SkScalarToDouble(getObject()->getAlphaf()); }
 
-  JSI_HOST_FUNCTION(setColor) {
-    SkColor color = JsiSkColor::fromValue(runtime, arguments[0]);
-    getObject()->setColor(color);
-    return jsi::Value::undefined();
-  }
+  void setColor(JsiColor color) { getObject()->setColor(color); }
 
-  JSI_HOST_FUNCTION(setAlphaf) {
-    SkScalar alpha = arguments[0].asNumber();
-    getObject()->setAlphaf(alpha);
-    return jsi::Value::undefined();
-  }
+  void setAlphaf(double alpha) { getObject()->setAlphaf(alpha); }
 
-  JSI_HOST_FUNCTION(setAntiAlias) {
-    bool antiAliased = arguments[0].getBool();
+  void setAntiAlias(bool antiAliased) {
     getObject()->setAntiAlias(antiAliased);
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(setDither) {
-    bool dithered = arguments[0].getBool();
-    getObject()->setDither(dithered);
-    return jsi::Value::undefined();
-  }
+  void setDither(bool dithered) { getObject()->setDither(dithered); }
 
-  JSI_HOST_FUNCTION(setStrokeWidth) {
-    SkScalar width = arguments[0].asNumber();
-    getObject()->setStrokeWidth(width);
-    return jsi::Value::undefined();
-  }
+  void setStrokeWidth(double width) { getObject()->setStrokeWidth(width); }
 
-  JSI_HOST_FUNCTION(setStyle) {
-    auto style = arguments[0].asNumber();
+  void setStyle(double style) {
     getObject()->setStyle(static_cast<SkPaint::Style>(style));
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(setStrokeCap) {
-    auto cap = arguments[0].asNumber();
+  void setStrokeCap(double cap) {
     getObject()->setStrokeCap(static_cast<SkPaint::Cap>(cap));
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(setStrokeJoin) {
-    int join = arguments[0].asNumber();
+  void setStrokeJoin(int join) {
     getObject()->setStrokeJoin(static_cast<SkPaint::Join>(join));
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(setStrokeMiter) {
-    int limit = arguments[0].asNumber();
-    getObject()->setStrokeMiter(limit);
-    return jsi::Value::undefined();
-  }
+  void setStrokeMiter(int limit) { getObject()->setStrokeMiter(limit); }
 
-  JSI_HOST_FUNCTION(setBlendMode) {
-    int blendModeValue = static_cast<int>(arguments[0].asNumber());
+  void setBlendMode(int blendModeValue) {
     applyBlendMode(*getObject(), blendModeValue);
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(setMaskFilter) {
-    auto maskFilter = arguments[0].isNull() || arguments[0].isUndefined()
-                          ? nullptr
-                          : JsiSkMaskFilter::fromValue(runtime, arguments[0]);
-    getObject()->setMaskFilter(std::move(maskFilter));
-    return jsi::Value::undefined();
+  void setMaskFilter(JsiOptional<sk_sp<SkMaskFilter>> maskFilter) {
+    getObject()->setMaskFilter(
+        maskFilter.has_value() ? std::move(*maskFilter) : nullptr);
   }
 
-  JSI_HOST_FUNCTION(setImageFilter) {
-    auto imageFilter = arguments[0].isNull() || arguments[0].isUndefined()
-                           ? nullptr
-                           : JsiSkImageFilter::fromValue(runtime, arguments[0]);
-    getObject()->setImageFilter(std::move(imageFilter));
-    return jsi::Value::undefined();
+  void setImageFilter(JsiOptional<sk_sp<SkImageFilter>> imageFilter) {
+    getObject()->setImageFilter(
+        imageFilter.has_value() ? std::move(*imageFilter) : nullptr);
   }
 
-  JSI_HOST_FUNCTION(setColorFilter) {
-    auto colorFilter = arguments[0].isNull() || arguments[0].isUndefined()
-                           ? nullptr
-                           : JsiSkColorFilter::fromValue(runtime, arguments[0]);
-    getObject()->setColorFilter(std::move(colorFilter));
-    return jsi::Value::undefined();
+  void setColorFilter(JsiOptional<sk_sp<SkColorFilter>> colorFilter) {
+    getObject()->setColorFilter(
+        colorFilter.has_value() ? std::move(*colorFilter) : nullptr);
   }
 
-  JSI_HOST_FUNCTION(setShader) {
-    auto shader = arguments[0].isNull() || arguments[0].isUndefined()
-                      ? nullptr
-                      : JsiSkShader::fromValue(runtime, arguments[0]);
-    getObject()->setShader(std::move(shader));
-    return jsi::Value::undefined();
+  void setShader(JsiOptional<sk_sp<SkShader>> shader) {
+    getObject()->setShader(shader.has_value() ? std::move(*shader) : nullptr);
   }
 
-  JSI_HOST_FUNCTION(setPathEffect) {
-    auto pathEffect = arguments[0].isNull() || arguments[0].isUndefined()
-                          ? nullptr
-                          : JsiSkPathEffect::fromValue(runtime, arguments[0]);
-    getObject()->setPathEffect(std::move(pathEffect));
-    return jsi::Value::undefined();
+  void setPathEffect(JsiOptional<sk_sp<SkPathEffect>> pathEffect) {
+    getObject()->setPathEffect(
+        pathEffect.has_value() ? std::move(*pathEffect) : nullptr);
   }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
     installCommon(runtime, prototype);
-    installHostMethod(runtime, prototype, "assign", &JsiSkPaint::assign);
-    installHostMethod(runtime, prototype, "copy", &JsiSkPaint::copy);
-    installHostMethod(runtime, prototype, "reset", &JsiSkPaint::reset);
-    installHostMethod(runtime, prototype, "getAlphaf", &JsiSkPaint::getAlphaf);
-    installHostMethod(runtime, prototype, "getColor", &JsiSkPaint::getColor);
-    installHostMethod(runtime, prototype, "getStrokeCap",
-                      &JsiSkPaint::getStrokeCap);
-    installHostMethod(runtime, prototype, "getStrokeJoin",
-                      &JsiSkPaint::getStrokeJoin);
-    installHostMethod(runtime, prototype, "getStrokeMiter",
-                      &JsiSkPaint::getStrokeMiter);
-    installHostMethod(runtime, prototype, "getStrokeWidth",
-                      &JsiSkPaint::getStrokeWidth);
-    installHostMethod(runtime, prototype, "setPathEffect",
-                      &JsiSkPaint::setPathEffect);
-    installHostMethod(runtime, prototype, "setShader", &JsiSkPaint::setShader);
-    installHostMethod(runtime, prototype, "setColorFilter",
-                      &JsiSkPaint::setColorFilter);
-    installHostMethod(runtime, prototype, "setImageFilter",
-                      &JsiSkPaint::setImageFilter);
-    installHostMethod(runtime, prototype, "setMaskFilter",
-                      &JsiSkPaint::setMaskFilter);
-    installHostMethod(runtime, prototype, "setBlendMode",
-                      &JsiSkPaint::setBlendMode);
-    installHostMethod(runtime, prototype, "setStrokeMiter",
-                      &JsiSkPaint::setStrokeMiter);
-    installHostMethod(runtime, prototype, "setStrokeJoin",
-                      &JsiSkPaint::setStrokeJoin);
-    installHostMethod(runtime, prototype, "setStrokeCap",
-                      &JsiSkPaint::setStrokeCap);
-    installHostMethod(runtime, prototype, "setAntiAlias",
-                      &JsiSkPaint::setAntiAlias);
-    installHostMethod(runtime, prototype, "setDither", &JsiSkPaint::setDither);
-    installHostMethod(runtime, prototype, "setStrokeWidth",
-                      &JsiSkPaint::setStrokeWidth);
-    installHostMethod(runtime, prototype, "setStyle", &JsiSkPaint::setStyle);
-    installHostMethod(runtime, prototype, "setColor", &JsiSkPaint::setColor);
-    installHostMethod(runtime, prototype, "setAlphaf", &JsiSkPaint::setAlphaf);
+    installMethod(runtime, prototype, "assign", &JsiSkPaint::assign);
+    installMethod(runtime, prototype, "copy", &JsiSkPaint::copy);
+    installMethod(runtime, prototype, "reset", &JsiSkPaint::reset);
+    installMethod(runtime, prototype, "getAlphaf", &JsiSkPaint::getAlphaf);
+    installMethod(runtime, prototype, "getColor", &JsiSkPaint::getColor);
+    installMethod(runtime, prototype, "getStrokeCap",
+                  &JsiSkPaint::getStrokeCap);
+    installMethod(runtime, prototype, "getStrokeJoin",
+                  &JsiSkPaint::getStrokeJoin);
+    installMethod(runtime, prototype, "getStrokeMiter",
+                  &JsiSkPaint::getStrokeMiter);
+    installMethod(runtime, prototype, "getStrokeWidth",
+                  &JsiSkPaint::getStrokeWidth);
+    installMethod(runtime, prototype, "setPathEffect",
+                  &JsiSkPaint::setPathEffect);
+    installMethod(runtime, prototype, "setShader", &JsiSkPaint::setShader);
+    installMethod(runtime, prototype, "setColorFilter",
+                  &JsiSkPaint::setColorFilter);
+    installMethod(runtime, prototype, "setImageFilter",
+                  &JsiSkPaint::setImageFilter);
+    installMethod(runtime, prototype, "setMaskFilter",
+                  &JsiSkPaint::setMaskFilter);
+    installMethod(runtime, prototype, "setBlendMode",
+                  &JsiSkPaint::setBlendMode);
+    installMethod(runtime, prototype, "setStrokeMiter",
+                  &JsiSkPaint::setStrokeMiter);
+    installMethod(runtime, prototype, "setStrokeJoin",
+                  &JsiSkPaint::setStrokeJoin);
+    installMethod(runtime, prototype, "setStrokeCap",
+                  &JsiSkPaint::setStrokeCap);
+    installMethod(runtime, prototype, "setAntiAlias",
+                  &JsiSkPaint::setAntiAlias);
+    installMethod(runtime, prototype, "setDither", &JsiSkPaint::setDither);
+    installMethod(runtime, prototype, "setStrokeWidth",
+                  &JsiSkPaint::setStrokeWidth);
+    installMethod(runtime, prototype, "setStyle", &JsiSkPaint::setStyle);
+    installMethod(runtime, prototype, "setColor", &JsiSkPaint::setColor);
+    installMethod(runtime, prototype, "setAlphaf", &JsiSkPaint::setAlphaf);
   }
 
   JsiSkPaint(std::shared_ptr<RNSkPlatformContext> context, SkPaint paint)

package/cpp/api/JsiSkParagraph.h

@@ -3,6 +3,7 @@
 #include <memory>
 #include <string>
 #include <utility>
+#include <variant>
 #include <vector>
 
 #include <jsi/jsi.h>
@@ -36,61 +37,46 @@ class JsiSkParagraph
 public:
   static constexpr const char *CLASS_NAME = "Paragraph";
 
-  JSI_HOST_FUNCTION(layout) {
-    auto width = getArgumentAsNumber(runtime, arguments, count, 0);
-    getObject()->layout(width);
-    return jsi::Value::undefined();
-  }
+  void layout(double width) { getObject()->layout(width); }
 
-  JSI_HOST_FUNCTION(paint) {
-    auto jsiCanvas = getJsiObject<JsiSkCanvas>(
-        runtime, getArgument(runtime, arguments, count, 0));
-    auto x = getArgumentAsNumber(runtime, arguments, count, 1);
-    auto y = getArgumentAsNumber(runtime, arguments, count, 2);
+  void paint(std::shared_ptr<JsiSkCanvas> jsiCanvas, double x, double y) {
     getObject()->paint(jsiCanvas->getCanvas(), x, y);
-    return jsi::Value::undefined();
   }
 
-  JSI_HOST_FUNCTION(getHeight) {
-    return static_cast<double>(getObject()->getHeight());
-  }
+  double getHeight() { return static_cast<double>(getObject()->getHeight()); }
 
-  JSI_HOST_FUNCTION(getMaxWidth) {
+  double getMaxWidth() {
     return static_cast<double>(getObject()->getMaxWidth());
   }
 
-  JSI_HOST_FUNCTION(getMaxIntrinsicWidth) {
+  double getMaxIntrinsicWidth() {
     return static_cast<double>(getObject()->getMaxIntrinsicWidth());
   }
 
-  JSI_HOST_FUNCTION(getMinIntrinsicWidth) {
+  double getMinIntrinsicWidth() {
     return static_cast<double>(getObject()->getMinIntrinsicWidth());
   }
 
-  JSI_HOST_FUNCTION(getLongestLine) {
+  double getLongestLine() {
     return static_cast<double>(getObject()->getLongestLine());
   }
 
-  JSI_HOST_FUNCTION(getGlyphPositionAtCoordinate) {
-    auto dx = getArgumentAsNumber(runtime, arguments, count, 0);
-    auto dy = getArgumentAsNumber(runtime, arguments, count, 1);
+  int getGlyphPositionAtCoordinate(double dx, double dy) {
     auto result = getObject()->getGlyphPositionAtCoordinate(dx, dy);
     return result.position;
   }
 
-  JSI_HOST_FUNCTION(getRectsForRange) {
-    auto start = getArgumentAsNumber(runtime, arguments, count, 0);
-    auto end = getArgumentAsNumber(runtime, arguments, count, 1);
+  std::vector<std::shared_ptr<JsiSkRect>> getRectsForRange(double start,
+                                                           double end) {
     auto result =
         getObject()->getRectsForRange(start, end, para::RectHeightStyle::kTight,
                                       para::RectWidthStyle::kTight);
-    auto returnValue = jsi::Array(runtime, result.size());
-    for (size_t i = 0; i < result.size(); ++i) {
-      returnValue.setValueAtIndex(
-          runtime, i,
-          JsiSkRect::toValue(runtime, getContext(), result[i].rect));
+    std::vector<std::shared_ptr<JsiSkRect>> rects;
+    rects.reserve(result.size());
+    for (const auto &box : result) {
+      rects.push_back(std::make_shared<JsiSkRect>(getContext(), box.rect));
     }
-    return returnValue;
+    return rects;
   }
 
   JSI_HOST_FUNCTION(getLineMetrics) {
@@ -143,14 +129,13 @@ public:
     return returnValue;
   }
 
-  JSI_HOST_FUNCTION(getPath) {
-    auto lineNumber =
-        static_cast<int>(getArgumentAsNumber(runtime, arguments, count, 0));
+  std::variant<std::nullptr_t, std::shared_ptr<JsiSkPath>>
+  getPath(int lineNumber) {
     auto paragraph = getObject();
     // Paragraph::getPath does not bounds-check the line number.
     if (lineNumber < 0 ||
         static_cast<size_t>(lineNumber) >= paragraph->lineNumber()) {
-      return jsi::Value::null();
+      return nullptr;
     }
     // Paragraph::getPath resets its path builder after every visual run, so
     // for lines shaped as multiple runs (e.g. through font fallback) it only
@@ -183,8 +168,7 @@ public:
               &rec);
         });
     SkPath path = builder.detach();
-    return makeJsiObject(
-        runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
+    return std::make_shared<JsiSkPath>(getContext(), std::move(path));
   }
 
   JSI_HOST_FUNCTION(extendedVisit) {
@@ -269,27 +253,26 @@ public:
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
     installCommon(runtime, prototype);
-    installHostMethod(runtime, prototype, "layout", &JsiSkParagraph::layout);
-    installHostMethod(runtime, prototype, "paint", &JsiSkParagraph::paint);
-    installHostMethod(runtime, prototype, "getMaxWidth",
-                      &JsiSkParagraph::getMaxWidth);
-    installHostMethod(runtime, prototype, "getMinIntrinsicWidth",
-                      &JsiSkParagraph::getMinIntrinsicWidth);
-    installHostMethod(runtime, prototype, "getMaxIntrinsicWidth",
-                      &JsiSkParagraph::getMaxIntrinsicWidth);
-    installHostMethod(runtime, prototype, "getLongestLine",
-                      &JsiSkParagraph::getLongestLine);
-    installHostMethod(runtime, prototype, "getHeight",
-                      &JsiSkParagraph::getHeight);
+    installMethod(runtime, prototype, "layout", &JsiSkParagraph::layout);
+    installMethod(runtime, prototype, "paint", &JsiSkParagraph::paint);
+    installMethod(runtime, prototype, "getMaxWidth",
+                  &JsiSkParagraph::getMaxWidth);
+    installMethod(runtime, prototype, "getMinIntrinsicWidth",
+                  &JsiSkParagraph::getMinIntrinsicWidth);
+    installMethod(runtime, prototype, "getMaxIntrinsicWidth",
+                  &JsiSkParagraph::getMaxIntrinsicWidth);
+    installMethod(runtime, prototype, "getLongestLine",
+                  &JsiSkParagraph::getLongestLine);
+    installMethod(runtime, prototype, "getHeight", &JsiSkParagraph::getHeight);
     installHostMethod(runtime, prototype, "getRectsForPlaceholders",
                       &JsiSkParagraph::getRectsForPlaceholders);
-    installHostMethod(runtime, prototype, "getGlyphPositionAtCoordinate",
-                      &JsiSkParagraph::getGlyphPositionAtCoordinate);
-    installHostMethod(runtime, prototype, "getRectsForRange",
-                      &JsiSkParagraph::getRectsForRange);
+    installMethod(runtime, prototype, "getGlyphPositionAtCoordinate",
+                  &JsiSkParagraph::getGlyphPositionAtCoordinate);
+    installMethod(runtime, prototype, "getRectsForRange",
+                  &JsiSkParagraph::getRectsForRange);
     installHostMethod(runtime, prototype, "getLineMetrics",
                       &JsiSkParagraph::getLineMetrics);
-    installHostMethod(runtime, prototype, "getPath", &JsiSkParagraph::getPath);
+    installMethod(runtime, prototype, "getPath", &JsiSkParagraph::getPath);
     installHostMethod(runtime, prototype, "extendedVisit",
                       &JsiSkParagraph::extendedVisit);
   }

package/cpp/api/JsiSkParagraphBuilder.h

@@ -1,10 +1,12 @@
 #pragma once
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include <jsi/jsi.h>
 
+#include "JsiSkConverters.h"
 #include "JsiSkFont.h"
 #include "JsiSkFontMgr.h"
 #include "JsiSkFontMgrFactory.h"
@@ -40,85 +42,55 @@ class JsiSkParagraphBuilder : public JsiSkNativeObject<JsiSkParagraphBuilder> {
 public:
   static constexpr const char *CLASS_NAME = "ParagraphBuilder";
 
-  JSI_HOST_FUNCTION(build) {
-    return makeJsiObject(runtime, std::make_shared<JsiSkParagraph>(
-                                      getContext(), _builder.get()));
+  std::shared_ptr<JsiSkParagraph> build() {
+    return std::make_shared<JsiSkParagraph>(getContext(), _builder.get());
   }
 
-  JSI_HOST_FUNCTION(reset) {
-    _builder->Reset();
-    return jsi::Value::undefined();
-  }
+  void reset() { _builder->Reset(); }
 
-  JSI_HOST_FUNCTION(addText) {
-    auto text = getArgumentAsString(runtime, arguments, count, 0).utf8(runtime);
-    _builder->addText(text.c_str());
-    return thisValue.asObject(runtime);
-  }
+  void addText(std::string text) { _builder->addText(text.c_str()); }
 
-  JSI_HOST_FUNCTION(addPlaceholder) {
-    auto width =
-        count >= 1 ? getArgumentAsNumber(runtime, arguments, count, 0) : 0;
-    auto height =
-        count >= 2 ? getArgumentAsNumber(runtime, arguments, count, 1) : 0;
-    auto alignment =
-        count >= 3 ? static_cast<para::PlaceholderAlignment>(
-                         getArgumentAsNumber(runtime, arguments, count, 2))
-                   : para::PlaceholderAlignment::kBaseline;
-    auto baseline = count >= 4
-                        ? static_cast<para::TextBaseline>(
-                              getArgumentAsNumber(runtime, arguments, count, 3))
+  void addPlaceholder(JsiOptional<double> width, JsiOptional<double> height,
+                      JsiOptional<double> alignmentParam,
+                      JsiOptional<double> baselineParam,
+                      JsiOptional<double> offset) {
+    auto alignment = alignmentParam.has_value()
+                         ? static_cast<para::PlaceholderAlignment>(
+                               *alignmentParam)
+                         : para::PlaceholderAlignment::kBaseline;
+    auto baseline = baselineParam.has_value()
+                        ? static_cast<para::TextBaseline>(*baselineParam)
                         : para::TextBaseline::kAlphabetic;
-    auto offset =
-        count >= 5 ? getArgumentAsNumber(runtime, arguments, count, 4) : 0;
-
-    para::PlaceholderStyle style(width, height, alignment, baseline, offset);
+    para::PlaceholderStyle style(width.value_or(0), height.value_or(0),
+                                 alignment, baseline, offset.value_or(0));
     _builder->addPlaceholder(style);
-
-    return thisValue.asObject(runtime);
   }
 
-  JSI_HOST_FUNCTION(pushStyle) {
-    auto textStyle = JsiSkTextStyle::fromValue(runtime, arguments[0]);
-    // Foreground paint
-    if (count >= 2) {
-      auto foreground = tryGetJsiObject<JsiSkPaint>(
-          runtime, getArgument(runtime, arguments, count, 1));
-      if (foreground) {
-        textStyle.setForegroundPaint(*foreground->getObject().get());
-      }
+  void pushStyle(para::TextStyle textStyle,
+                 JsiOptional<std::shared_ptr<SkPaint>> foreground,
+                 JsiOptional<std::shared_ptr<SkPaint>> background) {
+    if (foreground.has_value()) {
+      textStyle.setForegroundPaint(**foreground);
     }
-    // Background paint
-    if (count >= 3) {
-      auto background = tryGetJsiObject<JsiSkPaint>(
-          runtime, getArgument(runtime, arguments, count, 2));
-      if (background) {
-        textStyle.setBackgroundPaint(*background->getObject().get());
-      }
+    if (background.has_value()) {
+      textStyle.setBackgroundPaint(**background);
     }
-
     _builder->pushStyle(textStyle);
-
-    return thisValue.asObject(runtime);
   }
 
-  JSI_HOST_FUNCTION(pop) {
-    _builder->pop();
-    return thisValue.asObject(runtime);
-  }
+  void pop() { _builder->pop(); }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
-    installHostMethod(runtime, prototype, "build",
-                      &JsiSkParagraphBuilder::build);
-    installHostMethod(runtime, prototype, "reset",
-                      &JsiSkParagraphBuilder::reset);
-    installHostMethod(runtime, prototype, "addText",
-                      &JsiSkParagraphBuilder::addText);
-    installHostMethod(runtime, prototype, "addPlaceholder",
-                      &JsiSkParagraphBuilder::addPlaceholder);
-    installHostMethod(runtime, prototype, "pushStyle",
-                      &JsiSkParagraphBuilder::pushStyle);
-    installHostMethod(runtime, prototype, "pop", &JsiSkParagraphBuilder::pop);
+    installMethod(runtime, prototype, "build", &JsiSkParagraphBuilder::build);
+    installMethod(runtime, prototype, "reset", &JsiSkParagraphBuilder::reset);
+    installChainableMethod(runtime, prototype, "addText",
+                           &JsiSkParagraphBuilder::addText);
+    installChainableMethod(runtime, prototype, "addPlaceholder",
+                           &JsiSkParagraphBuilder::addPlaceholder);
+    installChainableMethod(runtime, prototype, "pushStyle",
+                           &JsiSkParagraphBuilder::pushStyle);
+    installChainableMethod(runtime, prototype, "pop",
+                           &JsiSkParagraphBuilder::pop);
   }
 
   size_t getMemoryPressure() override { return 1024 * 1024; }

package/cpp/api/JsiSkParagraphBuilderFactory.h

@@ -5,9 +5,11 @@
 
 #include <jsi/jsi.h>
 
+#include "JsiSkConverters.h"
 #include "JsiSkNativeObjects.h"
 #include "JsiSkParagraphBuilder.h"
 #include "JsiSkParagraphStyle.h"
+#include "JsiSkTypefaceFontProvider.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -31,25 +33,18 @@ class JsiSkParagraphBuilderFactory
 public:
   static constexpr const char *CLASS_NAME = "ParagraphBuilderFactory";
 
-  JSI_HOST_FUNCTION(Make) {
-    // Get paragraph style from params
-    auto paragraphStyle =
-        count > 0 ? JsiSkParagraphStyle::fromValue(runtime, arguments[0])
-                  : para::ParagraphStyle();
-
-    // get font manager
-    auto fontMgr =
-        count > 1 ? JsiSkTypefaceFontProvider::fromValue(runtime, arguments[1])
-                  : nullptr;
-
-    // Create the paragraph builder
-    return makeJsiObject(runtime, std::make_shared<JsiSkParagraphBuilder>(
-                                      getContext(), paragraphStyle, fontMgr));
+  std::shared_ptr<JsiSkParagraphBuilder>
+  Make(JsiOptional<para::ParagraphStyle> paragraphStyle,
+       JsiOptional<sk_sp<para::TypefaceFontProvider>> fontMgr) {
+    return std::make_shared<JsiSkParagraphBuilder>(
+        getContext(),
+        paragraphStyle.has_value() ? *paragraphStyle : para::ParagraphStyle(),
+        fontMgr.has_value() ? *fontMgr : nullptr);
   }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
-    installHostMethod(runtime, prototype, "Make",
-                      &JsiSkParagraphBuilderFactory::Make);
+    installMethod(runtime, prototype, "Make",
+                  &JsiSkParagraphBuilderFactory::Make);
   }
 
   size_t getMemoryPressure() override { return 1024 * 1024; }