@shopify/react-native-skia 0.1.230 → 0.1.231

package/lib/module/skia/web/JsiSkRRect.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseHostObject","JsiSkRect","JsiSkRRect","fromValue","CanvasKit","rect","ref","RRectXY","rx","ry","constructor","Infinity","width","height","scale","Math","min","Float32Array","of"],"sources":["JsiSkRRect.ts"],"sourcesContent":["import type { CanvasKit, RRect } from \"canvaskit-wasm\";\n\nimport type { SkRect, SkRRect } from \"../types\";\n\nimport { BaseHostObject } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkRRect\n  extends BaseHostObject<RRect, \"RRect\">\n  implements SkRRect\n{\n  dispose = () => {\n    // Float32Array\n  };\n\n  static fromValue(CanvasKit: CanvasKit, rect: SkRRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    return CanvasKit.RRectXY(\n      JsiSkRect.fromValue(CanvasKit, rect.rect),\n      rect.rx,\n      rect.ry\n    );\n  }\n\n  constructor(CanvasKit: CanvasKit, rect: SkRect, rx: number, ry: number) {\n    // based on https://github.com/google/skia/blob/main/src/core/SkRRect.cpp#L51\n    if (rx === Infinity || ry === Infinity) {\n      rx = ry = 0;\n    }\n    if (rect.width < rx + rx || rect.height < ry + ry) {\n      // At most one of these two divides will be by zero, and neither numerator is zero.\n      const scale = Math.min(rect.width / (rx + rx), rect.height / (ry + ry));\n      rx *= scale;\n      ry *= scale;\n    }\n    const ref = CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry);\n    super(CanvasKit, ref, \"RRect\");\n  }\n\n  get rx() {\n    return this.ref[4];\n  }\n\n  get ry() {\n    return this.ref[5];\n  }\n\n  get rect() {\n    return new JsiSkRect(\n      this.CanvasKit,\n      Float32Array.of(this.ref[0], this.ref[1], this.ref[2], this.ref[3])\n    );\n  }\n}\n"],"mappings":";;AAIA,SAASA,cAAT,QAA+B,QAA/B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,UAAN,SACGF,cADH,CAGP;EAKkB,OAATG,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAsC;IACpD,IAAIA,IAAI,YAAYJ,SAApB,EAA+B;MAC7B,OAAOI,IAAI,CAACC,GAAZ;IACD;;IACD,OAAOF,SAAS,CAACG,OAAV,CACLN,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAAI,CAACA,IAApC,CADK,EAELA,IAAI,CAACG,EAFA,EAGLH,IAAI,CAACI,EAHA,CAAP;EAKD;;EAEDC,WAAW,CAACN,SAAD,EAAuBC,IAAvB,EAAqCG,EAArC,EAAiDC,EAAjD,EAA6D;IACtE;IACA,IAAID,EAAE,KAAKG,QAAP,IAAmBF,EAAE,KAAKE,QAA9B,EAAwC;MACtCH,EAAE,GAAGC,EAAE,GAAG,CAAV;IACD;;IACD,IAAIJ,IAAI,CAACO,KAAL,GAAaJ,EAAE,GAAGA,EAAlB,IAAwBH,IAAI,CAACQ,MAAL,GAAcJ,EAAE,GAAGA,EAA/C,EAAmD;MACjD;MACA,MAAMK,KAAK,GAAGC,IAAI,CAACC,GAAL,CAASX,IAAI,CAACO,KAAL,IAAcJ,EAAE,GAAGA,EAAnB,CAAT,EAAiCH,IAAI,CAACQ,MAAL,IAAeJ,EAAE,GAAGA,EAApB,CAAjC,CAAd;MACAD,EAAE,IAAIM,KAAN;MACAL,EAAE,IAAIK,KAAN;IACD;;IACD,MAAMR,GAAG,GAAGF,SAAS,CAACG,OAAV,CAAkBN,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAA/B,CAAlB,EAAwDG,EAAxD,EAA4DC,EAA5D,CAAZ;IACA,MAAML,SAAN,EAAiBE,GAAjB,EAAsB,OAAtB;;IAZsE,iCAf9D,MAAM,CACd;IACD,CAauE;EAavE;;EAEK,IAAFE,EAAE,GAAG;IACP,OAAO,KAAKF,GAAL,CAAS,CAAT,CAAP;EACD;;EAEK,IAAFG,EAAE,GAAG;IACP,OAAO,KAAKH,GAAL,CAAS,CAAT,CAAP;EACD;;EAEO,IAAJD,IAAI,GAAG;IACT,OAAO,IAAIJ,SAAJ,CACL,KAAKG,SADA,EAELa,YAAY,CAACC,EAAb,CAAgB,KAAKZ,GAAL,CAAS,CAAT,CAAhB,EAA6B,KAAKA,GAAL,CAAS,CAAT,CAA7B,EAA0C,KAAKA,GAAL,CAAS,CAAT,CAA1C,EAAuD,KAAKA,GAAL,CAAS,CAAT,CAAvD,CAFK,CAAP;EAID;;AA5CH"}
+{"version":3,"names":["BaseHostObject","JsiSkRect","JsiSkRRect","fromValue","CanvasKit","rect","ref","Float32Array","of","x","y","width","height","topLeft","topRight","bottomRight","bottomLeft","RRectXY","rx","ry","constructor","Infinity","scale","Math","min"],"sources":["JsiSkRRect.ts"],"sourcesContent":["import type { CanvasKit, RRect } from \"canvaskit-wasm\";\n\nimport type { InputRRect, SkRect, SkRRect } from \"../types\";\n\nimport { BaseHostObject } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkRRect\n  extends BaseHostObject<RRect, \"RRect\">\n  implements SkRRect\n{\n  dispose = () => {\n    // Float32Array\n  };\n\n  static fromValue(CanvasKit: CanvasKit, rect: InputRRect) {\n    if (rect instanceof JsiSkRect) {\n      return rect.ref;\n    }\n    if (\n      \"topLeft\" in rect &&\n      \"topRight\" in rect &&\n      \"bottomRight\" in rect &&\n      \"bottomLeft\" in rect\n    ) {\n      return Float32Array.of(\n        rect.rect.x,\n        rect.rect.y,\n        rect.rect.x + rect.rect.width,\n        rect.rect.y + rect.rect.height,\n        rect.topLeft.x,\n        rect.topLeft.y,\n        rect.topRight.x,\n        rect.topRight.y,\n        rect.bottomRight.x,\n        rect.bottomRight.y,\n        rect.bottomLeft.x,\n        rect.bottomLeft.y\n      );\n    }\n    return CanvasKit.RRectXY(\n      JsiSkRect.fromValue(CanvasKit, rect.rect),\n      rect.rx,\n      rect.ry\n    );\n  }\n\n  constructor(CanvasKit: CanvasKit, rect: SkRect, rx: number, ry: number) {\n    // based on https://github.com/google/skia/blob/main/src/core/SkRRect.cpp#L51\n    if (rx === Infinity || ry === Infinity) {\n      rx = ry = 0;\n    }\n    if (rect.width < rx + rx || rect.height < ry + ry) {\n      // At most one of these two divides will be by zero, and neither numerator is zero.\n      const scale = Math.min(rect.width / (rx + rx), rect.height / (ry + ry));\n      rx *= scale;\n      ry *= scale;\n    }\n    const ref = CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry);\n    super(CanvasKit, ref, \"RRect\");\n  }\n\n  get rx() {\n    return this.ref[4];\n  }\n\n  get ry() {\n    return this.ref[5];\n  }\n\n  get rect() {\n    return new JsiSkRect(\n      this.CanvasKit,\n      Float32Array.of(this.ref[0], this.ref[1], this.ref[2], this.ref[3])\n    );\n  }\n}\n"],"mappings":";;AAIA,SAASA,cAAT,QAA+B,QAA/B;AACA,SAASC,SAAT,QAA0B,aAA1B;AAEA,OAAO,MAAMC,UAAN,SACGF,cADH,CAGP;EAKkB,OAATG,SAAS,CAACC,SAAD,EAAuBC,IAAvB,EAAyC;IACvD,IAAIA,IAAI,YAAYJ,SAApB,EAA+B;MAC7B,OAAOI,IAAI,CAACC,GAAZ;IACD;;IACD,IACE,aAAaD,IAAb,IACA,cAAcA,IADd,IAEA,iBAAiBA,IAFjB,IAGA,gBAAgBA,IAJlB,EAKE;MACA,OAAOE,YAAY,CAACC,EAAb,CACLH,IAAI,CAACA,IAAL,CAAUI,CADL,EAELJ,IAAI,CAACA,IAAL,CAAUK,CAFL,EAGLL,IAAI,CAACA,IAAL,CAAUI,CAAV,GAAcJ,IAAI,CAACA,IAAL,CAAUM,KAHnB,EAILN,IAAI,CAACA,IAAL,CAAUK,CAAV,GAAcL,IAAI,CAACA,IAAL,CAAUO,MAJnB,EAKLP,IAAI,CAACQ,OAAL,CAAaJ,CALR,EAMLJ,IAAI,CAACQ,OAAL,CAAaH,CANR,EAOLL,IAAI,CAACS,QAAL,CAAcL,CAPT,EAQLJ,IAAI,CAACS,QAAL,CAAcJ,CART,EASLL,IAAI,CAACU,WAAL,CAAiBN,CATZ,EAULJ,IAAI,CAACU,WAAL,CAAiBL,CAVZ,EAWLL,IAAI,CAACW,UAAL,CAAgBP,CAXX,EAYLJ,IAAI,CAACW,UAAL,CAAgBN,CAZX,CAAP;IAcD;;IACD,OAAON,SAAS,CAACa,OAAV,CACLhB,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAAI,CAACA,IAApC,CADK,EAELA,IAAI,CAACa,EAFA,EAGLb,IAAI,CAACc,EAHA,CAAP;EAKD;;EAEDC,WAAW,CAAChB,SAAD,EAAuBC,IAAvB,EAAqCa,EAArC,EAAiDC,EAAjD,EAA6D;IACtE;IACA,IAAID,EAAE,KAAKG,QAAP,IAAmBF,EAAE,KAAKE,QAA9B,EAAwC;MACtCH,EAAE,GAAGC,EAAE,GAAG,CAAV;IACD;;IACD,IAAId,IAAI,CAACM,KAAL,GAAaO,EAAE,GAAGA,EAAlB,IAAwBb,IAAI,CAACO,MAAL,GAAcO,EAAE,GAAGA,EAA/C,EAAmD;MACjD;MACA,MAAMG,KAAK,GAAGC,IAAI,CAACC,GAAL,CAASnB,IAAI,CAACM,KAAL,IAAcO,EAAE,GAAGA,EAAnB,CAAT,EAAiCb,IAAI,CAACO,MAAL,IAAeO,EAAE,GAAGA,EAApB,CAAjC,CAAd;MACAD,EAAE,IAAII,KAAN;MACAH,EAAE,IAAIG,KAAN;IACD;;IACD,MAAMhB,GAAG,GAAGF,SAAS,CAACa,OAAV,CAAkBhB,SAAS,CAACE,SAAV,CAAoBC,SAApB,EAA+BC,IAA/B,CAAlB,EAAwDa,EAAxD,EAA4DC,EAA5D,CAAZ;IACA,MAAMf,SAAN,EAAiBE,GAAjB,EAAsB,OAAtB;;IAZsE,iCApC9D,MAAM,CACd;IACD,CAkCuE;EAavE;;EAEK,IAAFY,EAAE,GAAG;IACP,OAAO,KAAKZ,GAAL,CAAS,CAAT,CAAP;EACD;;EAEK,IAAFa,EAAE,GAAG;IACP,OAAO,KAAKb,GAAL,CAAS,CAAT,CAAP;EACD;;EAEO,IAAJD,IAAI,GAAG;IACT,OAAO,IAAIJ,SAAJ,CACL,KAAKG,SADA,EAELG,YAAY,CAACC,EAAb,CAAgB,KAAKF,GAAL,CAAS,CAAT,CAAhB,EAA6B,KAAKA,GAAL,CAAS,CAAT,CAA7B,EAA0C,KAAKA,GAAL,CAAS,CAAT,CAA1C,EAAuD,KAAKA,GAAL,CAAS,CAAT,CAAvD,CAFK,CAAP;EAID;;AAjEH"}

package/lib/typescript/src/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/typescript/src/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/typescript/src/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/typescript/src/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/typescript/src/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/typescript/src/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

package/lib/typescript/src/skia/types/Path/Path.d.ts

@@ -1,6 +1,6 @@
 import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
-import type { SkRRect } from "../RRect";
+import type { InputRRect } from "../RRect";
 import type { StrokeJoin, StrokeCap } from "../Paint";
 import type { InputMatrix, SkMatrix } from "../Matrix";
 import type { SkJSIInstance } from "../JsiInstance";
@@ -347,7 +347,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param rrect
      * @param isCCW
      */
-    addRRect(rrect: SkRRect, isCCW?: boolean): SkPath;
+    addRRect(rrect: InputRRect, isCCW?: boolean): SkPath;
     /** Appends src to SkPath, transformed by matrix. Transformed curves may have
        different verbs, SkPoint, and conic weights.
   

package/lib/typescript/src/skia/types/RRect.d.ts

@@ -1,7 +1,16 @@
+import type { SkPoint } from "./Point";
 import type { SkRect } from "./Rect";
 export interface SkRRect {
     readonly rect: SkRect;
     readonly rx: number;
     readonly ry: number;
 }
+export interface NonUniformRRect {
+    readonly rect: SkRect;
+    readonly topLeft: SkPoint;
+    readonly topRight: SkPoint;
+    readonly bottomRight: SkPoint;
+    readonly bottomLeft: SkPoint;
+}
+export type InputRRect = SkRRect | NonUniformRRect;
 export declare const isRRect: (def: SkRect | SkRRect) => def is SkRRect;

package/lib/typescript/src/skia/web/JsiSkCanvas.d.ts

@@ -1,5 +1,5 @@
 import type { Canvas, CanvasKit } from "canvaskit-wasm";
-import type { BlendMode, ClipOp, FilterMode, MipmapMode, PointMode, SaveLayerFlag, ImageInfo, SkCanvas, SkColor, SkFont, SkImage, SkImageFilter, SkMatrix, SkPaint, SkPath, SkPicture, SkPoint, SkRect, SkRRect, SkSVG, SkTextBlob, SkVertices } from "../types";
+import type { BlendMode, ClipOp, FilterMode, MipmapMode, PointMode, SaveLayerFlag, ImageInfo, SkCanvas, SkColor, SkFont, SkImage, SkImageFilter, SkMatrix, SkPaint, SkPath, SkPicture, SkPoint, SkRect, InputRRect, SkSVG, SkTextBlob, SkVertices } from "../types";
 import { HostObject } from "./Host";
 export declare class JsiSkCanvas extends HostObject<Canvas, "Canvas"> implements SkCanvas {
     constructor(CanvasKit: CanvasKit, ref: Canvas);
@@ -20,8 +20,8 @@ export declare class JsiSkCanvas extends HostObject<Canvas, "Canvas"> implements
     restoreToCount(saveCount: number): void;
     drawPoints(mode: PointMode, points: SkPoint[], paint: SkPaint): void;
     drawArc(oval: SkRect, startAngle: number, sweepAngle: number, useCenter: boolean, paint: SkPaint): void;
-    drawRRect(rrect: SkRRect, paint: SkPaint): void;
-    drawDRRect(outer: SkRRect, inner: SkRRect, paint: SkPaint): void;
+    drawRRect(rrect: InputRRect, paint: SkPaint): void;
+    drawDRRect(outer: InputRRect, inner: InputRRect, paint: SkPaint): void;
     drawOval(oval: SkRect, paint: SkPaint): void;
     drawPath(path: SkPath, paint: SkPaint): void;
     drawText(str: string, x: number, y: number, paint: SkPaint, font: SkFont): void;
@@ -39,7 +39,7 @@ export declare class JsiSkCanvas extends HostObject<Canvas, "Canvas"> implements
     clear(color: SkColor): void;
     clipPath(path: SkPath, op: ClipOp, doAntiAlias: boolean): void;
     clipRect(rect: SkRect, op: ClipOp, doAntiAlias: boolean): void;
-    clipRRect(rrect: SkRRect, op: ClipOp, doAntiAlias: boolean): void;
+    clipRRect(rrect: InputRRect, op: ClipOp, doAntiAlias: boolean): void;
     concat(m: SkMatrix | number[]): void;
     drawPicture(skp: SkPicture): void;
     readPixels(srcX: number, srcY: number, imageInfo: ImageInfo): Float32Array | Uint8Array | null;

package/lib/typescript/src/skia/web/JsiSkPath.d.ts

@@ -1,5 +1,5 @@
 import type { CanvasKit, Path } from "canvaskit-wasm";
-import type { FillType, PathCommand, PathOp, SkMatrix, SkPath, SkPoint, SkRect, SkRRect, StrokeOpts } from "../types";
+import type { FillType, PathCommand, PathOp, SkMatrix, SkPath, SkPoint, SkRect, InputRRect, StrokeOpts } from "../types";
 import { HostObject } from "./Host";
 import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRect } from "./JsiSkRect";
@@ -41,7 +41,7 @@ export declare class JsiSkPath extends HostObject<Path, "Path"> implements SkPat
     getFillType(): number;
     quadTo(x1: number, y1: number, x2: number, y2: number): this;
     addRect(rect: SkRect, isCCW?: boolean): this;
-    addRRect(rrect: SkRRect, isCCW?: boolean): this;
+    addRRect(rrect: InputRRect, isCCW?: boolean): this;
     getPoint(index: number): JsiSkPoint;
     isEmpty(): boolean;
     isVolatile(): boolean;

package/lib/typescript/src/skia/web/JsiSkRRect.d.ts

@@ -1,10 +1,10 @@
 import type { CanvasKit, RRect } from "canvaskit-wasm";
-import type { SkRect, SkRRect } from "../types";
+import type { InputRRect, SkRect, SkRRect } from "../types";
 import { BaseHostObject } from "./Host";
 import { JsiSkRect } from "./JsiSkRect";
 export declare class JsiSkRRect extends BaseHostObject<RRect, "RRect"> implements SkRRect {
     dispose: () => void;
-    static fromValue(CanvasKit: CanvasKit, rect: SkRRect): Float32Array;
+    static fromValue(CanvasKit: CanvasKit, rect: InputRRect): Float32Array;
     constructor(CanvasKit: CanvasKit, rect: SkRect, rx: number, ry: number);
     get rx(): number;
     get ry(): number;

package/libs/ios/libskottie.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskottie.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskshaper.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libsvg.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsvg.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.230",
+  "version": "0.1.231",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [

package/src/dom/nodes/drawings/RRectNode.ts

@@ -1,11 +1,11 @@
-import type { SkRRect } from "../../../skia/types";
+import type { InputRRect, SkRRect } from "../../../skia/types";
 import type { DrawingContext, RoundedRectProps } from "../../types";
 import { NodeType } from "../../types";
 import { processRRect } from "../datatypes";
 import { JsiDrawingNode } from "../DrawingNode";
 import type { NodeContext } from "../Node";
 
-export class RRectNode extends JsiDrawingNode<RoundedRectProps, SkRRect> {
+export class RRectNode extends JsiDrawingNode<RoundedRectProps, InputRRect> {
   rect?: SkRRect;
 
   constructor(ctx: NodeContext, props: RoundedRectProps) {

package/src/dom/types/Common.ts

@@ -4,6 +4,7 @@ import type {
   BlendMode,
   Color,
   InputMatrix,
+  InputRRect,
   PaintStyle,
   SkPaint,
   SkPath,
@@ -48,7 +49,7 @@ export interface RRectCtor extends RectCtor {
 }
 
 export type RectDef = RectCtor | { rect: SkRect };
-export type RRectDef = RRectCtor | { rect: SkRRect };
+export type RRectDef = RRectCtor | { rect: InputRRect };
 
 export interface PointCircleDef {
   c?: Vector;

package/src/headless/index.ts

@@ -6,13 +6,14 @@ import type { ReactNode } from "react";
 import { JsiSkApi } from "../skia/web";
 import { SkiaRoot } from "../renderer/Reconciler";
 import { JsiDrawingContext } from "../dom/types";
+import type { SkSurface } from "../skia";
 
 export * from "../renderer/components";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 let Skia: any;
 
-export const draw = (element: ReactNode, width: number, height: number) => {
+export const makeOffscreenSurface = (width: number, height: number) => {
   if (!Skia) {
     Skia = JsiSkApi(CanvasKit);
   }
@@ -20,12 +21,15 @@ export const draw = (element: ReactNode, width: number, height: number) => {
   if (surface === null) {
     throw new Error("Couldn't create surface!");
   }
+  return surface;
+};
+
+export const drawOffscreen = (surface: SkSurface, element: ReactNode) => {
   const root = new SkiaRoot(Skia);
   root.render(element);
   const canvas = surface.getCanvas();
   const ctx = new JsiDrawingContext(Skia, canvas);
   root.dom.render(ctx);
   surface.flush();
-  const image = surface.makeImageSnapshot();
-  return image;
+  return surface.makeImageSnapshot();
 };

package/src/skia/types/Canvas.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";
@@ -278,7 +278,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.
@@ -287,7 +287,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,
@@ -479,7 +479,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.

package/src/skia/types/Path/Path.ts

@@ -1,6 +1,6 @@
 import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
-import type { SkRRect } from "../RRect";
+import type { InputRRect } from "../RRect";
 import type { StrokeJoin, StrokeCap } from "../Paint";
 import type { InputMatrix, SkMatrix } from "../Matrix";
 import type { SkJSIInstance } from "../JsiInstance";
@@ -439,7 +439,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
    * @param rrect
    * @param isCCW
    */
-  addRRect(rrect: SkRRect, isCCW?: boolean): SkPath;
+  addRRect(rrect: InputRRect, isCCW?: boolean): SkPath;
 
   /** Appends src to SkPath, transformed by matrix. Transformed curves may have
      different verbs, SkPoint, and conic weights.

package/src/skia/types/RRect.ts

@@ -1,3 +1,4 @@
+import type { SkPoint } from "./Point";
 import type { SkRect } from "./Rect";
 
 export interface SkRRect {
@@ -6,6 +7,16 @@ export interface SkRRect {
   readonly ry: number;
 }
 
+export interface NonUniformRRect {
+  readonly rect: SkRect;
+  readonly topLeft: SkPoint;
+  readonly topRight: SkPoint;
+  readonly bottomRight: SkPoint;
+  readonly bottomLeft: SkPoint;
+}
+
+export type InputRRect = SkRRect | NonUniformRRect;
+
 // We have an issue to check property existence on JSI backed instances
 export const isRRect = (def: SkRect | SkRRect): def is SkRRect =>
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/skia/web/JsiSkCanvas.ts

@@ -19,7 +19,7 @@ import type {
   SkPicture,
   SkPoint,
   SkRect,
-  SkRRect,
+  InputRRect,
   SkSVG,
   SkTextBlob,
   SkVertices,
@@ -235,14 +235,14 @@ export class JsiSkCanvas
     );
   }
 
-  drawRRect(rrect: SkRRect, paint: SkPaint) {
+  drawRRect(rrect: InputRRect, paint: SkPaint) {
     this.ref.drawRRect(
       JsiSkRRect.fromValue(this.CanvasKit, rrect),
       JsiSkPaint.fromValue(paint)
     );
   }
 
-  drawDRRect(outer: SkRRect, inner: SkRRect, paint: SkPaint) {
+  drawDRRect(outer: InputRRect, inner: InputRRect, paint: SkPaint) {
     this.ref.drawDRRect(
       JsiSkRRect.fromValue(this.CanvasKit, outer),
       JsiSkRRect.fromValue(this.CanvasKit, inner),
@@ -367,7 +367,7 @@ export class JsiSkCanvas
     );
   }
 
-  clipRRect(rrect: SkRRect, op: ClipOp, doAntiAlias: boolean) {
+  clipRRect(rrect: InputRRect, op: ClipOp, doAntiAlias: boolean) {
     this.ref.clipRRect(
       JsiSkRRect.fromValue(this.CanvasKit, rrect),
       getEnum(this.CanvasKit.PathOp, op),

package/src/skia/web/JsiSkPath.ts

@@ -9,7 +9,7 @@ import type {
   SkPath,
   SkPoint,
   SkRect,
-  SkRRect,
+  InputRRect,
   StrokeOpts,
 } from "../types";
 
@@ -285,7 +285,7 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
     return this;
   }
 
-  addRRect(rrect: SkRRect, isCCW?: boolean) {
+  addRRect(rrect: InputRRect, isCCW?: boolean) {
     this.ref.addRRect(JsiSkRRect.fromValue(this.CanvasKit, rrect), isCCW);
     return this;
   }

package/src/skia/web/JsiSkRRect.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit, RRect } from "canvaskit-wasm";
 
-import type { SkRect, SkRRect } from "../types";
+import type { InputRRect, SkRect, SkRRect } from "../types";
 
 import { BaseHostObject } from "./Host";
 import { JsiSkRect } from "./JsiSkRect";
@@ -13,10 +13,31 @@ export class JsiSkRRect
     // Float32Array
   };
 
-  static fromValue(CanvasKit: CanvasKit, rect: SkRRect) {
+  static fromValue(CanvasKit: CanvasKit, rect: InputRRect) {
     if (rect instanceof JsiSkRect) {
       return rect.ref;
     }
+    if (
+      "topLeft" in rect &&
+      "topRight" in rect &&
+      "bottomRight" in rect &&
+      "bottomLeft" in rect
+    ) {
+      return Float32Array.of(
+        rect.rect.x,
+        rect.rect.y,
+        rect.rect.x + rect.rect.width,
+        rect.rect.y + rect.rect.height,
+        rect.topLeft.x,
+        rect.topLeft.y,
+        rect.topRight.x,
+        rect.topRight.y,
+        rect.bottomRight.x,
+        rect.bottomRight.y,
+        rect.bottomLeft.x,
+        rect.bottomLeft.y
+      );
+    }
     return CanvasKit.RRectXY(
       JsiSkRect.fromValue(CanvasKit, rect.rect),
       rect.rx,