@shopify/react-native-skia 2.9.1 → 2.10.1

package/cpp/api/JsiSkImageInfo.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -18,11 +18,14 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkImageInfo : public JsiSkWrappingSharedPtrHostObject<SkImageInfo> {
+class JsiSkImageInfo
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkImageInfo, SkImageInfo> {
 public:
+  static constexpr const char *CLASS_NAME = "ImageInfo";
+
   JsiSkImageInfo(std::shared_ptr<RNSkPlatformContext> context,
                  const SkImageInfo &imageInfo)
-      : JsiSkWrappingSharedPtrHostObject<SkImageInfo>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkImageInfo, SkImageInfo>(
             std::move(context), std::make_shared<SkImageInfo>(imageInfo)) {}
 
   /**
@@ -31,8 +34,9 @@ public:
   static std::shared_ptr<SkImageInfo> fromValue(jsi::Runtime &runtime,
                                                 const jsi::Value &obj) {
     const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return object.asHostObject<JsiSkImageInfo>(runtime)->getObject();
+    auto imageInfo = tryGetJsiObject<JsiSkImageInfo>(runtime, object);
+    if (imageInfo) {
+      return imageInfo->getObject();
     } else {
       auto width = object.getProperty(runtime, "width").asNumber();
       auto height = object.getProperty(runtime, "height").asNumber();
@@ -52,35 +56,31 @@ public:
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkImageInfo &imageInfo) {
-    auto imageInfoObj =
-        std::make_shared<JsiSkImageInfo>(std::move(context), imageInfo);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, imageInfoObj,
-                                                       context);
+    return makeJsiObject(runtime, std::make_shared<JsiSkImageInfo>(
+                                      std::move(context), imageInfo));
   }
 
-  JSI_PROPERTY_GET(width) { return static_cast<double>(getObject()->width()); }
-  JSI_PROPERTY_GET(height) {
-    return static_cast<double>(getObject()->height());
-  }
-  JSI_PROPERTY_GET(colorType) {
+  double getWidth() { return static_cast<double>(getObject()->width()); }
+  double getHeight() { return static_cast<double>(getObject()->height()); }
+  double getColorType() {
     return static_cast<double>(getObject()->colorType());
   }
-  JSI_PROPERTY_GET(alphaType) {
+  double getAlphaType() {
     return static_cast<double>(getObject()->alphaType());
   }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkImageInfo), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkImageInfo"; }
-
-  JSI_API_TYPENAME(ImageInfo);
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkImageInfo, width),
-                              JSI_EXPORT_PROP_GET(JsiSkImageInfo, height),
-                              JSI_EXPORT_PROP_GET(JsiSkImageInfo, colorType),
-                              JSI_EXPORT_PROP_GET(JsiSkImageInfo, alphaType),
-                              JSI_EXPORT_PROP_GET(JsiSkImageInfo, __typename__))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installGetter(runtime, prototype, "width", &JsiSkImageInfo::getWidth);
+    installGetter(runtime, prototype, "height", &JsiSkImageInfo::getHeight);
+    installGetter(runtime, prototype, "colorType",
+                  &JsiSkImageInfo::getColorType);
+    installGetter(runtime, prototype, "alphaType",
+                  &JsiSkImageInfo::getAlphaType);
+  }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkMaskFilter.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -18,19 +18,29 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkMaskFilter : public JsiSkWrappingSkPtrHostObject<SkMaskFilter> {
+class JsiSkMaskFilter
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkMaskFilter, SkMaskFilter> {
 public:
+  static constexpr const char *CLASS_NAME = "MaskFilter";
+
   JsiSkMaskFilter(std::shared_ptr<RNSkPlatformContext> context,
                   sk_sp<SkMaskFilter> maskFilter)
-      : JsiSkWrappingSkPtrHostObject<SkMaskFilter>(std::move(context),
-                                                   std::move(maskFilter)) {}
-
-  size_t getMemoryPressure() const override { return 2048; }
-
-  std::string getObjectType() const override { return "JsiSkMaskFilter"; }
-
-  EXPORT_JSI_API_TYPENAME(JsiSkMaskFilter, MaskFilter)
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMaskFilter, dispose))
+      : JsiSkWrappingSkPtrNativeObject<JsiSkMaskFilter, SkMaskFilter>(
+            std::move(context), std::move(maskFilter)) {}
+
+  size_t getMemoryPressure() override { return 2048; }
+
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+  }
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<SkMaskFilter> fromValue(jsi::Runtime &runtime,
+                                       const jsi::Value &obj) {
+    return objectFromValue(runtime, obj);
+  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMaskFilterFactory.h

@@ -6,7 +6,9 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkColorFilter.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkConverters.h"
+#include "JsiSkMaskFilter.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -19,29 +21,27 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkMaskFilterFactory : public JsiSkHostObject {
+class JsiSkMaskFilterFactory
+    : public JsiSkNativeObject<JsiSkMaskFilterFactory> {
 public:
-  JSI_HOST_FUNCTION(MakeBlur) {
-    int blurStyle = arguments[0].asNumber();
-    float sigma = arguments[1].asNumber();
-    bool respectCTM = arguments[2].getBool();
-    auto maskFilter = std::make_shared<JsiSkMaskFilter>(
-        getContext(),
-        SkMaskFilter::MakeBlur((SkBlurStyle)blurStyle, sigma, respectCTM));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, maskFilter,
-                                                       getContext());
+  static constexpr const char *CLASS_NAME = "MaskFilterFactory";
+
+  std::shared_ptr<JsiSkMaskFilter> MakeBlur(int blurStyle, float sigma,
+                                            bool respectCTM) {
+    return std::make_shared<JsiSkMaskFilter>(
+        getContext(), SkMaskFilter::MakeBlur(static_cast<SkBlurStyle>(blurStyle),
+                                             sigma, respectCTM));
   }
 
-  size_t getMemoryPressure() const override { return 1024; }
+  size_t getMemoryPressure() override { return 1024; }
 
-  std::string getObjectType() const override {
-    return "JsiSkMaskFilterFactory";
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installMethod(runtime, prototype, "MakeBlur",
+                  &JsiSkMaskFilterFactory::MakeBlur);
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMaskFilterFactory, MakeBlur))
-
   explicit JsiSkMaskFilterFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkMaskFilterFactory>(std::move(context)) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMatrix.h

@@ -2,10 +2,12 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkConverters.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -18,10 +20,13 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkMatrix : public JsiSkWrappingSharedPtrHostObject<SkMatrix> {
+class JsiSkMatrix
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkMatrix, SkMatrix> {
 public:
+  static constexpr const char *CLASS_NAME = "Matrix";
+
   JsiSkMatrix(std::shared_ptr<RNSkPlatformContext> context, SkMatrix m)
-      : JsiSkWrappingSharedPtrHostObject<SkMatrix>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkMatrix, SkMatrix>(
             context, std::make_shared<SkMatrix>(std::move(m))) {}
 
   static SkMatrix getMatrix(jsi::Runtime &runtime, const jsi::Value &value) {
@@ -56,122 +61,82 @@ public:
                            std::to_string(array.size(runtime)));
   }
 
-  JSI_HOST_FUNCTION(concat) {
-    if (arguments[0].isObject() &&
-        arguments[0].asObject(runtime).isHostObject(runtime)) {
-      auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
-      getObject()->preConcat(*m3);
-    } else {
-      auto m3 = JsiSkMatrix::getMatrix(runtime, arguments[0]);
-      getObject()->preConcat(m3);
-    }
-    return thisValue.asObject(runtime);
+  void concat(std::shared_ptr<SkMatrix> matrix) {
+    getObject()->preConcat(*matrix);
   }
 
-  JSI_HOST_FUNCTION(translate) {
-    auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
-    getObject()->preTranslate(x, y);
-    return thisValue.asObject(runtime);
-  }
+  void translate(double x, double y) { getObject()->preTranslate(x, y); }
 
-  JSI_HOST_FUNCTION(postTranslate) {
-    auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
-    getObject()->postTranslate(x, y);
-    return thisValue.asObject(runtime);
-  }
+  void postTranslate(double x, double y) { getObject()->postTranslate(x, y); }
 
-  JSI_HOST_FUNCTION(scale) {
-    auto x = arguments[0].asNumber();
-    auto y = count > 1 ? arguments[1].asNumber() : 1;
-    getObject()->preScale(x, y);
-    return thisValue.asObject(runtime);
+  void scale(double x, JsiOptional<double> y) {
+    getObject()->preScale(x, y.has_value() ? *y : 1);
   }
 
-  JSI_HOST_FUNCTION(postScale) {
-    auto x = arguments[0].asNumber();
-    auto y = count > 1 ? arguments[1].asNumber() : 1;
-    getObject()->postScale(x, y);
-    return thisValue.asObject(runtime);
+  void postScale(double x, JsiOptional<double> y) {
+    getObject()->postScale(x, y.has_value() ? *y : 1);
   }
 
-  JSI_HOST_FUNCTION(skew) {
-    auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
-    getObject()->preSkew(x, y);
-    return thisValue.asObject(runtime);
-  }
+  void skew(double x, double y) { getObject()->preSkew(x, y); }
 
-  JSI_HOST_FUNCTION(postSkew) {
-    auto x = arguments[0].asNumber();
-    auto y = arguments[1].asNumber();
-    getObject()->postSkew(x, y);
-    return thisValue.asObject(runtime);
-  }
+  void postSkew(double x, double y) { getObject()->postSkew(x, y); }
 
-  JSI_HOST_FUNCTION(rotate) {
-    auto a = arguments[0].asNumber();
-    getObject()->preRotate(SkRadiansToDegrees(a));
-    return thisValue.asObject(runtime);
-  }
+  void rotate(double a) { getObject()->preRotate(SkRadiansToDegrees(a)); }
 
-  JSI_HOST_FUNCTION(postRotate) {
-    auto a = arguments[0].asNumber();
-    getObject()->postRotate(SkRadiansToDegrees(a));
-    return thisValue.asObject(runtime);
-  }
+  void postRotate(double a) { getObject()->postRotate(SkRadiansToDegrees(a)); }
 
-  JSI_HOST_FUNCTION(identity) {
-    getObject()->setIdentity();
-    return thisValue.asObject(runtime);
-  }
+  void identity() { getObject()->setIdentity(); }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverloaded-virtual"
-  JSI_HOST_FUNCTION(get) {
-    auto values = jsi::Array(runtime, 9);
+  std::vector<float> get() {
+    std::vector<float> values;
+    values.reserve(9);
     for (auto i = 0; i < 9; i++) {
-      values.setValueAtIndex(runtime, i, getObject()->get(i));
+      values.push_back(getObject()->get(i));
     }
     return values;
   }
 #pragma clang diagnostic pop
 
-  EXPORT_JSI_API_TYPENAME(JsiSkMatrix, Matrix)
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMatrix, concat),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, translate),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, postTranslate),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, scale),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, postScale),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, skew),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, postSkew),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, rotate),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, postRotate),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, identity),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, get),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installChainableMethod(runtime, prototype, "concat", &JsiSkMatrix::concat);
+    installChainableMethod(runtime, prototype, "translate",
+                           &JsiSkMatrix::translate);
+    installChainableMethod(runtime, prototype, "postTranslate",
+                           &JsiSkMatrix::postTranslate);
+    installChainableMethod(runtime, prototype, "scale", &JsiSkMatrix::scale);
+    installChainableMethod(runtime, prototype, "postScale",
+                           &JsiSkMatrix::postScale);
+    installChainableMethod(runtime, prototype, "skew", &JsiSkMatrix::skew);
+    installChainableMethod(runtime, prototype, "postSkew",
+                           &JsiSkMatrix::postSkew);
+    installChainableMethod(runtime, prototype, "rotate", &JsiSkMatrix::rotate);
+    installChainableMethod(runtime, prototype, "postRotate",
+                           &JsiSkMatrix::postRotate);
+    installChainableMethod(runtime, prototype, "identity",
+                           &JsiSkMatrix::identity);
+    installMethod(runtime, prototype, "get", &JsiSkMatrix::get);
+  }
 
   /**
    * Returns the underlying object from a host object of this type
    */
   static std::shared_ptr<SkMatrix> fromValue(jsi::Runtime &runtime,
                                              const jsi::Value &obj) {
-    const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return object.asHostObject<JsiSkMatrix>(runtime)->getObject();
+    auto matrix = tryGetJsiObject<JsiSkMatrix>(runtime, obj);
+    if (matrix) {
+      return matrix->getObject();
     } else {
       return std::make_shared<SkMatrix>(JsiSkMatrix::getMatrix(runtime, obj));
     }
   }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkMatrix), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkMatrix"; }
-
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
@@ -181,10 +146,8 @@ public:
       } else {
         matrix = SkMatrix::I();
       }
-      auto hostObjectInstance =
-          std::make_shared<JsiSkMatrix>(context, std::move(matrix));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-          runtime, hostObjectInstance, context);
+      return makeJsiObject(
+          runtime, std::make_shared<JsiSkMatrix>(context, std::move(matrix)));
     };
   }
 };