@shopify/react-native-skia 0.1.136 → 0.1.139

package/lib/module/renderer/components/text/Text.js

@@ -2,13 +2,10 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 import React from "react";
 import { createDrawing } from "../../nodes/Drawing";
-import { processFont } from "../../processors";
 const onDraw = createDrawing((_ref, _ref2) => {
   let {
     canvas,
-    paint,
-    fontMgr,
-    Skia
+    paint
   } = _ref;
   let {
     text,
@@ -16,7 +13,9 @@ const onDraw = createDrawing((_ref, _ref2) => {
     y,
     ...fontDef
   } = _ref2;
-  const font = processFont(Skia, fontMgr, fontDef);
+  const {
+    font
+  } = fontDef;
   canvas.drawText(text, x, y, paint, font);
 });
 export const Text = props => {

package/lib/module/renderer/components/text/Text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Text.tsx"],"names":["React","createDrawing","processFont","onDraw","canvas","paint","fontMgr","Skia","text","x","y","fontDef","font","drawText","Text","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,aAAT,QAA8B,qBAA9B;AACA,SAASC,WAAT,QAA4B,kBAA5B;AASA,MAAMC,MAAM,GAAGF,aAAa,CAC1B,iBAAkE;AAAA,MAAjE;AAAEG,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA,OAAjB;AAA0BC,IAAAA;AAA1B,GAAiE;AAAA,MAA/B;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,CAAR;AAAWC,IAAAA,CAAX;AAAc,OAAGC;AAAjB,GAA+B;AAChE,QAAMC,IAAI,GAAGV,WAAW,CAACK,IAAD,EAAOD,OAAP,EAAgBK,OAAhB,CAAxB;AACAP,EAAAA,MAAM,CAACS,QAAP,CAAgBL,IAAhB,EAAsBC,CAAtB,EAAyBC,CAAzB,EAA4BL,KAA5B,EAAmCO,IAAnC;AACD,CAJyB,CAA5B;AAOA,OAAO,MAAME,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAEZ;AAAnB,KAA+BY,KAA/B,EAAP;AACD,CAFM;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBP,EAAAA,CAAC,EAAE,CADe;AAElBC,EAAAA,CAAC,EAAE;AAFe,CAApB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  AnimatedProps,\n  FontDef,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport { processFont } from \"../../processors\";\n\ntype TextProps = CustomPaintProps &\n  FontDef & {\n    text: string;\n    x: number;\n    y: number;\n  };\n\nconst onDraw = createDrawing<TextProps>(\n  ({ canvas, paint, fontMgr, Skia }, { text, x, y, ...fontDef }) => {\n    const font = processFont(Skia, fontMgr, fontDef);\n    canvas.drawText(text, x, y, paint, font);\n  }\n);\n\nexport const Text = (props: AnimatedProps<TextProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nText.defaultProps = {\n  x: 0,\n  y: 0,\n};\n"]}
+{"version":3,"sources":["Text.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","text","x","y","fontDef","font","drawText","Text","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,aAAT,QAA8B,qBAA9B;AASA,MAAMC,MAAM,GAAGD,aAAa,CAC1B,iBAAmD;AAAA,MAAlD;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAkD;AAAA,MAA/B;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,CAAR;AAAWC,IAAAA,CAAX;AAAc,OAAGC;AAAjB,GAA+B;AACjD,QAAM;AAAEC,IAAAA;AAAF,MAAWD,OAAjB;AACAL,EAAAA,MAAM,CAACO,QAAP,CAAgBL,IAAhB,EAAsBC,CAAtB,EAAyBC,CAAzB,EAA4BH,KAA5B,EAAmCK,IAAnC;AACD,CAJyB,CAA5B;AAOA,OAAO,MAAME,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAEV;AAAnB,KAA+BU,KAA/B,EAAP;AACD,CAFM;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBP,EAAAA,CAAC,EAAE,CADe;AAElBC,EAAAA,CAAC,EAAE;AAFe,CAApB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  AnimatedProps,\n  FontDef,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\n\ntype TextProps = CustomPaintProps &\n  FontDef & {\n    text: string;\n    x: number;\n    y: number;\n  };\n\nconst onDraw = createDrawing<TextProps>(\n  ({ canvas, paint }, { text, x, y, ...fontDef }) => {\n    const { font } = fontDef;\n    canvas.drawText(text, x, y, paint, font);\n  }\n);\n\nexport const Text = (props: AnimatedProps<TextProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nText.defaultProps = {\n  x: 0,\n  y: 0,\n};\n"]}

package/lib/module/renderer/components/text/TextPath.js

@@ -2,12 +2,10 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 import React from "react";
 import { createDrawing } from "../../nodes";
-import { processFont } from "../../processors/Font";
 const onDraw = createDrawing((_ref, _ref2) => {
   let {
     canvas,
     paint,
-    fontMgr,
     Skia
   } = _ref;
   let {
@@ -22,7 +20,9 @@ const onDraw = createDrawing((_ref, _ref2) => {
     throw new Error("Invalid path: " + pathDef);
   }
 
-  const font = processFont(Skia, fontMgr, fontDef);
+  const {
+    font
+  } = fontDef;
   const ids = font.getGlyphIDs(text);
   const widths = font.getGlyphWidths(ids, paint);
   const rsx = [];

package/lib/module/renderer/components/text/TextPath.js.map

@@ -1 +1 @@
-{"version":3,"sources":["TextPath.tsx"],"names":["React","createDrawing","processFont","onDraw","canvas","paint","fontMgr","Skia","text","initialOffset","path","pathDef","fontDef","Path","MakeFromSVGString","Error","font","ids","getGlyphIDs","widths","getGlyphWidths","rsx","meas","ContourMeasureIter","cont","next","dist","i","length","width","substring","px","py","tx","ty","getPosTan","adjustedX","adjustedY","push","RSXform","blob","TextBlob","MakeFromRSXform","drawTextBlob","TextPath","props","defaultProps"],"mappings":"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","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps, AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\nimport type { SkPath, SkRSXform } from \"../../../skia/types\";\nimport type { FontDef } from \"../../processors/Font\";\nimport { processFont } from \"../../processors/Font\";\n\nexport type TextPathProps = CustomPaintProps &\n  FontDef & {\n    text: string;\n    path: SkPath | string;\n    initialOffset: number;\n  };\n\nconst onDraw = createDrawing<TextPathProps>(\n  (\n    { canvas, paint, fontMgr, Skia },\n    { text, initialOffset, path: pathDef, ...fontDef }\n  ) => {\n    const path =\n      typeof pathDef === \"string\"\n        ? Skia.Path.MakeFromSVGString(pathDef)\n        : pathDef;\n    if (path === null) {\n      throw new Error(\"Invalid path: \" + pathDef);\n    }\n    const font = processFont(Skia, fontMgr, fontDef);\n    const ids = font.getGlyphIDs(text);\n    const widths = font.getGlyphWidths(ids, paint);\n    const rsx: SkRSXform[] = [];\n    const meas = 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 { px, py, tx, ty } = cont.getPosTan(dist);\n      const adjustedX = px - (width / 2) * tx;\n      const adjustedY = py - (width / 2) * ty;\n      rsx.push(Skia.RSXform(tx, ty, adjustedX, adjustedY));\n      dist += width / 2;\n    }\n    const blob = Skia.TextBlob.MakeFromRSXform(text, rsx, font);\n    canvas.drawTextBlob(blob, 0, 0, paint);\n  }\n);\n\nexport const TextPath = (props: AnimatedProps<TextPathProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nTextPath.defaultProps = {\n  initialOffset: 0,\n};\n"]}
+{"version":3,"sources":["TextPath.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","Skia","text","initialOffset","path","pathDef","fontDef","Path","MakeFromSVGString","Error","font","ids","getGlyphIDs","widths","getGlyphWidths","rsx","meas","ContourMeasureIter","cont","next","dist","i","length","width","substring","px","py","tx","ty","getPosTan","adjustedX","adjustedY","push","RSXform","blob","TextBlob","MakeFromRSXform","drawTextBlob","TextPath","props","defaultProps"],"mappings":"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","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps, AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\nimport type { SkPath, SkRSXform } from \"../../../skia/types\";\nimport type { FontDef } from \"../../processors/Font\";\n\nexport type TextPathProps = CustomPaintProps &\n  FontDef & {\n    text: string;\n    path: SkPath | string;\n    initialOffset: number;\n  };\n\nconst onDraw = createDrawing<TextPathProps>(\n  (\n    { canvas, paint, Skia },\n    { text, initialOffset, path: pathDef, ...fontDef }\n  ) => {\n    const path =\n      typeof pathDef === \"string\"\n        ? Skia.Path.MakeFromSVGString(pathDef)\n        : pathDef;\n    if (path === null) {\n      throw new Error(\"Invalid path: \" + pathDef);\n    }\n    const { font } = fontDef;\n    const ids = font.getGlyphIDs(text);\n    const widths = font.getGlyphWidths(ids, paint);\n    const rsx: SkRSXform[] = [];\n    const meas = 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 { px, py, tx, ty } = cont.getPosTan(dist);\n      const adjustedX = px - (width / 2) * tx;\n      const adjustedY = py - (width / 2) * ty;\n      rsx.push(Skia.RSXform(tx, ty, adjustedX, adjustedY));\n      dist += width / 2;\n    }\n    const blob = Skia.TextBlob.MakeFromRSXform(text, rsx, font);\n    canvas.drawTextBlob(blob, 0, 0, paint);\n  }\n);\n\nexport const TextPath = (props: AnimatedProps<TextPathProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nTextPath.defaultProps = {\n  initialOffset: 0,\n};\n"]}

package/lib/module/renderer/processors/Font.js

@@ -1,27 +1,4 @@
 export const isFont = fontDef => // We have an issue to check property existence on JSI backed instances
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 fontDef.font !== undefined;
-export const processFont = (Skia, fontMgr, fontDef) => {
-  let selectedFont;
-
-  if (isFont(fontDef)) {
-    selectedFont = fontDef.font;
-  } else {
-    console.warn( // eslint-disable-next-line max-len
-    "Using system fonts is deprecated. Please use the font property instead: https://shopify.github.io/react-native-skia/docs/text/fonts");
-    const {
-      familyName,
-      size
-    } = fontDef;
-    const typeface = fontMgr.matchFamilyStyle(familyName);
-
-    if (typeface === null) {
-      throw new Error(`No typeface found for ${familyName}`);
-    }
-
-    selectedFont = Skia.Font(typeface, size);
-  }
-
-  return selectedFont;
-};
 //# sourceMappingURL=Font.js.map

package/lib/module/renderer/processors/Font.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Font.ts"],"names":["isFont","fontDef","font","undefined","processFont","Skia","fontMgr","selectedFont","console","warn","familyName","size","typeface","matchFamilyStyle","Error","Font"],"mappings":"AAIA,OAAO,MAAMA,MAAM,GAAIC,OAAD,IACpB;AACA;AACCA,OAAD,CAAiBC,IAAjB,KAA0BC,SAHrB;AAKP,OAAO,MAAMC,WAAW,GAAG,CACzBC,IADyB,EAEzBC,OAFyB,EAGzBL,OAHyB,KAItB;AACH,MAAIM,YAAJ;;AACA,MAAIP,MAAM,CAACC,OAAD,CAAV,EAAqB;AACnBM,IAAAA,YAAY,GAAGN,OAAO,CAACC,IAAvB;AACD,GAFD,MAEO;AACLM,IAAAA,OAAO,CAACC,IAAR,EACE;AACA,yIAFF;AAIA,UAAM;AAAEC,MAAAA,UAAF;AAAcC,MAAAA;AAAd,QAAuBV,OAA7B;AACA,UAAMW,QAAQ,GAAGN,OAAO,CAACO,gBAAR,CAAyBH,UAAzB,CAAjB;;AACA,QAAIE,QAAQ,KAAK,IAAjB,EAAuB;AACrB,YAAM,IAAIE,KAAJ,CAAW,yBAAwBJ,UAAW,EAA9C,CAAN;AACD;;AACDH,IAAAA,YAAY,GAAGF,IAAI,CAACU,IAAL,CAAUH,QAAV,EAAoBD,IAApB,CAAf;AACD;;AACD,SAAOJ,YAAP;AACD,CArBM","sourcesContent":["import type { SkFontMgr, SkFont, Skia } from \"../../skia/types\";\n\nexport type FontDef = { font: SkFont } | { familyName: string; size: number };\n\nexport const isFont = (fontDef: FontDef): fontDef is { font: SkFont } =>\n  // We have an issue to check property existence on JSI backed instances\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  (fontDef as any).font !== undefined;\n\nexport const processFont = (\n  Skia: Skia,\n  fontMgr: SkFontMgr,\n  fontDef: FontDef\n) => {\n  let selectedFont: SkFont;\n  if (isFont(fontDef)) {\n    selectedFont = fontDef.font;\n  } else {\n    console.warn(\n      // eslint-disable-next-line max-len\n      \"Using system fonts is deprecated. Please use the font property instead: https://shopify.github.io/react-native-skia/docs/text/fonts\"\n    );\n    const { familyName, size } = fontDef;\n    const typeface = fontMgr.matchFamilyStyle(familyName);\n    if (typeface === null) {\n      throw new Error(`No typeface found for ${familyName}`);\n    }\n    selectedFont = Skia.Font(typeface, size);\n  }\n  return selectedFont;\n};\n"]}
+{"version":3,"sources":["Font.ts"],"names":["isFont","fontDef","font","undefined"],"mappings":"AAIA,OAAO,MAAMA,MAAM,GAAIC,OAAD,IACpB;AACA;AACCA,OAAD,CAAiBC,IAAjB,KAA0BC,SAHrB","sourcesContent":["import type { SkFont } from \"../../skia/types\";\n\nexport type FontDef = { font: SkFont };\n\nexport const isFont = (fontDef: FontDef): fontDef is { font: SkFont } =>\n  // We have an issue to check property existence on JSI backed instances\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  (fontDef as any).font !== undefined;\n"]}

package/lib/module/renderer/processors/Transform.js

@@ -1,35 +1,28 @@
 import { processTransform } from "../../skia/types";
-export const processCanvasTransform = (_ref, _ref2) => {
-  let {
-    canvas,
-    Skia
-  } = _ref;
+export const processCanvasTransform = (canvas, _ref) => {
   let {
     transform,
     origin,
     matrix
-  } = _ref2;
+  } = _ref;
 
   if (matrix) {
     if (origin) {
-      const m3 = Skia.Matrix();
-      m3.translate(origin.x, origin.y);
-      m3.concat(matrix);
-      m3.translate(-origin.x, -origin.y);
-      canvas.concat(m3);
+      canvas.translate(origin.x, origin.y);
+      canvas.concat(matrix);
+      canvas.translate(-origin.x, -origin.y);
     } else {
       canvas.concat(matrix);
     }
   } else if (transform) {
-    const m3 = processTransform(Skia.Matrix(), origin ? transformOrigin(origin, transform) : transform);
-    canvas.concat(m3);
+    processTransform(canvas, origin ? transformOrigin(origin, transform) : transform);
   }
 };
-export const localMatrix = (m, _ref3) => {
+export const localMatrix = (m, _ref2) => {
   let {
     transform,
     origin
-  } = _ref3;
+  } = _ref2;
 
   if (transform) {
     return processTransform(m, origin ? transformOrigin(origin, transform) : transform);

package/lib/module/renderer/processors/Transform.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Transform.ts"],"names":["processTransform","processCanvasTransform","canvas","Skia","transform","origin","matrix","m3","Matrix","translate","x","y","concat","transformOrigin","localMatrix","m","undefined","translateX","translateY"],"mappings":"AAEA,SAASA,gBAAT,QAAiC,kBAAjC;AAQA,OAAO,MAAMC,sBAAsB,GAAG,iBAGjC;AAAA,MAFH;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAEG;AAAA,MADH;AAAEC,IAAAA,SAAF;AAAaC,IAAAA,MAAb;AAAqBC,IAAAA;AAArB,GACG;;AACH,MAAIA,MAAJ,EAAY;AACV,QAAID,MAAJ,EAAY;AACV,YAAME,EAAE,GAAGJ,IAAI,CAACK,MAAL,EAAX;AACAD,MAAAA,EAAE,CAACE,SAAH,CAAaJ,MAAM,CAACK,CAApB,EAAuBL,MAAM,CAACM,CAA9B;AACAJ,MAAAA,EAAE,CAACK,MAAH,CAAUN,MAAV;AACAC,MAAAA,EAAE,CAACE,SAAH,CAAa,CAACJ,MAAM,CAACK,CAArB,EAAwB,CAACL,MAAM,CAACM,CAAhC;AACAT,MAAAA,MAAM,CAACU,MAAP,CAAcL,EAAd;AACD,KAND,MAMO;AACLL,MAAAA,MAAM,CAACU,MAAP,CAAcN,MAAd;AACD;AACF,GAVD,MAUO,IAAIF,SAAJ,EAAe;AACpB,UAAMG,EAAE,GAAGP,gBAAgB,CACzBG,IAAI,CAACK,MAAL,EADyB,EAEzBH,MAAM,GAAGQ,eAAe,CAACR,MAAD,EAASD,SAAT,CAAlB,GAAwCA,SAFrB,CAA3B;AAIAF,IAAAA,MAAM,CAACU,MAAP,CAAcL,EAAd;AACD;AACF,CArBM;AAuBP,OAAO,MAAMO,WAAW,GAAG,CACzBC,CADyB,YAGtB;AAAA,MADH;AAAEX,IAAAA,SAAF;AAAaC,IAAAA;AAAb,GACG;;AACH,MAAID,SAAJ,EAAe;AACb,WAAOJ,gBAAgB,CACrBe,CADqB,EAErBV,MAAM,GAAGQ,eAAe,CAACR,MAAD,EAASD,SAAT,CAAlB,GAAwCA,SAFzB,CAAvB;AAID;;AACD,SAAOY,SAAP;AACD,CAXM;AAaP,OAAO,MAAMH,eAAe,GAAG,CAACR,MAAD,EAAiBD,SAAjB,KAA6C,CAC1E;AAAEa,EAAAA,UAAU,EAAEZ,MAAM,CAACK;AAArB,CAD0E,EAE1E;AAAEQ,EAAAA,UAAU,EAAEb,MAAM,CAACM;AAArB,CAF0E,EAG1E,GAAGP,SAHuE,EAI1E;AAAEa,EAAAA,UAAU,EAAE,CAACZ,MAAM,CAACK;AAAtB,CAJ0E,EAK1E;AAAEQ,EAAAA,UAAU,EAAE,CAACb,MAAM,CAACM;AAAtB,CAL0E,CAArE","sourcesContent":["import type { DrawingContext } from \"../DrawingContext\";\nimport type { SkMatrix, Vector, Transforms2d } from \"../../skia/types\";\nimport { processTransform } from \"../../skia/types\";\n\nexport interface TransformProps {\n  transform?: Transforms2d;\n  origin?: Vector;\n  matrix?: SkMatrix;\n}\n\nexport const processCanvasTransform = (\n  { canvas, Skia }: DrawingContext,\n  { transform, origin, matrix }: TransformProps\n) => {\n  if (matrix) {\n    if (origin) {\n      const m3 = Skia.Matrix();\n      m3.translate(origin.x, origin.y);\n      m3.concat(matrix);\n      m3.translate(-origin.x, -origin.y);\n      canvas.concat(m3);\n    } else {\n      canvas.concat(matrix);\n    }\n  } else if (transform) {\n    const m3 = processTransform(\n      Skia.Matrix(),\n      origin ? transformOrigin(origin, transform) : transform\n    );\n    canvas.concat(m3);\n  }\n};\n\nexport const localMatrix = (\n  m: SkMatrix,\n  { transform, origin }: TransformProps\n) => {\n  if (transform) {\n    return processTransform(\n      m,\n      origin ? transformOrigin(origin, transform) : transform\n    );\n  }\n  return undefined;\n};\n\nexport const transformOrigin = (origin: Vector, transform: Transforms2d) => [\n  { translateX: origin.x },\n  { translateY: origin.y },\n  ...transform,\n  { translateX: -origin.x },\n  { translateY: -origin.y },\n];\n"]}
+{"version":3,"sources":["Transform.ts"],"names":["processTransform","processCanvasTransform","canvas","transform","origin","matrix","translate","x","y","concat","transformOrigin","localMatrix","m","undefined","translateX","translateY"],"mappings":"AACA,SAASA,gBAAT,QAAiC,kBAAjC;AASA,OAAO,MAAMC,sBAAsB,GAAG,CACpCC,MADoC,WAGjC;AAAA,MADH;AAAEC,IAAAA,SAAF;AAAaC,IAAAA,MAAb;AAAqBC,IAAAA;AAArB,GACG;;AACH,MAAIA,MAAJ,EAAY;AACV,QAAID,MAAJ,EAAY;AACVF,MAAAA,MAAM,CAACI,SAAP,CAAiBF,MAAM,CAACG,CAAxB,EAA2BH,MAAM,CAACI,CAAlC;AACAN,MAAAA,MAAM,CAACO,MAAP,CAAcJ,MAAd;AACAH,MAAAA,MAAM,CAACI,SAAP,CAAiB,CAACF,MAAM,CAACG,CAAzB,EAA4B,CAACH,MAAM,CAACI,CAApC;AACD,KAJD,MAIO;AACLN,MAAAA,MAAM,CAACO,MAAP,CAAcJ,MAAd;AACD;AACF,GARD,MAQO,IAAIF,SAAJ,EAAe;AACpBH,IAAAA,gBAAgB,CACdE,MADc,EAEdE,MAAM,GAAGM,eAAe,CAACN,MAAD,EAASD,SAAT,CAAlB,GAAwCA,SAFhC,CAAhB;AAID;AACF,CAlBM;AAoBP,OAAO,MAAMQ,WAAW,GAAG,CACzBC,CADyB,YAGtB;AAAA,MADH;AAAET,IAAAA,SAAF;AAAaC,IAAAA;AAAb,GACG;;AACH,MAAID,SAAJ,EAAe;AACb,WAAOH,gBAAgB,CACrBY,CADqB,EAErBR,MAAM,GAAGM,eAAe,CAACN,MAAD,EAASD,SAAT,CAAlB,GAAwCA,SAFzB,CAAvB;AAID;;AACD,SAAOU,SAAP;AACD,CAXM;AAaP,OAAO,MAAMH,eAAe,GAAG,CAACN,MAAD,EAAiBD,SAAjB,KAA6C,CAC1E;AAAEW,EAAAA,UAAU,EAAEV,MAAM,CAACG;AAArB,CAD0E,EAE1E;AAAEQ,EAAAA,UAAU,EAAEX,MAAM,CAACI;AAArB,CAF0E,EAG1E,GAAGL,SAHuE,EAI1E;AAAEW,EAAAA,UAAU,EAAE,CAACV,MAAM,CAACG;AAAtB,CAJ0E,EAK1E;AAAEQ,EAAAA,UAAU,EAAE,CAACX,MAAM,CAACI;AAAtB,CAL0E,CAArE","sourcesContent":["import type { SkMatrix, Vector, Transforms2d } from \"../../skia/types\";\nimport { processTransform } from \"../../skia/types\";\nimport type { SkCanvas } from \"../../skia/types/Canvas\";\n\nexport interface TransformProps {\n  transform?: Transforms2d;\n  origin?: Vector;\n  matrix?: SkMatrix;\n}\n\nexport const processCanvasTransform = (\n  canvas: SkCanvas,\n  { transform, origin, matrix }: TransformProps\n) => {\n  if (matrix) {\n    if (origin) {\n      canvas.translate(origin.x, origin.y);\n      canvas.concat(matrix);\n      canvas.translate(-origin.x, -origin.y);\n    } else {\n      canvas.concat(matrix);\n    }\n  } else if (transform) {\n    processTransform(\n      canvas,\n      origin ? transformOrigin(origin, transform) : transform\n    );\n  }\n};\n\nexport const localMatrix = (\n  m: SkMatrix,\n  { transform, origin }: TransformProps\n) => {\n  if (transform) {\n    return processTransform(\n      m,\n      origin ? transformOrigin(origin, transform) : transform\n    );\n  }\n  return undefined;\n};\n\nexport const transformOrigin = (origin: Vector, transform: Transforms2d) => [\n  { translateX: origin.x },\n  { translateY: origin.y },\n  ...transform,\n  { translateX: -origin.x },\n  { translateY: -origin.y },\n];\n"]}

package/lib/module/skia/core/Data.js

@@ -20,7 +20,9 @@ const factoryWrapper = (data2, factory, onError) => {
 const loadDataCollection = (sources, factory, onError) => Promise.all(sources.map(source => loadData(source, factory, onError)));
 
 const loadData = (source, factory, onError) => {
-  if (source instanceof Uint8Array) {
+  if (source === null) {
+    return new Promise(resolve => resolve(null));
+  } else if (source instanceof Uint8Array) {
     return new Promise(resolve => resolve(factoryWrapper(Skia.Data.fromBytes(source), factory, onError)));
   } else {
     const uri = typeof source === "string" ? source : resolveAsset(source);

package/lib/module/skia/core/Data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Data.ts"],"names":["useRef","useEffect","useState","Image","Platform","Skia","resolveAsset","source","OS","default","resolveAssetSource","uri","factoryWrapper","data2","factory","onError","factoryResult","Error","loadDataCollection","sources","Promise","all","map","loadData","Uint8Array","resolve","Data","fromBytes","fromURI","then","d","useLoading","loader","deps","data","setData","prevSourceRef","current","useDataCollection","useRawData","identity","useData"],"mappings":"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","sourcesContent":["import type { DependencyList } from \"react\";\nimport { useRef, useEffect, useState } from \"react\";\nimport { Image, Platform } from \"react-native\";\n\nimport { Skia } from \"../Skia\";\nimport type { SkData, DataSource } from \"../types\";\n\nconst resolveAsset = (source: ReturnType<typeof require>) => {\n  return Platform.OS === \"web\"\n    ? source.default\n    : Image.resolveAssetSource(source).uri;\n};\n\nconst factoryWrapper = <T>(\n  data2: SkData,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n) => {\n  const factoryResult = factory(data2);\n  if (factoryResult === null) {\n    onError && onError(new Error(\"Could not load data\"));\n    return null;\n  } else {\n    return factoryResult;\n  }\n};\n\nconst loadDataCollection = <T>(\n  sources: DataSource[],\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n): Promise<(T | null)[]> =>\n  Promise.all(sources.map((source) => loadData(source, factory, onError)));\n\nconst loadData = <T>(\n  source: DataSource,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n): Promise<T | null> => {\n  if (source instanceof Uint8Array) {\n    return new Promise((resolve) =>\n      resolve(factoryWrapper(Skia.Data.fromBytes(source), factory, onError))\n    );\n  } else {\n    const uri = typeof source === \"string\" ? source : resolveAsset(source);\n    return Skia.Data.fromURI(uri).then((d) =>\n      factoryWrapper(d, factory, onError)\n    );\n  }\n};\n\ntype Source = DataSource | null | undefined;\n\nconst useLoading = <T>(\n  source: Source,\n  loader: () => Promise<T | null>,\n  deps: DependencyList = []\n) => {\n  const [data, setData] = useState<T | null>(null);\n  const prevSourceRef = useRef<Source>();\n  useEffect(() => {\n    if (prevSourceRef.current !== source) {\n      prevSourceRef.current = source;\n      loader().then(setData);\n    } else {\n      setData(null);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, deps);\n  return data;\n};\n\nexport const useDataCollection = <T>(\n  sources: DataSource[],\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) =>\n  useLoading(\n    sources,\n    () => loadDataCollection(sources, factory, onError),\n    deps\n  );\n\nexport const useRawData = <T>(\n  source: DataSource | null | undefined,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) => useLoading(source, () => loadData(source, factory, onError), deps);\n\nconst identity = (data: SkData) => data;\n\nexport const useData = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) => useRawData(source, identity, onError, deps);\n"]}
+{"version":3,"sources":["Data.ts"],"names":["useRef","useEffect","useState","Image","Platform","Skia","resolveAsset","source","OS","default","resolveAssetSource","uri","factoryWrapper","data2","factory","onError","factoryResult","Error","loadDataCollection","sources","Promise","all","map","loadData","resolve","Uint8Array","Data","fromBytes","fromURI","then","d","useLoading","loader","deps","data","setData","prevSourceRef","current","useDataCollection","useRawData","identity","useData"],"mappings":"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","sourcesContent":["import type { DependencyList } from \"react\";\nimport { useRef, useEffect, useState } from \"react\";\nimport { Image, Platform } from \"react-native\";\n\nimport { Skia } from \"../Skia\";\nimport type { SkData, DataSource } from \"../types\";\n\nconst resolveAsset = (source: ReturnType<typeof require>) => {\n  return Platform.OS === \"web\"\n    ? source.default\n    : Image.resolveAssetSource(source).uri;\n};\n\nconst factoryWrapper = <T>(\n  data2: SkData,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n) => {\n  const factoryResult = factory(data2);\n  if (factoryResult === null) {\n    onError && onError(new Error(\"Could not load data\"));\n    return null;\n  } else {\n    return factoryResult;\n  }\n};\n\nconst loadDataCollection = <T>(\n  sources: DataSource[],\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n): Promise<(T | null)[]> =>\n  Promise.all(sources.map((source) => loadData(source, factory, onError)));\n\nconst loadData = <T>(\n  source: DataSource,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void\n): Promise<T | null> => {\n  if (source === null) {\n    return new Promise((resolve) => resolve(null));\n  } else if (source instanceof Uint8Array) {\n    return new Promise((resolve) =>\n      resolve(factoryWrapper(Skia.Data.fromBytes(source), factory, onError))\n    );\n  } else {\n    const uri = typeof source === \"string\" ? source : resolveAsset(source);\n    return Skia.Data.fromURI(uri).then((d) =>\n      factoryWrapper(d, factory, onError)\n    );\n  }\n};\n\ntype Source = DataSource | null | undefined;\n\nconst useLoading = <T>(\n  source: Source,\n  loader: () => Promise<T | null>,\n  deps: DependencyList = []\n) => {\n  const [data, setData] = useState<T | null>(null);\n  const prevSourceRef = useRef<Source>();\n  useEffect(() => {\n    if (prevSourceRef.current !== source) {\n      prevSourceRef.current = source;\n      loader().then(setData);\n    } else {\n      setData(null);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, deps);\n  return data;\n};\n\nexport const useDataCollection = <T>(\n  sources: DataSource[],\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) =>\n  useLoading(\n    sources,\n    () => loadDataCollection(sources, factory, onError),\n    deps\n  );\n\nexport const useRawData = <T>(\n  source: DataSource | null | undefined,\n  factory: (data: SkData) => T,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) => useLoading(source, () => loadData(source, factory, onError), deps);\n\nconst identity = (data: SkData) => data;\n\nexport const useData = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void,\n  deps?: DependencyList\n) => useRawData(source, identity, onError, deps);\n"]}

package/lib/module/skia/core/Image.js

@@ -1,8 +1,9 @@
 import { Skia } from "../Skia";
 import { useRawData } from "./Data";
+const imgFactory = Skia.Image.MakeImageFromEncoded.bind(Skia.Image);
 /**
  * Returns a Skia Image object
  * */
 
-export const useImage = (source, onError) => useRawData(source, Skia.Image.MakeImageFromEncoded, onError);
+export const useImage = (source, onError) => useRawData(source, imgFactory, onError);
 //# sourceMappingURL=Image.js.map

package/lib/module/skia/core/Image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Image.ts"],"names":["Skia","useRawData","useImage","source","onError","Image","MakeImageFromEncoded"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AAEA;AACA;AACA;;AACA,OAAO,MAAMC,QAAQ,GAAG,CACtBC,MADsB,EAEtBC,OAFsB,KAGnBH,UAAU,CAACE,MAAD,EAASH,IAAI,CAACK,KAAL,CAAWC,oBAApB,EAA0CF,OAA1C,CAHR","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\n/**\n * Returns a Skia Image object\n * */\nexport const useImage = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) => useRawData(source, Skia.Image.MakeImageFromEncoded, onError);\n"]}
+{"version":3,"sources":["Image.ts"],"names":["Skia","useRawData","imgFactory","Image","MakeImageFromEncoded","bind","useImage","source","onError"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AAEA,MAAMC,UAAU,GAAGF,IAAI,CAACG,KAAL,CAAWC,oBAAX,CAAgCC,IAAhC,CAAqCL,IAAI,CAACG,KAA1C,CAAnB;AAEA;AACA;AACA;;AACA,OAAO,MAAMG,QAAQ,GAAG,CACtBC,MADsB,EAEtBC,OAFsB,KAGnBP,UAAU,CAACM,MAAD,EAASL,UAAT,EAAqBM,OAArB,CAHR","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nconst imgFactory = Skia.Image.MakeImageFromEncoded.bind(Skia.Image);\n\n/**\n * Returns a Skia Image object\n * */\nexport const useImage = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) => useRawData(source, imgFactory, onError);\n"]}

package/lib/module/skia/core/SVG.js

@@ -1,4 +1,5 @@
 import { Skia } from "../Skia";
 import { useRawData } from "./Data";
-export const useSVG = (source, onError) => useRawData(source, Skia.SVG.MakeFromData, onError);
+const svgFactory = Skia.SVG.MakeFromData.bind(Skia.SVG);
+export const useSVG = (source, onError) => useRawData(source, svgFactory, onError);
 //# sourceMappingURL=SVG.js.map

package/lib/module/skia/core/SVG.js.map

@@ -1 +1 @@
-{"version":3,"sources":["SVG.ts"],"names":["Skia","useRawData","useSVG","source","onError","SVG","MakeFromData"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AAEA,OAAO,MAAMC,MAAM,GAAG,CACpBC,MADoB,EAEpBC,OAFoB,KAGjBH,UAAU,CAACE,MAAD,EAASH,IAAI,CAACK,GAAL,CAASC,YAAlB,EAAgCF,OAAhC,CAHR","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nexport const useSVG = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) => useRawData(source, Skia.SVG.MakeFromData, onError);\n"]}
+{"version":3,"sources":["SVG.ts"],"names":["Skia","useRawData","svgFactory","SVG","MakeFromData","bind","useSVG","source","onError"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AAEA,MAAMC,UAAU,GAAGF,IAAI,CAACG,GAAL,CAASC,YAAT,CAAsBC,IAAtB,CAA2BL,IAAI,CAACG,GAAhC,CAAnB;AAEA,OAAO,MAAMG,MAAM,GAAG,CACpBC,MADoB,EAEpBC,OAFoB,KAGjBP,UAAU,CAACM,MAAD,EAASL,UAAT,EAAqBM,OAArB,CAHR","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nconst svgFactory = Skia.SVG.MakeFromData.bind(Skia.SVG);\n\nexport const useSVG = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) => useRawData(source, svgFactory, onError);\n"]}

package/lib/module/skia/core/Typeface.js

@@ -1,8 +1,9 @@
 import { Skia } from "../Skia";
 import { useRawData } from "./Data";
+const tfFactory = Skia.Typeface.MakeFreeTypeFaceFromData.bind(Skia.Typeface);
 /**
  * Returns a Skia Typeface object
  * */
 
-export const useTypeface = (source, onError) => useRawData(source, Skia.Typeface.MakeFreeTypeFaceFromData.bind(Skia.Typeface), onError);
+export const useTypeface = (source, onError) => useRawData(source, tfFactory, onError);
 //# sourceMappingURL=Typeface.js.map

package/lib/module/skia/core/Typeface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Typeface.ts"],"names":["Skia","useRawData","useTypeface","source","onError","Typeface","MakeFreeTypeFaceFromData","bind"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AACA;AACA;AACA;;AACA,OAAO,MAAMC,WAAW,GAAG,CACzBC,MADyB,EAEzBC,OAFyB,KAIzBH,UAAU,CACRE,MADQ,EAERH,IAAI,CAACK,QAAL,CAAcC,wBAAd,CAAuCC,IAAvC,CAA4CP,IAAI,CAACK,QAAjD,CAFQ,EAGRD,OAHQ,CAJL","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n/**\n * Returns a Skia Typeface object\n * */\nexport const useTypeface = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) =>\n  useRawData(\n    source,\n    Skia.Typeface.MakeFreeTypeFaceFromData.bind(Skia.Typeface),\n    onError\n  );\n"]}
+{"version":3,"sources":["Typeface.ts"],"names":["Skia","useRawData","tfFactory","Typeface","MakeFreeTypeFaceFromData","bind","useTypeface","source","onError"],"mappings":"AAAA,SAASA,IAAT,QAAqB,SAArB;AAGA,SAASC,UAAT,QAA2B,QAA3B;AAEA,MAAMC,SAAS,GAAGF,IAAI,CAACG,QAAL,CAAcC,wBAAd,CAAuCC,IAAvC,CAA4CL,IAAI,CAACG,QAAjD,CAAlB;AAEA;AACA;AACA;;AACA,OAAO,MAAMG,WAAW,GAAG,CACzBC,MADyB,EAEzBC,OAFyB,KAGtBP,UAAU,CAACM,MAAD,EAASL,SAAT,EAAoBM,OAApB,CAHR","sourcesContent":["import { Skia } from \"../Skia\";\nimport type { DataSource } from \"../types\";\n\nimport { useRawData } from \"./Data\";\n\nconst tfFactory = Skia.Typeface.MakeFreeTypeFaceFromData.bind(Skia.Typeface);\n\n/**\n * Returns a Skia Typeface object\n * */\nexport const useTypeface = (\n  source: DataSource | null | undefined,\n  onError?: (err: Error) => void\n) => useRawData(source, tfFactory, onError);\n"]}

package/lib/module/skia/core/index.js

@@ -4,10 +4,8 @@ export * from "./Typeface";
 export * from "./Image";
 export * from "./Picture";
 export * from "./SVG";
-export * from "./Path";
 export * from "./Vector";
 export * from "./Rect";
 export * from "./RRect";
 export * from "./Matrix";
-export * from "./Paint";
 //# sourceMappingURL=index.js.map

package/lib/module/skia/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd;AACA,cAAc,SAAd;AACA,cAAc,WAAd;AACA,cAAc,OAAd;AACA,cAAc,QAAd;AACA,cAAc,UAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,UAAd;AACA,cAAc,SAAd","sourcesContent":["export * from \"./Data\";\nexport * from \"./Font\";\nexport * from \"./Typeface\";\nexport * from \"./Image\";\nexport * from \"./Picture\";\nexport * from \"./SVG\";\nexport * from \"./Path\";\nexport * from \"./Vector\";\nexport * from \"./Rect\";\nexport * from \"./RRect\";\nexport * from \"./Matrix\";\nexport * from \"./Paint\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd;AACA,cAAc,SAAd;AACA,cAAc,WAAd;AACA,cAAc,OAAd;AACA,cAAc,UAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,UAAd","sourcesContent":["export * from \"./Data\";\nexport * from \"./Font\";\nexport * from \"./Typeface\";\nexport * from \"./Image\";\nexport * from \"./Picture\";\nexport * from \"./SVG\";\nexport * from \"./Vector\";\nexport * from \"./Rect\";\nexport * from \"./RRect\";\nexport * from \"./Matrix\";\n"]}

package/lib/module/skia/types/Font/Font.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Font.ts"],"names":["fontStyle","weight","width","slant","FontWeight","FontWidth","FontSlant","FontEdging","FontHinting","FontStyle","Normal","Upright","Bold","Italic","BoldItalic"],"mappings":"AAyKA,MAAMA,SAAS,GAAG,CAChBC,MADgB,EAEhBC,KAFgB,EAGhBC,KAHgB,MAID;AAAEF,EAAAA,MAAF;AAAUC,EAAAA,KAAV;AAAiBC,EAAAA;AAAjB,CAJC,CAAlB;;AAYA,WAAYC,UAAZ;;WAAYA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,KAAAA,U;;AAcZ,WAAYC,SAAZ;;WAAYA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,KAAAA,S;;AAYZ,WAAYC,SAAZ;;WAAYA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,KAAAA,S;;AAMZ,WAAYC,UAAZ;;WAAYA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,KAAAA,U;;AAMZ,WAAYC,WAAZ;;WAAYA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;GAAAA,W,KAAAA,W;;AAOZ,OAAO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,MAAM,EAAEV,SAAS,CAACI,UAAU,CAACM,MAAZ,EAAoBL,SAAS,CAACK,MAA9B,EAAsCJ,SAAS,CAACK,OAAhD,CADM;AAEvBC,EAAAA,IAAI,EAAEZ,SAAS,CAACI,UAAU,CAACQ,IAAZ,EAAkBP,SAAS,CAACK,MAA5B,EAAoCJ,SAAS,CAACK,OAA9C,CAFQ;AAGvBE,EAAAA,MAAM,EAAEb,SAAS,CAACI,UAAU,CAACM,MAAZ,EAAoBL,SAAS,CAACK,MAA9B,EAAsCJ,SAAS,CAACO,MAAhD,CAHM;AAIvBC,EAAAA,UAAU,EAAEd,SAAS,CAACI,UAAU,CAACQ,IAAZ,EAAkBP,SAAS,CAACK,MAA5B,EAAoCJ,SAAS,CAACO,MAA9C;AAJE,CAAlB","sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkPaint } from \"../Paint\";\nimport type { SkRect } from \"../Rect\";\nimport type { SkPoint } from \"../Point\";\nimport type { SkTypeface } from \"../Typeface\";\n\nexport interface FontMetrics {\n  ascent: number; // suggested space above the baseline. < 0\n  descent: number; // suggested space below the baseline. > 0\n  leading: number; // suggested spacing between descent of previous line and ascent of next line.\n  bounds?: SkRect; // smallest rect containing all glyphs (relative to 0,0)\n}\n\nexport interface SkFont extends SkJSIInstance<\"Font\"> {\n  /**\n   * Retrieves the total width of the provided text\n   * @param text\n   * @param paint\n   */\n  getTextWidth(text: string, paint?: SkPaint): number;\n\n  /**\n   * Retrieves the advanceX measurements for each glyph.\n   * If paint is not null, its stroking, PathEffect, and MaskFilter fields are respected.\n   * One width per glyph is returned in the returned array.\n   * @param glyphs\n   * @param paint\n   */\n  getGlyphWidths(glyphs: number[], paint?: SkPaint): number[];\n\n  /** Returns the advance width of text.\n      The advance is the normal distance to move before drawing additional text.\n      Returns the bounding box of text if bounds is not nullptr. The paint\n      stroke settings, mask filter, or path effect may modify the bounds.\n\n      @param text        character storage encoded with SkTextEncoding\n      @param byteLength  length of character storage in bytes\n      @param bounds      returns bounding box relative to (0, 0) if not nullptr\n      @param paint       optional; may be nullptr\n      @return            number of glyphs represented by text of length byteLength\n  */\n  measureText: (text: string, paint?: SkPaint) => SkRect;\n\n  /**\n   * Returns the FontMetrics for this font.\n   */\n  getMetrics(): FontMetrics;\n\n  /**\n   * Retrieves the glyph ids for each code point in the provided string. This call is passed to\n   * the typeface of this font. Note that glyph IDs are typeface-dependent; different faces\n   * may have different ids for the same code point.\n   * @param str\n   * @param numCodePoints - the number of code points in the string. Defaults to str.length.\n   */\n  getGlyphIDs(str: string, numCodePoints?: number): number[];\n\n  /**\n   * Computes any intersections of a thick \"line\" and a run of positionsed glyphs.\n   * The thick line is represented as a top and bottom coordinate (positive for\n   * below the baseline, negative for above). If there are no intersections\n   * (e.g. if this is intended as an underline, and there are no \"collisions\")\n   * then the returned array will be empty. If there are intersections, the array\n   * will contain pairs of X coordinates [start, end] for each segment that\n   * intersected with a glyph.\n   *\n   * @param glyphs        the glyphs to intersect with\n   * @param positions     x,y coordinates (2 per glyph) for each glyph\n   * @param top           top of the thick \"line\" to use for intersection testing\n   * @param bottom        bottom of the thick \"line\" to use for intersection testing\n   * @return              array of [start, end] x-coordinate pairs. Maybe be empty.\n   */\n  getGlyphIntercepts(\n    glyphs: number[],\n    positions: SkPoint[],\n    top: number,\n    bottom: number\n  ): number[];\n\n  /**\n   * Returns text scale on x-axis. Default value is 1.\n   */\n  getScaleX(): number;\n\n  /**\n   * Returns text size in points.\n   */\n  getSize(): number;\n\n  /**\n   * Returns text skew on x-axis. Default value is zero.\n   */\n  getSkewX(): number;\n\n  /**\n   * Returns embolden effect for this font. Default value is false.\n   */\n  isEmbolden(): boolean;\n\n  /**\n   * Returns the Typeface set for this font.\n   */\n  getTypeface(): SkTypeface | null;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with partial transparency.\n   * @param edging\n   */\n  setEdging(edging: FontEdging): void;\n\n  /**\n   * Requests, but does not require, to use bitmaps in fonts instead of outlines.\n   * @param embeddedBitmaps\n   */\n  setEmbeddedBitmaps(embeddedBitmaps: boolean): void;\n\n  /**\n   * Sets level of glyph outline adjustment.\n   * @param hinting\n   */\n  setHinting(hinting: FontHinting): void;\n\n  /**\n   * Requests, but does not require, linearly scalable font and glyph metrics.\n   *\n   * For outline fonts 'true' means font and glyph metrics should ignore hinting and rounding.\n   * Note that some bitmap formats may not be able to scale linearly and will ignore this flag.\n   * @param linearMetrics\n   */\n  setLinearMetrics(linearMetrics: boolean): void;\n\n  /**\n   * Sets the text scale on the x-axis.\n   * @param sx\n   */\n  setScaleX(sx: number): void;\n\n  /**\n   * Sets the text size in points on this font.\n   * @param points\n   */\n  setSize(points: number): void;\n\n  /**\n   * Sets the text-skew on the x axis for this font.\n   * @param sx\n   */\n  setSkewX(sx: number): void;\n\n  /**\n   * Set embolden effect for this font.\n   * @param embolden\n   */\n  setEmbolden(embolden: boolean): void;\n\n  /**\n   * Requests, but does not require, that glyphs respect sub-pixel positioning.\n   * @param subpixel\n   */\n  setSubpixel(subpixel: boolean): void;\n\n  /**\n   * Sets the typeface to use with this font. null means to clear the typeface and use the\n   * default one.\n   * @param face\n   */\n  setTypeface(face: SkTypeface | null): void;\n}\n\nconst fontStyle = (\n  weight: FontWeight,\n  width: FontWidth,\n  slant: FontSlant\n): FontStyle => ({ weight, width, slant });\n\nexport interface FontStyle {\n  weight?: FontWeight;\n  width?: FontWidth;\n  slant?: FontSlant;\n}\n\nexport enum FontWeight {\n  Invisible = 0,\n  Thin = 100,\n  ExtraLight = 200,\n  Light = 300,\n  Normal = 400,\n  Medium = 500,\n  SemiBold = 600,\n  Bold = 700,\n  ExtraBold = 800,\n  Black = 900,\n  ExtraBlack = 1000,\n}\n\nexport enum FontWidth {\n  UltraCondensed = 1,\n  ExtraCondensed = 2,\n  Condensed = 3,\n  SemiCondensed = 4,\n  Normal = 5,\n  SemiExpanded = 6,\n  Expanded = 7,\n  ExtraExpanded = 8,\n  UltraExpanded = 9,\n}\n\nexport enum FontSlant {\n  Upright,\n  Italic,\n  Oblique,\n}\n\nexport enum FontEdging {\n  Alias,\n  AntiAlias,\n  SubpixelAntiAlias,\n}\n\nexport enum FontHinting {\n  None,\n  Slight,\n  Normal,\n  Full,\n}\n\nexport const FontStyle = {\n  Normal: fontStyle(FontWeight.Normal, FontWidth.Normal, FontSlant.Upright),\n  Bold: fontStyle(FontWeight.Bold, FontWidth.Normal, FontSlant.Upright),\n  Italic: fontStyle(FontWeight.Normal, FontWidth.Normal, FontSlant.Italic),\n  BoldItalic: fontStyle(FontWeight.Bold, FontWidth.Normal, FontSlant.Italic),\n};\n"]}
+{"version":3,"sources":["Font.ts"],"names":["fontStyle","weight","width","slant","FontWeight","FontWidth","FontSlant","FontEdging","FontHinting","FontStyle","Normal","Upright","Bold","Italic","BoldItalic"],"mappings":"AA4JA,MAAMA,SAAS,GAAG,CAChBC,MADgB,EAEhBC,KAFgB,EAGhBC,KAHgB,MAID;AAAEF,EAAAA,MAAF;AAAUC,EAAAA,KAAV;AAAiBC,EAAAA;AAAjB,CAJC,CAAlB;;AAYA,WAAYC,UAAZ;;WAAYA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,KAAAA,U;;AAcZ,WAAYC,SAAZ;;WAAYA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,KAAAA,S;;AAYZ,WAAYC,SAAZ;;WAAYA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,KAAAA,S;;AAMZ,WAAYC,UAAZ;;WAAYA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,KAAAA,U;;AAMZ,WAAYC,WAAZ;;WAAYA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;GAAAA,W,KAAAA,W;;AAOZ,OAAO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,MAAM,EAAEV,SAAS,CAACI,UAAU,CAACM,MAAZ,EAAoBL,SAAS,CAACK,MAA9B,EAAsCJ,SAAS,CAACK,OAAhD,CADM;AAEvBC,EAAAA,IAAI,EAAEZ,SAAS,CAACI,UAAU,CAACQ,IAAZ,EAAkBP,SAAS,CAACK,MAA5B,EAAoCJ,SAAS,CAACK,OAA9C,CAFQ;AAGvBE,EAAAA,MAAM,EAAEb,SAAS,CAACI,UAAU,CAACM,MAAZ,EAAoBL,SAAS,CAACK,MAA9B,EAAsCJ,SAAS,CAACO,MAAhD,CAHM;AAIvBC,EAAAA,UAAU,EAAEd,SAAS,CAACI,UAAU,CAACQ,IAAZ,EAAkBP,SAAS,CAACK,MAA5B,EAAoCJ,SAAS,CAACO,MAA9C;AAJE,CAAlB","sourcesContent":["import type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkPaint } from \"../Paint\";\nimport type { SkRect } from \"../Rect\";\nimport type { SkPoint } from \"../Point\";\nimport type { SkTypeface } from \"../Typeface\";\n\nexport interface FontMetrics {\n  ascent: number; // suggested space above the baseline. < 0\n  descent: number; // suggested space below the baseline. > 0\n  leading: number; // suggested spacing between descent of previous line and ascent of next line.\n  bounds?: SkRect; // smallest rect containing all glyphs (relative to 0,0)\n}\n\nexport interface SkFont extends SkJSIInstance<\"Font\"> {\n  /**\n   * Retrieves the total width of the provided text\n   * @param text\n   * @param paint\n   */\n  getTextWidth(text: string, paint?: SkPaint): number;\n\n  /**\n   * Retrieves the advanceX measurements for each glyph.\n   * If paint is not null, its stroking, PathEffect, and MaskFilter fields are respected.\n   * One width per glyph is returned in the returned array.\n   * @param glyphs\n   * @param paint\n   */\n  getGlyphWidths(glyphs: number[], paint?: SkPaint): number[];\n\n  /**\n   * Returns the FontMetrics for this font.\n   */\n  getMetrics(): FontMetrics;\n\n  /**\n   * Retrieves the glyph ids for each code point in the provided string. This call is passed to\n   * the typeface of this font. Note that glyph IDs are typeface-dependent; different faces\n   * may have different ids for the same code point.\n   * @param str\n   * @param numCodePoints - the number of code points in the string. Defaults to str.length.\n   */\n  getGlyphIDs(str: string, numCodePoints?: number): number[];\n\n  /**\n   * Computes any intersections of a thick \"line\" and a run of positionsed glyphs.\n   * The thick line is represented as a top and bottom coordinate (positive for\n   * below the baseline, negative for above). If there are no intersections\n   * (e.g. if this is intended as an underline, and there are no \"collisions\")\n   * then the returned array will be empty. If there are intersections, the array\n   * will contain pairs of X coordinates [start, end] for each segment that\n   * intersected with a glyph.\n   *\n   * @param glyphs        the glyphs to intersect with\n   * @param positions     x,y coordinates (2 per glyph) for each glyph\n   * @param top           top of the thick \"line\" to use for intersection testing\n   * @param bottom        bottom of the thick \"line\" to use for intersection testing\n   * @return              array of [start, end] x-coordinate pairs. Maybe be empty.\n   */\n  getGlyphIntercepts(\n    glyphs: number[],\n    positions: SkPoint[],\n    top: number,\n    bottom: number\n  ): number[];\n\n  /**\n   * Returns text scale on x-axis. Default value is 1.\n   */\n  getScaleX(): number;\n\n  /**\n   * Returns text size in points.\n   */\n  getSize(): number;\n\n  /**\n   * Returns text skew on x-axis. Default value is zero.\n   */\n  getSkewX(): number;\n\n  /**\n   * Returns embolden effect for this font. Default value is false.\n   */\n  isEmbolden(): boolean;\n\n  /**\n   * Returns the Typeface set for this font.\n   */\n  getTypeface(): SkTypeface | null;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with partial transparency.\n   * @param edging\n   */\n  setEdging(edging: FontEdging): void;\n\n  /**\n   * Requests, but does not require, to use bitmaps in fonts instead of outlines.\n   * @param embeddedBitmaps\n   */\n  setEmbeddedBitmaps(embeddedBitmaps: boolean): void;\n\n  /**\n   * Sets level of glyph outline adjustment.\n   * @param hinting\n   */\n  setHinting(hinting: FontHinting): void;\n\n  /**\n   * Requests, but does not require, linearly scalable font and glyph metrics.\n   *\n   * For outline fonts 'true' means font and glyph metrics should ignore hinting and rounding.\n   * Note that some bitmap formats may not be able to scale linearly and will ignore this flag.\n   * @param linearMetrics\n   */\n  setLinearMetrics(linearMetrics: boolean): void;\n\n  /**\n   * Sets the text scale on the x-axis.\n   * @param sx\n   */\n  setScaleX(sx: number): void;\n\n  /**\n   * Sets the text size in points on this font.\n   * @param points\n   */\n  setSize(points: number): void;\n\n  /**\n   * Sets the text-skew on the x axis for this font.\n   * @param sx\n   */\n  setSkewX(sx: number): void;\n\n  /**\n   * Set embolden effect for this font.\n   * @param embolden\n   */\n  setEmbolden(embolden: boolean): void;\n\n  /**\n   * Requests, but does not require, that glyphs respect sub-pixel positioning.\n   * @param subpixel\n   */\n  setSubpixel(subpixel: boolean): void;\n\n  /**\n   * Sets the typeface to use with this font. null means to clear the typeface and use the\n   * default one.\n   * @param face\n   */\n  setTypeface(face: SkTypeface | null): void;\n}\n\nconst fontStyle = (\n  weight: FontWeight,\n  width: FontWidth,\n  slant: FontSlant\n): FontStyle => ({ weight, width, slant });\n\nexport interface FontStyle {\n  weight?: FontWeight;\n  width?: FontWidth;\n  slant?: FontSlant;\n}\n\nexport enum FontWeight {\n  Invisible = 0,\n  Thin = 100,\n  ExtraLight = 200,\n  Light = 300,\n  Normal = 400,\n  Medium = 500,\n  SemiBold = 600,\n  Bold = 700,\n  ExtraBold = 800,\n  Black = 900,\n  ExtraBlack = 1000,\n}\n\nexport enum FontWidth {\n  UltraCondensed = 1,\n  ExtraCondensed = 2,\n  Condensed = 3,\n  SemiCondensed = 4,\n  Normal = 5,\n  SemiExpanded = 6,\n  Expanded = 7,\n  ExtraExpanded = 8,\n  UltraExpanded = 9,\n}\n\nexport enum FontSlant {\n  Upright,\n  Italic,\n  Oblique,\n}\n\nexport enum FontEdging {\n  Alias,\n  AntiAlias,\n  SubpixelAntiAlias,\n}\n\nexport enum FontHinting {\n  None,\n  Slight,\n  Normal,\n  Full,\n}\n\nexport const FontStyle = {\n  Normal: fontStyle(FontWeight.Normal, FontWidth.Normal, FontSlant.Upright),\n  Bold: fontStyle(FontWeight.Bold, FontWidth.Normal, FontSlant.Upright),\n  Italic: fontStyle(FontWeight.Normal, FontWidth.Normal, FontSlant.Italic),\n  BoldItalic: fontStyle(FontWeight.Bold, FontWidth.Normal, FontSlant.Italic),\n};\n"]}

package/lib/module/skia/types/Matrix.js

@@ -9,9 +9,10 @@ export let MatrixIndex;
   MatrixIndex[MatrixIndex["TransY"] = 5] = "TransY";
   MatrixIndex[MatrixIndex["Persp0"] = 6] = "Persp0";
   MatrixIndex[MatrixIndex["Persp1"] = 7] = "Persp1";
-  MatrixIndex[MatrixIndex["persp2"] = 8] = "persp2";
+  MatrixIndex[MatrixIndex["Persp2"] = 8] = "Persp2";
 })(MatrixIndex || (MatrixIndex = {}));
 
+export const isMatrix = obj => obj !== null && obj.__typename__ === "Matrix";
 export const processTransform = (m, transforms) => {
   for (const transform of transforms) {
     const key = Object.keys(transform)[0];
@@ -53,7 +54,12 @@ export const processTransform = (m, transforms) => {
     }
 
     if (key === "rotate" || key === "rotateZ") {
-      m.rotate(value);
+      if (isMatrix(m)) {
+        m.rotate(value);
+      } else {
+        m.rotate(toDegrees(value), 0, 0);
+      }
+
       continue;
     }
 
@@ -66,4 +72,8 @@ export const processTransform = (m, transforms) => {
 const exhaustiveCheck = a => {
   throw new Error(`Unknown transformation: ${a}`);
 };
+
+export const toDegrees = rad => {
+  return rad * 180 / Math.PI;
+};
 //# sourceMappingURL=Matrix.js.map

package/lib/module/skia/types/Matrix.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Matrix.ts"],"names":["MatrixIndex","processTransform","m","transforms","transform","key","Object","keys","value","translate","scale","skew","rotate","exhaustiveCheck","a","Error"],"mappings":"AACA,WAAYA,WAAZ;;WAAYA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;GAAAA,W,KAAAA,W;;AAkDZ,OAAO,MAAMC,gBAAgB,GAAG,CAACC,CAAD,EAAcC,UAAd,KAA2C;AACzE,OAAK,MAAMC,SAAX,IAAwBD,UAAxB,EAAoC;AAClC,UAAME,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,SAAF,CAAYD,KAAZ,EAAmB,CAAnB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,SAAF,CAAY,CAAZ,EAAeD,KAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACQ,KAAF,CAAQF,KAAR,EAAeA,KAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,KAAF,CAAQF,KAAR,EAAe,CAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,KAAF,CAAQ,CAAR,EAAWF,KAAX;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,IAAF,CAAOH,KAAP,EAAc,CAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,IAAF,CAAO,CAAP,EAAUH,KAAV;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzCH,MAAAA,CAAC,CAACU,MAAF,CAASJ,KAAT;AACA;AACD;;AACDK,IAAAA,eAAe,CAACR,GAAD,CAAf;AACD;;AACD,SAAOH,CAAP;AACD,CAvCM;;AAyCP,MAAMW,eAAe,GAAIC,CAAD,IAAqB;AAC3C,QAAM,IAAIC,KAAJ,CAAW,2BAA0BD,CAAE,EAAvC,CAAN;AACD,CAFD","sourcesContent":["import type { SkJSIInstance } from \"./JsiInstance\";\nexport enum MatrixIndex {\n  ScaleX = 0,\n  SkewX = 1,\n  TransX = 2,\n  SkewY = 3,\n  ScaleY = 4,\n  TransY = 5,\n  Persp0 = 6,\n  Persp1 = 7,\n  persp2 = 8,\n}\n\nexport interface SkMatrix extends SkJSIInstance<\"Matrix\"> {\n  concat: (matrix: SkMatrix) => void;\n  translate: (x: number, y: number) => void;\n  scale: (x: number, y?: number) => void;\n  skew: (x: number, y: number) => void;\n  rotate: (theta: number) => void;\n}\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\n\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\nexport const processTransform = (m: SkMatrix, transforms: Transforms2d) => {\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.translate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.translate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.scale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.scale(value, 1);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.scale(1, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.skew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.skew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      m.rotate(value);\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n\nconst exhaustiveCheck = (a: never): never => {\n  throw new Error(`Unknown transformation: ${a}`);\n};\n"]}
+{"version":3,"sources":["Matrix.ts"],"names":["MatrixIndex","isMatrix","obj","__typename__","processTransform","m","transforms","transform","key","Object","keys","value","translate","scale","skew","rotate","toDegrees","exhaustiveCheck","a","Error","rad","Math","PI"],"mappings":"AAEA,WAAYA,WAAZ;;WAAYA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;AAAAA,EAAAA,W,CAAAA,W;GAAAA,W,KAAAA,W;;AAYZ,OAAO,MAAMC,QAAQ,GAAIC,GAAD,IACtBA,GAAG,KAAK,IAAR,IAAiBA,GAAD,CAA+BC,YAA/B,KAAgD,QAD3D;AA0CP,OAAO,MAAMC,gBAAgB,GAAG,CAC9BC,CAD8B,EAE9BC,UAF8B,KAG3B;AACH,OAAK,MAAMC,SAAX,IAAwBD,UAAxB,EAAoC;AAClC,UAAME,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,SAAF,CAAYD,KAAZ,EAAmB,CAAnB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,SAAF,CAAY,CAAZ,EAAeD,KAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACQ,KAAF,CAAQF,KAAR,EAAeA,KAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,KAAF,CAAQF,KAAR,EAAe,CAAf;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,KAAF,CAAQ,CAAR,EAAWF,KAAX;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,IAAF,CAAOH,KAAP,EAAc,CAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,IAAF,CAAO,CAAP,EAAUH,KAAV;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzC,UAAIP,QAAQ,CAACI,CAAD,CAAZ,EAAiB;AACfA,QAAAA,CAAC,CAACU,MAAF,CAASJ,KAAT;AACD,OAFD,MAEO;AACLN,QAAAA,CAAC,CAACU,MAAF,CAASC,SAAS,CAACL,KAAD,CAAlB,EAA2B,CAA3B,EAA8B,CAA9B;AACD;;AACD;AACD;;AACDM,IAAAA,eAAe,CAACT,GAAD,CAAf;AACD;;AACD,SAAOH,CAAP;AACD,CA9CM;;AAgDP,MAAMY,eAAe,GAAIC,CAAD,IAAqB;AAC3C,QAAM,IAAIC,KAAJ,CAAW,2BAA0BD,CAAE,EAAvC,CAAN;AACD,CAFD;;AAIA,OAAO,MAAMF,SAAS,GAAII,GAAD,IAAiB;AACxC,SAAQA,GAAG,GAAG,GAAP,GAAcC,IAAI,CAACC,EAA1B;AACD,CAFM","sourcesContent":["import type { SkJSIInstance } from \"./JsiInstance\";\nimport type { SkCanvas } from \"./Canvas\";\nexport enum MatrixIndex {\n  ScaleX = 0,\n  SkewX = 1,\n  TransX = 2,\n  SkewY = 3,\n  ScaleY = 4,\n  TransY = 5,\n  Persp0 = 6,\n  Persp1 = 7,\n  Persp2 = 8,\n}\n\nexport const isMatrix = (obj: unknown): obj is SkMatrix =>\n  obj !== null && (obj as SkJSIInstance<string>).__typename__ === \"Matrix\";\n\nexport interface SkMatrix extends SkJSIInstance<\"Matrix\"> {\n  concat: (matrix: SkMatrix) => void;\n  translate: (x: number, y: number) => void;\n  scale: (x: number, y?: number) => void;\n  skew: (x: number, y: number) => void;\n  rotate: (theta: number) => void;\n  identity: () => void;\n}\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\n\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\nexport const processTransform = <T extends SkMatrix | SkCanvas>(\n  m: T,\n  transforms: Transforms2d\n) => {\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.translate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.translate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.scale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.scale(value, 1);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.scale(1, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.skew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.skew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      if (isMatrix(m)) {\n        m.rotate(value);\n      } else {\n        m.rotate(toDegrees(value), 0, 0);\n      }\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n\nconst exhaustiveCheck = (a: never): never => {\n  throw new Error(`Unknown transformation: ${a}`);\n};\n\nexport const toDegrees = (rad: number) => {\n  return (rad * 180) / Math.PI;\n};\n"]}

package/lib/module/skia/types/index.js

@@ -2,7 +2,6 @@ export * from "./Picture";
 export * from "./Data";
 export * from "./SVG";
 export * from "./Surface";
-export * from "./FontMgr";
 export * from "./Vertices";
 export * from "./RuntimeEffect";
 export * from "./Shader";

package/lib/module/skia/types/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAd;AACA,cAAc,QAAd;AACA,cAAc,OAAd;AACA,cAAc,WAAd;AACA,cAAc,WAAd;AACA,cAAc,YAAd;AACA,cAAc,iBAAd;AACA,cAAc,UAAd;AACA,cAAc,SAAd;AACA,cAAc,eAAd;AACA,cAAc,eAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd;AACA,cAAc,SAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,UAAd;AACA,cAAc,kBAAd;AACA,cAAc,cAAd;AACA,cAAc,UAAd;AACA,cAAc,cAAd;AACA,cAAc,SAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,WAAd;AACA,cAAc,eAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd","sourcesContent":["export * from \"./Picture\";\nexport * from \"./Data\";\nexport * from \"./SVG\";\nexport * from \"./Surface\";\nexport * from \"./FontMgr\";\nexport * from \"./Vertices\";\nexport * from \"./RuntimeEffect\";\nexport * from \"./Shader\";\nexport * from \"./Image\";\nexport * from \"./ColorFilter\";\nexport * from \"./ImageFilter\";\nexport * from \"./Font\";\nexport * from \"./Typeface\";\nexport * from \"./Paint\";\nexport * from \"./Path\";\nexport * from \"./Color\";\nexport * from \"./Canvas\";\nexport * from \"./ContourMeasure\";\nexport * from \"./MaskFilter\";\nexport * from \"./Matrix\";\nexport * from \"./PathEffect\";\nexport * from \"./Point\";\nexport * from \"./Rect\";\nexport * from \"./RRect\";\nexport * from \"./RSXform\";\nexport * from \"./JsiInstance\";\nexport * from \"./Skia\";\nexport * from \"./TextBlob\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAd;AACA,cAAc,QAAd;AACA,cAAc,OAAd;AACA,cAAc,WAAd;AACA,cAAc,YAAd;AACA,cAAc,iBAAd;AACA,cAAc,UAAd;AACA,cAAc,SAAd;AACA,cAAc,eAAd;AACA,cAAc,eAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd;AACA,cAAc,SAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,UAAd;AACA,cAAc,kBAAd;AACA,cAAc,cAAd;AACA,cAAc,UAAd;AACA,cAAc,cAAd;AACA,cAAc,SAAd;AACA,cAAc,QAAd;AACA,cAAc,SAAd;AACA,cAAc,WAAd;AACA,cAAc,eAAd;AACA,cAAc,QAAd;AACA,cAAc,YAAd","sourcesContent":["export * from \"./Picture\";\nexport * from \"./Data\";\nexport * from \"./SVG\";\nexport * from \"./Surface\";\nexport * from \"./Vertices\";\nexport * from \"./RuntimeEffect\";\nexport * from \"./Shader\";\nexport * from \"./Image\";\nexport * from \"./ColorFilter\";\nexport * from \"./ImageFilter\";\nexport * from \"./Font\";\nexport * from \"./Typeface\";\nexport * from \"./Paint\";\nexport * from \"./Path\";\nexport * from \"./Color\";\nexport * from \"./Canvas\";\nexport * from \"./ContourMeasure\";\nexport * from \"./MaskFilter\";\nexport * from \"./Matrix\";\nexport * from \"./PathEffect\";\nexport * from \"./Point\";\nexport * from \"./Rect\";\nexport * from \"./RRect\";\nexport * from \"./RSXform\";\nexport * from \"./JsiInstance\";\nexport * from \"./Skia\";\nexport * from \"./TextBlob\";\n"]}

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

@@ -6,12 +6,6 @@ export class JsiSkFont extends HostObject {
     super(CanvasKit, ref, "Font");
   }
 
-  measureText(_text, _paint) {
-    console.warn(`measureText() is deprecated an returns an empty rectangle on React Native Web.
-Clients should use "Font.getGlyphWidths" instead (the latter does no shaping)`);
-    return new JsiSkRect(this.CanvasKit, this.CanvasKit.XYWHRect(0, 0, 0, 0));
-  }
-
   getTextWidth(text, paint) {
     const ids = this.getGlyphIDs(text);
     const widths = this.getGlyphWidths(ids, paint);

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

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkFont.ts"],"names":["HostObject","toValue","ckEnum","JsiSkRect","JsiSkTypeface","JsiSkFont","constructor","CanvasKit","ref","measureText","_text","_paint","console","warn","XYWHRect","getTextWidth","text","paint","ids","getGlyphIDs","widths","getGlyphWidths","reduce","a","b","getMetrics","result","ascent","descent","leading","bounds","undefined","str","numCodePoints","glyphs","getGlyphIntercepts","positions","top","bottom","map","p","getScaleX","getSize","getSkewX","isEmbolden","getTypeface","tf","setEdging","edging","setEmbeddedBitmaps","embeddedBitmaps","setHinting","hinting","setLinearMetrics","linearMetrics","setScaleX","sx","setSize","points","setSkewX","setEmbolden","embolden","setSubpixel","subpixel","setTypeface","face"],"mappings":"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","sourcesContent":["import type { CanvasKit, Font } from \"canvaskit-wasm\";\n\nimport type {\n  FontEdging,\n  FontHinting,\n  SkFont,\n  SkPaint,\n  SkPoint,\n  SkRect,\n  SkTypeface,\n} from \"../types\";\n\nimport { HostObject, toValue, ckEnum } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkFont extends HostObject<Font, \"Font\"> implements SkFont {\n  constructor(CanvasKit: CanvasKit, ref: Font) {\n    super(CanvasKit, ref, \"Font\");\n  }\n\n  measureText(_text: string, _paint?: SkPaint): SkRect {\n    console.warn(\n      `measureText() is deprecated an returns an empty rectangle on React Native Web.\nClients should use \"Font.getGlyphWidths\" instead (the latter does no shaping)`\n    );\n    return new JsiSkRect(this.CanvasKit, this.CanvasKit.XYWHRect(0, 0, 0, 0));\n  }\n\n  getTextWidth(text: string, paint?: SkPaint | undefined) {\n    const ids = this.getGlyphIDs(text);\n    const widths = this.getGlyphWidths(ids, paint);\n    return widths.reduce((a, b) => a + b, 0);\n  }\n\n  getMetrics() {\n    const result = this.ref.getMetrics();\n    return {\n      ascent: result.ascent,\n      descent: result.descent,\n      leading: result.leading,\n      bounds: result.bounds\n        ? new JsiSkRect(this.CanvasKit, result.bounds)\n        : undefined,\n    };\n  }\n\n  getGlyphIDs(str: string, numCodePoints?: number) {\n    // TODO: Fix return value in the C++ implementation\n    return [...this.ref.getGlyphIDs(str, numCodePoints)];\n  }\n\n  // TODO: Fix return value in the C++ implementation, it return float32\n  getGlyphWidths(glyphs: number[], paint?: SkPaint | null) {\n    return [...this.ref.getGlyphWidths(glyphs, paint ? toValue(paint) : null)];\n  }\n\n  getGlyphIntercepts(\n    glyphs: number[],\n    positions: SkPoint[],\n    top: number,\n    bottom: number\n  ) {\n    return [\n      ...this.ref.getGlyphIntercepts(\n        glyphs,\n        positions.map((p) => toValue(p)),\n        top,\n        bottom\n      ),\n    ];\n  }\n\n  getScaleX() {\n    return this.ref.getScaleX();\n  }\n\n  getSize() {\n    return this.ref.getSize();\n  }\n\n  getSkewX() {\n    return this.ref.getSkewX();\n  }\n\n  isEmbolden() {\n    return this.ref.isEmbolden();\n  }\n\n  getTypeface() {\n    const tf = this.ref.getTypeface();\n    return tf ? new JsiSkTypeface(this.CanvasKit, tf) : null;\n  }\n\n  setEdging(edging: FontEdging) {\n    this.ref.setEdging(ckEnum(edging));\n  }\n\n  setEmbeddedBitmaps(embeddedBitmaps: boolean) {\n    this.ref.setEmbeddedBitmaps(embeddedBitmaps);\n  }\n\n  setHinting(hinting: FontHinting) {\n    this.ref.setHinting(ckEnum(hinting));\n  }\n\n  setLinearMetrics(linearMetrics: boolean) {\n    this.ref.setLinearMetrics(linearMetrics);\n  }\n\n  setScaleX(sx: number) {\n    this.ref.setScaleX(sx);\n  }\n\n  setSize(points: number) {\n    this.ref.setSize(points);\n  }\n\n  setSkewX(sx: number) {\n    this.ref.setSkewX(sx);\n  }\n\n  setEmbolden(embolden: boolean) {\n    this.ref.setEmbolden(embolden);\n  }\n\n  setSubpixel(subpixel: boolean) {\n    this.ref.setSubpixel(subpixel);\n  }\n\n  setTypeface(face: SkTypeface | null) {\n    this.ref.setTypeface(face ? toValue(face) : null);\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkFont.ts"],"names":["HostObject","toValue","ckEnum","JsiSkRect","JsiSkTypeface","JsiSkFont","constructor","CanvasKit","ref","getTextWidth","text","paint","ids","getGlyphIDs","widths","getGlyphWidths","reduce","a","b","getMetrics","result","ascent","descent","leading","bounds","undefined","str","numCodePoints","glyphs","getGlyphIntercepts","positions","top","bottom","map","p","getScaleX","getSize","getSkewX","isEmbolden","getTypeface","tf","setEdging","edging","setEmbeddedBitmaps","embeddedBitmaps","setHinting","hinting","setLinearMetrics","linearMetrics","setScaleX","sx","setSize","points","setSkewX","setEmbolden","embolden","setSubpixel","subpixel","setTypeface","face"],"mappings":"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","sourcesContent":["import type { CanvasKit, Font } from \"canvaskit-wasm\";\n\nimport type {\n  FontEdging,\n  FontHinting,\n  SkFont,\n  SkPaint,\n  SkPoint,\n  SkTypeface,\n} from \"../types\";\n\nimport { HostObject, toValue, ckEnum } from \"./Host\";\nimport { JsiSkRect } from \"./JsiSkRect\";\nimport { JsiSkTypeface } from \"./JsiSkTypeface\";\n\nexport class JsiSkFont extends HostObject<Font, \"Font\"> implements SkFont {\n  constructor(CanvasKit: CanvasKit, ref: Font) {\n    super(CanvasKit, ref, \"Font\");\n  }\n\n  getTextWidth(text: string, paint?: SkPaint | undefined) {\n    const ids = this.getGlyphIDs(text);\n    const widths = this.getGlyphWidths(ids, paint);\n    return widths.reduce((a, b) => a + b, 0);\n  }\n\n  getMetrics() {\n    const result = this.ref.getMetrics();\n    return {\n      ascent: result.ascent,\n      descent: result.descent,\n      leading: result.leading,\n      bounds: result.bounds\n        ? new JsiSkRect(this.CanvasKit, result.bounds)\n        : undefined,\n    };\n  }\n\n  getGlyphIDs(str: string, numCodePoints?: number) {\n    // TODO: Fix return value in the C++ implementation\n    return [...this.ref.getGlyphIDs(str, numCodePoints)];\n  }\n\n  // TODO: Fix return value in the C++ implementation, it return float32\n  getGlyphWidths(glyphs: number[], paint?: SkPaint | null) {\n    return [...this.ref.getGlyphWidths(glyphs, paint ? toValue(paint) : null)];\n  }\n\n  getGlyphIntercepts(\n    glyphs: number[],\n    positions: SkPoint[],\n    top: number,\n    bottom: number\n  ) {\n    return [\n      ...this.ref.getGlyphIntercepts(\n        glyphs,\n        positions.map((p) => toValue(p)),\n        top,\n        bottom\n      ),\n    ];\n  }\n\n  getScaleX() {\n    return this.ref.getScaleX();\n  }\n\n  getSize() {\n    return this.ref.getSize();\n  }\n\n  getSkewX() {\n    return this.ref.getSkewX();\n  }\n\n  isEmbolden() {\n    return this.ref.isEmbolden();\n  }\n\n  getTypeface() {\n    const tf = this.ref.getTypeface();\n    return tf ? new JsiSkTypeface(this.CanvasKit, tf) : null;\n  }\n\n  setEdging(edging: FontEdging) {\n    this.ref.setEdging(ckEnum(edging));\n  }\n\n  setEmbeddedBitmaps(embeddedBitmaps: boolean) {\n    this.ref.setEmbeddedBitmaps(embeddedBitmaps);\n  }\n\n  setHinting(hinting: FontHinting) {\n    this.ref.setHinting(ckEnum(hinting));\n  }\n\n  setLinearMetrics(linearMetrics: boolean) {\n    this.ref.setLinearMetrics(linearMetrics);\n  }\n\n  setScaleX(sx: number) {\n    this.ref.setScaleX(sx);\n  }\n\n  setSize(points: number) {\n    this.ref.setSize(points);\n  }\n\n  setSkewX(sx: number) {\n    this.ref.setSkewX(sx);\n  }\n\n  setEmbolden(embolden: boolean) {\n    this.ref.setEmbolden(embolden);\n  }\n\n  setSubpixel(subpixel: boolean) {\n    this.ref.setSubpixel(subpixel);\n  }\n\n  setTypeface(face: SkTypeface | null) {\n    this.ref.setTypeface(face ? toValue(face) : null);\n  }\n}\n"]}

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

@@ -24,5 +24,9 @@ export class JsiSkMatrix extends HostObject {
     this.concat(new JsiSkMatrix(this.CanvasKit, Float32Array.of(...this.CanvasKit.Matrix.rotated(value))));
   }
 
+  identity() {
+    this.ref.set(this.CanvasKit.Matrix.identity());
+  }
+
 }
 //# sourceMappingURL=JsiSkMatrix.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkMatrix.ts"],"names":["HostObject","toValue","JsiSkMatrix","constructor","CanvasKit","ref","concat","matrix","set","Matrix","multiply","translate","x","y","Float32Array","of","translated","scale","scaled","skew","skewed","rotate","value","rotated"],"mappings":"AAIA,SAASA,UAAT,EAAqBC,OAArB,QAAoC,QAApC;AAEA,OAAO,MAAMC,WAAN,SACGF,UADH,CAGP;AACEG,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAuC;AAChD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,QAAtB;AACD;;AAEDC,EAAAA,MAAM,CAACC,MAAD,EAAmB;AACvB,SAAKF,GAAL,CAASG,GAAT,CAAa,KAAKJ,SAAL,CAAeK,MAAf,CAAsBC,QAAtB,CAA+B,KAAKL,GAApC,EAAyCJ,OAAO,CAACM,MAAD,CAAhD,CAAb;AACD;;AAEDI,EAAAA,SAAS,CAACC,CAAD,EAAYC,CAAZ,EAAuB;AAC9B,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBO,UAAtB,CAAiCJ,CAAjC,EAAoCC,CAApC,CAAnB,CAFF,CADF;AAMD;;AAEDI,EAAAA,KAAK,CAACL,CAAD,EAAYC,CAAZ,EAAwB;AAC3B,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBS,MAAtB,CAA6BN,CAA7B,EAAgCC,CAAhC,aAAgCA,CAAhC,cAAgCA,CAAhC,GAAqCD,CAArC,CAAnB,CAFF,CADF;AAMD;;AAEDO,EAAAA,IAAI,CAACP,CAAD,EAAYC,CAAZ,EAAuB;AACzB,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBW,MAAtB,CAA6BR,CAA7B,EAAgCC,CAAhC,CAAnB,CAFF,CADF;AAMD;;AAEDQ,EAAAA,MAAM,CAACC,KAAD,EAAgB;AACpB,SAAKhB,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBc,OAAtB,CAA8BD,KAA9B,CAAnB,CAFF,CADF;AAMD;;AA3CH","sourcesContent":["import type { CanvasKit, Matrix3x3 } from \"canvaskit-wasm\";\n\nimport type { SkMatrix } from \"../types\";\n\nimport { HostObject, toValue } from \"./Host\";\n\nexport class JsiSkMatrix\n  extends HostObject<Matrix3x3, \"Matrix\">\n  implements SkMatrix\n{\n  constructor(CanvasKit: CanvasKit, ref: Matrix3x3) {\n    super(CanvasKit, ref, \"Matrix\");\n  }\n\n  concat(matrix: SkMatrix) {\n    this.ref.set(this.CanvasKit.Matrix.multiply(this.ref, toValue(matrix)));\n  }\n\n  translate(x: number, y: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.translated(x, y))\n      )\n    );\n  }\n\n  scale(x: number, y?: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.scaled(x, y ?? x))\n      )\n    );\n  }\n\n  skew(x: number, y: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.skewed(x, y))\n      )\n    );\n  }\n\n  rotate(value: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.rotated(value))\n      )\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkMatrix.ts"],"names":["HostObject","toValue","JsiSkMatrix","constructor","CanvasKit","ref","concat","matrix","set","Matrix","multiply","translate","x","y","Float32Array","of","translated","scale","scaled","skew","skewed","rotate","value","rotated","identity"],"mappings":"AAIA,SAASA,UAAT,EAAqBC,OAArB,QAAoC,QAApC;AAEA,OAAO,MAAMC,WAAN,SACGF,UADH,CAGP;AACEG,EAAAA,WAAW,CAACC,SAAD,EAAuBC,GAAvB,EAAuC;AAChD,UAAMD,SAAN,EAAiBC,GAAjB,EAAsB,QAAtB;AACD;;AAEDC,EAAAA,MAAM,CAACC,MAAD,EAAmB;AACvB,SAAKF,GAAL,CAASG,GAAT,CAAa,KAAKJ,SAAL,CAAeK,MAAf,CAAsBC,QAAtB,CAA+B,KAAKL,GAApC,EAAyCJ,OAAO,CAACM,MAAD,CAAhD,CAAb;AACD;;AAEDI,EAAAA,SAAS,CAACC,CAAD,EAAYC,CAAZ,EAAuB;AAC9B,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBO,UAAtB,CAAiCJ,CAAjC,EAAoCC,CAApC,CAAnB,CAFF,CADF;AAMD;;AAEDI,EAAAA,KAAK,CAACL,CAAD,EAAYC,CAAZ,EAAwB;AAC3B,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBS,MAAtB,CAA6BN,CAA7B,EAAgCC,CAAhC,aAAgCA,CAAhC,cAAgCA,CAAhC,GAAqCD,CAArC,CAAnB,CAFF,CADF;AAMD;;AAEDO,EAAAA,IAAI,CAACP,CAAD,EAAYC,CAAZ,EAAuB;AACzB,SAAKP,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBW,MAAtB,CAA6BR,CAA7B,EAAgCC,CAAhC,CAAnB,CAFF,CADF;AAMD;;AAEDQ,EAAAA,MAAM,CAACC,KAAD,EAAgB;AACpB,SAAKhB,MAAL,CACE,IAAIJ,WAAJ,CACE,KAAKE,SADP,EAEEU,YAAY,CAACC,EAAb,CAAgB,GAAG,KAAKX,SAAL,CAAeK,MAAf,CAAsBc,OAAtB,CAA8BD,KAA9B,CAAnB,CAFF,CADF;AAMD;;AAEDE,EAAAA,QAAQ,GAAG;AACT,SAAKnB,GAAL,CAASG,GAAT,CAAa,KAAKJ,SAAL,CAAeK,MAAf,CAAsBe,QAAtB,EAAb;AACD;;AA/CH","sourcesContent":["import type { CanvasKit, Matrix3x3 } from \"canvaskit-wasm\";\n\nimport type { SkMatrix } from \"../types\";\n\nimport { HostObject, toValue } from \"./Host\";\n\nexport class JsiSkMatrix\n  extends HostObject<Matrix3x3, \"Matrix\">\n  implements SkMatrix\n{\n  constructor(CanvasKit: CanvasKit, ref: Matrix3x3) {\n    super(CanvasKit, ref, \"Matrix\");\n  }\n\n  concat(matrix: SkMatrix) {\n    this.ref.set(this.CanvasKit.Matrix.multiply(this.ref, toValue(matrix)));\n  }\n\n  translate(x: number, y: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.translated(x, y))\n      )\n    );\n  }\n\n  scale(x: number, y?: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.scaled(x, y ?? x))\n      )\n    );\n  }\n\n  skew(x: number, y: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.skewed(x, y))\n      )\n    );\n  }\n\n  rotate(value: number) {\n    this.concat(\n      new JsiSkMatrix(\n        this.CanvasKit,\n        Float32Array.of(...this.CanvasKit.Matrix.rotated(value))\n      )\n    );\n  }\n\n  identity() {\n    this.ref.set(this.CanvasKit.Matrix.identity());\n  }\n}\n"]}

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

@@ -14,7 +14,7 @@ export class JsiSkTextBlobFactory extends Host {
   }
 
   MakeFromRSXform(str, rsxforms, font) {
-    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXform(str, rsxforms.map(f => toValue(f)), toValue(font)));
+    return new JsiSkTextBlob(this.CanvasKit, this.CanvasKit.TextBlob.MakeFromRSXform(str, rsxforms.map(f => Array.from(toValue(f))).flat(), toValue(font)));
   }
 
   MakeFromRSXformGlyphs(glyphs, rsxforms, font) {

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

@@ -1 +1 @@
-{"version":3,"sources":["JsiSkTextBlobFactory.ts"],"names":["Host","toValue","JsiSkTextBlob","JsiSkTextBlobFactory","constructor","CanvasKit","MakeFromText","str","font","TextBlob","MakeFromGlyphs","glyphs","MakeFromRSXform","rsxforms","map","f","MakeFromRSXformGlyphs"],"mappings":"AAKA,SAASA,IAAT,EAAeC,OAAf,QAA8B,QAA9B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,oBAAN,SAAmCH,IAAnC,CAAmE;AACxEI,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,YAAY,CAACC,GAAD,EAAcC,IAAd,EAA4B;AACtC,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBH,YAAxB,CAAqCC,GAArC,EAA0CN,OAAO,CAACO,IAAD,CAAjD,CAFK,CAAP;AAID;;AAEDE,EAAAA,cAAc,CAACC,MAAD,EAAmBH,IAAnB,EAAiC;AAC7C,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBC,cAAxB,CAAuCC,MAAvC,EAA+CV,OAAO,CAACO,IAAD,CAAtD,CAFK,CAAP;AAID;;AAEDI,EAAAA,eAAe,CAACL,GAAD,EAAcM,QAAd,EAAqCL,IAArC,EAAmD;AAChE,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBG,eAAxB,CACEL,GADF,EAEEM,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOd,OAAO,CAACc,CAAD,CAA3B,CAFF,EAGEd,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAEDQ,EAAAA,qBAAqB,CAACL,MAAD,EAAmBE,QAAnB,EAA0CL,IAA1C,EAAwD;AAC3E,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBO,qBAAxB,CACEL,MADF,EAEEE,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOd,OAAO,CAACc,CAAD,CAA3B,CAFF,EAGEd,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAvCuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkFont, SkRSXform } from \"../types\";\nimport type { TextBlobFactory } from \"../types/TextBlob\";\n\nimport { Host, toValue } from \"./Host\";\nimport { JsiSkTextBlob } from \"./JsiSkTextBlob\";\n\nexport class JsiSkTextBlobFactory extends Host implements TextBlobFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFromText(str: string, font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromText(str, toValue(font))\n    );\n  }\n\n  MakeFromGlyphs(glyphs: number[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, toValue(font))\n    );\n  }\n\n  MakeFromRSXform(str: string, rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXform(\n        str,\n        rsxforms.map((f) => toValue(f)),\n        toValue(font)\n      )\n    );\n  }\n\n  MakeFromRSXformGlyphs(glyphs: number[], rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(\n        glyphs,\n        rsxforms.map((f) => toValue(f)),\n        toValue(font)\n      )\n    );\n  }\n}\n"]}
+{"version":3,"sources":["JsiSkTextBlobFactory.ts"],"names":["Host","toValue","JsiSkTextBlob","JsiSkTextBlobFactory","constructor","CanvasKit","MakeFromText","str","font","TextBlob","MakeFromGlyphs","glyphs","MakeFromRSXform","rsxforms","map","f","Array","from","flat","MakeFromRSXformGlyphs"],"mappings":"AAKA,SAASA,IAAT,EAAeC,OAAf,QAA8B,QAA9B;AACA,SAASC,aAAT,QAA8B,iBAA9B;AAEA,OAAO,MAAMC,oBAAN,SAAmCH,IAAnC,CAAmE;AACxEI,EAAAA,WAAW,CAACC,SAAD,EAAuB;AAChC,UAAMA,SAAN;AACD;;AAEDC,EAAAA,YAAY,CAACC,GAAD,EAAcC,IAAd,EAA4B;AACtC,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBH,YAAxB,CAAqCC,GAArC,EAA0CN,OAAO,CAACO,IAAD,CAAjD,CAFK,CAAP;AAID;;AAEDE,EAAAA,cAAc,CAACC,MAAD,EAAmBH,IAAnB,EAAiC;AAC7C,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBC,cAAxB,CAAuCC,MAAvC,EAA+CV,OAAO,CAACO,IAAD,CAAtD,CAFK,CAAP;AAID;;AAEDI,EAAAA,eAAe,CAACL,GAAD,EAAcM,QAAd,EAAqCL,IAArC,EAAmD;AAChE,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBG,eAAxB,CACEL,GADF,EAEEM,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOC,KAAK,CAACC,IAAN,CAAWhB,OAAO,CAAec,CAAf,CAAlB,CAApB,EAA0DG,IAA1D,EAFF,EAGEjB,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAEDW,EAAAA,qBAAqB,CAACR,MAAD,EAAmBE,QAAnB,EAA0CL,IAA1C,EAAwD;AAC3E,WAAO,IAAIN,aAAJ,CACL,KAAKG,SADA,EAEL,KAAKA,SAAL,CAAeI,QAAf,CAAwBU,qBAAxB,CACER,MADF,EAEEE,QAAQ,CAACC,GAAT,CAAcC,CAAD,IAAOd,OAAO,CAACc,CAAD,CAA3B,CAFF,EAGEd,OAAO,CAACO,IAAD,CAHT,CAFK,CAAP;AAQD;;AAvCuE","sourcesContent":["import type { CanvasKit } from \"canvaskit-wasm\";\n\nimport type { SkFont, SkRSXform } from \"../types\";\nimport type { TextBlobFactory } from \"../types/TextBlob\";\n\nimport { Host, toValue } from \"./Host\";\nimport { JsiSkTextBlob } from \"./JsiSkTextBlob\";\n\nexport class JsiSkTextBlobFactory extends Host implements TextBlobFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeFromText(str: string, font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromText(str, toValue(font))\n    );\n  }\n\n  MakeFromGlyphs(glyphs: number[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromGlyphs(glyphs, toValue(font))\n    );\n  }\n\n  MakeFromRSXform(str: string, rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXform(\n        str,\n        rsxforms.map((f) => Array.from(toValue<Float32Array>(f))).flat(),\n        toValue(font)\n      )\n    );\n  }\n\n  MakeFromRSXformGlyphs(glyphs: number[], rsxforms: SkRSXform[], font: SkFont) {\n    return new JsiSkTextBlob(\n      this.CanvasKit,\n      this.CanvasKit.TextBlob.MakeFromRSXformGlyphs(\n        glyphs,\n        rsxforms.map((f) => toValue(f)),\n        toValue(font)\n      )\n    );\n  }\n}\n"]}

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

@@ -22,7 +22,6 @@ import { JsiSkDataFactory } from "./JsiSkDataFactory";
 import { JsiSkImageFactory } from "./JsiSkImageFactory";
 import { JsiSkSVGFactory } from "./JsiSkSVGFactory";
 import { JsiSkTextBlobFactory } from "./JsiSkTextBlobFactory";
-import { JsiSkFontMgrFactory } from "./JsiSkFontMgrFactory";
 import { JsiSkFont } from "./JsiSkFont";
 import { MakeVertices } from "./JsiSkVerticesFactory";
 export const JsiSkApi = CanvasKit => ({
@@ -52,7 +51,6 @@ export const JsiSkApi = CanvasKit => ({
   Image: new JsiSkImageFactory(CanvasKit),
   SVG: new JsiSkSVGFactory(CanvasKit),
   TextBlob: new JsiSkTextBlobFactory(CanvasKit),
-  FontMgr: new JsiSkFontMgrFactory(CanvasKit),
   XYWHRect: (x, y, width, height) => {
     return new JsiSkRect(CanvasKit, CanvasKit.XYWHRect(x, y, width, height));
   },