@shopify/react-native-skia 0.1.165 → 0.1.167

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

@@ -1 +1 @@
-{"version":3,"names":["BaseHostObject","JsiSkRect","JsiSkRRect","fromValue","CanvasKit","rect","ref","RRectXY","rx","ry","constructor","Float32Array","of"],"sources":["JsiSkRRect.ts"],"sourcesContent":["import type { CanvasKit, RRect } from \"canvaskit-wasm\";\n\nimport type { 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  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, ref: RRect) {\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;EACkB,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,EAAuBE,GAAvB,EAAmC;IAC5C,MAAMF,SAAN,EAAiBE,GAAjB,EAAsB,OAAtB;EACD;;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,EAELO,YAAY,CAACC,EAAb,CAAgB,KAAKN,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;;AA7BH"}
+{"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  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;EACkB,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;EACD;;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;;AAxCH"}

package/lib/module/skia/web/JsiSkia.js

@@ -30,7 +30,7 @@ export const JsiSkApi = CanvasKit => ({
   RuntimeShaderBuilder: _ => {
     throw new Error("Not implemented on React Native Web");
   },
-  RRectXY: (rect, rx, ry) => new JsiSkRRect(CanvasKit, CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry)),
+  RRectXY: (rect, rx, ry) => new JsiSkRRect(CanvasKit, rect, rx, ry),
   RSXform: (scos, ssin, tx, ty) => new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),
   Color,
   ContourMeasureIter: (path, forceClosed, resScale) => new JsiSkContourMeasureIter(CanvasKit, new CanvasKit.ContourMeasureIter(JsiSkPath.fromValue(path), forceClosed, resScale)),

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

@@ -1 +1 @@
-{"version":3,"names":["JsiSkPoint","JsiSkPaint","JsiSkRect","Color","JsiSkSurfaceFactory","JsiSkRRect","JsiSkRSXform","JsiSkContourMeasureIter","JsiSkPictureRecorder","JsiSkPictureFactory","JsiSkPathFactory","JsiSkMatrix","JsiSkColorFilterFactory","JsiSkTypefaceFactory","JsiSkMaskFilterFactory","JsiSkRuntimeEffectFactory","JsiSkImageFilterFactory","JsiSkShaderFactory","JsiSkPathEffectFactory","JsiSkDataFactory","JsiSkImageFactory","JsiSkSVGFactory","JsiSkTextBlobFactory","JsiSkFont","MakeVertices","JsiSkPath","JsiSkTypeface","JsiSkApi","CanvasKit","Point","x","y","Float32Array","of","RuntimeShaderBuilder","_","Error","RRectXY","rect","rx","ry","fromValue","RSXform","scos","ssin","tx","ty","ContourMeasureIter","path","forceClosed","resScale","Paint","paint","setAntiAlias","PictureRecorder","Picture","Path","Matrix","matrix","identity","ColorFilter","Font","typeface","size","undefined","Typeface","MaskFilter","RuntimeEffect","ImageFilter","Shader","PathEffect","bind","Data","Image","SVG","TextBlob","XYWHRect","width","height","Surface"],"sources":["JsiSkia.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  SkContourMeasureIter,\n  Skia,\n  SkPath,\n  SkRect,\n  SkRuntimeEffect,\n  SkRuntimeShaderBuilder,\n  SkTypeface,\n} from \"../types\";\n\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { Color } from \"./JsiSkColor\";\nimport { JsiSkSurfaceFactory } from \"./JsiSkSurfaceFactory\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkRSXform } from \"./JsiSkRSXform\";\nimport { JsiSkContourMeasureIter } from \"./JsiSkContourMeasureIter\";\nimport { JsiSkPictureRecorder } from \"./JsiSkPictureRecorder\";\nimport { JsiSkPictureFactory } from \"./JsiSkPictureFactory\";\nimport { JsiSkPathFactory } from \"./JsiSkPathFactory\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkColorFilterFactory } from \"./JsiSkColorFilterFactory\";\nimport { JsiSkTypefaceFactory } from \"./JsiSkTypefaceFactory\";\nimport { JsiSkMaskFilterFactory } from \"./JsiSkMaskFilterFactory\";\nimport { JsiSkRuntimeEffectFactory } from \"./JsiSkRuntimeEffectFactory\";\nimport { JsiSkImageFilterFactory } from \"./JsiSkImageFilterFactory\";\nimport { JsiSkShaderFactory } from \"./JsiSkShaderFactory\";\nimport { JsiSkPathEffectFactory } from \"./JsiSkPathEffectFactory\";\nimport { JsiSkDataFactory } from \"./JsiSkDataFactory\";\nimport { JsiSkImageFactory } from \"./JsiSkImageFactory\";\nimport { JsiSkSVGFactory } from \"./JsiSkSVGFactory\";\nimport { JsiSkTextBlobFactory } from \"./JsiSkTextBlobFactory\";\nimport { JsiSkFont } from \"./JsiSkFont\";\nimport { MakeVertices } from \"./JsiSkVerticesFactory\";\nimport { JsiSkPath } from \"./JsiSkPath\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({\n  Point: (x: number, y: number) =>\n    new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),\n  RuntimeShaderBuilder: (_: SkRuntimeEffect): SkRuntimeShaderBuilder => {\n    throw new Error(\"Not implemented on React Native Web\");\n  },\n  RRectXY: (rect: SkRect, rx: number, ry: number) =>\n    new JsiSkRRect(\n      CanvasKit,\n      CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry)\n    ),\n  RSXform: (scos: number, ssin: number, tx: number, ty: number) =>\n    new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),\n  Color,\n  ContourMeasureIter: (\n    path: SkPath,\n    forceClosed: boolean,\n    resScale: number\n  ): SkContourMeasureIter =>\n    new JsiSkContourMeasureIter(\n      CanvasKit,\n      new CanvasKit.ContourMeasureIter(\n        JsiSkPath.fromValue(path),\n        forceClosed,\n        resScale\n      )\n    ),\n  Paint: () => {\n    const paint = new JsiSkPaint(CanvasKit, new CanvasKit.Paint());\n    paint.setAntiAlias(true);\n    return paint;\n  },\n  PictureRecorder: () =>\n    new JsiSkPictureRecorder(CanvasKit, new CanvasKit.PictureRecorder()),\n  Picture: new JsiSkPictureFactory(CanvasKit),\n  Path: new JsiSkPathFactory(CanvasKit),\n  Matrix: (matrix?: readonly number[]) =>\n    new JsiSkMatrix(\n      CanvasKit,\n      matrix\n        ? Float32Array.of(...matrix)\n        : Float32Array.of(...CanvasKit.Matrix.identity())\n    ),\n  ColorFilter: new JsiSkColorFilterFactory(CanvasKit),\n  Font: (typeface?: SkTypeface, size?: number) =>\n    new JsiSkFont(\n      CanvasKit,\n      new CanvasKit.Font(\n        typeface === undefined ? null : JsiSkTypeface.fromValue(typeface),\n        size\n      )\n    ),\n  Typeface: new JsiSkTypefaceFactory(CanvasKit),\n  MaskFilter: new JsiSkMaskFilterFactory(CanvasKit),\n  RuntimeEffect: new JsiSkRuntimeEffectFactory(CanvasKit),\n  ImageFilter: new JsiSkImageFilterFactory(CanvasKit),\n  Shader: new JsiSkShaderFactory(CanvasKit),\n  PathEffect: new JsiSkPathEffectFactory(CanvasKit),\n  MakeVertices: MakeVertices.bind(null, CanvasKit),\n  Data: new JsiSkDataFactory(CanvasKit),\n  Image: new JsiSkImageFactory(CanvasKit),\n  SVG: new JsiSkSVGFactory(CanvasKit),\n  TextBlob: new JsiSkTextBlobFactory(CanvasKit),\n  XYWHRect: (x: number, y: number, width: number, height: number) => {\n    return new JsiSkRect(CanvasKit, CanvasKit.XYWHRect(x, y, width, height));\n  },\n  Surface: new JsiSkSurfaceFactory(CanvasKit),\n});\n"],"mappings":"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"}
+{"version":3,"names":["JsiSkPoint","JsiSkPaint","JsiSkRect","Color","JsiSkSurfaceFactory","JsiSkRRect","JsiSkRSXform","JsiSkContourMeasureIter","JsiSkPictureRecorder","JsiSkPictureFactory","JsiSkPathFactory","JsiSkMatrix","JsiSkColorFilterFactory","JsiSkTypefaceFactory","JsiSkMaskFilterFactory","JsiSkRuntimeEffectFactory","JsiSkImageFilterFactory","JsiSkShaderFactory","JsiSkPathEffectFactory","JsiSkDataFactory","JsiSkImageFactory","JsiSkSVGFactory","JsiSkTextBlobFactory","JsiSkFont","MakeVertices","JsiSkPath","JsiSkTypeface","JsiSkApi","CanvasKit","Point","x","y","Float32Array","of","RuntimeShaderBuilder","_","Error","RRectXY","rect","rx","ry","RSXform","scos","ssin","tx","ty","ContourMeasureIter","path","forceClosed","resScale","fromValue","Paint","paint","setAntiAlias","PictureRecorder","Picture","Path","Matrix","matrix","identity","ColorFilter","Font","typeface","size","undefined","Typeface","MaskFilter","RuntimeEffect","ImageFilter","Shader","PathEffect","bind","Data","Image","SVG","TextBlob","XYWHRect","width","height","Surface"],"sources":["JsiSkia.ts"],"sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type {\n  SkContourMeasureIter,\n  Skia,\n  SkPath,\n  SkRect,\n  SkRuntimeEffect,\n  SkRuntimeShaderBuilder,\n  SkTypeface,\n} from \"../types\";\n\nimport { JsiSkPoint } from \"./JsiSkPoint\";\nimport { JsiSkPaint } from \"./JsiSkPaint\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { Color } from \"./JsiSkColor\";\nimport { JsiSkSurfaceFactory } from \"./JsiSkSurfaceFactory\";\nimport { JsiSkRRect } from \"./JsiSkRRect\";\nimport { JsiSkRSXform } from \"./JsiSkRSXform\";\nimport { JsiSkContourMeasureIter } from \"./JsiSkContourMeasureIter\";\nimport { JsiSkPictureRecorder } from \"./JsiSkPictureRecorder\";\nimport { JsiSkPictureFactory } from \"./JsiSkPictureFactory\";\nimport { JsiSkPathFactory } from \"./JsiSkPathFactory\";\nimport { JsiSkMatrix } from \"./JsiSkMatrix\";\nimport { JsiSkColorFilterFactory } from \"./JsiSkColorFilterFactory\";\nimport { JsiSkTypefaceFactory } from \"./JsiSkTypefaceFactory\";\nimport { JsiSkMaskFilterFactory } from \"./JsiSkMaskFilterFactory\";\nimport { JsiSkRuntimeEffectFactory } from \"./JsiSkRuntimeEffectFactory\";\nimport { JsiSkImageFilterFactory } from \"./JsiSkImageFilterFactory\";\nimport { JsiSkShaderFactory } from \"./JsiSkShaderFactory\";\nimport { JsiSkPathEffectFactory } from \"./JsiSkPathEffectFactory\";\nimport { JsiSkDataFactory } from \"./JsiSkDataFactory\";\nimport { JsiSkImageFactory } from \"./JsiSkImageFactory\";\nimport { JsiSkSVGFactory } from \"./JsiSkSVGFactory\";\nimport { JsiSkTextBlobFactory } from \"./JsiSkTextBlobFactory\";\nimport { JsiSkFont } from \"./JsiSkFont\";\nimport { MakeVertices } from \"./JsiSkVerticesFactory\";\nimport { JsiSkPath } from \"./JsiSkPath\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({\n  Point: (x: number, y: number) =>\n    new JsiSkPoint(CanvasKit, Float32Array.of(x, y)),\n  RuntimeShaderBuilder: (_: SkRuntimeEffect): SkRuntimeShaderBuilder => {\n    throw new Error(\"Not implemented on React Native Web\");\n  },\n  RRectXY: (rect: SkRect, rx: number, ry: number) =>\n    new JsiSkRRect(CanvasKit, rect, rx, ry),\n  RSXform: (scos: number, ssin: number, tx: number, ty: number) =>\n    new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),\n  Color,\n  ContourMeasureIter: (\n    path: SkPath,\n    forceClosed: boolean,\n    resScale: number\n  ): SkContourMeasureIter =>\n    new JsiSkContourMeasureIter(\n      CanvasKit,\n      new CanvasKit.ContourMeasureIter(\n        JsiSkPath.fromValue(path),\n        forceClosed,\n        resScale\n      )\n    ),\n  Paint: () => {\n    const paint = new JsiSkPaint(CanvasKit, new CanvasKit.Paint());\n    paint.setAntiAlias(true);\n    return paint;\n  },\n  PictureRecorder: () =>\n    new JsiSkPictureRecorder(CanvasKit, new CanvasKit.PictureRecorder()),\n  Picture: new JsiSkPictureFactory(CanvasKit),\n  Path: new JsiSkPathFactory(CanvasKit),\n  Matrix: (matrix?: readonly number[]) =>\n    new JsiSkMatrix(\n      CanvasKit,\n      matrix\n        ? Float32Array.of(...matrix)\n        : Float32Array.of(...CanvasKit.Matrix.identity())\n    ),\n  ColorFilter: new JsiSkColorFilterFactory(CanvasKit),\n  Font: (typeface?: SkTypeface, size?: number) =>\n    new JsiSkFont(\n      CanvasKit,\n      new CanvasKit.Font(\n        typeface === undefined ? null : JsiSkTypeface.fromValue(typeface),\n        size\n      )\n    ),\n  Typeface: new JsiSkTypefaceFactory(CanvasKit),\n  MaskFilter: new JsiSkMaskFilterFactory(CanvasKit),\n  RuntimeEffect: new JsiSkRuntimeEffectFactory(CanvasKit),\n  ImageFilter: new JsiSkImageFilterFactory(CanvasKit),\n  Shader: new JsiSkShaderFactory(CanvasKit),\n  PathEffect: new JsiSkPathEffectFactory(CanvasKit),\n  MakeVertices: MakeVertices.bind(null, CanvasKit),\n  Data: new JsiSkDataFactory(CanvasKit),\n  Image: new JsiSkImageFactory(CanvasKit),\n  SVG: new JsiSkSVGFactory(CanvasKit),\n  TextBlob: new JsiSkTextBlobFactory(CanvasKit),\n  XYWHRect: (x: number, y: number, width: number, height: number) => {\n    return new JsiSkRect(CanvasKit, CanvasKit.XYWHRect(x, y, width, height));\n  },\n  Surface: new JsiSkSurfaceFactory(CanvasKit),\n});\n"],"mappings":"AAYA,SAASA,UAAT,QAA2B,cAA3B;AACA,SAASC,UAAT,QAA2B,cAA3B;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,SAASC,KAAT,QAAsB,cAAtB;AACA,SAASC,mBAAT,QAAoC,uBAApC;AACA,SAASC,UAAT,QAA2B,cAA3B;AACA,SAASC,YAAT,QAA6B,gBAA7B;AACA,SAASC,uBAAT,QAAwC,2BAAxC;AACA,SAASC,oBAAT,QAAqC,wBAArC;AACA,SAASC,mBAAT,QAAoC,uBAApC;AACA,SAASC,gBAAT,QAAiC,oBAAjC;AACA,SAASC,WAAT,QAA4B,eAA5B;AACA,SAASC,uBAAT,QAAwC,2BAAxC;AACA,SAASC,oBAAT,QAAqC,wBAArC;AACA,SAASC,sBAAT,QAAuC,0BAAvC;AACA,SAASC,yBAAT,QAA0C,6BAA1C;AACA,SAASC,uBAAT,QAAwC,2BAAxC;AACA,SAASC,kBAAT,QAAmC,sBAAnC;AACA,SAASC,sBAAT,QAAuC,0BAAvC;AACA,SAASC,gBAAT,QAAiC,oBAAjC;AACA,SAASC,iBAAT,QAAkC,qBAAlC;AACA,SAASC,eAAT,QAAgC,mBAAhC;AACA,SAASC,oBAAT,QAAqC,wBAArC;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,SAASC,YAAT,QAA6B,wBAA7B;AACA,SAASC,SAAT,QAA0B,aAA1B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,QAAQ,GAAIC,SAAD,KAAiC;EACvDC,KAAK,EAAE,CAACC,CAAD,EAAYC,CAAZ,KACL,IAAI/B,UAAJ,CAAe4B,SAAf,EAA0BI,YAAY,CAACC,EAAb,CAAgBH,CAAhB,EAAmBC,CAAnB,CAA1B,CAFqD;EAGvDG,oBAAoB,EAAGC,CAAD,IAAgD;IACpE,MAAM,IAAIC,KAAJ,CAAU,qCAAV,CAAN;EACD,CALsD;EAMvDC,OAAO,EAAE,CAACC,IAAD,EAAeC,EAAf,EAA2BC,EAA3B,KACP,IAAInC,UAAJ,CAAeuB,SAAf,EAA0BU,IAA1B,EAAgCC,EAAhC,EAAoCC,EAApC,CAPqD;EAQvDC,OAAO,EAAE,CAACC,IAAD,EAAeC,IAAf,EAA6BC,EAA7B,EAAyCC,EAAzC,KACP,IAAIvC,YAAJ,CAAiBsB,SAAjB,EAA4BI,YAAY,CAACC,EAAb,CAAgBS,IAAhB,EAAsBC,IAAtB,EAA4BC,EAA5B,EAAgCC,EAAhC,CAA5B,CATqD;EAUvD1C,KAVuD;EAWvD2C,kBAAkB,EAAE,CAClBC,IADkB,EAElBC,WAFkB,EAGlBC,QAHkB,KAKlB,IAAI1C,uBAAJ,CACEqB,SADF,EAEE,IAAIA,SAAS,CAACkB,kBAAd,CACErB,SAAS,CAACyB,SAAV,CAAoBH,IAApB,CADF,EAEEC,WAFF,EAGEC,QAHF,CAFF,CAhBqD;EAwBvDE,KAAK,EAAE,MAAM;IACX,MAAMC,KAAK,GAAG,IAAInD,UAAJ,CAAe2B,SAAf,EAA0B,IAAIA,SAAS,CAACuB,KAAd,EAA1B,CAAd;IACAC,KAAK,CAACC,YAAN,CAAmB,IAAnB;IACA,OAAOD,KAAP;EACD,CA5BsD;EA6BvDE,eAAe,EAAE,MACf,IAAI9C,oBAAJ,CAAyBoB,SAAzB,EAAoC,IAAIA,SAAS,CAAC0B,eAAd,EAApC,CA9BqD;EA+BvDC,OAAO,EAAE,IAAI9C,mBAAJ,CAAwBmB,SAAxB,CA/B8C;EAgCvD4B,IAAI,EAAE,IAAI9C,gBAAJ,CAAqBkB,SAArB,CAhCiD;EAiCvD6B,MAAM,EAAGC,MAAD,IACN,IAAI/C,WAAJ,CACEiB,SADF,EAEE8B,MAAM,GACF1B,YAAY,CAACC,EAAb,CAAgB,GAAGyB,MAAnB,CADE,GAEF1B,YAAY,CAACC,EAAb,CAAgB,GAAGL,SAAS,CAAC6B,MAAV,CAAiBE,QAAjB,EAAnB,CAJN,CAlCqD;EAwCvDC,WAAW,EAAE,IAAIhD,uBAAJ,CAA4BgB,SAA5B,CAxC0C;EAyCvDiC,IAAI,EAAE,CAACC,QAAD,EAAwBC,IAAxB,KACJ,IAAIxC,SAAJ,CACEK,SADF,EAEE,IAAIA,SAAS,CAACiC,IAAd,CACEC,QAAQ,KAAKE,SAAb,GAAyB,IAAzB,GAAgCtC,aAAa,CAACwB,SAAd,CAAwBY,QAAxB,CADlC,EAEEC,IAFF,CAFF,CA1CqD;EAiDvDE,QAAQ,EAAE,IAAIpD,oBAAJ,CAAyBe,SAAzB,CAjD6C;EAkDvDsC,UAAU,EAAE,IAAIpD,sBAAJ,CAA2Bc,SAA3B,CAlD2C;EAmDvDuC,aAAa,EAAE,IAAIpD,yBAAJ,CAA8Ba,SAA9B,CAnDwC;EAoDvDwC,WAAW,EAAE,IAAIpD,uBAAJ,CAA4BY,SAA5B,CApD0C;EAqDvDyC,MAAM,EAAE,IAAIpD,kBAAJ,CAAuBW,SAAvB,CArD+C;EAsDvD0C,UAAU,EAAE,IAAIpD,sBAAJ,CAA2BU,SAA3B,CAtD2C;EAuDvDJ,YAAY,EAAEA,YAAY,CAAC+C,IAAb,CAAkB,IAAlB,EAAwB3C,SAAxB,CAvDyC;EAwDvD4C,IAAI,EAAE,IAAIrD,gBAAJ,CAAqBS,SAArB,CAxDiD;EAyDvD6C,KAAK,EAAE,IAAIrD,iBAAJ,CAAsBQ,SAAtB,CAzDgD;EA0DvD8C,GAAG,EAAE,IAAIrD,eAAJ,CAAoBO,SAApB,CA1DkD;EA2DvD+C,QAAQ,EAAE,IAAIrD,oBAAJ,CAAyBM,SAAzB,CA3D6C;EA4DvDgD,QAAQ,EAAE,CAAC9C,CAAD,EAAYC,CAAZ,EAAuB8C,KAAvB,EAAsCC,MAAtC,KAAyD;IACjE,OAAO,IAAI5E,SAAJ,CAAc0B,SAAd,EAAyBA,SAAS,CAACgD,QAAV,CAAmB9C,CAAnB,EAAsBC,CAAtB,EAAyB8C,KAAzB,EAAgCC,MAAhC,CAAzB,CAAP;EACD,CA9DsD;EA+DvDC,OAAO,EAAE,IAAI3E,mBAAJ,CAAwBwB,SAAxB;AA/D8C,CAAjC,CAAjB"}

package/lib/typescript/src/renderer/Canvas.d.ts

@@ -1,14 +1,11 @@
 import React from "react";
-import type { RefObject, ReactNode, ComponentProps } from "react";
-import ReactReconciler from "react-reconciler";
+import type { RefObject, ReactNode } from "react";
 import { SkiaDomView } from "../views";
-import type { TouchHandler } from "../views";
-import { Container } from "./Container";
-export declare const skiaReconciler: ReactReconciler.Reconciler<Container, import("..").Node<unknown>, import("..").Node<unknown>, import("..").Node<unknown>, import("..").Node<unknown>>;
+import type { TouchHandler, SkiaBaseViewProps } from "../views";
 export declare const useCanvasRef: () => React.RefObject<SkiaDomView>;
-export interface CanvasProps extends ComponentProps<typeof SkiaDomView> {
+export interface CanvasProps extends SkiaBaseViewProps {
     ref?: RefObject<SkiaDomView>;
     children: ReactNode;
     onTouch?: TouchHandler;
 }
-export declare const Canvas: React.ForwardRefExoticComponent<Pick<CanvasProps, "children" | "style" | "mode" | "debug" | "onSize" | "root" | "onTouch" | "hitSlop" | "onLayout" | "pointerEvents" | "removeClippedSubviews" | "testID" | "nativeID" | "collapsable" | "needsOffscreenAlphaCompositing" | "renderToHardwareTextureAndroid" | "focusable" | "shouldRasterizeIOS" | "isTVSelectable" | "hasTVPreferredFocus" | "tvParallaxProperties" | "tvParallaxShiftDistanceX" | "tvParallaxShiftDistanceY" | "tvParallaxTiltAngle" | "tvParallaxMagnification" | "onStartShouldSetResponder" | "onMoveShouldSetResponder" | "onResponderEnd" | "onResponderGrant" | "onResponderReject" | "onResponderMove" | "onResponderRelease" | "onResponderStart" | "onResponderTerminationRequest" | "onResponderTerminate" | "onStartShouldSetResponderCapture" | "onMoveShouldSetResponderCapture" | "onTouchStart" | "onTouchMove" | "onTouchEnd" | "onTouchCancel" | "onTouchEndCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerUp" | "onPointerUpCapture" | "accessible" | "accessibilityActions" | "accessibilityLabel" | "accessibilityRole" | "accessibilityState" | "accessibilityHint" | "accessibilityValue" | "onAccessibilityAction" | "accessibilityLabelledBy" | "accessibilityLiveRegion" | "importantForAccessibility" | "accessibilityElementsHidden" | "accessibilityLanguage" | "accessibilityViewIsModal" | "onAccessibilityEscape" | "onAccessibilityTap" | "onMagicTap" | "accessibilityIgnoresInvertColors"> & React.RefAttributes<SkiaDomView>>;
+export declare const Canvas: React.FC<CanvasProps & React.RefAttributes<SkiaDomView>>;

package/lib/typescript/src/renderer/DrawingContext.d.ts

@@ -1,9 +1,6 @@
-import type { RefObject } from "react";
-import type { DrawingInfo, SkiaView } from "../views";
-import type { Skia, Vector } from "../skia/types";
+import type { DrawingInfo } from "../views";
+import type { Skia } from "../skia/types";
 import type { DrawingContext as DOMDrawingContext } from "../dom/types";
 export interface DrawingContext extends Omit<DrawingInfo, "touches">, DOMDrawingContext {
-    center: Vector;
-    ref: RefObject<SkiaView>;
     Skia: Skia;
 }

package/lib/typescript/src/renderer/Reconciler.d.ts

@@ -0,0 +1,13 @@
+import type { ReactNode } from "react";
+import type { Skia } from "../skia/types";
+import type { SkiaValue } from "../values/types";
+declare type RegisterValues = (values: Array<SkiaValue<unknown>>) => () => void;
+export declare class SkiaRoot {
+    private root;
+    private container;
+    constructor(Skia: Skia, registerValues?: RegisterValues, redraw?: () => void);
+    render(element: ReactNode): void;
+    unmount(): void;
+    get dom(): import("..").RenderNode<import("..").GroupProps>;
+}
+export {};

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

@@ -348,6 +348,19 @@ export interface SkPath extends SkJSIInstance<"Path"> {
      * @param isCCW
      */
     addRRect(rrect: SkRRect, isCCW?: boolean): SkPath;
+    /** Appends src to SkPath, transformed by matrix. Transformed curves may have
+       different verbs, SkPoint, and conic weights.
+  
+        If mode is kAppend_AddPathMode, src verb array, SkPoint array, and conic
+       weights are added unaltered. If mode is kExtend_AddPathMode, add line
+       before appending verbs, SkPoint, and conic weights.
+  
+        @param src     SkPath verbs, SkPoint, and conic weights to add
+        @param matrix  transform applied to src
+        @param extend  extends path with line if true
+        @return        reference to SkPath
+    */
+    addPath(src: SkPath, matrix?: SkMatrix, extend?: boolean): SkPath;
     /**
      * Returns the Point at index in Point array. Valid range for index is
      * 0 to countPoints() - 1.

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

@@ -3,8 +3,7 @@ import type { Vector } from "../Point";
 import type { SkRuntimeEffect, SkRuntimeShaderBuilder } from "../RuntimeEffect";
 export declare const isShader: (obj: SkJSIInstance<string> | null) => obj is SkShader;
 export declare type SkShader = SkJSIInstance<"Shader">;
-export declare type UniformValue = number | Vector | readonly number[];
-export declare type Uniform = UniformValue | readonly UniformValue[] | Float32Array;
+export declare type Uniform = number | Vector | Float32Array | Uniform[];
 export interface Uniforms {
     [name: string]: Uniform;
 }

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

@@ -5,6 +5,7 @@ import { JsiSkPoint } from "./JsiSkPoint";
 import { JsiSkRect } from "./JsiSkRect";
 export declare class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
     constructor(CanvasKit: CanvasKit, ref: Path);
+    addPath(src: SkPath, matrix?: SkMatrix, extend?: boolean): this;
     addArc(oval: SkRect, startAngleInDegrees: number, sweepAngleInDegrees: number): this;
     addOval(oval: SkRect, isCCW?: boolean, startIndex?: number): this;
     countPoints(): number;

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

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

package/package.json

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

package/src/dom/nodes/datatypes/Transform.ts

@@ -10,11 +10,9 @@ export const processTransformProps = (m3: SkMatrix, props: TransformProps) => {
       m3.concat(matrix);
       m3.translate(-origin.x, -origin.y);
     } else {
-      m3.identity();
       m3.concat(matrix);
     }
   } else if (transform) {
-    m3.identity();
     if (origin) {
       m3.translate(origin.x, origin.y);
     }

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

@@ -40,7 +40,7 @@ export class BoxShadowNode extends JsiDeclarationNode<
   BoxShadowProps
 > {
   constructor(ctx: NodeContext, props: BoxShadowProps) {
-    super(ctx, DeclarationType.Unknown, NodeType.Box, props);
+    super(ctx, DeclarationType.Unknown, NodeType.BoxShadow, props);
   }
 
   materialize() {

package/src/dom/nodes/paint/ImageFilters.ts

@@ -140,7 +140,7 @@ export class BlurImageFilterNode extends ImageFilterDeclaration<BlurImageFilterP
 
 export class DropShadowImageFilterNode extends ImageFilterDeclaration<DropShadowImageFilterProps> {
   constructor(ctx: NodeContext, props: DropShadowImageFilterProps) {
-    super(ctx, NodeType.BlurImageFilter, props);
+    super(ctx, NodeType.DropShadowImageFilter, props);
   }
 
   materialize() {

package/src/dom/nodes/paint/Shaders.ts

@@ -67,19 +67,19 @@ export class ImageShaderNode extends ShaderDeclaration<ImageShaderProps> {
   materialize() {
     const { fit, image, tx, ty, fm, mm, ...imageShaderProps } = this.props;
     const rct = getRect(this.Skia, imageShaderProps);
+    const m3 = this.Skia.Matrix();
     if (rct) {
       const rects = fitRects(
         fit,
         { x: 0, y: 0, width: image.width(), height: image.height() },
         rct
       );
-      const m3 = rect2rect(rects.src, rects.dst);
-      imageShaderProps.transform = [
-        ...(imageShaderProps.transform ?? []),
-        ...m3,
-      ];
+      const [x, y, sx, sy] = rect2rect(rects.src, rects.dst);
+      m3.translate(x.translateX, y.translateY);
+      m3.scale(sx.scaleX, sy.scaleY);
     }
     const lm = this.Skia.Matrix();
+    lm.concat(m3);
     processTransformProps(lm, imageShaderProps);
     return image.makeShaderOptions(
       TileMode[enumKey(tx)],

package/src/renderer/Canvas.tsx

@@ -8,48 +8,20 @@ import React, {
 import type {
   RefObject,
   ReactNode,
-  ComponentProps,
   MutableRefObject,
   ForwardedRef,
 } from "react";
-import type { OpaqueRoot } from "react-reconciler";
-import ReactReconciler from "react-reconciler";
 
 import { SkiaDomView } from "../views";
-import type { TouchHandler } from "../views";
 import { Skia } from "../skia/Skia";
-import type { SkiaValue } from "../values";
+import type { TouchHandler, SkiaBaseViewProps } from "../views";
+import type { SkiaValue } from "../values/types";
 
-import { debug as hostDebug, skHostConfig } from "./HostConfig";
-// import { debugTree } from "./nodes";
-import { Container } from "./Container";
-import { DependencyManager } from "./DependencyManager";
-
-export const skiaReconciler = ReactReconciler(skHostConfig);
-
-skiaReconciler.injectIntoDevTools({
-  bundleType: 1,
-  version: "0.0.1",
-  rendererPackageName: "react-native-skia",
-});
-
-const render = (element: ReactNode, root: OpaqueRoot, container: Container) => {
-  skiaReconciler.updateContainer(element, root, null, () => {
-    hostDebug("updateContainer");
-    container.depMgr.update();
-  });
-};
+import { SkiaRoot } from "./Reconciler";
 
 export const useCanvasRef = () => useRef<SkiaDomView>(null);
 
-const createDependencyManager = (
-  registerValues: (values: Array<SkiaValue<unknown>>) => () => void
-) =>
-  global.SkiaDomApi && global.SkiaDomApi.DependencyManager
-    ? global.SkiaDomApi.DependencyManager(registerValues)
-    : new DependencyManager(registerValues);
-
-export interface CanvasProps extends ComponentProps<typeof SkiaDomView> {
+export interface CanvasProps extends SkiaBaseViewProps {
   ref?: RefObject<SkiaDomView>;
   children: ReactNode;
   onTouch?: TouchHandler;
@@ -75,48 +47,27 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
       },
       [ref]
     );
-
-    const container = useMemo(() => {
-      return new Container(
-        Skia,
-        createDependencyManager(registerValues),
-        redraw
-      );
-    }, [redraw, registerValues]);
-
     const root = useMemo(
-      () =>
-        skiaReconciler.createContainer(
-          container,
-          0,
-          null,
-          true,
-          null,
-          "",
-          console.error,
-          null
-        ),
-      [container]
+      () => new SkiaRoot(Skia, registerValues, redraw),
+      [redraw, registerValues]
     );
 
     // Render effect
     useEffect(() => {
-      render(children, root, container);
-    }, [children, root, redraw, container]);
+      root.render(children);
+    }, [children, root, redraw]);
 
     useEffect(() => {
       return () => {
-        skiaReconciler.updateContainer(null, root, null, () => {
-          container.depMgr.remove();
-        });
+        root.unmount();
       };
-    }, [container, root]);
+    }, [root]);
 
     return (
       <SkiaDomView
         ref={ref}
         style={style}
-        root={container.root}
+        root={root.dom}
         onTouch={onTouch}
         onSize={onSize}
         mode={mode}
@@ -125,7 +76,7 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
       />
     );
   }
-);
+) as React.FC<CanvasProps & React.RefAttributes<SkiaDomView>>;
 
 /**
  * Combines a list of refs into a single ref. This can be used to provide

package/src/renderer/DrawingContext.ts

@@ -1,13 +1,9 @@
-import type { RefObject } from "react";
-
-import type { DrawingInfo, SkiaView } from "../views";
-import type { Skia, Vector } from "../skia/types";
+import type { DrawingInfo } from "../views";
+import type { Skia } from "../skia/types";
 import type { DrawingContext as DOMDrawingContext } from "../dom/types";
 
 export interface DrawingContext
   extends Omit<DrawingInfo, "touches">,
     DOMDrawingContext {
-  center: Vector;
-  ref: RefObject<SkiaView>;
   Skia: Skia;
 }

package/src/renderer/Reconciler.tsx

@@ -0,0 +1,66 @@
+import type { ReactNode } from "react";
+import type { OpaqueRoot } from "react-reconciler";
+import ReactReconciler from "react-reconciler";
+
+import type { Skia } from "../skia/types";
+import type { SkiaValue } from "../values/types";
+
+import { DependencyManager } from "./DependencyManager";
+import { skHostConfig, debug as hostDebug } from "./HostConfig";
+import { Container } from "./Container";
+
+const skiaReconciler = ReactReconciler(skHostConfig);
+
+type RegisterValues = (values: Array<SkiaValue<unknown>>) => () => void;
+
+const createDependencyManager = (registerValues: RegisterValues) =>
+  global.SkiaDomApi && global.SkiaDomApi.DependencyManager
+    ? global.SkiaDomApi.DependencyManager(registerValues)
+    : new DependencyManager(registerValues);
+
+skiaReconciler.injectIntoDevTools({
+  bundleType: 1,
+  version: "0.0.1",
+  rendererPackageName: "react-native-skia",
+});
+
+export class SkiaRoot {
+  private root: OpaqueRoot;
+  private container: Container;
+
+  constructor(
+    Skia: Skia,
+    registerValues: RegisterValues = () => () => {},
+    redraw: () => void = () => {}
+  ) {
+    const depMgr = createDependencyManager(registerValues);
+    this.container = new Container(Skia, depMgr, redraw);
+    this.root = skiaReconciler.createContainer(
+      this.container,
+      0,
+      null,
+      true,
+      null,
+      "",
+      console.error,
+      null
+    );
+  }
+
+  render(element: ReactNode) {
+    skiaReconciler.updateContainer(element, this.root, null, () => {
+      hostDebug("updateContainer");
+      this.container.depMgr.update();
+    });
+  }
+
+  unmount() {
+    skiaReconciler.updateContainer(null, this.root, null, () => {
+      this.container.depMgr.remove();
+    });
+  }
+
+  get dom() {
+    return this.container.root;
+  }
+}

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

@@ -441,6 +441,20 @@ export interface SkPath extends SkJSIInstance<"Path"> {
    */
   addRRect(rrect: SkRRect, isCCW?: boolean): SkPath;
 
+  /** Appends src to SkPath, transformed by matrix. Transformed curves may have
+     different verbs, SkPoint, and conic weights.
+
+      If mode is kAppend_AddPathMode, src verb array, SkPoint array, and conic
+     weights are added unaltered. If mode is kExtend_AddPathMode, add line
+     before appending verbs, SkPoint, and conic weights.
+
+      @param src     SkPath verbs, SkPoint, and conic weights to add
+      @param matrix  transform applied to src
+      @param extend  extends path with line if true
+      @return        reference to SkPath
+  */
+  addPath(src: SkPath, matrix?: SkMatrix, extend?: boolean): SkPath;
+
   /**
    * Returns the Point at index in Point array. Valid range for index is
    * 0 to countPoints() - 1.

package/src/skia/types/Shader/Shader.ts

@@ -7,9 +7,7 @@ export const isShader = (obj: SkJSIInstance<string> | null): obj is SkShader =>
 
 export type SkShader = SkJSIInstance<"Shader">;
 
-export type UniformValue = number | Vector | readonly number[];
-
-export type Uniform = UniformValue | readonly UniformValue[] | Float32Array;
+export type Uniform = number | Vector | Float32Array | Uniform[];
 
 export interface Uniforms {
   [name: string]: Uniform;
@@ -20,11 +18,16 @@ const isVector = (obj: unknown): obj is Vector =>
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (obj as any).x !== undefined && (obj as any).y !== undefined;
 
-const processValue = (value: UniformValue): number | readonly number[] => {
-  if (isVector(value)) {
-    return [value.x, value.y];
+const processValue = (values: number[], value: Uniform) => {
+  if (typeof value === "number") {
+    values.push(value);
+  } else if (Array.isArray(value)) {
+    value.forEach((v) => processValue(values, v));
+  } else if (isVector(value)) {
+    values.push(value.x, value.y);
+  } else if (value instanceof Float32Array) {
+    values.push(...value);
   }
-  return value;
 };
 
 export const processUniforms = (
@@ -32,36 +35,25 @@ export const processUniforms = (
   uniforms: Uniforms,
   builder?: SkRuntimeShaderBuilder
 ) => {
-  const processed = new Array(source.getUniformCount())
-    .fill(0)
-    .flatMap((_, i) => {
-      const name = source.getUniformName(i);
-      const rawValue = uniforms[name];
-      if (rawValue === undefined) {
-        throw new Error(`No value specified for uniform ${name}`);
-      }
-      const value =
-        rawValue instanceof Float32Array ? Array.from(rawValue) : rawValue;
-      const result = Array.isArray(value)
-        ? value.flatMap(processValue)
-        : processValue(value as UniformValue);
-      builder?.setUniform(name, typeof result === "number" ? [result] : result);
-      return result;
-    });
-  const names = Object.keys(uniforms);
-  if (names.length > source.getUniformCount()) {
-    const usedUniforms = new Array(source.getUniformCount())
-      .fill(0)
-      .map((_, i) => source.getUniformName(i));
-    const unusedUniform = names
-      .map((name) => {
-        if (usedUniforms.indexOf(name) === -1) {
-          return name;
-        }
-        return null;
-      })
-      .filter((n) => n !== null);
-    console.warn("Unused uniforms were provided: " + unusedUniform.join(", "));
+  const result: number[] = [];
+  const uniformsCount = source.getUniformCount();
+  for (let i = 0; i < uniformsCount; i++) {
+    const name = source.getUniformName(i);
+    const value = uniforms[name];
+    if (!value === undefined) {
+      throw new Error(
+        // eslint-disable-next-line max-len
+        `The runtime effect has the uniform value "${name}" declared, but it is missing from the uniforms property of the Runtime effect.`
+      );
+    }
+    if (builder === undefined) {
+      processValue(result, value);
+    } else {
+      const uniformValue: number[] = [];
+      processValue(uniformValue, value);
+      builder.setUniform(name, uniformValue);
+      result.push(...uniformValue);
+    }
   }
-  return processed;
+  return result;
 };

package/src/skia/web/JsiSkPath.ts

@@ -33,6 +33,16 @@ export class JsiSkPath extends HostObject<Path, "Path"> implements SkPath {
     super(CanvasKit, ref, "Path");
   }
 
+  addPath(src: SkPath, matrix?: SkMatrix, extend = false) {
+    const args = [
+      JsiSkPath.fromValue(src),
+      ...(matrix ? JsiSkMatrix.fromValue<Float32Array>(matrix) : []),
+      extend,
+    ];
+    this.ref.addPath(...args);
+    return this;
+  }
+
   addArc(
     oval: SkRect,
     startAngleInDegrees: number,

package/src/skia/web/JsiSkRRect.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit, RRect } from "canvaskit-wasm";
 
-import type { SkRRect } from "../types";
+import type { SkRect, SkRRect } from "../types";
 
 import { BaseHostObject } from "./Host";
 import { JsiSkRect } from "./JsiSkRect";
@@ -20,7 +20,18 @@ export class JsiSkRRect
     );
   }
 
-  constructor(CanvasKit: CanvasKit, ref: RRect) {
+  constructor(CanvasKit: CanvasKit, rect: SkRect, rx: number, ry: number) {
+    // based on https://github.com/google/skia/blob/main/src/core/SkRRect.cpp#L51
+    if (rx === Infinity || ry === Infinity) {
+      rx = ry = 0;
+    }
+    if (rect.width < rx + rx || rect.height < ry + ry) {
+      // At most one of these two divides will be by zero, and neither numerator is zero.
+      const scale = Math.min(rect.width / (rx + rx), rect.height / (ry + ry));
+      rx *= scale;
+      ry *= scale;
+    }
+    const ref = CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry);
     super(CanvasKit, ref, "RRect");
   }
 

package/src/skia/web/JsiSkia.ts

@@ -45,10 +45,7 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
     throw new Error("Not implemented on React Native Web");
   },
   RRectXY: (rect: SkRect, rx: number, ry: number) =>
-    new JsiSkRRect(
-      CanvasKit,
-      CanvasKit.RRectXY(JsiSkRect.fromValue(CanvasKit, rect), rx, ry)
-    ),
+    new JsiSkRRect(CanvasKit, rect, rx, ry),
   RSXform: (scos: number, ssin: number, tx: number, ty: number) =>
     new JsiSkRSXform(CanvasKit, Float32Array.of(scos, ssin, tx, ty)),
   Color,