@shopify/react-native-skia 1.12.1 → 1.12.3

package/apple/SkiaUIView.mm

@@ -0,0 +1,172 @@
+#import <React/RCTBridge.h>
+
+#import "RNSkiaModule.h"
+#import "SkiaUIView.h"
+
+#include <utility>
+#include <vector>
+
+#import "RNSkManager.h"
+
+@implementation SkiaUIView {
+  std::shared_ptr<RNSkBaseAppleView> _impl;
+  RNSkia::RNSkManager *_manager;
+  std::function<std::shared_ptr<RNSkBaseAppleView>(
+      std::shared_ptr<RNSkia::RNSkPlatformContext>)>
+      _factory;
+  bool _debugMode;
+  bool _opaque;
+  size_t _nativeId;
+}
+
+#pragma mark Initialization and destruction
+
+- (instancetype)initWithManager:(RNSkia::RNSkManager *)manager
+                        factory:
+                            (std::function<std::shared_ptr<RNSkBaseAppleView>(
+                                 std::shared_ptr<RNSkia::RNSkPlatformContext>)>)
+                                factory {
+  self = [super init];
+  if (self) {
+    [self initCommon:manager factory:factory];
+  }
+  // Listen to notifications about module invalidation
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(willInvalidateModules)
+             name:RCTBridgeWillInvalidateModulesNotification
+           object:nil];
+  return self;
+}
+
+- (void)initCommon:(RNSkia::RNSkManager *)manager
+           factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
+                        std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory {
+  _manager = manager;
+  _nativeId = 0;
+  _debugMode = false;
+  _factory = factory;
+}
+
+- (void)willInvalidateModules {
+  _impl = nullptr;
+  _manager = nullptr;
+}
+
+#pragma mark Lifecycle
+
+#if !TARGET_OS_OSX
+- (void)willMoveToSuperview:(UIView *)newSuperView {
+#else
+- (void)viewWillMoveToSuperview:(NSView *)newSuperView {
+#endif // !TARGET_OS_OSX
+  if (newSuperView != nullptr) {
+    // Create implementation view when the parent view is set
+    if (_impl == nullptr && _manager != nullptr) {
+      _impl = _factory(_manager->getPlatformContext());
+      if (_impl == nullptr) {
+        throw std::runtime_error(
+            "Expected Skia view implementation, got nullptr.");
+      }
+      [self.layer addSublayer:_impl->getLayer()];
+      if (_nativeId != 0) {
+        _manager->setSkiaView(_nativeId, _impl->getDrawView());
+      }
+      _impl->getDrawView()->setShowDebugOverlays(_debugMode);
+    }
+  }
+}
+
+- (void)removeFromSuperview {
+  // Cleanup when removed from view hierarchy
+  if (_impl != nullptr) {
+    [_impl->getLayer() removeFromSuperlayer];
+
+    if (_nativeId != 0 && _manager != nullptr) {
+      _manager->setSkiaView(_nativeId, nullptr);
+    }
+
+    _impl = nullptr;
+  }
+
+  [super removeFromSuperview];
+}
+
+- (void)dealloc {
+  [self unregisterView];
+  [[NSNotificationCenter defaultCenter]
+      removeObserver:self
+                name:RCTBridgeWillInvalidateModulesNotification
+              object:nil];
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  [self unregisterView];
+}
+
+- (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
+  [super finalizeUpdates:updateMask];
+  if (updateMask == RNComponentViewUpdateMaskAll) {
+    // this flag is only set when the view is inserted and we want to set the
+    // manager here since the view could be recycled or the app could be
+    // refreshed and we would have a stale manager then
+    _manager = [SkiaManager latestActiveSkManager].get();
+  }
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
+- (void)unregisterView {
+  if (_manager != nullptr && _nativeId != 0) {
+    _manager->unregisterSkiaView(_nativeId);
+  }
+}
+
+#pragma Render
+
+- (void)drawRect:(CGRect)rect {
+  // We override drawRect to ensure we to direct rendering when the
+  // underlying OS view needs to render:
+  if (_impl != nullptr) {
+    _impl->getDrawView()->redraw();
+  }
+}
+
+#pragma mark Layout
+
+- (void)layoutSubviews {
+  [super layoutSubviews];
+  if (_impl != nullptr) {
+    _impl->setSize(self.bounds.size.width, self.bounds.size.height);
+  }
+}
+
+#pragma mark Properties
+
+- (void)setDebugMode:(bool)debugMode {
+  _debugMode = debugMode;
+  if (_impl != nullptr) {
+    _impl->getDrawView()->setShowDebugOverlays(debugMode);
+  }
+}
+
+- (void)setOpaque:(bool)opaque {
+  _opaque = opaque;
+}
+
+- (void)setNativeId:(size_t)nativeId {
+  _nativeId = nativeId;
+
+  if (_impl != nullptr) {
+    _manager->registerSkiaView(nativeId, _impl->getDrawView());
+  }
+}
+
+#pragma mark External API
+
+- (std::shared_ptr<RNSkBaseAppleView>)impl {
+  return _impl;
+}
+
+@end

package/apple/ViewScreenshotService.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#import <CoreFoundation/CoreFoundation.h>
+#if !TARGET_OS_OSX
+#import <UIKit/UIKit.h>
+#else
+#import <Appkit/Appkit.h>
+#endif // !TARGET_OS_OSX
+
+#import <React/RCTUIManager.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "include/core/SkImage.h"
+
+#pragma clang diagnostic pop
+
+@interface ViewScreenshotService : NSObject {
+}
+
+- (instancetype)initWithUiManager:(RCTUIManager *)uiManager;
+- (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag;
+
+@end

package/apple/ViewScreenshotService.mm

@@ -0,0 +1,89 @@
+#import "ViewScreenshotService.h"
+#import <QuartzCore/QuartzCore.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "include/core/SkData.h"
+
+#pragma clang diagnostic pop
+
+@implementation ViewScreenshotService {
+  RCTUIManager *_uiManager;
+}
+
+- (instancetype)initWithUiManager:(RCTUIManager *)uiManager {
+  if (self = [super init]) {
+    _uiManager = uiManager;
+  }
+  return self;
+}
+
+- (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag {
+#if !TARGET_OS_OSX
+  // Find view corresponding to the tag
+  auto view = [_uiManager viewForReactTag:viewTag];
+  if (view == NULL) {
+    RCTFatal(RCTErrorWithMessage(@"Could not find view with tag"));
+    return nullptr;
+  }
+
+  // Get size
+  CGSize size = view.frame.size;
+
+  // Setup context
+  UIGraphicsImageRendererFormat *format =
+      [UIGraphicsImageRendererFormat defaultFormat];
+  format.opaque = NO;
+  format.preferredRange = UIGraphicsImageRendererFormatRangeStandard;
+
+  UIGraphicsImageRenderer *renderer =
+      [[UIGraphicsImageRenderer alloc] initWithSize:size format:format];
+
+  // Render to context - this is now the only part of this function that shows
+  // up in the profiler!
+  UIImage *image = [renderer
+      imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
+        [view drawViewHierarchyInRect:(CGRect){CGPointZero, size}
+                   afterScreenUpdates:YES];
+      }];
+
+  // Convert from UIImage -> CGImage -> SkImage
+  CGImageRef cgImage = image.CGImage;
+
+  // Get some info about the image
+  auto width = CGImageGetWidth(cgImage);
+  auto height = CGImageGetHeight(cgImage);
+  auto bytesPerRow = CGImageGetBytesPerRow(cgImage);
+
+  // Convert from UIImage -> SkImage, start by getting the pixels directly from
+  // the CGImage:
+  auto dataRef = CGDataProviderCopyData(CGImageGetDataProvider(cgImage));
+  auto length = CFDataGetLength(dataRef);
+  void *data = CFDataGetMutableBytePtr((CFMutableDataRef)dataRef);
+
+  // Now we'll capture the data in an SkData object and control releasing it:
+  auto skData = SkData::MakeWithProc(
+      data, length,
+      [](const void *ptr, void *context) {
+        CFDataRef dataRef = (CFDataRef)context;
+        CFRelease(dataRef);
+      },
+      (void *)dataRef);
+
+  // Make SkImageInfo
+  // We're using kBGRA_8888_SkColorType since this is what we get when the
+  // UIGraphicsImageRenderer uses the standard format (the extended is using
+  // 64bits so it is not suitable for us).
+  SkImageInfo info =
+      SkImageInfo::Make(static_cast<int>(width), static_cast<int>(height),
+                        kBGRA_8888_SkColorType, kPremul_SkAlphaType);
+
+  // ... and then create the SkImage itself!
+  return SkImages::RasterFromData(info, skData, bytesPerRow);
+#else
+  return nullptr;
+#endif // !TARGET_OS_OSX
+}
+
+@end

package/cpp/api/JsiSkShaderFactory.h

@@ -84,14 +84,22 @@ public:
     SkPoint pts[] = {p1, p2};
 
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or have the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     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);
+        pts, colors.data(), !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -103,14 +111,23 @@ public:
     auto r = arguments[1].asNumber();
 
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     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);
+        center, r, colors.data(),
+        !positions.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -120,7 +137,15 @@ public:
     auto x = arguments[0].asNumber();
     auto y = arguments[1].asNumber();
     std::vector<SkColor> colors = getColors(runtime, arguments[2]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[3]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 4, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 5, count);
     auto flag = getFlag(arguments, 6, count);
@@ -130,8 +155,9 @@ 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.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, startAngle, endAngle, flag,
+        localMatrix);
     return jsi::Object::createFromHostObject(
         runtime,
         std::make_shared<JsiSkShader>(getContext(), std::move(gradient)));
@@ -147,14 +173,23 @@ public:
     auto endRadius = arguments[3].asNumber();
 
     std::vector<SkColor> colors = getColors(runtime, arguments[4]);
+    auto colorsSize = colors.size();
+    if (colorsSize < 2) {
+      throw std::invalid_argument("colors must have at least 2 colors");
+    }
     std::vector<SkScalar> positions = getPositions(runtime, arguments[5]);
+    if (!positions.empty() && positions.size() != colorsSize) {
+      throw std::invalid_argument(
+          "positions must be empty or the same size as colors");
+    }
     auto tileMode = getTileMode(arguments, 6, count);
     auto localMatrix = getLocalMatrix(runtime, arguments, 7, count);
     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.empty() ? positions.data() : nullptr,
+        static_cast<int>(colorsSize), tileMode, flag, localMatrix);
 
     return jsi::Object::createFromHostObject(
         runtime,

package/cpp/api/JsiSkVertices.h

@@ -70,6 +70,10 @@ public:
       if (count >= 3 && !arguments[2].isNull() && !arguments[2].isUndefined()) {
         auto jsiTexs = arguments[2].asObject(runtime).asArray(runtime);
         auto texsSize = jsiTexs.size(runtime);
+        if (texsSize != positionsSize) {
+          throw jsi::JSError(runtime, "The number of texture coordinates must "
+                                      "match the number of positions");
+        }
         texs.reserve(texsSize);
         for (int i = 0; i < texsSize; i++) {
           auto point = JsiSkPoint::fromValue(
@@ -81,6 +85,11 @@ public:
       if (count >= 4 && !arguments[3].isNull() && !arguments[3].isUndefined()) {
         auto jsiColors = arguments[3].asObject(runtime).asArray(runtime);
         auto colorsSize = jsiColors.size(runtime);
+        if (colorsSize != positionsSize) {
+          throw jsi::JSError(
+              runtime,
+              "The number of colors must match the number of positions");
+        }
         colors.reserve(colorsSize);
         for (int i = 0; i < colorsSize; i++) {
           SkColor color = JsiSkColor::fromValue(
@@ -132,9 +141,11 @@ public:
       //                    builder.indices());
       //                }
       //                auto vertices = builder.detach();
-      auto vertices = SkVertices::MakeCopy(
-          mode, positionsSize, positions.data(), texs.data(), colors.data(),
-          indicesSize, indices.data());
+      auto vertices =
+          SkVertices::MakeCopy(mode, positionsSize, positions.data(),
+                               texs.size() > 0 ? texs.data() : nullptr,
+                               colors.size() > 0 ? colors.data() : nullptr,
+                               indicesSize, indices.data());
       return jsi::Object::createFromHostObject(
           runtime,
           std::make_shared<JsiSkVertices>(context, std::move(vertices)));

package/lib/commonjs/__tests__/setup.d.ts

@@ -15,4 +15,22 @@ interface CheckImageOptions {
     shouldFail?: boolean;
 }
 export declare const checkImage: (image: SkImage, relPath: string, opts?: CheckImageOptions) => number;
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            /**
+             * Checks if values are approximately equal within the given tolerance.
+             * Works with:
+             * - Single numbers
+             * - Arrays of numbers
+             * - Float32Arrays
+             * - SVG path strings (compares numeric values with tolerance)
+             *
+             * @param expected - The expected value to compare against
+             * @param tolerance - The maximum allowed difference between elements (default: 0.01)
+             */
+            toBeApproximatelyEqual(expected: number | number[] | Float32Array | string, tolerance?: number): R;
+        }
+    }
+}
 export {};

package/lib/commonjs/headless/index.d.ts

@@ -1,6 +1,7 @@
 import type { ReactNode } from "react";
 import type { SkSurface } from "../skia";
 export * from "../renderer/components";
+export * from "../skia/types";
 export declare const makeOffscreenSurface: (width: number, height: number) => SkSurface;
 export declare const getSkiaExports: () => {
     Skia: import("../skia/types").Skia;

package/lib/commonjs/headless/index.js

@@ -23,6 +23,18 @@ Object.keys(_components).forEach(function (key) {
     }
   });
 });
+var _types = require("../skia/types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 

package/lib/commonjs/headless/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_web","require","_Reconciler","_components","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Skia","makeOffscreenSurface","width","height","JsiSkApi","CanvasKit","surface","Surface","MakeOffscreen","Error","getSkiaExports","drawOffscreen","element","root","SkiaSGRoot","render","canvas","getCanvas","drawOnCanvas","unmount","flush","makeImageSnapshot"],"sources":["index.ts"],"sourcesContent":["// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\nimport CanvasKitInit from \"canvaskit-wasm/bin/full/canvaskit\";\nimport type { ReactNode } from \"react\";\n\nimport { JsiSkApi } from \"../skia/web\";\nimport type { SkSurface } from \"../skia\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport * from \"../renderer/components\";\n\nlet Skia: ReturnType<typeof JsiSkApi>;\n\nexport const makeOffscreenSurface = (width: number, height: number) => {\n  if (!Skia) {\n    Skia = JsiSkApi(CanvasKit);\n  }\n  const surface = Skia.Surface.MakeOffscreen(width, height);\n  if (surface === null) {\n    throw new Error(\"Couldn't create surface!\");\n  }\n  return surface;\n};\n\nexport const getSkiaExports = () => {\n  if (!Skia) {\n    Skia = JsiSkApi(CanvasKit);\n  }\n  return { Skia };\n};\n\nexport const drawOffscreen = (surface: SkSurface, element: ReactNode) => {\n  const root = new SkiaSGRoot(Skia);\n  root.render(element);\n  const canvas = surface.getCanvas();\n  root.drawOnCanvas(canvas);\n  root.unmount();\n  surface.flush();\n  return surface.makeImageSnapshot();\n};\n"],"mappings":";;;;;;;;;;;AAKA,IAAAA,IAAA,GAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AAAAG,MAAA,CAAAC,IAAA,CAAAF,WAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,WAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,WAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AATA;AACA;;AAUA,IAAIS,IAAiC;AAE9B,MAAMC,oBAAoB,GAAGA,CAACC,KAAa,EAAEC,MAAc,KAAK;EACrE,IAAI,CAACH,IAAI,EAAE;IACTA,IAAI,GAAG,IAAAI,aAAQ,EAACC,SAAS,CAAC;EAC5B;EACA,MAAMC,OAAO,GAAGN,IAAI,CAACO,OAAO,CAACC,aAAa,CAACN,KAAK,EAAEC,MAAM,CAAC;EACzD,IAAIG,OAAO,KAAK,IAAI,EAAE;IACpB,MAAM,IAAIG,KAAK,CAAC,0BAA0B,CAAC;EAC7C;EACA,OAAOH,OAAO;AAChB,CAAC;AAACV,OAAA,CAAAK,oBAAA,GAAAA,oBAAA;AAEK,MAAMS,cAAc,GAAGA,CAAA,KAAM;EAClC,IAAI,CAACV,IAAI,EAAE;IACTA,IAAI,GAAG,IAAAI,aAAQ,EAACC,SAAS,CAAC;EAC5B;EACA,OAAO;IAAEL;EAAK,CAAC;AACjB,CAAC;AAACJ,OAAA,CAAAc,cAAA,GAAAA,cAAA;AAEK,MAAMC,aAAa,GAAGA,CAACL,OAAkB,EAAEM,OAAkB,KAAK;EACvE,MAAMC,IAAI,GAAG,IAAIC,sBAAU,CAACd,IAAI,CAAC;EACjCa,IAAI,CAACE,MAAM,CAACH,OAAO,CAAC;EACpB,MAAMI,MAAM,GAAGV,OAAO,CAACW,SAAS,CAAC,CAAC;EAClCJ,IAAI,CAACK,YAAY,CAACF,MAAM,CAAC;EACzBH,IAAI,CAACM,OAAO,CAAC,CAAC;EACdb,OAAO,CAACc,KAAK,CAAC,CAAC;EACf,OAAOd,OAAO,CAACe,iBAAiB,CAAC,CAAC;AACpC,CAAC;AAACzB,OAAA,CAAAe,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_web","require","_Reconciler","_components","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_types","Skia","makeOffscreenSurface","width","height","JsiSkApi","CanvasKit","surface","Surface","MakeOffscreen","Error","getSkiaExports","drawOffscreen","element","root","SkiaSGRoot","render","canvas","getCanvas","drawOnCanvas","unmount","flush","makeImageSnapshot"],"sources":["index.ts"],"sourcesContent":["// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\nimport CanvasKitInit from \"canvaskit-wasm/bin/full/canvaskit\";\nimport type { ReactNode } from \"react\";\n\nimport type { SkSurface } from \"../skia\";\nimport { JsiSkApi } from \"../skia/web\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport * from \"../renderer/components\";\nexport * from \"../skia/types\";\n\nlet Skia: ReturnType<typeof JsiSkApi>;\n\nexport const makeOffscreenSurface = (width: number, height: number) => {\n  if (!Skia) {\n    Skia = JsiSkApi(CanvasKit);\n  }\n  const surface = Skia.Surface.MakeOffscreen(width, height);\n  if (surface === null) {\n    throw new Error(\"Couldn't create surface!\");\n  }\n  return surface;\n};\n\nexport const getSkiaExports = () => {\n  if (!Skia) {\n    Skia = JsiSkApi(CanvasKit);\n  }\n  return { Skia };\n};\n\nexport const drawOffscreen = (surface: SkSurface, element: ReactNode) => {\n  const root = new SkiaSGRoot(Skia);\n  root.render(element);\n  const canvas = surface.getCanvas();\n  root.drawOnCanvas(canvas);\n  root.unmount();\n  surface.flush();\n  return surface.makeImageSnapshot();\n};\n"],"mappings":";;;;;;;;;;;AAMA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AAAAG,MAAA,CAAAC,IAAA,CAAAF,WAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,WAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,WAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,MAAA,GAAAf,OAAA;AAAAG,MAAA,CAAAC,IAAA,CAAAW,MAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,MAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,MAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AAVA;AACA;;AAWA,IAAIU,IAAiC;AAE9B,MAAMC,oBAAoB,GAAGA,CAACC,KAAa,EAAEC,MAAc,KAAK;EACrE,IAAI,CAACH,IAAI,EAAE;IACTA,IAAI,GAAG,IAAAI,aAAQ,EAACC,SAAS,CAAC;EAC5B;EACA,MAAMC,OAAO,GAAGN,IAAI,CAACO,OAAO,CAACC,aAAa,CAACN,KAAK,EAAEC,MAAM,CAAC;EACzD,IAAIG,OAAO,KAAK,IAAI,EAAE;IACpB,MAAM,IAAIG,KAAK,CAAC,0BAA0B,CAAC;EAC7C;EACA,OAAOH,OAAO;AAChB,CAAC;AAACX,OAAA,CAAAM,oBAAA,GAAAA,oBAAA;AAEK,MAAMS,cAAc,GAAGA,CAAA,KAAM;EAClC,IAAI,CAACV,IAAI,EAAE;IACTA,IAAI,GAAG,IAAAI,aAAQ,EAACC,SAAS,CAAC;EAC5B;EACA,OAAO;IAAEL;EAAK,CAAC;AACjB,CAAC;AAACL,OAAA,CAAAe,cAAA,GAAAA,cAAA;AAEK,MAAMC,aAAa,GAAGA,CAACL,OAAkB,EAAEM,OAAkB,KAAK;EACvE,MAAMC,IAAI,GAAG,IAAIC,sBAAU,CAACd,IAAI,CAAC;EACjCa,IAAI,CAACE,MAAM,CAACH,OAAO,CAAC;EACpB,MAAMI,MAAM,GAAGV,OAAO,CAACW,SAAS,CAAC,CAAC;EAClCJ,IAAI,CAACK,YAAY,CAACF,MAAM,CAAC;EACzBH,IAAI,CAACM,OAAO,CAAC,CAAC;EACdb,OAAO,CAACc,KAAK,CAAC,CAAC;EACf,OAAOd,OAAO,CAACe,iBAAiB,CAAC,CAAC;AACpC,CAAC;AAAC1B,OAAA,CAAAgB,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/skia/web/Host.d.ts

@@ -1,4 +1,4 @@
-import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from "canvaskit-wasm";
+import type { CanvasKit, EmbindEnumEntity } from "canvaskit-wasm";
 import type { SkJSIInstance } from "../types";
 export declare const throwNotImplementedOnRNWeb: <T>() => T;
 export declare abstract class Host {
@@ -14,5 +14,5 @@ export declare abstract class BaseHostObject<T, N extends string> extends Host i
 export declare abstract class HostObject<T, N extends string> extends BaseHostObject<T, N> {
     static fromValue<T>(value: SkJSIInstance<string>): T;
 }
-export declare const getEnum: (e: EmbindEnum, v: number) => EmbindEnumEntity;
-export declare const optEnum: (e: EmbindEnum, value: number | undefined) => EmbindEnumEntity | undefined;
+export declare const getEnum: (CanvasKit: CanvasKit, name: keyof CanvasKit, v: number) => EmbindEnumEntity;
+export declare const optEnum: (CanvasKit: CanvasKit, name: keyof CanvasKit, v: number | undefined) => EmbindEnumEntity | undefined;

package/lib/commonjs/skia/web/Host.js

@@ -37,10 +37,22 @@ class HostObject extends BaseHostObject {
   }
 }
 exports.HostObject = HostObject;
-const getEnum = (e, v) => Object.values(e).find(({
-  value
-}) => value === v);
+const getEnum = (CanvasKit, name, v) => {
+  const e = CanvasKit[name];
+  if (typeof e !== "function") {
+    throw new Error(`${name} is not an number`);
+  }
+  const result = Object.values(e).find(({
+    value
+  }) => value === v);
+  if (!result) {
+    throw new Error(`Enum ${name} does not have value ${v} on React Native Web`);
+  }
+  return result;
+};
 exports.getEnum = getEnum;
-const optEnum = (e, value) => value === undefined ? undefined : getEnum(e, value);
+const optEnum = (CanvasKit, name, v) => {
+  return v === undefined ? undefined : getEnum(CanvasKit, name, v);
+};
 exports.optEnum = optEnum;
 //# sourceMappingURL=Host.js.map

package/lib/commonjs/skia/web/Host.js.map

@@ -1 +1 @@
-{"version":3,"names":["throwNotImplementedOnRNWeb","jest","fn","Error","exports","Host","constructor","CanvasKit","_defineProperty","BaseHostObject","ref","typename","__typename__","HostObject","fromValue","value","getEnum","e","v","Object","values","find","optEnum","undefined"],"sources":["Host.ts"],"sourcesContent":["import type { CanvasKit, EmbindEnumEntity, EmbindEnum } from \"canvaskit-wasm\";\n\nimport type { SkJSIInstance } from \"../types\";\n\nexport const throwNotImplementedOnRNWeb = <T>(): T => {\n  if (typeof jest !== \"undefined\") {\n    return jest.fn() as unknown as T;\n  }\n  throw new Error(\"Not implemented on React Native Web\");\n};\n\nexport abstract class Host {\n  readonly CanvasKit: CanvasKit;\n\n  constructor(CanvasKit: CanvasKit) {\n    this.CanvasKit = CanvasKit;\n  }\n}\n\nexport abstract class BaseHostObject<T, N extends string>\n  extends Host\n  implements SkJSIInstance<N>\n{\n  readonly __typename__: N;\n  ref: T;\n\n  constructor(CanvasKit: CanvasKit, ref: T, typename: N) {\n    super(CanvasKit);\n    this.ref = ref;\n    this.__typename__ = typename;\n  }\n\n  abstract dispose(): void;\n}\n\nexport abstract class HostObject<T, N extends string> extends BaseHostObject<\n  T,\n  N\n> {\n  static fromValue<T>(value: SkJSIInstance<string>) {\n    return (value as HostObject<T, string>).ref;\n  }\n}\n\nexport const getEnum = (e: EmbindEnum, v: number): EmbindEnumEntity =>\n  Object.values(e).find(({ value }) => value === v);\n\nexport const optEnum = (\n  e: EmbindEnum,\n  value: number | undefined\n): EmbindEnumEntity | undefined =>\n  value === undefined ? undefined : getEnum(e, value);\n"],"mappings":";;;;;;;;;AAIO,MAAMA,0BAA0B,GAAGA,CAAA,KAAY;EACpD,IAAI,OAAOC,IAAI,KAAK,WAAW,EAAE;IAC/B,OAAOA,IAAI,CAACC,EAAE,CAAC,CAAC;EAClB;EACA,MAAM,IAAIC,KAAK,CAAC,qCAAqC,CAAC;AACxD,CAAC;AAACC,OAAA,CAAAJ,0BAAA,GAAAA,0BAAA;AAEK,MAAeK,IAAI,CAAC;EAGzBC,WAAWA,CAACC,SAAoB,EAAE;IAAAC,eAAA;IAChC,IAAI,CAACD,SAAS,GAAGA,SAAS;EAC5B;AACF;AAACH,OAAA,CAAAC,IAAA,GAAAA,IAAA;AAEM,MAAeI,cAAc,SAC1BJ,IAAI,CAEd;EAIEC,WAAWA,CAACC,SAAoB,EAAEG,GAAM,EAAEC,QAAW,EAAE;IACrD,KAAK,CAACJ,SAAS,CAAC;IAACC,eAAA;IAAAA,eAAA;IACjB,IAAI,CAACE,GAAG,GAAGA,GAAG;IACd,IAAI,CAACE,YAAY,GAAGD,QAAQ;EAC9B;AAGF;AAACP,OAAA,CAAAK,cAAA,GAAAA,cAAA;AAEM,MAAeI,UAAU,SAA8BJ,cAAc,CAG1E;EACA,OAAOK,SAASA,CAAIC,KAA4B,EAAE;IAChD,OAAQA,KAAK,CAA2BL,GAAG;EAC7C;AACF;AAACN,OAAA,CAAAS,UAAA,GAAAA,UAAA;AAEM,MAAMG,OAAO,GAAGA,CAACC,CAAa,EAAEC,CAAS,KAC9CC,MAAM,CAACC,MAAM,CAACH,CAAC,CAAC,CAACI,IAAI,CAAC,CAAC;EAAEN;AAAM,CAAC,KAAKA,KAAK,KAAKG,CAAC,CAAC;AAACd,OAAA,CAAAY,OAAA,GAAAA,OAAA;AAE7C,MAAMM,OAAO,GAAGA,CACrBL,CAAa,EACbF,KAAyB,KAEzBA,KAAK,KAAKQ,SAAS,GAAGA,SAAS,GAAGP,OAAO,CAACC,CAAC,EAAEF,KAAK,CAAC;AAACX,OAAA,CAAAkB,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"names":["throwNotImplementedOnRNWeb","jest","fn","Error","exports","Host","constructor","CanvasKit","_defineProperty","BaseHostObject","ref","typename","__typename__","HostObject","fromValue","value","getEnum","name","v","e","result","Object","values","find","optEnum","undefined"],"sources":["Host.ts"],"sourcesContent":["import type { CanvasKit, EmbindEnumEntity } from \"canvaskit-wasm\";\n\nimport type { SkJSIInstance } from \"../types\";\n\nexport const throwNotImplementedOnRNWeb = <T>(): T => {\n  if (typeof jest !== \"undefined\") {\n    return jest.fn() as unknown as T;\n  }\n  throw new Error(\"Not implemented on React Native Web\");\n};\n\nexport abstract class Host {\n  readonly CanvasKit: CanvasKit;\n\n  constructor(CanvasKit: CanvasKit) {\n    this.CanvasKit = CanvasKit;\n  }\n}\n\nexport abstract class BaseHostObject<T, N extends string>\n  extends Host\n  implements SkJSIInstance<N>\n{\n  readonly __typename__: N;\n  ref: T;\n\n  constructor(CanvasKit: CanvasKit, ref: T, typename: N) {\n    super(CanvasKit);\n    this.ref = ref;\n    this.__typename__ = typename;\n  }\n\n  abstract dispose(): void;\n}\n\nexport abstract class HostObject<T, N extends string> extends BaseHostObject<\n  T,\n  N\n> {\n  static fromValue<T>(value: SkJSIInstance<string>) {\n    return (value as HostObject<T, string>).ref;\n  }\n}\n\nexport const getEnum = (\n  CanvasKit: CanvasKit,\n  name: keyof CanvasKit,\n  v: number\n): EmbindEnumEntity => {\n  const e = CanvasKit[name];\n  if (typeof e !== \"function\") {\n    throw new Error(`${name} is not an number`);\n  }\n  const result = Object.values(e).find(({ value }) => value === v);\n  if (!result) {\n    throw new Error(\n      `Enum ${name} does not have value ${v} on React Native Web`\n    );\n  }\n  return result;\n};\n\nexport const optEnum = (\n  CanvasKit: CanvasKit,\n  name: keyof CanvasKit,\n  v: number | undefined\n): EmbindEnumEntity | undefined => {\n  return v === undefined ? undefined : getEnum(CanvasKit, name, v);\n};\n"],"mappings":";;;;;;;;;AAIO,MAAMA,0BAA0B,GAAGA,CAAA,KAAY;EACpD,IAAI,OAAOC,IAAI,KAAK,WAAW,EAAE;IAC/B,OAAOA,IAAI,CAACC,EAAE,CAAC,CAAC;EAClB;EACA,MAAM,IAAIC,KAAK,CAAC,qCAAqC,CAAC;AACxD,CAAC;AAACC,OAAA,CAAAJ,0BAAA,GAAAA,0BAAA;AAEK,MAAeK,IAAI,CAAC;EAGzBC,WAAWA,CAACC,SAAoB,EAAE;IAAAC,eAAA;IAChC,IAAI,CAACD,SAAS,GAAGA,SAAS;EAC5B;AACF;AAACH,OAAA,CAAAC,IAAA,GAAAA,IAAA;AAEM,MAAeI,cAAc,SAC1BJ,IAAI,CAEd;EAIEC,WAAWA,CAACC,SAAoB,EAAEG,GAAM,EAAEC,QAAW,EAAE;IACrD,KAAK,CAACJ,SAAS,CAAC;IAACC,eAAA;IAAAA,eAAA;IACjB,IAAI,CAACE,GAAG,GAAGA,GAAG;IACd,IAAI,CAACE,YAAY,GAAGD,QAAQ;EAC9B;AAGF;AAACP,OAAA,CAAAK,cAAA,GAAAA,cAAA;AAEM,MAAeI,UAAU,SAA8BJ,cAAc,CAG1E;EACA,OAAOK,SAASA,CAAIC,KAA4B,EAAE;IAChD,OAAQA,KAAK,CAA2BL,GAAG;EAC7C;AACF;AAACN,OAAA,CAAAS,UAAA,GAAAA,UAAA;AAEM,MAAMG,OAAO,GAAGA,CACrBT,SAAoB,EACpBU,IAAqB,EACrBC,CAAS,KACY;EACrB,MAAMC,CAAC,GAAGZ,SAAS,CAACU,IAAI,CAAC;EACzB,IAAI,OAAOE,CAAC,KAAK,UAAU,EAAE;IAC3B,MAAM,IAAIhB,KAAK,CAAC,GAAGc,IAAI,mBAAmB,CAAC;EAC7C;EACA,MAAMG,MAAM,GAAGC,MAAM,CAACC,MAAM,CAACH,CAAC,CAAC,CAACI,IAAI,CAAC,CAAC;IAAER;EAAM,CAAC,KAAKA,KAAK,KAAKG,CAAC,CAAC;EAChE,IAAI,CAACE,MAAM,EAAE;IACX,MAAM,IAAIjB,KAAK,CACb,QAAQc,IAAI,wBAAwBC,CAAC,sBACvC,CAAC;EACH;EACA,OAAOE,MAAM;AACf,CAAC;AAAChB,OAAA,CAAAY,OAAA,GAAAA,OAAA;AAEK,MAAMQ,OAAO,GAAGA,CACrBjB,SAAoB,EACpBU,IAAqB,EACrBC,CAAqB,KACY;EACjC,OAAOA,CAAC,KAAKO,SAAS,GAAGA,SAAS,GAAGT,OAAO,CAACT,SAAS,EAAEU,IAAI,EAAEC,CAAC,CAAC;AAClE,CAAC;AAACd,OAAA,CAAAoB,OAAA,GAAAA,OAAA","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkCanvas.js

@@ -42,16 +42,16 @@ class JsiSkCanvas extends _Host.HostObject {
     this.ref.drawImageCubic(_JsiSkImage.JsiSkImage.fromValue(img), left, top, B, C, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
   drawImageOptions(img, left, top, fm, mm, paint) {
-    this.ref.drawImageOptions(_JsiSkImage.JsiSkImage.fromValue(img), left, top, (0, _Host.getEnum)(this.CanvasKit.FilterMode, fm), (0, _Host.getEnum)(this.CanvasKit.MipmapMode, mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
+    this.ref.drawImageOptions(_JsiSkImage.JsiSkImage.fromValue(img), left, top, (0, _Host.getEnum)(this.CanvasKit, "FilterMode", fm), (0, _Host.getEnum)(this.CanvasKit, "MipmapMode", mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
   drawImageNine(img, center, dest, filter, paint) {
-    this.ref.drawImageNine(_JsiSkImage.JsiSkImage.fromValue(img), Array.from(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, center)), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.getEnum)(this.CanvasKit.FilterMode, filter), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
+    this.ref.drawImageNine(_JsiSkImage.JsiSkImage.fromValue(img), Array.from(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, center)), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.getEnum)(this.CanvasKit, "FilterMode", filter), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
   drawImageRectCubic(img, src, dest, B, C, paint) {
     this.ref.drawImageRectCubic(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), B, C, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
   drawImageRectOptions(img, src, dest, fm, mm, paint) {
-    this.ref.drawImageRectOptions(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.getEnum)(this.CanvasKit.FilterMode, fm), (0, _Host.getEnum)(this.CanvasKit.MipmapMode, mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
+    this.ref.drawImageRectOptions(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.getEnum)(this.CanvasKit, "FilterMode", fm), (0, _Host.getEnum)(this.CanvasKit, "MipmapMode", mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
   drawPaint(paint) {
     this.ref.drawPaint(_JsiSkPaint.JsiSkPaint.fromValue(paint));
@@ -63,19 +63,19 @@ class JsiSkCanvas extends _Host.HostObject {
     this.ref.drawCircle(cx, cy, radius, _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
   drawVertices(verts, mode, paint) {
-    this.ref.drawVertices(_JsiSkVertices.JsiSkVertices.fromValue(verts), (0, _Host.getEnum)(this.CanvasKit.BlendMode, mode), _JsiSkPaint.JsiSkPaint.fromValue(paint));
+    this.ref.drawVertices(_JsiSkVertices.JsiSkVertices.fromValue(verts), (0, _Host.getEnum)(this.CanvasKit, "BlendMode", mode), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
   drawPatch(cubics, colors, texs, mode, paint) {
     this.ref.drawPatch(cubics.map(({
       x,
       y
-    }) => [x, y]).flat(), colors, texs ? texs.flatMap(p => Array.from(_JsiSkPoint.JsiSkPoint.fromValue(p))) : texs, mode ? (0, _Host.getEnum)(this.CanvasKit.BlendMode, mode) : null, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : undefined);
+    }) => [x, y]).flat(), colors, texs ? texs.flatMap(p => Array.from(_JsiSkPoint.JsiSkPoint.fromValue(p))) : texs, mode ? (0, _Host.getEnum)(this.CanvasKit, "BlendMode", mode) : null, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : undefined);
   }
   restoreToCount(saveCount) {
     this.ref.restoreToCount(saveCount);
   }
   drawPoints(mode, points, paint) {
-    this.ref.drawPoints((0, _Host.getEnum)(this.CanvasKit.PointMode, mode), points.map(({
+    this.ref.drawPoints((0, _Host.getEnum)(this.CanvasKit, "PointMode", mode), points.map(({
       x,
       y
     }) => [x, y]).flat(), _JsiSkPaint.JsiSkPaint.fromValue(paint));
@@ -130,19 +130,19 @@ class JsiSkCanvas extends _Host.HostObject {
     this.ref.translate(dx, dy);
   }
   drawColor(color, blendMode) {
-    this.ref.drawColor(color, blendMode ? (0, _Host.getEnum)(this.CanvasKit.BlendMode, blendMode) : undefined);
+    this.ref.drawColor(color, blendMode ? (0, _Host.getEnum)(this.CanvasKit, "BlendMode", blendMode) : undefined);
   }
   clear(color) {
     this.ref.clear(color);
   }
   clipPath(path, op, doAntiAlias) {
-    this.ref.clipPath(_JsiSkPath.JsiSkPath.fromValue(path), (0, _Host.getEnum)(this.CanvasKit.PathOp, op), doAntiAlias);
+    this.ref.clipPath(_JsiSkPath.JsiSkPath.fromValue(path), (0, _Host.getEnum)(this.CanvasKit, "PathOp", op), doAntiAlias);
   }
   clipRect(rect, op, doAntiAlias) {
-    this.ref.clipRect(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, rect), (0, _Host.getEnum)(this.CanvasKit.PathOp, op), doAntiAlias);
+    this.ref.clipRect(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, rect), (0, _Host.getEnum)(this.CanvasKit, "PathOp", op), doAntiAlias);
   }
   clipRRect(rrect, op, doAntiAlias) {
-    this.ref.clipRRect(_JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, rrect), (0, _Host.getEnum)(this.CanvasKit.PathOp, op), doAntiAlias);
+    this.ref.clipRRect(_JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, rrect), (0, _Host.getEnum)(this.CanvasKit, "PathOp", op), doAntiAlias);
   }
   concat(m) {
     this.ref.concat(Array.isArray(m) ? m : _JsiSkMatrix.JsiSkMatrix.fromValue(m));
@@ -169,19 +169,19 @@ class JsiSkCanvas extends _Host.HostObject {
       ckSampling = sampling;
     } else if (sampling) {
       ckSampling = {
-        filter: (0, _Host.getEnum)(this.CanvasKit.FilterMode, sampling.filter),
-        mipmap: sampling.mipmap ? (0, _Host.getEnum)(this.CanvasKit.MipmapMode, sampling.mipmap) : this.CanvasKit.MipmapMode.None
+        filter: (0, _Host.getEnum)(this.CanvasKit, "FilterMode", sampling.filter),
+        mipmap: sampling.mipmap ? (0, _Host.getEnum)(this.CanvasKit, "MipmapMode", sampling.mipmap) : this.CanvasKit.MipmapMode.None
       };
     }
-    this.ref.drawAtlas(_JsiSkImage.JsiSkImage.fromValue(atlas), src, dst, _JsiSkPaint.JsiSkPaint.fromValue(paint), blendMode ? (0, _Host.getEnum)(this.CanvasKit.BlendMode, blendMode) : this.CanvasKit.BlendMode.DstOver, cls, ckSampling);
+    this.ref.drawAtlas(_JsiSkImage.JsiSkImage.fromValue(atlas), src, dst, _JsiSkPaint.JsiSkPaint.fromValue(paint), blendMode ? (0, _Host.getEnum)(this.CanvasKit, "BlendMode", blendMode) : this.CanvasKit.BlendMode.DstOver, cls, ckSampling);
   }
   readPixels(srcX, srcY, imageInfo) {
     const pxInfo = {
       width: imageInfo.width,
       height: imageInfo.height,
       colorSpace: this.CanvasKit.ColorSpace.SRGB,
-      alphaType: (0, _Host.getEnum)(this.CanvasKit.AlphaType, imageInfo.alphaType),
-      colorType: (0, _Host.getEnum)(this.CanvasKit.ColorType, imageInfo.colorType)
+      alphaType: (0, _Host.getEnum)(this.CanvasKit, "AlphaType", imageInfo.alphaType),
+      colorType: (0, _Host.getEnum)(this.CanvasKit, "ColorType", imageInfo.colorType)
     };
     return this.ref.readPixels(srcX, srcY, pxInfo);
   }