@shopify/react-native-skia 0.1.155 → 0.1.156

package/cpp/api/JsiSkRuntimeEffectFactory.h

@@ -6,12 +6,12 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkRuntimeEffect.h"
 #include "JsiSkHostObjects.h"
+#include "JsiSkRuntimeEffect.h"
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkRuntimeEffectFactory : public JsiSkHostObject {
 public:
@@ -21,21 +21,20 @@ public:
     auto effect = result.effect;
     auto errorText = result.errorText;
     if (!effect) {
-      throw jsi::JSError(
-          runtime,
-          std::string("Error in sksl:\n" + std::string(errorText.c_str()))
-              .c_str());
+      throw jsi::JSError(runtime, std::string("Error in sksl:\n" +
+                                              std::string(errorText.c_str()))
+                                      .c_str());
       return jsi::Value::null();
     }
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkRuntimeEffect>(getContext(), std::move(effect)));
+        runtime,
+        std::make_shared<JsiSkRuntimeEffect>(getContext(), std::move(effect)));
   }
 
-  JSI_EXPORT_FUNCTIONS(
-    JSI_EXPORT_FUNC(JsiSkRuntimeEffectFactory, Make)
-  )
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffectFactory, Make))
 
-  JsiSkRuntimeEffectFactory(std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkRuntimeEffectFactory(
+      std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}
 };
 

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <jsi/jsi.h>
 
@@ -17,72 +18,74 @@
 
 namespace RNSkia {
 
-    using namespace facebook;
+namespace jsi = facebook::jsi;
 
-    class JsiSkRuntimeShaderBuilder : public JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder> {
-    public:
-       
-        /**
-         Constructor
-         */
-        JsiSkRuntimeShaderBuilder(std::shared_ptr<RNSkPlatformContext> context, const SkRuntimeShaderBuilder &rt)
-                : JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder>(
-                std::move(context), std::make_shared<SkRuntimeShaderBuilder>(rt)){}
+class JsiSkRuntimeShaderBuilder
+    : public JsiSkWrappingSharedPtrHostObject<SkRuntimeShaderBuilder> {
+public:
+  /**
+   Constructor
+   */
+  JsiSkRuntimeShaderBuilder(std::shared_ptr<RNSkPlatformContext> context,
+                            const SkRuntimeShaderBuilder &rt)
+      : 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_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)
-        )
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeShaderBuilder, setUniform))
 
-        /**
-          Returns the underlying object from a host object of this type
-         */
-        static std::shared_ptr<SkRuntimeShaderBuilder> fromValue(jsi::Runtime &runtime,
-                                                 const jsi::Value &obj) {
-            const auto& object = obj.asObject(runtime);
-            return object.asHostObject<JsiSkRuntimeShaderBuilder>(runtime)->getObject();
-           
-        }
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static std::shared_ptr<SkRuntimeShaderBuilder>
+  fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
+    const auto &object = obj.asObject(runtime);
+    return object.asHostObject<JsiSkRuntimeShaderBuilder>(runtime)->getObject();
+  }
 
-        /**
-          Returns the jsi object from a host object of this type
-         */
-        static jsi::Value toValue(jsi::Runtime &runtime,
-                                  std::shared_ptr<RNSkPlatformContext> context,
-                                  const SkRuntimeShaderBuilder &rt) {
-            return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkRuntimeShaderBuilder>(std::move(context), rt));
-        }
+  /**
+    Returns the jsi object from a host object of this type
+   */
+  static jsi::Value toValue(jsi::Runtime &runtime,
+                            std::shared_ptr<RNSkPlatformContext> context,
+                            const SkRuntimeShaderBuilder &rt) {
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkRuntimeShaderBuilder>(std::move(context), rt));
+  }
 
-        /**
-         * Creates the function for construction a new instance of the SkRect
-         * wrapper
-         * @param context platform context
-         * @return A function for creating a new host object wrapper for the SkRect
-         * class
-         */
-        static const jsi::HostFunctionType
-        createCtor(std::shared_ptr<RNSkPlatformContext> context) {
-            return JSI_HOST_FUNCTION_LAMBDA {
-                auto rt = JsiSkRuntimeEffect::fromValue(runtime, arguments[0]);
-                auto rtb = SkRuntimeShaderBuilder(rt);
-                // Return the newly constructed object
-                return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkRuntimeShaderBuilder>(std::move(context), std::move(rtb)));
-            };
-        }
+  /**
+   * Creates the function for construction a new instance of the SkRect
+   * wrapper
+   * @param context platform context
+   * @return A function for creating a new host object wrapper for the SkRect
+   * class
+   */
+  static const jsi::HostFunctionType
+  createCtor(std::shared_ptr<RNSkPlatformContext> context) {
+    return JSI_HOST_FUNCTION_LAMBDA {
+      auto rt = JsiSkRuntimeEffect::fromValue(runtime, arguments[0]);
+      auto rtb = SkRuntimeShaderBuilder(rt);
+      // Return the newly constructed object
+      return jsi::Object::createFromHostObject(
+          runtime, std::make_shared<JsiSkRuntimeShaderBuilder>(
+                       std::move(context), std::move(rtb)));
     };
+  }
+};
 } // namespace RNSkia

package/cpp/api/JsiSkSVG.h

@@ -16,12 +16,13 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkSVG : public JsiSkWrappingSkPtrHostObject<SkSVGDOM> {
 public:
   JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom)
-      : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context), std::move(svgdom)){}
+      : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
+                                               std::move(svgdom)) {}
 
   JSI_PROPERTY_GET(__typename__) {
     return jsi::String::createFromUtf8(runtime, "SVG");
@@ -34,9 +35,7 @@ public:
    */
   static sk_sp<SkSVGDOM> fromValue(jsi::Runtime &runtime,
                                    const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkSVG>(runtime)
-        ->getObject();
+    return obj.asObject(runtime).asHostObject<JsiSkSVG>(runtime)->getObject();
   }
 };
 

package/cpp/api/JsiSkSVGFactory.h

@@ -5,10 +5,10 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkTypeface.h"
-#include "JsiSkHostObjects.h"
 #include "JsiSkData.h"
+#include "JsiSkHostObjects.h"
 #include "JsiSkSVG.h"
+#include "JsiSkTypeface.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -19,30 +19,31 @@
 
 namespace RNSkia {
 
-    using namespace facebook;
-
-    class JsiSkSVGFactory : public JsiSkHostObject {
-    public:
-        JSI_HOST_FUNCTION(MakeFromData) {
-            auto data = JsiSkData::fromValue(runtime, arguments[0]);
-            auto stream = SkMemoryStream::Make(data);
-            auto svg_dom = SkSVGDOM::Builder().make(*stream);
-            return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom)));
-        }
-
-        JSI_HOST_FUNCTION(MakeFromString) {
-            auto svgText = arguments[0].asString(runtime).utf8(runtime);
-            auto stream = SkMemoryStream::MakeDirect(svgText.c_str(), svgText.size());
-            auto svg_dom = SkSVGDOM::Builder().make(*stream);
-            return jsi::Object::createFromHostObject(
-                    runtime, std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom)));
-        }
-
-        JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSVGFactory, MakeFromData), JSI_EXPORT_FUNC(JsiSkSVGFactory, MakeFromString))
-
-        JsiSkSVGFactory(std::shared_ptr<RNSkPlatformContext> context)
-                : JsiSkHostObject(std::move(context)) {}
-    };
+namespace jsi = facebook::jsi;
+
+class JsiSkSVGFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(MakeFromData) {
+    auto data = JsiSkData::fromValue(runtime, arguments[0]);
+    auto stream = SkMemoryStream::Make(data);
+    auto svg_dom = SkSVGDOM::Builder().make(*stream);
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom)));
+  }
+
+  JSI_HOST_FUNCTION(MakeFromString) {
+    auto svgText = arguments[0].asString(runtime).utf8(runtime);
+    auto stream = SkMemoryStream::MakeDirect(svgText.c_str(), svgText.size());
+    auto svg_dom = SkSVGDOM::Builder().make(*stream);
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom)));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSVGFactory, MakeFromData),
+                       JSI_EXPORT_FUNC(JsiSkSVGFactory, MakeFromString))
+
+  explicit JsiSkSVGFactory(std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
 
 } // namespace RNSkia

package/cpp/api/JsiSkShader.h

@@ -17,13 +17,14 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkShader : public JsiSkWrappingSkPtrHostObject<SkShader> {
 public:
   JsiSkShader(std::shared_ptr<RNSkPlatformContext> context,
               sk_sp<SkShader> shader)
-      : JsiSkWrappingSkPtrHostObject<SkShader>(std::move(context), std::move(shader)) {}
+      : JsiSkWrappingSkPtrHostObject<SkShader>(std::move(context),
+                                               std::move(shader)) {}
 
   // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
   JSI_PROPERTY_GET(__typename__) {

package/cpp/api/JsiSkShaderFactory.h

@@ -20,44 +20,47 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
-int getFlag(const jsi::Value* values, int i, size_t size) {
+int getFlag(const jsi::Value *values, int i, size_t size) {
   if (i >= size || values[i].isUndefined()) {
     return 0;
   }
   return values[i].asNumber();
 }
 
-SkMatrix* getLocalMatrix(jsi::Runtime &runtime, const jsi::Value* values, int i, size_t size) {
+SkMatrix *getLocalMatrix(jsi::Runtime &runtime, const jsi::Value *values, int i,
+                         size_t size) {
   if (i >= size || values[i].isUndefined()) {
     return nullptr;
   }
   return JsiSkMatrix::fromValue(runtime, values[i]).get();
 }
 
-SkTileMode getTileMode(const jsi::Value* values, int i, size_t size) {
+SkTileMode getTileMode(const jsi::Value *values, int i, size_t size) {
   if (i >= size || values[i].isUndefined()) {
     return SkTileMode::kClamp;
   }
   return static_cast<SkTileMode>(values[i].asNumber());
 }
 
-std::vector<SkColor> getColors(jsi::Runtime &runtime, const jsi::Value& value) {
+std::vector<SkColor> getColors(jsi::Runtime &runtime, const jsi::Value &value) {
   std::vector<SkColor> colors;
   if (!value.isNull()) {
     auto jsiColors = value.asObject(runtime).asArray(runtime);
     auto size = jsiColors.size(runtime);
     colors.reserve(size);
     for (int i = 0; i < size; i++) {
-      SkColor color = JsiSkColor::fromValue(runtime, jsiColors.getValueAtIndex(runtime, i));
+      SkColor color =
+          JsiSkColor::fromValue(runtime, jsiColors.getValueAtIndex(runtime, i));
       colors.push_back(color);
     }
   }
   return colors;
 }
 
-std::vector<SkScalar> getPositions(jsi::Runtime &runtime, const jsi::Value& value) {
+std::vector<SkScalar> getPositions(jsi::Runtime &runtime,
+                                   const jsi::Value &value) {
   std::vector<SkScalar> positions;
   if (!value.isNull()) {
     auto jsiPositions = value.asObject(runtime).asArray(runtime);
@@ -86,10 +89,12 @@ public:
     auto flag = getFlag(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
 
-    sk_sp<SkShader> gradient = SkGradientShader::MakeLinear(pts, colors.data(), positions.data(),
-                                                  static_cast<int>(colors.size()), tileMode, flag, localMatrix);
+    sk_sp<SkShader> gradient = SkGradientShader::MakeLinear(
+        pts, colors.data(), positions.data(), static_cast<int>(colors.size()),
+        tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeRadialGradient) {
@@ -103,11 +108,12 @@ public:
     auto flag = getFlag(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
 
-    sk_sp<SkShader> gradient = SkGradientShader::MakeRadial(center, r, colors.data(),
-                                              positions.data(), static_cast<int>(colors.size()), tileMode,
-                                              flag, localMatrix);
+    sk_sp<SkShader> gradient = SkGradientShader::MakeRadial(
+        center, r, colors.data(), positions.data(),
+        static_cast<int>(colors.size()), tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeSweepGradient) {
@@ -124,10 +130,11 @@ public:
                         ? 360
                         : arguments[8].asNumber();
     sk_sp<SkShader> gradient = SkGradientShader::MakeSweep(
-        x, y, colors.data(), positions.data(), static_cast<int>(colors.size()), tileMode, startAngle,
-        endAngle, flag, localMatrix);
+        x, y, colors.data(), positions.data(), static_cast<int>(colors.size()),
+        tileMode, startAngle, endAngle, flag, localMatrix);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeTwoPointConicalGradient) {
@@ -146,11 +153,12 @@ public:
     auto flag = getFlag(arguments, 8, count);
 
     sk_sp<SkShader> gradient = SkGradientShader::MakeTwoPointConical(
-            start, startRadius, end, endRadius, colors.data(), positions.data(),
-            static_cast<int>(colors.size()), tileMode, flag, localMatrix);
+        start, startRadius, end, endRadius, colors.data(), positions.data(),
+        static_cast<int>(colors.size()), tileMode, flag, localMatrix);
 
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeTurbulence) {
@@ -164,7 +172,8 @@ public:
     sk_sp<SkShader> gradient = SkPerlinNoiseShader::MakeTurbulence(
         baseFreqX, baseFreqY, octaves, seed, &size);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeFractalNoise) {
@@ -178,7 +187,8 @@ public:
     sk_sp<SkShader> gradient = SkPerlinNoiseShader::MakeFractalNoise(
         baseFreqX, baseFreqY, octaves, seed, &size);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeBlend) {
@@ -187,14 +197,16 @@ public:
     auto two = JsiSkShader::fromValue(runtime, arguments[2]);
     sk_sp<SkShader> gradient = SkShaders::Blend(blendMode, one, two);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_HOST_FUNCTION(MakeColor) {
     auto color = JsiSkColor::fromValue(runtime, arguments[0]);
     sk_sp<SkShader> gradient = SkShaders::Color(color);
     return jsi::Object::createFromHostObject(
-        runtime, std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
+        runtime,
+        std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkShaderFactory, MakeLinearGradient),
@@ -207,7 +219,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkShaderFactory, MakeBlend),
                        JSI_EXPORT_FUNC(JsiSkShaderFactory, MakeColor))
 
-  JsiSkShaderFactory(std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkShaderFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}
 };
 

package/cpp/api/JsiSkSurface.h

@@ -7,9 +7,9 @@
 
 #include "JsiSkHostObjects.h"
 
-#include <JsiSkSurfaceFactory.h>
-#include <JsiSkImage.h>
 #include <JsiSkCanvas.h>
+#include <JsiSkImage.h>
+#include <JsiSkSurfaceFactory.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -20,48 +20,52 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkSurface : public JsiSkWrappingSkPtrHostObject<SkSurface> {
 public:
-    JsiSkSurface(std::shared_ptr<RNSkPlatformContext> context,
-                 sk_sp<SkSurface> surface)
-            : JsiSkWrappingSkPtrHostObject<SkSurface>(std::move(context), std::move(surface)) {}
-
-    // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-    JSI_PROPERTY_GET(__typename__) {
-            return jsi::String::createFromUtf8(runtime, "Surface");
-    }
-
-    JSI_HOST_FUNCTION(getCanvas) {
-        return jsi::Object::createFromHostObject(runtime,
-        std::make_shared<JsiSkCanvas>(getContext(),
-                                      getObject()->getCanvas()));
-    }
-
-    JSI_HOST_FUNCTION(makeImageSnapshot) {
-      sk_sp<SkImage> image;
-      if(count == 1) {
-        auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
-        image = getObject()->makeImageSnapshot(SkIRect::MakeXYWH(rect->x(), rect->y(), rect->width(), rect->height()));
-      } else {
-        image = getObject()->makeImageSnapshot();
-      }
-      return jsi::Object::createFromHostObject(runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
-    }
-
-    JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkSurface, __typename__))
-    JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurface, getCanvas),
-                         JSI_EXPORT_FUNC(JsiSkSurface, makeImageSnapshot))
-
-    /**
-      Returns the underlying object from a host object of this type
-     */
-    static sk_sp<SkSurface> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-        return obj.asObject(runtime)
-                .asHostObject<JsiSkSurface>(runtime)
-                ->getObject();
+  JsiSkSurface(std::shared_ptr<RNSkPlatformContext> context,
+               sk_sp<SkSurface> surface)
+      : JsiSkWrappingSkPtrHostObject<SkSurface>(std::move(context),
+                                                std::move(surface)) {}
+
+  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
+  JSI_PROPERTY_GET(__typename__) {
+    return jsi::String::createFromUtf8(runtime, "Surface");
+  }
+
+  JSI_HOST_FUNCTION(getCanvas) {
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkCanvas>(getContext(), getObject()->getCanvas()));
+  }
+
+  JSI_HOST_FUNCTION(makeImageSnapshot) {
+    sk_sp<SkImage> image;
+    if (count == 1) {
+      auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
+      image = getObject()->makeImageSnapshot(SkIRect::MakeXYWH(
+          rect->x(), rect->y(), rect->width(), rect->height()));
+    } else {
+      image = getObject()->makeImageSnapshot();
     }
+    return jsi::Object::createFromHostObject(
+        runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
+  }
+
+  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkSurface, __typename__))
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurface, getCanvas),
+                       JSI_EXPORT_FUNC(JsiSkSurface, makeImageSnapshot))
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<SkSurface> fromValue(jsi::Runtime &runtime,
+                                    const jsi::Value &obj) {
+    return obj.asObject(runtime)
+        .asHostObject<JsiSkSurface>(runtime)
+        ->getObject();
+  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkSurfaceFactory.h

@@ -12,33 +12,33 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkSurface.h>
 #include <SkImage.h>
+#include <SkSurface.h>
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-    using namespace facebook;
-
-    class JsiSkSurfaceFactory : public JsiSkHostObject {
-    public:
-        JSI_HOST_FUNCTION(Make) {
-            auto width = static_cast<int>(arguments[0].asNumber());
-            auto height = static_cast<int>(arguments[1].asNumber());
-            auto surface = SkSurface::MakeRasterN32Premul(width, height);
-            if(surface == nullptr) {
-                return jsi::Value::null();
-            }
-            return jsi::Object::createFromHostObject(runtime,
-                std::make_shared<JsiSkSurface>(getContext(), std::move(surface)));
-        }
-      
-        JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurfaceFactory, Make))
-
-        JsiSkSurfaceFactory(std::shared_ptr<RNSkPlatformContext> context)
-            : JsiSkHostObject(std::move(context)) {}
-
-    };
+namespace jsi = facebook::jsi;
+
+class JsiSkSurfaceFactory : public JsiSkHostObject {
+public:
+  JSI_HOST_FUNCTION(Make) {
+    auto width = static_cast<int>(arguments[0].asNumber());
+    auto height = static_cast<int>(arguments[1].asNumber());
+    auto surface = SkSurface::MakeRasterN32Premul(width, height);
+    if (surface == nullptr) {
+      return jsi::Value::null();
+    }
+    return jsi::Object::createFromHostObject(
+        runtime,
+        std::make_shared<JsiSkSurface>(getContext(), std::move(surface)));
+  }
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurfaceFactory, Make))
+
+  explicit JsiSkSurfaceFactory(std::shared_ptr<RNSkPlatformContext> context)
+      : JsiSkHostObject(std::move(context)) {}
+};
 
 } // namespace RNSkia