@shopify/react-native-skia 1.11.0 → 1.11.1

package/cpp/api/recorder/Convertor.h

@@ -781,7 +781,8 @@ SkRect getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value) {
 }
 
 template <>
-std::variant<SkRect, SkRRect> getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value) {
+std::variant<SkRect, SkRRect> getPropertyValue(jsi::Runtime &runtime,
+                                               const jsi::Value &value) {
   if (value.isObject()) {
     auto rect = processRect(runtime, value);
     if (rect) {

package/cpp/api/recorder/DataTypes.h

@@ -148,87 +148,85 @@ std::shared_ptr<SkPath> processPath(jsi::Runtime &runtime,
 }
 
 // Function to process uniforms and return SkData for PushShaderCmd
-inline sk_sp<SkData> processUniforms(
-    const sk_sp<SkRuntimeEffect>& effect,
-    const Uniforms& uniforms) {
-    
-    size_t uniformSize = effect->uniformSize();
-    auto uniformsData = SkData::MakeUninitialized(uniformSize);
-    auto uniformDataPtr = static_cast<float*>(uniformsData->writable_data());
-
-    const auto& sourceUniforms = effect->uniforms();
-    for (const auto& uniform : sourceUniforms) {
-        auto it = uniforms.find(std::string(uniform.name));
-        if (it == uniforms.end()) {
-            throw std::runtime_error("Missing uniform value for: " + 
-                                   std::string(uniform.name));
-        }
+inline sk_sp<SkData> processUniforms(const sk_sp<SkRuntimeEffect> &effect,
+                                     const Uniforms &uniforms) {
+
+  size_t uniformSize = effect->uniformSize();
+  auto uniformsData = SkData::MakeUninitialized(uniformSize);
+  auto uniformDataPtr = static_cast<float *>(uniformsData->writable_data());
+
+  const auto &sourceUniforms = effect->uniforms();
+  for (const auto &uniform : sourceUniforms) {
+    auto it = uniforms.find(std::string(uniform.name));
+    if (it == uniforms.end()) {
+      throw std::runtime_error("Missing uniform value for: " +
+                               std::string(uniform.name));
+    }
 
-        const auto& uniformValues = it->second;
-        RuntimeEffectUniform reu = JsiSkRuntimeEffect::fromUniform(uniform);
-        size_t expectedSize = reu.columns * reu.rows;
-        
-        if (uniformValues.size() != expectedSize) {
-            throw std::runtime_error("Incorrect uniform size for: " + 
-                                   std::string(uniform.name) + ". Expected " + 
-                                   std::to_string(expectedSize) + " got " + 
-                                   std::to_string(uniformValues.size()));
-        }
+    const auto &uniformValues = it->second;
+    RuntimeEffectUniform reu = JsiSkRuntimeEffect::fromUniform(uniform);
+    size_t expectedSize = reu.columns * reu.rows;
 
-        // Process each element in the uniform
-        for (std::size_t j = 0; j < expectedSize; ++j) {
-            const std::size_t offset = reu.slot + j;
-            float fValue = uniformValues[j];
-            
-            if (reu.isInteger) {
-                int iValue = static_cast<int>(fValue);
-                uniformDataPtr[offset] = SkBits2Float(iValue);
-            } else {
-                uniformDataPtr[offset] = fValue;
-            }
-        }
+    if (uniformValues.size() != expectedSize) {
+      throw std::runtime_error(
+          "Incorrect uniform size for: " + std::string(uniform.name) +
+          ". Expected " + std::to_string(expectedSize) + " got " +
+          std::to_string(uniformValues.size()));
+    }
+
+    // Process each element in the uniform
+    for (std::size_t j = 0; j < expectedSize; ++j) {
+      const std::size_t offset = reu.slot + j;
+      float fValue = uniformValues[j];
+
+      if (reu.isInteger) {
+        int iValue = static_cast<int>(fValue);
+        uniformDataPtr[offset] = SkBits2Float(iValue);
+      } else {
+        uniformDataPtr[offset] = fValue;
+      }
     }
+  }
 
-    return uniformsData;
+  return uniformsData;
 }
 
-inline void processUniforms(
-    SkRuntimeShaderBuilder& builder,
-    const sk_sp<SkRuntimeEffect>& effect,
-    const Uniforms& uniforms) {
-    
-    const auto& sourceUniforms = effect->uniforms();
-    for (const auto& uniform : sourceUniforms) {
-        auto it = uniforms.find(std::string(uniform.name));
-        if (it == uniforms.end()) {
-            throw std::runtime_error("Missing uniform value for: " + 
-                                   std::string(uniform.name));
-        }
+inline void processUniforms(SkRuntimeShaderBuilder &builder,
+                            const sk_sp<SkRuntimeEffect> &effect,
+                            const Uniforms &uniforms) {
 
-        const auto& uniformValues = it->second;
-        RuntimeEffectUniform reu = JsiSkRuntimeEffect::fromUniform(uniform);
-        size_t expectedSize = reu.columns * reu.rows;
-        
-        if (uniformValues.size() != expectedSize) {
-            throw std::runtime_error("Incorrect uniform size for: " + 
-                                   std::string(uniform.name) + ". Expected " + 
-                                   std::to_string(expectedSize) + " got " + 
-                                   std::to_string(uniformValues.size()));
-        }
+  const auto &sourceUniforms = effect->uniforms();
+  for (const auto &uniform : sourceUniforms) {
+    auto it = uniforms.find(std::string(uniform.name));
+    if (it == uniforms.end()) {
+      throw std::runtime_error("Missing uniform value for: " +
+                               std::string(uniform.name));
+    }
 
-        auto builderUniform = builder.uniform(uniform.name);
-        
-        if (reu.isInteger) {
-            std::vector<float> convertedValues(uniformValues.size());
-            for (size_t i = 0; i < uniformValues.size(); ++i) {
-                int iValue = static_cast<int>(uniformValues[i]);
-                convertedValues[i] = SkBits2Float(iValue);
-            }
-            builderUniform.set(convertedValues.data(), convertedValues.size());
-        } else {
-            builderUniform.set(uniformValues.data(), uniformValues.size());
-        }
+    const auto &uniformValues = it->second;
+    RuntimeEffectUniform reu = JsiSkRuntimeEffect::fromUniform(uniform);
+    size_t expectedSize = reu.columns * reu.rows;
+
+    if (uniformValues.size() != expectedSize) {
+      throw std::runtime_error(
+          "Incorrect uniform size for: " + std::string(uniform.name) +
+          ". Expected " + std::to_string(expectedSize) + " got " +
+          std::to_string(uniformValues.size()));
+    }
+
+    auto builderUniform = builder.uniform(uniform.name);
+
+    if (reu.isInteger) {
+      std::vector<float> convertedValues(uniformValues.size());
+      for (size_t i = 0; i < uniformValues.size(); ++i) {
+        int iValue = static_cast<int>(uniformValues[i]);
+        convertedValues[i] = SkBits2Float(iValue);
+      }
+      builderUniform.set(convertedValues.data(), convertedValues.size());
+    } else {
+      builderUniform.set(uniformValues.data(), uniformValues.size());
     }
+  }
 }
 
 } // namespace RNSkia

package/cpp/api/recorder/Drawings.h

@@ -5,7 +5,7 @@
 #include "Command.h"
 #include "Convertor.h"
 #include "DrawingCtx.h"
-#include "Image.h"
+#include "ImageFit.h"
 
 namespace RNSkia {
 
@@ -355,35 +355,35 @@ private:
   std::vector<BoxShadowCmdProps> shadows;
 
   // Helper function to inflate RRect (deflate is just negative inflation)
-  SkRRect inflate(const SkRRect& box, float dx, float dy, float tx = 0, float ty = 0) {
-    const auto& rect = box.rect();
-    SkRect newRect = SkRect::MakeXYWH(
-      rect.x() - dx + tx,
-      rect.y() - dy + ty,
-      rect.width() + 2 * dx,
-      rect.height() + 2 * dy
-    );
-    
+  SkRRect inflate(const SkRRect &box, float dx, float dy, float tx = 0,
+                  float ty = 0) {
+    const auto &rect = box.rect();
+    SkRect newRect =
+        SkRect::MakeXYWH(rect.x() - dx + tx, rect.y() - dy + ty,
+                         rect.width() + 2 * dx, rect.height() + 2 * dy);
+
     SkRRect result;
     result.setRectXY(newRect, box.radii()[0].fX + dx, box.radii()[0].fY + dy);
     return result;
   }
 
-  SkRRect deflate(const SkRRect& box, float dx, float dy, float tx = 0, float ty = 0) {
+  SkRRect deflate(const SkRRect &box, float dx, float dy, float tx = 0,
+                  float ty = 0) {
     return inflate(box, -dx, -dy, tx, ty);
   }
 
 public:
-  BoxCmd(jsi::Runtime &runtime, const jsi::Object &object, const jsi::Array &shadowsArray,
-         Variables &variables)
+  BoxCmd(jsi::Runtime &runtime, const jsi::Object &object,
+         const jsi::Array &shadowsArray, Variables &variables)
       : Command(CommandType::DrawBox) {
-    
+
     convertProperty(runtime, object, "box", props.box, variables);
     size_t shadowCount = shadowsArray.size(runtime);
     shadows.reserve(shadowCount);
-    
+
     for (size_t i = 0; i < shadowCount; i++) {
-      auto shadowObj = shadowsArray.getValueAtIndex(runtime, i).asObject(runtime);
+      auto shadowObj =
+          shadowsArray.getValueAtIndex(runtime, i).asObject(runtime);
       BoxShadowCmdProps shadow;
 
       convertProperty(runtime, shadowObj, "dx", shadow.dx, variables);
@@ -399,7 +399,6 @@ public:
 
   void draw(DrawingCtx *ctx) {
 
-
     // Get current paint properties
     auto paint = ctx->getPaint();
     float opacity = paint.getAlphaf();
@@ -414,16 +413,17 @@ public:
     }
 
     // Draw outer shadows first
-    for (const auto& shadow : shadows) {
+    for (const auto &shadow : shadows) {
       if (!shadow.inner.value_or(false)) {
         SkPaint shadowPaint;
         shadowPaint.setAntiAlias(true);
         shadowPaint.setColor(shadow.color.value_or(SK_ColorBLACK));
         shadowPaint.setAlphaf(opacity);
         shadowPaint.setMaskFilter(SkMaskFilter::MakeBlur(
-          SkBlurStyle::kNormal_SkBlurStyle, shadow.blur, true));
+            SkBlurStyle::kNormal_SkBlurStyle, shadow.blur, true));
 
-        auto shadowBox = inflate(box, shadow.spread, shadow.spread, shadow.dx, shadow.dy);
+        auto shadowBox =
+            inflate(box, shadow.spread, shadow.spread, shadow.dx, shadow.dy);
         ctx->canvas->drawRRect(shadowBox, shadowPaint);
       }
     }
@@ -432,10 +432,10 @@ public:
     ctx->canvas->drawRRect(box, paint);
 
     // Draw inner shadows
-    for (const auto& shadow : shadows) {
+    for (const auto &shadow : shadows) {
       if (shadow.inner.value_or(false)) {
         ctx->canvas->save();
-        
+
         // Clip to box bounds
         ctx->canvas->clipRRect(box, SkClipOp::kIntersect, true);
 
@@ -444,11 +444,12 @@ public:
         shadowPaint.setColor(shadow.color.value_or(SK_ColorBLACK));
         shadowPaint.setAlphaf(opacity);
         shadowPaint.setMaskFilter(SkMaskFilter::MakeBlur(
-          SkBlurStyle::kNormal_SkBlurStyle, shadow.blur, true));
+            SkBlurStyle::kNormal_SkBlurStyle, shadow.blur, true));
 
         // Calculate shadow bounds
         float delta = 10 + std::max(std::abs(shadow.dx), std::abs(shadow.dy));
-        auto inner = deflate(box, shadow.spread, shadow.spread, shadow.dx, shadow.dy);
+        auto inner =
+            deflate(box, shadow.spread, shadow.spread, shadow.dx, shadow.dy);
         auto outer = inflate(box, delta, delta);
 
         ctx->canvas->drawDRRect(outer, inner, shadowPaint);

package/cpp/api/recorder/RNRecorder.h

@@ -62,9 +62,10 @@ public:
     } else if (nodeType == "skTwoPointConicalGradient") {
       commands.push_back(std::make_unique<TwoPointConicalGradientCmd>(
           runtime, props, variables));
-        // TODO: should receive skBlendShader here
+      // TODO: should receive skBlendShader here
     } else if (nodeType == "skBlend") {
-      commands.push_back(std::make_unique<BlendShaderCmd>(runtime, props, variables));
+      commands.push_back(
+          std::make_unique<BlendShaderCmd>(runtime, props, variables));
     }
   }
 
@@ -204,8 +205,10 @@ public:
     commands.push_back(std::make_unique<Command>(CommandType::DrawPaint));
   }
 
-  void drawBox(jsi::Runtime &runtime, const jsi::Object &props, const jsi::Array &shadows) {
-    commands.push_back(std::make_unique<BoxCmd>(runtime, props, shadows, variables));
+  void drawBox(jsi::Runtime &runtime, const jsi::Object &props,
+               const jsi::Array &shadows) {
+    commands.push_back(
+        std::make_unique<BoxCmd>(runtime, props, shadows, variables));
   }
 
   void drawImage(jsi::Runtime &runtime, const jsi::Object &props) {
@@ -376,11 +379,10 @@ public:
               static_cast<TwoPointConicalGradientCmd *>(cmd.get());
           twoPointConicalGradientCmd->pushShader(ctx);
         } else if (nodeType == "skBlendShader") {
-          auto *blendShaderCmd =
-              static_cast<BlendShaderCmd *>(cmd.get());
+          auto *blendShaderCmd = static_cast<BlendShaderCmd *>(cmd.get());
           blendShaderCmd->pushShader(ctx);
         } else {
-            throw std::runtime_error("Invalid shader type: " + nodeType);
+          throw std::runtime_error("Invalid shader type: " + nodeType);
         }
         break;
       }
@@ -442,8 +444,8 @@ public:
           auto *line2DCmd = static_cast<Line2DPathEffectCmd *>(cmd.get());
           line2DCmd->pushPathEffect(ctx);
         } else {
-            throw std::runtime_error("Invalid path effect type: " + nodeType);
-          }
+          throw std::runtime_error("Invalid path effect type: " + nodeType);
+        }
         break;
       }
 
@@ -470,7 +472,7 @@ public:
           auto *lerpCmd = static_cast<LerpColorFilterCmd *>(cmd.get());
           lerpCmd->pushColorFilter(ctx);
         } else {
-            throw std::runtime_error("Invalid color filter type: " + nodeType);
+          throw std::runtime_error("Invalid color filter type: " + nodeType);
         }
         break;
       }

package/cpp/api/recorder/Shaders.h

@@ -9,7 +9,7 @@
 #include "Command.h"
 #include "Convertor.h"
 #include "DrawingCtx.h"
-#include "Image.h"
+#include "ImageFit.h"
 
 namespace RNSkia {
 
@@ -41,7 +41,7 @@ public:
 
     std::vector<sk_sp<SkShader>> children = ctx->popAllShaders();
     auto shader = source->makeShader(std::move(uniformsData), children.data(),
-                                   children.size(), &m3);
+                                     children.size(), &m3);
 
     ctx->shaders.push_back(shader);
   }
@@ -384,17 +384,17 @@ public:
   void pushShader(DrawingCtx *ctx) {
     // Get all existing shaders from the context
     std::vector<sk_sp<SkShader>> shaders = ctx->popAllShaders();
-    
+
     // We need at least 2 shaders to blend
     if (shaders.size() >= 2) {
       // Start from the last shader and blend backwards
       sk_sp<SkShader> blendedShader = shaders.back();
-      
+
       // Iterate from second-to-last to first shader
       for (int i = shaders.size() - 2; i >= 0; i--) {
         blendedShader = SkShaders::Blend(props.mode, shaders[i], blendedShader);
       }
-      
+
       ctx->shaders.push_back(blendedShader);
     } else if (shaders.size() == 1) {
       // If only one shader, just push it back

package/ios/RNSkia-iOS/SkiaCVPixelBufferUtils.mm

@@ -30,12 +30,16 @@
 #include <TargetConditionals.h>
 #if TARGET_RT_BIG_ENDIAN
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1),                 \
-                 *(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
+  (const char[]) {                                                             \
+    *((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2),    \
+        *(((char *)&fourcc) + 3), 0                                            \
+  }
 #else
 #define FourCC2Str(fourcc)                                                     \
-  (const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),           \
-                 *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
+  (const char[]) {                                                             \
+    *(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2),                        \
+        *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0                  \
+  }
 #endif
 
 // pragma MARK: TextureHolder

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",