@shopify/react-native-skia 0.1.230 → 0.1.232

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,9 +31,7 @@ public:
             "Expected SkFont object or null/undefined for the Font property.");
       }
     } else {
-      auto font = std::make_shared<SkFont>(SkFont());
-      font->setSize(14);
-      setDerivedValue(font);
+      setDerivedValue(nullptr);
     }
   }
 
@@ -41,4 +39,4 @@ private:
   NodeProp *_fontProp;
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

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/nodes/drawings/Text.js

@@ -21,18 +21,8 @@ class TextNode extends _DrawingNode.JsiDrawingNode {
       font
     } = this.props;
 
-    if (font === null) {
+    if (!font) {
       return null;
-    } else if (font === undefined) {
-      console.warn("<Text />: the font property is mandatory on React Native Web");
-      return null; // return this.Skia.Font(
-      //   this.Skia.FontMgr.System().matchFamilyStyle("System", {
-      //     width: 5,
-      //     weight: 400,
-      //     slant: 0,
-      //   }),
-      //   14
-      // );
     }
 
     return font;

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

@@ -1 +1 @@
-{"version":3,"names":["TextNode","JsiDrawingNode","constructor","ctx","props","NodeType","Text","deriveProps","font","undefined","console","warn","draw","canvas","paint","text","x","y","derived","Error","drawText","TextPathNode","TextPath","path","processPath","Skia","initialOffset","ids","getGlyphIDs","widths","getGlyphWidths","rsx","meas","ContourMeasureIter","cont","next","dist","i","length","width","substring","p","t","getPosTan","adjustedX","adjustedY","push","RSXform","TextBlob","MakeFromRSXform","drawTextBlob","TextBlobNode","blob","GlyphsNode","Glyphs","glyphs","reduce","acc","glyph","id","pos","positions","drawGlyphs"],"sources":["Text.ts"],"sourcesContent":["import type {\n  SkRSXform,\n  SkTextBlob,\n  SkPoint,\n  SkFont,\n} from \"../../../skia/types\";\nimport type {\n  DrawingContext,\n  TextBlobProps,\n  TextPathProps,\n  TextProps,\n} from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processPath } from \"../datatypes\";\nimport type { GlyphsProps } from \"../../types/Drawings\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class TextNode extends JsiDrawingNode<TextProps, SkFont | null> {\n  constructor(ctx: NodeContext, props: TextProps) {\n    super(ctx, NodeType.Text, props);\n  }\n\n  protected deriveProps() {\n    const { font } = this.props;\n    if (font === null) {\n      return null;\n    } else if (font === undefined) {\n      console.warn(\n        \"<Text />: the font property is mandatory on React Native Web\"\n      );\n      return null;\n      // return this.Skia.Font(\n      //   this.Skia.FontMgr.System().matchFamilyStyle(\"System\", {\n      //     width: 5,\n      //     weight: 400,\n      //     slant: 0,\n      //   }),\n      //   14\n      // );\n    }\n    return font;\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { text, x, y } = this.props;\n    const font = this.derived;\n    if (font === undefined) {\n      throw new Error(\"TextNode: font hasn't been derived\");\n    }\n    if (font != null) {\n      canvas.drawText(text, x, y, paint, font);\n    }\n  }\n}\n\nexport class TextPathNode extends JsiDrawingNode<\n  TextPathProps,\n  SkTextBlob | null\n> {\n  constructor(ctx: NodeContext, props: TextPathProps) {\n    super(ctx, NodeType.TextPath, props);\n  }\n\n  deriveProps() {\n    const path = processPath(this.Skia, this.props.path);\n    const { font, initialOffset } = this.props;\n    if (!font) {\n      return null;\n    }\n    let { text } = this.props;\n    const ids = font.getGlyphIDs(text);\n    const widths = font.getGlyphWidths(ids);\n    const rsx: SkRSXform[] = [];\n    const meas = this.Skia.ContourMeasureIter(path, false, 1);\n    let cont = meas.next();\n    let dist = initialOffset;\n    for (let i = 0; i < text.length && cont; i++) {\n      const width = widths[i];\n      dist += width / 2;\n      if (dist > cont.length()) {\n        // jump to next contour\n        cont = meas.next();\n        if (!cont) {\n          // We have come to the end of the path - terminate the string\n          // right here.\n          text = text.substring(0, i);\n          break;\n        }\n        dist = width / 2;\n      }\n      // Gives us the (x, y) coordinates as well as the cos/sin of the tangent\n      // line at that position.\n      const [p, t] = cont.getPosTan(dist);\n      const adjustedX = p.x - (width / 2) * t.x;\n      const adjustedY = p.y - (width / 2) * t.y;\n      rsx.push(this.Skia.RSXform(t.x, t.y, adjustedX, adjustedY));\n      dist += width / 2;\n    }\n    return this.Skia.TextBlob.MakeFromRSXform(text, rsx, font);\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"TextPathNode: blob is null\");\n    }\n    canvas.drawTextBlob(this.derived, 0, 0, paint);\n  }\n}\n\nexport class TextBlobNode extends JsiDrawingNode<TextBlobProps, null> {\n  constructor(ctx: NodeContext, props: TextBlobProps) {\n    super(ctx, NodeType.TextBlob, props);\n  }\n\n  protected deriveProps() {\n    return null;\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { blob, x, y } = this.props;\n    canvas.drawTextBlob(blob, x, y, paint);\n  }\n}\n\ninterface ProcessedGlyphs {\n  glyphs: number[];\n  positions: SkPoint[];\n}\n\nexport class GlyphsNode extends JsiDrawingNode<GlyphsProps, ProcessedGlyphs> {\n  constructor(ctx: NodeContext, props: GlyphsProps) {\n    super(ctx, NodeType.Glyphs, props);\n  }\n\n  deriveProps() {\n    return this.props.glyphs.reduce<ProcessedGlyphs>(\n      (acc, glyph) => {\n        const { id, pos } = glyph;\n        acc.glyphs.push(id);\n        acc.positions.push(pos);\n        return acc;\n      },\n      { glyphs: [], positions: [] }\n    );\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"GlyphsNode: processedGlyphs is null\");\n    }\n    const { glyphs, positions } = this.derived;\n    const { x, y, font } = this.props;\n    if (font) {\n      canvas.drawGlyphs(glyphs, positions, x, y, font, paint);\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["TextNode","JsiDrawingNode","constructor","ctx","props","NodeType","Text","deriveProps","font","draw","canvas","paint","text","x","y","derived","undefined","Error","drawText","TextPathNode","TextPath","path","processPath","Skia","initialOffset","ids","getGlyphIDs","widths","getGlyphWidths","rsx","meas","ContourMeasureIter","cont","next","dist","i","length","width","substring","p","t","getPosTan","adjustedX","adjustedY","push","RSXform","TextBlob","MakeFromRSXform","drawTextBlob","TextBlobNode","blob","GlyphsNode","Glyphs","glyphs","reduce","acc","glyph","id","pos","positions","drawGlyphs"],"sources":["Text.ts"],"sourcesContent":["import type {\n  SkRSXform,\n  SkTextBlob,\n  SkPoint,\n  SkFont,\n} from \"../../../skia/types\";\nimport type {\n  DrawingContext,\n  TextBlobProps,\n  TextPathProps,\n  TextProps,\n} from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processPath } from \"../datatypes\";\nimport type { GlyphsProps } from \"../../types/Drawings\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class TextNode extends JsiDrawingNode<TextProps, SkFont | null> {\n  constructor(ctx: NodeContext, props: TextProps) {\n    super(ctx, NodeType.Text, props);\n  }\n\n  protected deriveProps() {\n    const { font } = this.props;\n    if (!font) {\n      return null;\n    }\n    return font;\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { text, x, y } = this.props;\n    const font = this.derived;\n    if (font === undefined) {\n      throw new Error(\"TextNode: font hasn't been derived\");\n    }\n    if (font != null) {\n      canvas.drawText(text, x, y, paint, font);\n    }\n  }\n}\n\nexport class TextPathNode extends JsiDrawingNode<\n  TextPathProps,\n  SkTextBlob | null\n> {\n  constructor(ctx: NodeContext, props: TextPathProps) {\n    super(ctx, NodeType.TextPath, props);\n  }\n\n  deriveProps() {\n    const path = processPath(this.Skia, this.props.path);\n    const { font, initialOffset } = this.props;\n    if (!font) {\n      return null;\n    }\n    let { text } = this.props;\n    const ids = font.getGlyphIDs(text);\n    const widths = font.getGlyphWidths(ids);\n    const rsx: SkRSXform[] = [];\n    const meas = this.Skia.ContourMeasureIter(path, false, 1);\n    let cont = meas.next();\n    let dist = initialOffset;\n    for (let i = 0; i < text.length && cont; i++) {\n      const width = widths[i];\n      dist += width / 2;\n      if (dist > cont.length()) {\n        // jump to next contour\n        cont = meas.next();\n        if (!cont) {\n          // We have come to the end of the path - terminate the string\n          // right here.\n          text = text.substring(0, i);\n          break;\n        }\n        dist = width / 2;\n      }\n      // Gives us the (x, y) coordinates as well as the cos/sin of the tangent\n      // line at that position.\n      const [p, t] = cont.getPosTan(dist);\n      const adjustedX = p.x - (width / 2) * t.x;\n      const adjustedY = p.y - (width / 2) * t.y;\n      rsx.push(this.Skia.RSXform(t.x, t.y, adjustedX, adjustedY));\n      dist += width / 2;\n    }\n    return this.Skia.TextBlob.MakeFromRSXform(text, rsx, font);\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"TextPathNode: blob is null\");\n    }\n    canvas.drawTextBlob(this.derived, 0, 0, paint);\n  }\n}\n\nexport class TextBlobNode extends JsiDrawingNode<TextBlobProps, null> {\n  constructor(ctx: NodeContext, props: TextBlobProps) {\n    super(ctx, NodeType.TextBlob, props);\n  }\n\n  protected deriveProps() {\n    return null;\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { blob, x, y } = this.props;\n    canvas.drawTextBlob(blob, x, y, paint);\n  }\n}\n\ninterface ProcessedGlyphs {\n  glyphs: number[];\n  positions: SkPoint[];\n}\n\nexport class GlyphsNode extends JsiDrawingNode<GlyphsProps, ProcessedGlyphs> {\n  constructor(ctx: NodeContext, props: GlyphsProps) {\n    super(ctx, NodeType.Glyphs, props);\n  }\n\n  deriveProps() {\n    return this.props.glyphs.reduce<ProcessedGlyphs>(\n      (acc, glyph) => {\n        const { id, pos } = glyph;\n        acc.glyphs.push(id);\n        acc.positions.push(pos);\n        return acc;\n      },\n      { glyphs: [], positions: [] }\n    );\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    if (!this.derived) {\n      throw new Error(\"GlyphsNode: processedGlyphs is null\");\n    }\n    const { glyphs, positions } = this.derived;\n    const { x, y, font } = this.props;\n    if (font) {\n      canvas.drawGlyphs(glyphs, positions, x, y, font, paint);\n    }\n  }\n}\n"],"mappings":"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"}

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/dom/types/Drawings.d.ts

@@ -66,7 +66,7 @@ export interface DiffRectProps extends DrawingNodeProps {
     outer: SkRRect;
 }
 export interface TextProps extends DrawingNodeProps {
-    font?: SkFont | null;
+    font: SkFont | null;
     text: string;
     x: number;
     y: number;

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Drawings.ts"],"sourcesContent":["import type {\n  FillType,\n  SkImage,\n  StrokeOpts,\n  Vector,\n  Color,\n  SkPoint,\n  BlendMode,\n  PointMode,\n  VertexMode,\n  SkFont,\n  SkRRect,\n  SkTextBlob,\n  SkPicture,\n  SkSVG,\n  SkPaint,\n  SkRect,\n} from \"../../skia/types\";\n\nimport type {\n  CircleDef,\n  Fit,\n  GroupProps,\n  PathDef,\n  RectDef,\n  RRectDef,\n  SkEnum,\n} from \"./Common\";\n\nexport interface DrawingNodeProps extends GroupProps {\n  paint?: SkPaint;\n}\n\nexport type ImageProps = DrawingNodeProps &\n  RectDef & {\n    fit?: Fit;\n    image: SkImage | null;\n  };\n\nexport type CircleProps = CircleDef & DrawingNodeProps;\n\nexport interface PathProps extends DrawingNodeProps {\n  path: PathDef;\n  start: number;\n  end: number;\n  stroke?: StrokeOpts;\n  fillType?: SkEnum<typeof FillType>;\n}\n\nexport interface LineProps extends DrawingNodeProps {\n  p1: Vector;\n  p2: Vector;\n}\n\nexport type OvalProps = RectDef & DrawingNodeProps;\n\nexport type RectProps = RectDef & DrawingNodeProps;\n\nexport type RoundedRectProps = RRectDef & DrawingNodeProps;\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends DrawingNodeProps {\n  colors?: Color[];\n  patch: [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nexport interface VerticesProps extends DrawingNodeProps {\n  colors?: string[];\n  vertices: SkPoint[];\n  textures?: SkPoint[];\n  mode: SkEnum<typeof VertexMode>;\n  blendMode?: SkEnum<typeof BlendMode>;\n  indices?: number[];\n}\n\nexport interface ImageSVGProps extends DrawingNodeProps {\n  svg: SkSVG | null;\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  rect?: SkRect;\n}\n\nexport interface PictureProps extends DrawingNodeProps {\n  picture: SkPicture;\n}\n\nexport interface PointsProps extends DrawingNodeProps {\n  points: SkPoint[];\n  mode: SkEnum<typeof PointMode>;\n}\n\nexport interface DiffRectProps extends DrawingNodeProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nexport interface TextProps extends DrawingNodeProps {\n  font?: SkFont | null;\n  text: string;\n  x: number;\n  y: number;\n}\n\nexport interface TextPathProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  path: PathDef;\n  initialOffset: number;\n}\n\nexport interface TextBlobProps extends DrawingNodeProps {\n  blob: SkTextBlob;\n  x: number;\n  y: number;\n}\n\nexport interface Glyph {\n  id: number;\n  pos: SkPoint;\n}\n\nexport interface GlyphsProps extends DrawingNodeProps {\n  font: SkFont | null;\n  x: number;\n  y: number;\n  glyphs: Glyph[];\n}\n\nexport interface BoxProps extends DrawingNodeProps {\n  box: SkRRect | SkRect;\n}\n\nexport interface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["Drawings.ts"],"sourcesContent":["import type {\n  FillType,\n  SkImage,\n  StrokeOpts,\n  Vector,\n  Color,\n  SkPoint,\n  BlendMode,\n  PointMode,\n  VertexMode,\n  SkFont,\n  SkRRect,\n  SkTextBlob,\n  SkPicture,\n  SkSVG,\n  SkPaint,\n  SkRect,\n} from \"../../skia/types\";\n\nimport type {\n  CircleDef,\n  Fit,\n  GroupProps,\n  PathDef,\n  RectDef,\n  RRectDef,\n  SkEnum,\n} from \"./Common\";\n\nexport interface DrawingNodeProps extends GroupProps {\n  paint?: SkPaint;\n}\n\nexport type ImageProps = DrawingNodeProps &\n  RectDef & {\n    fit?: Fit;\n    image: SkImage | null;\n  };\n\nexport type CircleProps = CircleDef & DrawingNodeProps;\n\nexport interface PathProps extends DrawingNodeProps {\n  path: PathDef;\n  start: number;\n  end: number;\n  stroke?: StrokeOpts;\n  fillType?: SkEnum<typeof FillType>;\n}\n\nexport interface LineProps extends DrawingNodeProps {\n  p1: Vector;\n  p2: Vector;\n}\n\nexport type OvalProps = RectDef & DrawingNodeProps;\n\nexport type RectProps = RectDef & DrawingNodeProps;\n\nexport type RoundedRectProps = RRectDef & DrawingNodeProps;\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends DrawingNodeProps {\n  colors?: Color[];\n  patch: [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nexport interface VerticesProps extends DrawingNodeProps {\n  colors?: string[];\n  vertices: SkPoint[];\n  textures?: SkPoint[];\n  mode: SkEnum<typeof VertexMode>;\n  blendMode?: SkEnum<typeof BlendMode>;\n  indices?: number[];\n}\n\nexport interface ImageSVGProps extends DrawingNodeProps {\n  svg: SkSVG | null;\n  x?: number;\n  y?: number;\n  width?: number;\n  height?: number;\n  rect?: SkRect;\n}\n\nexport interface PictureProps extends DrawingNodeProps {\n  picture: SkPicture;\n}\n\nexport interface PointsProps extends DrawingNodeProps {\n  points: SkPoint[];\n  mode: SkEnum<typeof PointMode>;\n}\n\nexport interface DiffRectProps extends DrawingNodeProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nexport interface TextProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  x: number;\n  y: number;\n}\n\nexport interface TextPathProps extends DrawingNodeProps {\n  font: SkFont | null;\n  text: string;\n  path: PathDef;\n  initialOffset: number;\n}\n\nexport interface TextBlobProps extends DrawingNodeProps {\n  blob: SkTextBlob;\n  x: number;\n  y: number;\n}\n\nexport interface Glyph {\n  id: number;\n  pos: SkPoint;\n}\n\nexport interface GlyphsProps extends DrawingNodeProps {\n  font: SkFont | null;\n  x: number;\n  y: number;\n  glyphs: Glyph[];\n}\n\nexport interface BoxProps extends DrawingNodeProps {\n  box: SkRRect | SkRect;\n}\n\nexport interface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n"],"mappings":""}