@shopify/react-native-skia 0.1.230 → 0.1.231

package/android/CMakeLists.txt

@@ -62,6 +62,7 @@ add_library(
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/dom/base/ConcatablePaint.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/CSSColorParser.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/base64.cpp"
 
 )
 

package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp

@@ -31,8 +31,8 @@ sk_sp<SkSurface> SkiaOpenGLSurfaceFactory::makeOffscreenSurface(int width,
   // Create texture
   auto texture =
       ThreadContextHolder::ThreadSkiaOpenGLContext.directContext
-          ->createBackendTexture(width, height, colorType, GrMipMapped::kNo,
-                                 GrRenderable::kYes);
+          ->createBackendTexture(width, height, colorType,
+                                 skgpu::Mipmapped::kNo, GrRenderable::kYes);
 
   struct ReleaseContext {
     SkiaOpenGLContext *context;

package/cpp/api/JsiSkAnimatedImage.h

@@ -5,12 +5,12 @@
 #include <utility>
 
 #include "JsiSkHostObjects.h"
+#include "third_party/base64.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "JsiSkImage.h"
-#include "SkBase64.h"
 #include "SkStream.h"
 #include "include/codec/SkEncodedImageFormat.h"
 

package/cpp/api/JsiSkDataFactory.h

@@ -7,7 +7,7 @@
 
 #include "JsiPromises.h"
 #include "JsiSkData.h"
-#include "SkBase64.h"
+#include "third_party/base64.h"
 
 namespace RNSkia {
 
@@ -67,17 +67,17 @@ public:
     // Calculate length
     size_t len;
     auto err =
-        SkBase64::Decode(&base64.utf8(runtime).c_str()[0], size, nullptr, &len);
-    if (err != SkBase64::Error::kNoError) {
+        Base64::Decode(&base64.utf8(runtime).c_str()[0], size, nullptr, &len);
+    if (err != Base64::Error::kNone) {
       throw jsi::JSError(runtime, "Error decoding base64 string");
       return jsi::Value::undefined();
     }
 
     // Create data object and decode
     auto data = SkData::MakeUninitialized(len);
-    err = SkBase64::Decode(&base64.utf8(runtime).c_str()[0], size,
-                           data->writable_data(), &len);
-    if (err != SkBase64::Error::kNoError) {
+    err = Base64::Decode(&base64.utf8(runtime).c_str()[0], size,
+                         data->writable_data(), &len);
+    if (err != Base64::Error::kNone) {
       throw jsi::JSError(runtime, "Error decoding base64 string");
       return jsi::Value::undefined();
     }

package/cpp/api/JsiSkImage.h

@@ -8,13 +8,13 @@
 #include "JsiSkImageInfo.h"
 #include "JsiSkMatrix.h"
 #include "JsiSkShader.h"
+#include "third_party/base64.h"
 
 #include "RNSkTypedArray.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkBase64.h"
 #include "SkImage.h"
 #include "SkStream.h"
 #include "include/codec/SkEncodedImageFormat.h"
@@ -133,10 +133,10 @@ public:
   JSI_HOST_FUNCTION(encodeToBase64) {
     auto data = encodeImageData(arguments, count);
 
-    auto len = SkBase64::Encode(data->bytes(), data->size(), nullptr);
+    auto len = Base64::Encode(data->bytes(), data->size(), nullptr);
     auto buffer = std::string(len, 0);
-    SkBase64::Encode(data->bytes(), data->size(),
-                     reinterpret_cast<void *>(&buffer[0]));
+    Base64::Encode(data->bytes(), data->size(),
+                   reinterpret_cast<void *>(&buffer[0]));
     return jsi::String::createFromAscii(runtime, buffer);
   }
 

package/cpp/api/JsiSkPath.h

@@ -494,7 +494,7 @@ public:
   JSI_HOST_FUNCTION(interpolate) {
     auto path2 = JsiSkPath::fromValue(runtime, arguments[0]);
     auto weight = arguments[1].asNumber();
-    if (count > 2) {
+    if (count > 2 && !arguments[2].isUndefined()) {
       auto path3 = JsiSkPath::fromValue(runtime, arguments[2]);
       auto succeed = getObject()->interpolate(*path2, weight, path3.get());
       if (!succeed) {

package/cpp/api/JsiSkRRect.h

@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <jsi/jsi.h>
 
@@ -61,9 +62,35 @@ public:
     } else {
       auto rect =
           JsiSkRect::fromValue(runtime, object.getProperty(runtime, "rect"));
-      auto rx = object.getProperty(runtime, "rx").asNumber();
-      auto ry = object.getProperty(runtime, "ry").asNumber();
-      return std::make_shared<SkRRect>(SkRRect::MakeRectXY(*rect, rx, ry));
+      if (!object.getProperty(runtime, "rx").isUndefined()) {
+        auto rx = object.getProperty(runtime, "rx").asNumber();
+        auto ry = object.getProperty(runtime, "ry").asNumber();
+        return std::make_shared<SkRRect>(SkRRect::MakeRectXY(*rect, rx, ry));
+      } else if (object.getProperty(runtime, "topLeft").isObject() &&
+                 object.getProperty(runtime, "topRight").isObject() &&
+                 object.getProperty(runtime, "bottomRight").isObject() &&
+                 object.getProperty(runtime, "bottomLeft").isObject()) {
+        std::vector<SkPoint> points;
+        std::shared_ptr<SkPoint> topLeft = JsiSkPoint::fromValue(
+            runtime, object.getProperty(runtime, "topLeft").asObject(runtime));
+        std::shared_ptr<SkPoint> topRight = JsiSkPoint::fromValue(
+            runtime, object.getProperty(runtime, "topRight").asObject(runtime));
+        std::shared_ptr<SkPoint> bottomRight = JsiSkPoint::fromValue(
+            runtime,
+            object.getProperty(runtime, "bottomRight").asObject(runtime));
+        std::shared_ptr<SkPoint> bottomLeft = JsiSkPoint::fromValue(
+            runtime,
+            object.getProperty(runtime, "bottomLeft").asObject(runtime));
+        points.push_back(*topLeft.get());
+        points.push_back(*topRight.get());
+        points.push_back(*bottomRight.get());
+        points.push_back(*bottomLeft.get());
+        auto rrect = SkRRect::MakeEmpty();
+        rrect.setRectRadii(*rect, points.data());
+        return std::make_shared<SkRRect>(rrect);
+      } else {
+        throw jsi::JSError(runtime, "Invalid RRect object");
+      }
     }
   }
 

package/cpp/api/third_party/base64.cpp

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2006 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "third_party/base64.h"
+
+#include <cstdint>
+
+#define DecodePad -2
+#define EncodePad 64
+
+static const char kDefaultEncode[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                     "abcdefghijklmnopqrstuvwxyz"
+                                     "0123456789+/=";
+
+static const signed char kDecodeData[] = {
+    62, -1, -1,        -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1,
+    -1, -1, DecodePad, -1, -1, -1, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    10, 11, 12,        13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+    -1, -1, -1,        -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38,        39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+
+namespace RNSkia {
+
+Base64::Error Base64::Decode(const void *srcv, size_t srcLength, void *dstv,
+                             size_t *dstLength) {
+  const unsigned char *src = static_cast<const unsigned char *>(srcv);
+  unsigned char *dst = static_cast<unsigned char *>(dstv);
+
+  int i = 0;
+  bool padTwo = false;
+  bool padThree = false;
+  char unsigned const *const end = src + srcLength;
+  while (src < end) {
+    unsigned char bytes[4] = {0, 0, 0, 0};
+    int byte = 0;
+    do {
+      unsigned char srcByte = *src++;
+      if (srcByte == 0) {
+        *dstLength = i;
+        return Error::kNone;
+      }
+      if (srcByte <= ' ') {
+        continue; // treat as white space
+      }
+      if (srcByte < '+' || srcByte > 'z') {
+        return Error::kBadChar;
+      }
+      signed char decoded = kDecodeData[srcByte - '+'];
+      bytes[byte] = decoded;
+      if (decoded != DecodePad) {
+        if (decoded < 0) {
+          return Error::kBadChar;
+        }
+        byte++;
+        if (*src) {
+          continue;
+        }
+        if (byte == 0) {
+          *dstLength = i;
+          return Error::kNone;
+        }
+        if (byte == 4) {
+          break;
+        }
+      }
+      // As an optimization, if we find an equals sign
+      // we assume all future bytes to read are the
+      // appropriate number of padding equals signs.
+      if (byte < 2) {
+        return Error::kBadPadding;
+      }
+      padThree = true;
+      if (byte == 2) {
+        padTwo = true;
+      }
+      break;
+    } while (byte < 4);
+    int two = 0;
+    int three = 0;
+    if (dst) {
+      int one = (uint8_t)(bytes[0] << 2);
+      two = bytes[1];
+      one |= two >> 4;
+      two = (uint8_t)((two << 4) & 0xFF);
+      three = bytes[2];
+      two |= three >> 2;
+      three = (uint8_t)((three << 6) & 0xFF);
+      three |= bytes[3];
+      dst[i] = (unsigned char)one;
+    }
+    i++;
+    if (padTwo) {
+      break;
+    }
+    if (dst) {
+      dst[i] = (unsigned char)two;
+    }
+    i++;
+    if (padThree) {
+      break;
+    }
+    if (dst) {
+      dst[i] = (unsigned char)three;
+    }
+    i++;
+  }
+  *dstLength = i;
+  return Error::kNone;
+}
+
+size_t Base64::Encode(const void *srcv, size_t length, void *dstv) {
+  const unsigned char *src = static_cast<const unsigned char *>(srcv);
+  unsigned char *dst = static_cast<unsigned char *>(dstv);
+
+  const char *encode = kDefaultEncode;
+  if (dst) {
+    size_t remainder = length % 3;
+    char unsigned const *const end = &src[length - remainder];
+    while (src < end) {
+      unsigned a = *src++;
+      unsigned b = *src++;
+      unsigned c = *src++;
+      int d = c & 0x3F;
+      c = (c >> 6 | b << 2) & 0x3F;
+      b = (b >> 4 | a << 4) & 0x3F;
+      a = a >> 2;
+      *dst++ = encode[a];
+      *dst++ = encode[b];
+      *dst++ = encode[c];
+      *dst++ = encode[d];
+    }
+    if (remainder > 0) {
+      int k1 = 0;
+      int k2 = EncodePad;
+      int a = (uint8_t)*src++;
+      if (remainder == 2) {
+        int b = *src++;
+        k1 = b >> 4;
+        k2 = (b << 2) & 0x3F;
+      }
+      *dst++ = encode[a >> 2];
+      *dst++ = encode[(k1 | a << 4) & 0x3F];
+      *dst++ = encode[k2];
+      *dst++ = encode[EncodePad];
+    }
+  }
+  return (length + 2) / 3 * 4;
+}
+
+} // namespace RNSkia

package/cpp/api/third_party/base64.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2006 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#pragma once
+
+#include <cstddef>
+
+namespace RNSkia {
+
+struct Base64 {
+public:
+  enum class Error {
+    kNone,
+    kBadPadding,
+    kBadChar,
+  };
+
+  /**
+     Base64 encodes src into dst.
+
+     Normally this is called once with 'dst' nullptr to get the required size,
+     then again with an allocated 'dst' pointer to do the actual encoding.
+
+     @param dst nullptr or a pointer to a buffer large enough to receive the
+     result
+
+     @return the required length of dst for encoding.
+  */
+  static size_t Encode(const void *src, size_t length, void *dst);
+
+  /**
+     Base64 decodes src into dst.
+
+     Normally this is called once with 'dst' nullptr to get the required size,
+     then again with an allocated 'dst' pointer to do the actual encoding.
+
+     @param dst nullptr or a pointer to a buffer large enough to receive the
+     result
+
+     @param dstLength assigned the length dst is required to be. Must not be
+     nullptr.
+  */
+  [[nodiscard]] static Error Decode(const void *src, size_t srcLength,
+                                    void *dst, size_t *dstLength);
+};
+
+} // namespace RNSkia

package/cpp/jsi/JsiPromises.h

@@ -6,7 +6,7 @@
 
 #include <jsi/jsi.h>
 
-#include "SkBase64.h"
+#include "third_party/base64.h"
 
 namespace RNJsi {
 namespace jsi = facebook::jsi;

package/cpp/rnskia/dom/props/FontProp.h

@@ -31,7 +31,10 @@ public:
             "Expected SkFont object or null/undefined for the Font property.");
       }
     } else {
-      auto font = std::make_shared<SkFont>(SkFont());
+      auto fm = SkFontMgr::RefDefault();
+      sk_sp<SkTypeface> typeface =
+          fm->legacyMakeTypeface(nullptr, SkFontStyle());
+      auto font = std::make_shared<SkFont>(SkFont(typeface));
       font->setSize(14);
       setDerivedValue(font);
     }

package/cpp/rnskia/dom/props/RRectProp.h

@@ -5,6 +5,7 @@
 #include "RectProp.h"
 
 #include <memory>
+#include <vector>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -19,6 +20,10 @@ namespace RNSkia {
 static PropId PropNameRx = JsiPropId::get("rx");
 static PropId PropNameRy = JsiPropId::get("ry");
 static PropId PropNameR = JsiPropId::get("r");
+static PropId PropNameTopLeft = JsiPropId::get("topLeft");
+static PropId PropNameTopRight = JsiPropId::get("topRight");
+static PropId PropNameBottomRight = JsiPropId::get("bottomRight");
+static PropId PropNameBottomLeft = JsiPropId::get("bottomLeft");
 
 /**
  Reads a rect from a given propety in the node. The name of the property is
@@ -64,6 +69,51 @@ public:
                                  width.getAsNumber(), height.getAsNumber()),
                 rx.getAsNumber(), ry.getAsNumber()));
           }
+        } else if (value.hasValue(PropNameRect) &&
+                   value.hasValue(PropNameTopLeft) &&
+                   value.hasValue(PropNameTopRight) &&
+                   value.hasValue(PropNameBottomRight) &&
+                   value.hasValue(PropNameBottomLeft)) {
+          auto rect = value.getValue(PropNameRect);
+          if (rect.hasValue(PropNameX) && rect.hasValue(PropNameY) &&
+              rect.hasValue(PropNameWidth) && rect.hasValue(PropNameHeight)) {
+            auto x = rect.getValue(PropNameX);
+            auto y = rect.getValue(PropNameY);
+            auto width = rect.getValue(PropNameWidth);
+            auto height = rect.getValue(PropNameHeight);
+            std::vector<SkPoint> points;
+            points.reserve(4);
+            auto topLeft = value.getValue(PropNameTopLeft);
+            auto topLeftX = topLeft.getValue(PropNameX);
+            auto topLeftY = topLeft.getValue(PropNameY);
+            points.push_back(
+                SkPoint::Make(topLeftX.getAsNumber(), topLeftY.getAsNumber()));
+
+            auto topRight = value.getValue(PropNameTopRight);
+            auto topRightX = topRight.getValue(PropNameX);
+            auto topRightY = topRight.getValue(PropNameY);
+            points.push_back(SkPoint::Make(topRightX.getAsNumber(),
+                                           topRightY.getAsNumber()));
+
+            auto bottomRight = value.getValue(PropNameBottomRight);
+            auto bottomRightX = bottomRight.getValue(PropNameX);
+            auto bottomRightY = bottomRight.getValue(PropNameY);
+            points.push_back(SkPoint::Make(bottomRightX.getAsNumber(),
+                                           bottomRightY.getAsNumber()));
+
+            auto bottomLeft = value.getValue(PropNameBottomLeft);
+            auto bottomLeftX = bottomLeft.getValue(PropNameX);
+            auto bottomLeftY = bottomLeft.getValue(PropNameY);
+            points.push_back(SkPoint::Make(bottomLeftX.getAsNumber(),
+                                           bottomLeftY.getAsNumber()));
+
+            auto rrect = std::make_shared<SkRRect>(SkRRect::MakeEmpty());
+            rrect->setRectRadii(
+                SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
+                                 width.getAsNumber(), height.getAsNumber()),
+                points.data());
+            return rrect;
+          }
         }
       }
     }

package/ios/RNSkia-iOS/SkiaMetalSurfaceFactory.mm

@@ -92,7 +92,7 @@ sk_sp<SkSurface> SkiaMetalSurfaceFactory::makeOffscreenSurface(int width,
   // Create a GrBackendTexture from the Metal texture
   GrMtlTextureInfo info;
   info.fTexture.retain((__bridge void *)ctx->texture);
-  GrBackendTexture backendTexture(width, height, GrMipMapped::kNo, info);
+  GrBackendTexture backendTexture(width, height, skgpu::Mipmapped::kNo, info);
 
   // Create a SkSurface from the GrBackendTexture
   auto surface = SkSurfaces::WrapBackendTexture(

package/lib/commonjs/dom/nodes/JsiSkDOM.d.ts

@@ -2,6 +2,7 @@ import type { PathProps, SkDOM, GroupProps, ImageProps, BlurImageFilterProps, Ma
 import type { BlendImageFilterProps, BlendProps, DisplacementMapImageFilterProps, DropShadowImageFilterProps, MorphologyImageFilterProps, RuntimeShaderImageFilterProps } from "../types/ImageFilters";
 import type { CornerPathEffectProps, DashPathEffectProps, DiscretePathEffectProps, Line2DPathEffectProps, Path1DPathEffectProps, Path2DPathEffectProps } from "../types/PathEffects";
 import type { ParagraphProps } from "../types/Paragraph";
+import { RRectNode } from "./drawings";
 import type { NodeContext } from "./Node";
 export declare class JsiSkDOM implements SkDOM {
     private ctx;
@@ -18,7 +19,7 @@ export declare class JsiSkDOM implements SkDOM {
     Patch(props: PatchProps): import("../types").RenderNode<PatchProps>;
     Points(props: PointsProps): import("../types").RenderNode<PointsProps>;
     Rect(props: RectProps): import("./DrawingNode").JsiDrawingNode<RectProps, import("../..").SkRect>;
-    RRect(props: RoundedRectProps): import("./DrawingNode").JsiDrawingNode<RoundedRectProps, import("../..").SkRRect>;
+    RRect(props: RoundedRectProps): import("./DrawingNode").JsiDrawingNode<RoundedRectProps, import("../..").SkRRect> | RRectNode;
     Vertices(props: VerticesProps): import("../types").RenderNode<VerticesProps>;
     Text(props: TextProps): import("../types").RenderNode<TextProps>;
     TextPath(props: TextPathProps): import("../types").RenderNode<TextPathProps>;

package/lib/commonjs/dom/nodes/datatypes/Rect.d.ts

@@ -2,4 +2,4 @@ import type { Skia, SkRect, Vector } from "../../../skia/types";
 import type { RectDef, RRectDef } from "../../types";
 export declare const isEdge: (pos: Vector, b: SkRect) => boolean;
 export declare const processRect: (Skia: Skia, def: RectDef) => SkRect;
-export declare const processRRect: (Skia: Skia, def: RRectDef) => import("../../../skia/types").SkRRect;
+export declare const processRRect: (Skia: Skia, def: RRectDef) => import("../../../skia/types").InputRRect;

package/lib/commonjs/dom/nodes/drawings/RRectNode.d.ts

@@ -1,10 +1,10 @@
-import type { SkRRect } from "../../../skia/types";
+import type { InputRRect, SkRRect } from "../../../skia/types";
 import type { DrawingContext, RoundedRectProps } from "../../types";
 import { JsiDrawingNode } from "../DrawingNode";
 import type { NodeContext } from "../Node";
-export declare class RRectNode extends JsiDrawingNode<RoundedRectProps, SkRRect> {
+export declare class RRectNode extends JsiDrawingNode<RoundedRectProps, InputRRect> {
     rect?: SkRRect;
     constructor(ctx: NodeContext, props: RoundedRectProps);
-    protected deriveProps(): SkRRect;
+    protected deriveProps(): InputRRect;
     draw({ canvas, paint }: DrawingContext): void;
 }

package/lib/commonjs/dom/nodes/drawings/RRectNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["RRectNode","JsiDrawingNode","constructor","ctx","props","NodeType","RRect","deriveProps","processRRect","Skia","draw","canvas","paint","derived","undefined","Error","drawRRect"],"sources":["RRectNode.ts"],"sourcesContent":["import type { SkRRect } from \"../../../skia/types\";\nimport type { DrawingContext, RoundedRectProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processRRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class RRectNode extends JsiDrawingNode<RoundedRectProps, SkRRect> {\n  rect?: SkRRect;\n\n  constructor(ctx: NodeContext, props: RoundedRectProps) {\n    super(ctx, NodeType.RRect, props);\n  }\n\n  protected deriveProps() {\n    return processRRect(this.Skia, this.props);\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (this.derived === undefined) {\n      throw new Error(\"RRectNode: rect is undefined\");\n    }\n    canvas.drawRRect(this.derived, paint);\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAAkE;EAGvEC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAA4C;IACrD,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;;IADqD;EAEtD;;EAESG,WAAW,GAAG;IACtB,OAAO,IAAAC,uBAAA,EAAa,KAAKC,IAAlB,EAAwB,KAAKL,KAA7B,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;;IACtC,IAAI,KAAKC,OAAL,KAAiBC,SAArB,EAAgC;MAC9B,MAAM,IAAIC,KAAJ,CAAU,8BAAV,CAAN;IACD;;IACDJ,MAAM,CAACK,SAAP,CAAiB,KAAKH,OAAtB,EAA+BD,KAA/B;EACD;;AAhBsE"}
+{"version":3,"names":["RRectNode","JsiDrawingNode","constructor","ctx","props","NodeType","RRect","deriveProps","processRRect","Skia","draw","canvas","paint","derived","undefined","Error","drawRRect"],"sources":["RRectNode.ts"],"sourcesContent":["import type { InputRRect, SkRRect } from \"../../../skia/types\";\nimport type { DrawingContext, RoundedRectProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processRRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class RRectNode extends JsiDrawingNode<RoundedRectProps, InputRRect> {\n  rect?: SkRRect;\n\n  constructor(ctx: NodeContext, props: RoundedRectProps) {\n    super(ctx, NodeType.RRect, props);\n  }\n\n  protected deriveProps() {\n    return processRRect(this.Skia, this.props);\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (this.derived === undefined) {\n      throw new Error(\"RRectNode: rect is undefined\");\n    }\n    canvas.drawRRect(this.derived, paint);\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAAqE;EAG1EC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAA4C;IACrD,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;;IADqD;EAEtD;;EAESG,WAAW,GAAG;IACtB,OAAO,IAAAC,uBAAA,EAAa,KAAKC,IAAlB,EAAwB,KAAKL,KAA7B,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;;IACtC,IAAI,KAAKC,OAAL,KAAiBC,SAArB,EAAgC;MAC9B,MAAM,IAAIC,KAAJ,CAAU,8BAAV,CAAN;IACD;;IACDJ,MAAM,CAACK,SAAP,CAAiB,KAAKH,OAAtB,EAA+BD,KAA/B;EACD;;AAhByE"}

package/lib/commonjs/dom/types/Common.d.ts

@@ -1,5 +1,5 @@
 import type { ReactNode } from "react";
-import type { BlendMode, Color, InputMatrix, PaintStyle, SkPaint, SkPath, SkRect, SkRRect, StrokeCap, StrokeJoin, Transforms3d, Vector } from "../../skia/types";
+import type { BlendMode, Color, InputMatrix, InputRRect, PaintStyle, SkPaint, SkPath, SkRect, SkRRect, StrokeCap, StrokeJoin, Transforms3d, Vector } from "../../skia/types";
 export type SkEnum<T> = Uncapitalize<keyof T extends string ? keyof T : never>;
 export type PathDef = string | SkPath;
 export type ClipDef = SkRRect | SkRect | PathDef;
@@ -21,7 +21,7 @@ export type RectDef = RectCtor | {
     rect: SkRect;
 };
 export type RRectDef = RRectCtor | {
-    rect: SkRRect;
+    rect: InputRRect;
 };
 export interface PointCircleDef {
     c?: Vector;

package/lib/commonjs/dom/types/Common.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Common.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\n\nimport type {\n  BlendMode,\n  Color,\n  InputMatrix,\n  PaintStyle,\n  SkPaint,\n  SkPath,\n  SkRect,\n  SkRRect,\n  StrokeCap,\n  StrokeJoin,\n  Transforms3d,\n  Vector,\n} from \"../../skia/types\";\n\nexport type SkEnum<T> = Uncapitalize<keyof T extends string ? keyof T : never>;\n\nexport type PathDef = string | SkPath;\n\nexport type ClipDef = SkRRect | SkRect | PathDef;\n\nexport type Fit =\n  | \"cover\"\n  | \"contain\"\n  | \"fill\"\n  | \"fitHeight\"\n  | \"fitWidth\"\n  | \"none\"\n  | \"scaleDown\";\n\nexport type Radius = number | Vector;\n\nexport interface ChildrenProps {\n  children?: ReactNode | ReactNode[];\n}\n\nexport interface RectCtor {\n  x?: number;\n  y?: number;\n  width: number;\n  height: number;\n}\n\nexport interface RRectCtor extends RectCtor {\n  r?: Radius;\n}\n\nexport type RectDef = RectCtor | { rect: SkRect };\nexport type RRectDef = RRectCtor | { rect: SkRRect };\n\nexport interface PointCircleDef {\n  c?: Vector;\n  r: number;\n}\n\nexport interface ScalarCircleDef {\n  cx: number;\n  cy: number;\n  r: number;\n}\n\nexport type CircleDef = PointCircleDef | ScalarCircleDef;\n\nexport interface TransformProps {\n  transform?: Transforms3d;\n  origin?: Vector;\n  matrix?: InputMatrix;\n}\n\nexport interface PaintProps extends ChildrenProps {\n  color?: Color;\n  strokeWidth?: number;\n  blendMode?: SkEnum<typeof BlendMode>;\n  style?: SkEnum<typeof PaintStyle>;\n  strokeJoin?: SkEnum<typeof StrokeJoin>;\n  strokeCap?: SkEnum<typeof StrokeCap>;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n  dither?: boolean;\n}\n\nexport interface GroupProps extends PaintProps, TransformProps {\n  clip?: ClipDef;\n  invertClip?: boolean;\n  layer?: SkPaint | boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["Common.ts"],"sourcesContent":["import type { ReactNode } from \"react\";\n\nimport type {\n  BlendMode,\n  Color,\n  InputMatrix,\n  InputRRect,\n  PaintStyle,\n  SkPaint,\n  SkPath,\n  SkRect,\n  SkRRect,\n  StrokeCap,\n  StrokeJoin,\n  Transforms3d,\n  Vector,\n} from \"../../skia/types\";\n\nexport type SkEnum<T> = Uncapitalize<keyof T extends string ? keyof T : never>;\n\nexport type PathDef = string | SkPath;\n\nexport type ClipDef = SkRRect | SkRect | PathDef;\n\nexport type Fit =\n  | \"cover\"\n  | \"contain\"\n  | \"fill\"\n  | \"fitHeight\"\n  | \"fitWidth\"\n  | \"none\"\n  | \"scaleDown\";\n\nexport type Radius = number | Vector;\n\nexport interface ChildrenProps {\n  children?: ReactNode | ReactNode[];\n}\n\nexport interface RectCtor {\n  x?: number;\n  y?: number;\n  width: number;\n  height: number;\n}\n\nexport interface RRectCtor extends RectCtor {\n  r?: Radius;\n}\n\nexport type RectDef = RectCtor | { rect: SkRect };\nexport type RRectDef = RRectCtor | { rect: InputRRect };\n\nexport interface PointCircleDef {\n  c?: Vector;\n  r: number;\n}\n\nexport interface ScalarCircleDef {\n  cx: number;\n  cy: number;\n  r: number;\n}\n\nexport type CircleDef = PointCircleDef | ScalarCircleDef;\n\nexport interface TransformProps {\n  transform?: Transforms3d;\n  origin?: Vector;\n  matrix?: InputMatrix;\n}\n\nexport interface PaintProps extends ChildrenProps {\n  color?: Color;\n  strokeWidth?: number;\n  blendMode?: SkEnum<typeof BlendMode>;\n  style?: SkEnum<typeof PaintStyle>;\n  strokeJoin?: SkEnum<typeof StrokeJoin>;\n  strokeCap?: SkEnum<typeof StrokeCap>;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n  dither?: boolean;\n}\n\nexport interface GroupProps extends PaintProps, TransformProps {\n  clip?: ClipDef;\n  invertClip?: boolean;\n  layer?: SkPaint | boolean;\n}\n"],"mappings":""}

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

@@ -1,3 +1,5 @@
 import type { ReactNode } from "react";
+import type { SkSurface } from "../skia";
 export * from "../renderer/components";
-export declare const draw: (element: ReactNode, width: number, height: number) => any;
+export declare const makeOffscreenSurface: (width: number, height: number) => any;
+export declare const drawOffscreen: (surface: SkSurface, element: ReactNode) => import("../skia").SkImage;

package/lib/commonjs/headless/index.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  draw: true
+  makeOffscreenSurface: true,
+  drawOffscreen: true
 };
-exports.draw = void 0;
+exports.makeOffscreenSurface = exports.drawOffscreen = void 0;
 
 var _web = require("../skia/web");
 
@@ -32,7 +33,7 @@ Object.keys(_components).forEach(function (key) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let Skia;
 
-const draw = (element, width, height) => {
+const makeOffscreenSurface = (width, height) => {
   if (!Skia) {
     Skia = (0, _web.JsiSkApi)(CanvasKit);
   }
@@ -43,15 +44,20 @@ const draw = (element, width, height) => {
     throw new Error("Couldn't create surface!");
   }
 
+  return surface;
+};
+
+exports.makeOffscreenSurface = makeOffscreenSurface;
+
+const drawOffscreen = (surface, element) => {
   const root = new _Reconciler.SkiaRoot(Skia);
   root.render(element);
   const canvas = surface.getCanvas();
   const ctx = new _types.JsiDrawingContext(Skia, canvas);
   root.dom.render(ctx);
   surface.flush();
-  const image = surface.makeImageSnapshot();
-  return image;
+  return surface.makeImageSnapshot();
 };
 
-exports.draw = draw;
+exports.drawOffscreen = drawOffscreen;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["Skia","draw","element","width","height","JsiSkApi","CanvasKit","surface","Surface","MakeOffscreen","Error","root","SkiaRoot","render","canvas","getCanvas","ctx","JsiDrawingContext","dom","flush","image","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 { SkiaRoot } from \"../renderer/Reconciler\";\nimport { JsiDrawingContext } from \"../dom/types\";\n\nexport * from \"../renderer/components\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nlet Skia: any;\n\nexport const draw = (element: ReactNode, 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  const root = new SkiaRoot(Skia);\n  root.render(element);\n  const canvas = surface.getCanvas();\n  const ctx = new JsiDrawingContext(Skia, canvas);\n  root.dom.render(ctx);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image;\n};\n"],"mappings":";;;;;;;;;;AAKA;;AACA;;AACA;;AAEA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AATA;AACA;AAUA;AACA,IAAIA,IAAJ;;AAEO,MAAMC,IAAI,GAAG,CAACC,OAAD,EAAqBC,KAArB,EAAoCC,MAApC,KAAuD;EACzE,IAAI,CAACJ,IAAL,EAAW;IACTA,IAAI,GAAG,IAAAK,aAAA,EAASC,SAAT,CAAP;EACD;;EACD,MAAMC,OAAO,GAAGP,IAAI,CAACQ,OAAL,CAAaC,aAAb,CAA2BN,KAA3B,EAAkCC,MAAlC,CAAhB;;EACA,IAAIG,OAAO,KAAK,IAAhB,EAAsB;IACpB,MAAM,IAAIG,KAAJ,CAAU,0BAAV,CAAN;EACD;;EACD,MAAMC,IAAI,GAAG,IAAIC,oBAAJ,CAAaZ,IAAb,CAAb;EACAW,IAAI,CAACE,MAAL,CAAYX,OAAZ;EACA,MAAMY,MAAM,GAAGP,OAAO,CAACQ,SAAR,EAAf;EACA,MAAMC,GAAG,GAAG,IAAIC,wBAAJ,CAAsBjB,IAAtB,EAA4Bc,MAA5B,CAAZ;EACAH,IAAI,CAACO,GAAL,CAASL,MAAT,CAAgBG,GAAhB;EACAT,OAAO,CAACY,KAAR;EACA,MAAMC,KAAK,GAAGb,OAAO,CAACc,iBAAR,EAAd;EACA,OAAOD,KAAP;AACD,CAhBM"}
+{"version":3,"names":["Skia","makeOffscreenSurface","width","height","JsiSkApi","CanvasKit","surface","Surface","MakeOffscreen","Error","drawOffscreen","element","root","SkiaRoot","render","canvas","getCanvas","ctx","JsiDrawingContext","dom","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 { SkiaRoot } from \"../renderer/Reconciler\";\nimport { JsiDrawingContext } from \"../dom/types\";\nimport type { SkSurface } from \"../skia\";\n\nexport * from \"../renderer/components\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nlet Skia: any;\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 drawOffscreen = (surface: SkSurface, element: ReactNode) => {\n  const root = new SkiaRoot(Skia);\n  root.render(element);\n  const canvas = surface.getCanvas();\n  const ctx = new JsiDrawingContext(Skia, canvas);\n  root.dom.render(ctx);\n  surface.flush();\n  return surface.makeImageSnapshot();\n};\n"],"mappings":";;;;;;;;;;;AAKA;;AACA;;AACA;;AAGA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAVA;AACA;AAWA;AACA,IAAIA,IAAJ;;AAEO,MAAMC,oBAAoB,GAAG,CAACC,KAAD,EAAgBC,MAAhB,KAAmC;EACrE,IAAI,CAACH,IAAL,EAAW;IACTA,IAAI,GAAG,IAAAI,aAAA,EAASC,SAAT,CAAP;EACD;;EACD,MAAMC,OAAO,GAAGN,IAAI,CAACO,OAAL,CAAaC,aAAb,CAA2BN,KAA3B,EAAkCC,MAAlC,CAAhB;;EACA,IAAIG,OAAO,KAAK,IAAhB,EAAsB;IACpB,MAAM,IAAIG,KAAJ,CAAU,0BAAV,CAAN;EACD;;EACD,OAAOH,OAAP;AACD,CATM;;;;AAWA,MAAMI,aAAa,GAAG,CAACJ,OAAD,EAAqBK,OAArB,KAA4C;EACvE,MAAMC,IAAI,GAAG,IAAIC,oBAAJ,CAAab,IAAb,CAAb;EACAY,IAAI,CAACE,MAAL,CAAYH,OAAZ;EACA,MAAMI,MAAM,GAAGT,OAAO,CAACU,SAAR,EAAf;EACA,MAAMC,GAAG,GAAG,IAAIC,wBAAJ,CAAsBlB,IAAtB,EAA4Be,MAA5B,CAAZ;EACAH,IAAI,CAACO,GAAL,CAASL,MAAT,CAAgBG,GAAhB;EACAX,OAAO,CAACc,KAAR;EACA,OAAOd,OAAO,CAACe,iBAAR,EAAP;AACD,CARM"}

package/lib/commonjs/skia/types/Canvas.d.ts

@@ -5,7 +5,7 @@ import type { SkPath } from "./Path";
 import type { SkImage, MipmapMode, FilterMode, ImageInfo } from "./Image";
 import type { SkSVG } from "./SVG";
 import type { SkColor } from "./Color";
-import type { SkRRect } from "./RRect";
+import type { InputRRect } from "./RRect";
 import type { BlendMode } from "./Paint/BlendMode";
 import type { SkPoint, PointMode } from "./Point";
 import type { InputMatrix } from "./Matrix";
@@ -202,7 +202,7 @@ export interface SkCanvas {
      * @param rrect
      * @param paint
      */
-    drawRRect(rrect: SkRRect, paint: SkPaint): void;
+    drawRRect(rrect: InputRRect, paint: SkPaint): void;
     /**
      * Draws RRect outer and inner using clip, Matrix, and Paint paint.
      * outer must contain inner or the drawing is undefined.
@@ -210,7 +210,7 @@ export interface SkCanvas {
      * @param inner
      * @param paint
      */
-    drawDRRect(outer: SkRRect, inner: SkRRect, paint: SkPaint): void;
+    drawDRRect(outer: InputRRect, inner: InputRRect, paint: SkPaint): void;
     /**
      * Draws an oval bounded by the given rectangle using the current clip, current matrix,
      * and the provided paint.
@@ -367,7 +367,7 @@ export interface SkCanvas {
      * @param op
      * @param doAntiAlias
      */
-    clipRRect(rrect: SkRRect, op: ClipOp, doAntiAlias: boolean): void;
+    clipRRect(rrect: InputRRect, op: ClipOp, doAntiAlias: boolean): void;
     /**
      * Replaces current matrix with m premultiplied with the existing matrix.
      * @param m