@shopify/react-native-skia 2.12.0 → 2.13.1

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaTextureView.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -16,11 +16,13 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
     SkiaViewAPI mApi;
     boolean mDebug;
 
-    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
+    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug, boolean opaque) {
         super(context);
         mApi = api;
         mDebug = debug;
-        setOpaque(false);
+        // An opaque TextureView lets the UI toolkit skip blending it; it can be
+        // toggled on a live view.
+        setOpaque(opaque);
         setSurfaceTextureListener(this);
     }
 

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaViewAPI.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.graphics.SurfaceTexture;
 import android.view.Surface;

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/ViewScreenshotService.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

package/apple/MetalContext.mm

@@ -31,7 +31,7 @@ MetalContext::MetalContext() {
   GrContextOptions grContextOptions; // set different options here.
 
   // Create the Skia Direct Context
-  _directContext = GrDirectContexts::MakeMetal(backendContext);
+  _directContext = GrDirectContexts::MakeMetal(backendContext, grContextOptions);
   if (_directContext == nullptr) {
     RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
   }

package/apple/RNSkiaModule.h

@@ -1,19 +1,10 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <rnskia/rnskia.h>
-#else
-#import <React/RCTBridgeModule.h>
-#endif
 
 #include "SkiaManager.h"
 
-@interface RNSkiaModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-                          <NativeSkiaModuleSpec>
-#else
-                          <RCTBridgeModule>
-#endif
+@interface RNSkiaModule : NSObject <NativeSkiaModuleSpec>
 
 - (SkiaManager *)manager;
 

package/apple/RNSkiaModule.mm

@@ -1,6 +1,5 @@
 
 #import "RNSkiaModule.h"
-#import <React/RCTBridge+Private.h>
 #import <ReactCommon/RCTTurboModule.h>
 
 @implementation RNSkiaModule {
@@ -35,14 +34,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     // Already initialized, ignore call.
     return @true;
   }
-#ifndef RCT_REMOVE_LEGACY_ARCH
   if (!jsInvoker) {
-    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-    jsInvoker = cxxBridge.jsCallInvoker;
-  }
-#endif
-  if (!jsInvoker) {
-    NSLog(@"[RNSkiaModule] Failed to install SkiaManager: jsInvoker is not initialized.");
+    NSLog(@"[RNSkiaModule] Failed to install SkiaManager: jsInvoker is not "
+          @"initialized.");
     return @false;
   }
   skiaManager = [[SkiaManager alloc] initWithBridge:self.bridge
@@ -50,12 +44,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   return @true;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   jsInvoker = params.jsInvoker;
   return std::make_shared<facebook::react::NativeSkiaModuleSpecJSI>(params);
 }
-#endif
 
 @end

package/apple/SkiaManager.h

@@ -16,10 +16,8 @@
                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)
                                    jsInvoker;
 
-#ifdef RCT_NEW_ARCH_ENABLED
 // Fabric components do not have a better way to interact with TurboModules.
 // Workaround to get the SkManager instance from singleton.
 + (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager;
-#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/apple/SkiaManager.mm

@@ -7,10 +7,9 @@
 
 #import "RNSkApplePlatformContext.h"
 
-// Forward-declared runtime accessor that is satisfied by RCTCxxBridge
-// (legacy/transitional) and RCTBridgeProxy (bridgeless). Avoids referencing
-// RCTCxxBridge directly, which is compiled out when RCT_REMOVE_LEGACY_ARCH
-// is set (React Native 0.82+).
+// Forward-declared runtime accessor satisfied by RCTBridgeProxy (bridgeless).
+// Avoids referencing RCTCxxBridge, which is compiled out when
+// RCT_REMOVE_LEGACY_ARCH is set (React Native 0.82+).
 @interface RCTBridge (RNSkiaRuntime)
 - (void *)runtime;
 @end
@@ -54,12 +53,11 @@ static __weak SkiaManager *sharedInstance = nil;
   sharedInstance = nil;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 + (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager {
   if (sharedInstance != nil) {
     return [sharedInstance skManager];
   }
   return nullptr;
 }
-#endif // RCT_NEW_ARCH_ENABLED
+
 @end

package/apple/SkiaPictureView.h

@@ -1,7 +1,7 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#pragma once
+
 #import "SkiaUIView.h"
 
 @interface SkiaPictureView : SkiaUIView
 
 @end
-#endif // RCT_NEW_ARCH_ENABLED

package/apple/SkiaPictureView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "SkiaPictureView.h"
 
 #import "RNSkAppleView.h"
@@ -9,7 +8,6 @@
 #import "SkiaManager.h"
 #import "SkiaUIView.h"
 
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -70,5 +68,3 @@ using namespace facebook::react;
 Class<RCTComponentViewProtocol> SkiaPictureViewCls(void) {
   return SkiaPictureView.class;
 }
-
-#endif // RCT_NEW_ARCH_ENABLED

package/apple/SkiaUIView.h

@@ -10,29 +10,14 @@
 #import <React/RCTUIKit.h>
 #endif // !TARGET_OS_OSX
 
+#import <React/RCTViewComponentView.h>
+
 #import "RNSkAppleView.h"
 #import "RNSkManager.h"
 #import "SkiaManager.h"
 
-#if RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
-#endif // RCT_NEW_ARCH_ENABLED
-
-@interface SkiaUIView :
-#if RCT_NEW_ARCH_ENABLED
-    RCTViewComponentView
-#else
-#if !TARGET_OS_OSX
-    UIView
-#else
-    RCTUIView
-#endif // !TARGET_OS_OSX
-#endif // RCT_NEW_ARCH_ENABLED
+@interface SkiaUIView : RCTViewComponentView
 
-- (instancetype)
-    initWithManager:(RNSkia::RNSkManager *)manager
-            factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
-                         std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory;
 - (void)initCommon:(RNSkia::RNSkManager *)manager
            factory:(std::function<std::shared_ptr<RNSkBaseAppleView>(
                         std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory;

package/apple/SkiaUIView.mm

@@ -1,5 +1,4 @@
 #import <QuartzCore/CATransaction.h>
-#import <React/RCTBridge.h>
 
 #import "RNSkiaModule.h"
 #import "SkiaUIView.h"
@@ -24,24 +23,6 @@
 
 #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 {
@@ -51,11 +32,6 @@
   _factory = factory;
 }
 
-- (void)willInvalidateModules {
-  _impl = nullptr;
-  _manager = nullptr;
-}
-
 #pragma mark Lifecycle
 
 #if !TARGET_OS_OSX
@@ -99,13 +75,8 @@
 
 - (void)dealloc {
   [self unregisterView];
-  [[NSNotificationCenter defaultCenter]
-      removeObserver:self
-                name:RCTBridgeWillInvalidateModulesNotification
-              object:nil];
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)prepareForRecycle {
   [super prepareForRecycle];
   [self unregisterView];
@@ -120,7 +91,6 @@
     _manager = [SkiaManager latestActiveSkManager].get();
   }
 }
-#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)unregisterView {
   if (_manager != nullptr && _nativeId != 0) {

package/cpp/api/CustomBlendModes.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <stdexcept>
+#include <string>
+
 #include "include/core/SkBlender.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkString.h"
@@ -94,4 +97,18 @@ inline void applyBlendMode(SkPaint &paint, int blendModeValue) {
   }
 }
 
+// Converts a JS blend mode value to an SkBlendMode for the Skia entry points
+// that take a plain SkBlendMode rather than a paint (drawPatch, drawVertices,
+// drawAtlas, drawColor). The custom blend modes above are implemented as
+// blenders on an SkPaint and have no SkBlendMode equivalent, so they - and any
+// other out of range value - are rejected instead of being cast blindly.
+inline SkBlendMode toBlendMode(double blendModeValue) {
+  auto value = static_cast<int>(blendModeValue);
+  if (value < 0 || value > static_cast<int>(SkBlendMode::kLastMode)) {
+    throw std::invalid_argument("Unsupported blend mode: " +
+                                std::to_string(value));
+  }
+  return static_cast<SkBlendMode>(value);
+}
+
 } // namespace RNSkia

package/cpp/api/JsiSkCanvas.h

@@ -5,6 +5,7 @@
 #include <utility>
 #include <vector>
 
+#include "CustomBlendModes.h"
 #include "JsiSkConverters.h"
 #include "JsiSkFont.h"
 #include "JsiSkImage.h"
@@ -226,8 +227,7 @@ public:
 
   void drawVertices(sk_sp<SkVertices> vertices, double blendMode,
                     std::shared_ptr<SkPaint> paint) {
-    _canvas->drawVertices(vertices, static_cast<SkBlendMode>(blendMode),
-                          *paint);
+    _canvas->drawVertices(vertices, toBlendMode(blendMode), *paint);
   }
 
   JSI_HOST_FUNCTION(drawPatch) {
@@ -287,11 +287,19 @@ public:
       }
     }
 
-    auto paint =
-        count >= 4 ? JsiSkPaint::fromValue(runtime, arguments[4]) : nullptr;
-    auto blendMode = static_cast<SkBlendMode>(arguments[3].asNumber());
+    auto blendMode =
+        count >= 4 && !arguments[3].isNull() && !arguments[3].isUndefined()
+            ? toBlendMode(arguments[3].asNumber())
+            : SkBlendMode::kModulate;
+
+    std::shared_ptr<SkPaint> paint;
+    if (count >= 5 && !arguments[4].isNull() && !arguments[4].isUndefined()) {
+      paint = JsiSkPaint::fromValue(runtime, arguments[4]);
+    }
+    SkPaint defaultPaint;
     _canvas->drawPatch(cubics.data(), colors.empty() ? nullptr : colors.data(),
-                       texs.empty() ? nullptr : texs.data(), blendMode, *paint);
+                       texs.empty() ? nullptr : texs.data(), blendMode,
+                       paint ? *paint : defaultPaint);
     return jsi::Value::undefined();
   }
 
@@ -392,7 +400,7 @@ public:
 
   void drawColor(JsiColor cl, JsiOptional<double> mode) {
     if (mode.has_value()) {
-      _canvas->drawColor(cl, static_cast<SkBlendMode>(*mode));
+      _canvas->drawColor(cl, toBlendMode(*mode));
     } else {
       _canvas->drawColor(cl);
     }
@@ -411,9 +419,10 @@ public:
     auto rects = arguments[1].asObject(runtime).asArray(runtime);
     auto transforms = arguments[2].asObject(runtime).asArray(runtime);
     auto paint = JsiSkPaint::fromValue(runtime, arguments[3]);
-    auto blendMode = count > 5 && !arguments[4].isUndefined()
-                         ? static_cast<SkBlendMode>(arguments[4].asNumber())
-                         : SkBlendMode::kDstOver;
+    auto blendMode =
+        count > 4 && !arguments[4].isNull() && !arguments[4].isUndefined()
+            ? toBlendMode(arguments[4].asNumber())
+            : SkBlendMode::kDstOver;
 
     std::vector<SkRSXform> xforms;
     int xformsSize = static_cast<int>(transforms.size(runtime));

package/cpp/api/JsiSkImage.h

@@ -66,7 +66,7 @@ static sk_sp<SkData> replaceJpegICCWithAppleP3(sk_sp<SkData> jpegData) {
     return jpegData;
 
   const uint8_t *iccBytes = CFDataGetBytePtr(cfICC);
-  size_t iccLen = (size_t)CFDataGetLength(cfICC);
+  size_t iccLen = static_cast<size_t>(CFDataGetLength(cfICC));
 
   // "ICC_PROFILE\0" APP2 marker signature (12 bytes)
   static const uint8_t iccSig[] = {0x49, 0x43, 0x43, 0x5F, 0x50, 0x52,

package/cpp/api/JsiSkImageFilter.h

@@ -28,7 +28,9 @@ public:
       : JsiSkWrappingSkPtrNativeObject<JsiSkImageFilter, SkImageFilter>(
             std::move(context), std::move(imageFilter)) {}
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  // A image filter node is a few hundred bytes; the images it may reference
+  // are reported by their own wrappers.
+  size_t getMemoryPressure() override { return kMinMemoryPressure; }
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
     installCommon(runtime, prototype);

package/cpp/api/JsiSkParagraph.h

@@ -277,7 +277,8 @@ public:
                       &JsiSkParagraph::extendedVisit);
   }
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  // Shaped glyph runs and line metrics; there is no exact API for this.
+  size_t getMemoryPressure() override { return 16 * 1024; }
 
   explicit JsiSkParagraph(std::shared_ptr<RNSkPlatformContext> context,
                           para::ParagraphBuilder *paragraphBuilder)

package/cpp/api/JsiSkParagraphBuilder.h

@@ -93,7 +93,7 @@ public:
                            &JsiSkParagraphBuilder::pop);
   }
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  size_t getMemoryPressure() override { return kMinMemoryPressure; }
 
   explicit JsiSkParagraphBuilder(std::shared_ptr<RNSkPlatformContext> context,
                                  para::ParagraphStyle paragraphStyle,

package/cpp/api/JsiSkParagraphBuilderFactory.h

@@ -47,7 +47,7 @@ public:
                   &JsiSkParagraphBuilderFactory::Make);
   }
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  size_t getMemoryPressure() override { return kMinMemoryPressure; }
 
   explicit JsiSkParagraphBuilderFactory(
       std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/JsiSkPath.h

@@ -640,11 +640,18 @@ public:
       : JsiSkPath(std::move(context), SkPathBuilder(path)) {}
 
   size_t getMemoryPressure() override {
-    auto builder = getObject();
-    if (!builder)
+    if (isDisposed()) {
       return 0;
-
-    return builder->snapshot().approximateBytesUsed();
+    }
+    auto builder = getObjectUnchecked();
+    if (!builder) {
+      return 0;
+    }
+    // The point, verb and conic weight arrays of the builder. Snapshotting
+    // the path to measure it would copy them, and this runs on every round
+    // trip of the object to JS.
+    return builder->points().size_bytes() + builder->verbs().size_bytes() +
+           builder->conicWeights().size_bytes();
   }
 
   /**

package/cpp/api/JsiSkPathBuilder.h

@@ -271,11 +271,18 @@ public:
             std::make_shared<SkPathBuilder>(std::move(builder))) {}
 
   size_t getMemoryPressure() override {
-    auto builder = getObject();
-    if (!builder)
+    if (isDisposed()) {
       return 0;
-    // Estimate memory usage based on snapshot
-    return builder->snapshot().approximateBytesUsed();
+    }
+    auto builder = getObjectUnchecked();
+    if (!builder) {
+      return 0;
+    }
+    // The point, verb and conic weight arrays of the builder. Snapshotting
+    // the path to measure it would copy them, and this runs on every round
+    // trip of the object to JS.
+    return builder->points().size_bytes() + builder->verbs().size_bytes() +
+           builder->conicWeights().size_bytes();
   }
 
   static jsi::Value toValue(jsi::Runtime &runtime,

package/cpp/api/JsiSkPictureRecorder.h

@@ -58,7 +58,8 @@ public:
                   &JsiSkPictureRecorder::finishRecordingAsPicture);
   }
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  // The recorded picture reports its own size once finished.
+  size_t getMemoryPressure() override { return kMinMemoryPressure; }
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {

package/cpp/api/JsiSkShader.h

@@ -29,7 +29,9 @@ public:
       : JsiSkWrappingSkPtrNativeObject<JsiSkShader, SkShader>(
             std::move(context), std::move(shader)) {}
 
-  size_t getMemoryPressure() override { return 1024 * 1024; }
+  // A shader node is a few hundred bytes; the images it may reference
+  // are reported by their own wrappers.
+  size_t getMemoryPressure() override { return kMinMemoryPressure; }
 
   static sk_sp<SkShader> fromValue(jsi::Runtime &runtime,
                                    const jsi::Value &obj) {

package/cpp/api/JsiSkSkottie.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <memory>
 #include <optional>
 #include <string>
@@ -31,7 +32,7 @@
 #pragma clang diagnostic pop
 
 namespace RNSkia {
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 std::unique_ptr<SkCodec> DecodeImageData(sk_sp<SkData> data) {
   if (data == nullptr) {
@@ -74,6 +75,8 @@ public:
       if (!codec) {
         return nullptr;
       }
+      // The asset keeps its decoded frame for the lifetime of the animation.
+      _decodedImageBytes += codec->getInfo().computeMinByteSize();
       return skresources::MultiFrameImageAsset::Make(std::move(codec));
     }
 
@@ -102,11 +105,16 @@ public:
     return this->findAsset(name);
   }
 
+  // Bytes of the decoded images for the assets loaded so far.
+  size_t decodedImageBytes() const { return _decodedImageBytes; }
+
 private:
   explicit SkottieAssetProvider(AssetMap assets, sk_sp<SkFontMgr> fontMgr)
       : fAssets(std::move(assets)), fFontMgr(std::move(fontMgr)) {}
   const AssetMap fAssets;
   const sk_sp<SkFontMgr> fFontMgr;
+  // loadImageAsset() is const in skottie::ResourceProvider.
+  mutable size_t _decodedImageBytes = 0;
 
   sk_sp<SkData> findAsset(const char name[]) const {
     auto it = fAssets.find(name);
@@ -121,6 +129,12 @@ class ManagedAnimation {
 public:
   ManagedAnimation(std::string json, SkottieAssetProvider::AssetMap assets,
                    sk_sp<SkFontMgr> fontMgr) {
+    _approximateBytesUsed = json.size();
+    for (const auto &asset : assets) {
+      if (asset.second) {
+        _approximateBytesUsed += asset.second->size();
+      }
+    }
     _propManager = std::make_unique<CustomPropertyManager>(
         CustomPropertyManager::Mode::kCollapseProperties, "");
     _resourceProvider =
@@ -132,6 +146,8 @@ public:
     builder->setPropertyObserver(_propManager->getPropertyObserver());
     _animation = builder->make(json.c_str(), json.size());
     _slotManager = builder->getSlotManager();
+    // Image assets are loaded while the animation is built.
+    _approximateBytesUsed += _resourceProvider->decodedImageBytes();
   }
 
   ~ManagedAnimation() {
@@ -151,6 +167,10 @@ public:
   sk_sp<skottie::SlotManager> _slotManager = nullptr;
   sk_sp<SkottieAssetProvider> _resourceProvider = nullptr;
   std::unique_ptr<CustomPropertyManager> _propManager = nullptr;
+  // Size of the animation JSON, its encoded assets and its decoded images:
+  // the memory the animation actually owns (the scene graph is in the same
+  // order as the JSON). Used as the GC hint for the wrapper.
+  size_t _approximateBytesUsed = 0;
 };
 
 class JsiSkSkottie
@@ -579,31 +599,13 @@ public:
 
   size_t getMemoryPressure() override {
     auto animation = getObject();
-    if (!animation || !animation->_animation) {
-      return 1024; // Base size if no animation
+    if (!animation) {
+      return kMinMemoryPressure;
     }
-
-    auto size = animation->_animation->size();
-    auto duration = animation->_animation->duration();
-    auto fps = animation->_animation->fps();
-
-    // Estimate memory usage based on animation properties
-    // Base calculation: width * height * 4 bytes per pixel * estimated frame
-    // count
-    size_t frameCount = static_cast<size_t>(duration * fps);
-    size_t estimatedFrameSize =
-        static_cast<size_t>(size.width() * size.height() * 4);
-
-    // Conservative estimate: assume some frames are cached
-    size_t cachedFrames =
-        std::min(frameCount, static_cast<size_t>(60)); // Max 60 cached frames
-    size_t animationMemory = estimatedFrameSize * cachedFrames;
-
-    // Add base overhead for animation data structures
-    size_t baseOverhead =
-        64 * 1024; // 64KB for metadata, property managers, etc.
-
-    return animationMemory + baseOverhead;
+    // Skottie keeps no frame cache: report the bytes the animation owns.
+    // Estimating a pixel cache here (width * height * 4 * 60 frames) charged
+    // hundreds of MB per wrapper, and each capture in a worklet repeated it.
+    return std::max(animation->_approximateBytesUsed, kMinMemoryPressure);
   }
 };
 } // namespace RNSkia

package/cpp/api/recorder/Command.h

@@ -55,7 +55,7 @@ public:
   CommandType type;
   std::string nodeType;
 
-  Command(CommandType t) : type(t) {}
+  explicit Command(CommandType t) : type(t) {}
   Command(CommandType t, std::string nodeT) : type(t), nodeType(nodeT) {}
   virtual ~Command() = default;
 };

package/cpp/api/recorder/Convertor.h

@@ -692,7 +692,7 @@ SkPath1DPathEffect::Style getPropertyValue(jsi::Runtime &runtime,
 // specialization
 struct BlendModeValue {
   int value;
-  BlendModeValue(int v = 0) : value(v) {}
+  explicit BlendModeValue(int v = 0) : value(v) {}
   operator int() const { return value; }
 };
 

package/cpp/api/recorder/DataTypes.h

@@ -78,7 +78,7 @@ SkPoint processPoint(jsi::Runtime &runtime, const jsi::Value &value) {
     }
   }
   throw std::runtime_error("Couldn't read point value");
-};
+}
 
 // TODO: return the SkRRect directly
 std::shared_ptr<SkRRect> processRRect(jsi::Runtime &runtime,

package/cpp/api/recorder/DrawingCtx.h

@@ -52,7 +52,7 @@ struct Composers {
 
 class DrawingCtx {
 public:
-  DrawingCtx(SkCanvas *canvas) : canvas(canvas) {
+  explicit DrawingCtx(SkCanvas *canvas) : canvas(canvas) {
     SkPaint paint;
     paint.setAntiAlias(true);
     paints.push_back(paint);