@shopify/react-native-skia 0.1.142 → 0.1.146

package/lib/commonjs/renderer/components/Blend.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Blend.tsx"],"names":["onDeclare","children","mode","Skia","inner","outer","blend","BlendMode","ImageFilter","MakeBlend","Shader","Error","Blend","props"],"mappings":";;;;;;;AACA;;AAEA;;AACA;;AAEA;;;;;;AAOA,MAAMA,SAAS,GAAG,8BAChB,OAAWC,QAAX,YAAkC;AAAA,MAAjC;AAAEC,IAAAA;AAAF,GAAiC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAChC,QAAM,CAACC,KAAD,EAAQC,KAAR,IAAiBJ,QAAvB;;AACA,QAAMK,KAAK,GAAGC,iBAAU,oBAAQL,IAAR,CAAV,CAAd;;AACA,MAAI,0BAAcG,KAAd,KAAwB,0BAAcD,KAAd,CAA5B,EAAkD;AAChD,WAAOD,IAAI,CAACK,WAAL,CAAiBC,SAAjB,CAA2BH,KAA3B,EAAkCD,KAAlC,EAAyCD,KAAzC,CAAP;AACD,GAFD,MAEO,IAAI,qBAASC,KAAT,KAAmB,qBAASD,KAAT,CAAvB,EAAwC;AAC7C,WAAOD,IAAI,CAACO,MAAL,CAAYD,SAAZ,CAAsBH,KAAtB,EAA6BD,KAA7B,EAAoCD,KAApC,CAAP;AACD;;AACD,QAAM,IAAIO,KAAJ,CAAU,kDAAV,CAAN;AACD,CAVe,CAAlB;;AAaO,MAAMC,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAe,IAAA,SAAS,EAAEb;AAA1B,KAAyCa,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import type { ReactNode } from \"react\";\nimport React from \"react\";\n\nimport { isImageFilter, BlendMode, isShader } from \"../../skia/types\";\nimport { createDeclaration } from \"../nodes\";\nimport type { AnimatedProps, SkEnum } from \"../processors\";\nimport { enumKey } from \"../processors/Paint\";\n\ninterface BlendProps {\n  mode: SkEnum<typeof BlendMode>;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlendProps>(\n  ({ mode }, children, { Skia }) => {\n    const [inner, outer] = children;\n    const blend = BlendMode[enumKey(mode)];\n    if (isImageFilter(outer) && isImageFilter(inner)) {\n      return Skia.ImageFilter.MakeBlend(blend, outer, inner);\n    } else if (isShader(outer) && isShader(inner)) {\n      return Skia.Shader.MakeBlend(blend, outer, inner);\n    }\n    throw new Error(\"<Blend /> can only blend Shaders or ImageFilters\");\n  }\n);\n\nexport const Blend = (props: AnimatedProps<BlendProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["Blend.tsx"],"names":["childrenAreImageFilters","children","every","child","childrenAreShaders","onDeclare","mode","Skia","blend","BlendMode","reverse","reduce","inner","outer","ImageFilter","MakeBlend","Shader","Error","Blend","props"],"mappings":";;;;;;;AACA;;AAGA;;AACA;;AAEA;;;;;;AAGA,MAAMA,uBAAuB,GAC3BC,QAD8B,IAG9BA,QAAQ,CAACC,KAAT,CAAgBC,KAAD,IAAW,0BAAcA,KAAd,CAA1B,CAHF;;AAKA,MAAMC,kBAAkB,GACtBH,QADyB,IAEEA,QAAQ,CAACC,KAAT,CAAgBC,KAAD,IAAW,qBAASA,KAAT,CAA1B,CAF7B;;AASA,MAAME,SAAS,GAAG,8BAChB,OAAWJ,QAAX,YAAkC;AAAA,MAAjC;AAAEK,IAAAA;AAAF,GAAiC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;;AAChC,QAAMC,KAAK,GAAGC,iBAAU,oBAAQH,IAAR,CAAV,CAAd;;AACA,MAAIN,uBAAuB,CAACC,QAAD,CAA3B,EAAuC;AACrC,WAAOA,QAAQ,CAACS,OAAT,GAAmBC,MAAnB,CAAgD,CAACC,KAAD,EAAQC,KAAR,KAAkB;AACvE,UAAID,KAAK,KAAK,IAAd,EAAoB;AAClB,eAAOC,KAAP;AACD;;AACD,aAAON,IAAI,CAACO,WAAL,CAAiBC,SAAjB,CAA2BP,KAA3B,EAAkCK,KAAlC,EAAyCD,KAAzC,CAAP;AACD,KALM,EAKJ,IALI,CAAP;AAMD,GAPD,MAOO,IAAIR,kBAAkB,CAACH,QAAD,CAAtB,EAAkC;AACvC,WAAOA,QAAQ,CAACS,OAAT,GAAmBC,MAAnB,CAA2C,CAACC,KAAD,EAAQC,KAAR,KAAkB;AAClE,UAAID,KAAK,KAAK,IAAd,EAAoB;AAClB,eAAOC,KAAP;AACD;;AACD,aAAON,IAAI,CAACS,MAAL,CAAYD,SAAZ,CAAsBP,KAAtB,EAA6BK,KAA7B,EAAoCD,KAApC,CAAP;AACD,KALM,EAKJ,IALI,CAAP;AAMD;;AACD,QAAM,IAAIK,KAAJ,CAAU,kDAAV,CAAN;AACD,CAnBe,CAAlB;;AAsBO,MAAMC,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAe,IAAA,SAAS,EAAEd;AAA1B,KAAyCc,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import type { ReactNode } from \"react\";\nimport React from \"react\";\n\nimport type { SkImageFilter, SkShader } from \"../../skia/types\";\nimport { isImageFilter, BlendMode, isShader } from \"../../skia/types\";\nimport { createDeclaration } from \"../nodes\";\nimport type { AnimatedProps, SkEnum } from \"../processors\";\nimport { enumKey } from \"../processors/Paint\";\nimport type { DeclarationResult } from \"../nodes/Declaration\";\n\nconst childrenAreImageFilters = (\n  children: DeclarationResult[]\n): children is SkImageFilter[] =>\n  children.every((child) => isImageFilter(child));\n\nconst childrenAreShaders = (\n  children: DeclarationResult[]\n): children is SkShader[] => children.every((child) => isShader(child));\n\ninterface BlendProps {\n  mode: SkEnum<typeof BlendMode>;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlendProps>(\n  ({ mode }, children, { Skia }) => {\n    const blend = BlendMode[enumKey(mode)];\n    if (childrenAreImageFilters(children)) {\n      return children.reverse().reduce<SkImageFilter | null>((inner, outer) => {\n        if (inner === null) {\n          return outer;\n        }\n        return Skia.ImageFilter.MakeBlend(blend, outer, inner);\n      }, null);\n    } else if (childrenAreShaders(children)) {\n      return children.reverse().reduce<SkShader | null>((inner, outer) => {\n        if (inner === null) {\n          return outer;\n        }\n        return Skia.Shader.MakeBlend(blend, outer, inner);\n      }, null);\n    }\n    throw new Error(\"<Blend /> can only blend Shaders or ImageFilters\");\n  }\n);\n\nexport const Blend = (props: AnimatedProps<BlendProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/backdrop/BackdropFilter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["BackdropFilter.tsx"],"names":["disableFilterMemoization","children","forEach","child","memoizable","onDraw","ctx","_","node","toFilter","visit","filter","Skia","Error","canvas","saveLayer","undefined","restore","BackdropFilter","filterChild","groupChildren","props"],"mappings":";;;;;;;AACA;;AAGA;;AAEA;;AAEA;;;;AAEA,MAAMA,wBAAwB,GAAIC,QAAD,IAA+B;AAC9DA,EAAAA,QAAQ,CAACC,OAAT,CAAkBC,KAAD,IAAW;AAC1BA,IAAAA,KAAK,CAACC,UAAN,GAAmB,KAAnB;AACAJ,IAAAA,wBAAwB,CAACG,KAAK,CAACF,QAAP,CAAxB;AACD,GAHD;AAID,CALD;;AAWA,MAAMI,MAAM,GAAG,0BAAmC,CAACC,GAAD,EAAMC,CAAN,EAASC,IAAT,KAAkB;AAClER,EAAAA,wBAAwB,CAACQ,IAAI,CAACP,QAAN,CAAxB;AACA,QAAMQ,QAAQ,GAAGD,IAAI,CAACE,KAAL,CAAWJ,GAAX,CAAjB;AACA,QAAMK,MAAM,GAAG,wBAASL,GAAG,CAACM,IAAb,EAAmBH,QAAnB,CAAf;;AACA,MAAI,CAACE,MAAL,EAAa;AACX,UAAM,IAAIE,KAAJ,CAAU,4CAAV,CAAN;AACD;;AACD,QAAM;AAAEC,IAAAA;AAAF,MAAaR,GAAnB;AACAQ,EAAAA,MAAM,CAACC,SAAP,CAAiBC,SAAjB,EAA4B,IAA5B,EAAkCL,MAAlC;AACAG,EAAAA,MAAM,CAACG,OAAP;AACD,CAVc,CAAf;;AAYO,MAAMC,cAAc,GAAG,QAIY;AAAA,MAJX;AAC7BP,IAAAA,MAAM,EAAEQ,WADqB;AAE7BlB,IAAAA,QAAQ,EAAEmB,aAFmB;AAG7B,OAAGC;AAH0B,GAIW;AACxC,sBACE,6BAAC,YAAD,EAAWA,KAAX,eACE;AAAW,IAAA,MAAM,EAAEhB,MAAnB;AAA2B,IAAA,cAAc;AAAzC,KACGc,WADH,CADF,EAIGC,aAJH,CADF;AAQD,CAbM","sourcesContent":["import type { ReactNode } from \"react\";\nimport React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\nimport type { Node } from \"../../nodes\";\nimport { getInput } from \"../imageFilters/getInput\";\nimport type { GroupProps } from \"../Group\";\nimport { Group } from \"../Group\";\n\nconst disableFilterMemoization = (children: Node<unknown>[]) => {\n  children.forEach((child) => {\n    child.memoizable = false;\n    disableFilterMemoization(child.children);\n  });\n};\n\nexport interface BackdropFilterProps extends GroupProps {\n  filter: ReactNode | ReactNode[];\n}\n\nconst onDraw = createDrawing<BackdropFilterProps>((ctx, _, node) => {\n  disableFilterMemoization(node.children);\n  const toFilter = node.visit(ctx);\n  const filter = getInput(ctx.Skia, toFilter);\n  if (!filter) {\n    throw new Error(\"No image filter provided to the background\");\n  }\n  const { canvas } = ctx;\n  canvas.saveLayer(undefined, null, filter);\n  canvas.restore();\n});\n\nexport const BackdropFilter = ({\n  filter: filterChild,\n  children: groupChildren,\n  ...props\n}: AnimatedProps<BackdropFilterProps>) => {\n  return (\n    <Group {...props}>\n      <skDrawing onDraw={onDraw} skipProcessing>\n        {filterChild}\n      </skDrawing>\n      {groupChildren}\n    </Group>\n  );\n};\n"]}
+{"version":3,"sources":["BackdropFilter.tsx"],"names":["disableFilterMemoization","children","forEach","child","memoizable","onDraw","ctx","_","node","toFilter","visit","filter","Skia","Error","canvas","saveLayer","undefined","restore","BackdropFilter","filterChild","groupChildren","props"],"mappings":";;;;;;;AACA;;AAGA;;AAEA;;AAEA;;;;AAEA,MAAMA,wBAAwB,GAAIC,QAAD,IAAsB;AACrDA,EAAAA,QAAQ,CAACC,OAAT,CAAkBC,KAAD,IAAW;AAC1BA,IAAAA,KAAK,CAACC,UAAN,GAAmB,KAAnB;AACAJ,IAAAA,wBAAwB,CAACG,KAAK,CAACF,QAAP,CAAxB;AACD,GAHD;AAID,CALD;;AAWA,MAAMI,MAAM,GAAG,0BAAmC,CAACC,GAAD,EAAMC,CAAN,EAASC,IAAT,KAAkB;AAClER,EAAAA,wBAAwB,CAACQ,IAAI,CAACP,QAAN,CAAxB;AACA,QAAMQ,QAAQ,GAAGD,IAAI,CAACE,KAAL,CAAWJ,GAAX,CAAjB;AACA,QAAMK,MAAM,GAAG,wBAASL,GAAG,CAACM,IAAb,EAAmBH,QAAnB,CAAf;;AACA,MAAI,CAACE,MAAL,EAAa;AACX,UAAM,IAAIE,KAAJ,CAAU,4CAAV,CAAN;AACD;;AACD,QAAM;AAAEC,IAAAA;AAAF,MAAaR,GAAnB;AACAQ,EAAAA,MAAM,CAACC,SAAP,CAAiBC,SAAjB,EAA4B,IAA5B,EAAkCL,MAAlC;AACAG,EAAAA,MAAM,CAACG,OAAP;AACD,CAVc,CAAf;;AAYO,MAAMC,cAAc,GAAG,QAIY;AAAA,MAJX;AAC7BP,IAAAA,MAAM,EAAEQ,WADqB;AAE7BlB,IAAAA,QAAQ,EAAEmB,aAFmB;AAG7B,OAAGC;AAH0B,GAIW;AACxC,sBACE,6BAAC,YAAD,EAAWA,KAAX,eACE;AAAW,IAAA,MAAM,EAAEhB,MAAnB;AAA2B,IAAA,cAAc;AAAzC,KACGc,WADH,CADF,EAIGC,aAJH,CADF;AAQD,CAbM","sourcesContent":["import type { ReactNode } from \"react\";\nimport React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\nimport type { Node } from \"../../nodes\";\nimport { getInput } from \"../imageFilters/getInput\";\nimport type { GroupProps } from \"../Group\";\nimport { Group } from \"../Group\";\n\nconst disableFilterMemoization = (children: Node[]) => {\n  children.forEach((child) => {\n    child.memoizable = false;\n    disableFilterMemoization(child.children);\n  });\n};\n\nexport interface BackdropFilterProps extends GroupProps {\n  filter: ReactNode | ReactNode[];\n}\n\nconst onDraw = createDrawing<BackdropFilterProps>((ctx, _, node) => {\n  disableFilterMemoization(node.children);\n  const toFilter = node.visit(ctx);\n  const filter = getInput(ctx.Skia, toFilter);\n  if (!filter) {\n    throw new Error(\"No image filter provided to the background\");\n  }\n  const { canvas } = ctx;\n  canvas.saveLayer(undefined, null, filter);\n  canvas.restore();\n});\n\nexport const BackdropFilter = ({\n  filter: filterChild,\n  children: groupChildren,\n  ...props\n}: AnimatedProps<BackdropFilterProps>) => {\n  return (\n    <Group {...props}>\n      <skDrawing onDraw={onDraw} skipProcessing>\n        {filterChild}\n      </skDrawing>\n      {groupChildren}\n    </Group>\n  );\n};\n"]}

package/lib/commonjs/renderer/components/imageFilters/Morphology.js

@@ -27,7 +27,7 @@ const onDeclare = (0, _Declaration.createDeclaration)((_ref, children, _ref2) =>
   } = _ref2;
   const input = (0, _getInput.getInput)(Skia, children);
   const r = (0, _Radius.processRadius)(Skia, radius);
-  const factory = operator === "dilate" ? Skia.ImageFilter.MakeDilate : Skia.ImageFilter.MakeErode;
+  const factory = operator === "dilate" ? Skia.ImageFilter.MakeDilate.bind(Skia.ImageFilter) : Skia.ImageFilter.MakeErode.bind(Skia.ImageFilter);
   return factory(r.x, r.y, input);
 });
 

package/lib/commonjs/renderer/components/imageFilters/Morphology.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Morphology.tsx"],"names":["onDeclare","children","radius","operator","Skia","input","r","factory","ImageFilter","MakeDilate","MakeErode","x","y","Morphology","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,oCAChB,OAAuBC,QAAvB,YAA8C;AAAA,MAA7C;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAA6C;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC5C,QAAMC,KAAK,GAAG,wBAASD,IAAT,EAAeH,QAAf,CAAd;AACA,QAAMK,CAAC,GAAG,2BAAcF,IAAd,EAAoBF,MAApB,CAAV;AACA,QAAMK,OAAO,GACXJ,QAAQ,KAAK,QAAb,GACIC,IAAI,CAACI,WAAL,CAAiBC,UADrB,GAEIL,IAAI,CAACI,WAAL,CAAiBE,SAHvB;AAIA,SAAOH,OAAO,CAACD,CAAC,CAACK,CAAH,EAAML,CAAC,CAACM,CAAR,EAAWP,KAAX,CAAd;AACD,CATe,CAAlB;;AAYO,MAAMQ,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEd;AAA1B,KAAyCc,KAAzC,EAAP;AACD,CAFM;;;AAIPD,UAAU,CAACE,YAAX,GAA0B;AACxBZ,EAAAA,QAAQ,EAAE;AADc,CAA1B","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps, Radius } from \"../../processors\";\nimport { processRadius } from \"../../processors/Radius\";\n\nimport { getInput } from \"./getInput\";\n\nexport interface MorphologyProps {\n  operator: \"erode\" | \"dilate\";\n  radius: Radius;\n  children?: React.ReactNode | React.ReactNode[];\n}\n\nconst onDeclare = createDeclaration<MorphologyProps>(\n  ({ radius, operator }, children, { Skia }) => {\n    const input = getInput(Skia, children);\n    const r = processRadius(Skia, radius);\n    const factory =\n      operator === \"dilate\"\n        ? Skia.ImageFilter.MakeDilate\n        : Skia.ImageFilter.MakeErode;\n    return factory(r.x, r.y, input);\n  }\n);\n\nexport const Morphology = (props: AnimatedProps<MorphologyProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nMorphology.defaultProps = {\n  operator: \"dilate\",\n};\n"]}
+{"version":3,"sources":["Morphology.tsx"],"names":["onDeclare","children","radius","operator","Skia","input","r","factory","ImageFilter","MakeDilate","bind","MakeErode","x","y","Morphology","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,oCAChB,OAAuBC,QAAvB,YAA8C;AAAA,MAA7C;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAA6C;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC5C,QAAMC,KAAK,GAAG,wBAASD,IAAT,EAAeH,QAAf,CAAd;AACA,QAAMK,CAAC,GAAG,2BAAcF,IAAd,EAAoBF,MAApB,CAAV;AACA,QAAMK,OAAO,GACXJ,QAAQ,KAAK,QAAb,GACIC,IAAI,CAACI,WAAL,CAAiBC,UAAjB,CAA4BC,IAA5B,CAAiCN,IAAI,CAACI,WAAtC,CADJ,GAEIJ,IAAI,CAACI,WAAL,CAAiBG,SAAjB,CAA2BD,IAA3B,CAAgCN,IAAI,CAACI,WAArC,CAHN;AAIA,SAAOD,OAAO,CAACD,CAAC,CAACM,CAAH,EAAMN,CAAC,CAACO,CAAR,EAAWR,KAAX,CAAd;AACD,CATe,CAAlB;;AAYO,MAAMS,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEf;AAA1B,KAAyCe,KAAzC,EAAP;AACD,CAFM;;;AAIPD,UAAU,CAACE,YAAX,GAA0B;AACxBb,EAAAA,QAAQ,EAAE;AADc,CAA1B","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps, Radius } from \"../../processors\";\nimport { processRadius } from \"../../processors/Radius\";\n\nimport { getInput } from \"./getInput\";\n\nexport interface MorphologyProps {\n  operator: \"erode\" | \"dilate\";\n  radius: Radius;\n  children?: React.ReactNode | React.ReactNode[];\n}\n\nconst onDeclare = createDeclaration<MorphologyProps>(\n  ({ radius, operator }, children, { Skia }) => {\n    const input = getInput(Skia, children);\n    const r = processRadius(Skia, radius);\n    const factory =\n      operator === \"dilate\"\n        ? Skia.ImageFilter.MakeDilate.bind(Skia.ImageFilter)\n        : Skia.ImageFilter.MakeErode.bind(Skia.ImageFilter);\n    return factory(r.x, r.y, input);\n  }\n);\n\nexport const Morphology = (props: AnimatedProps<MorphologyProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nMorphology.defaultProps = {\n  operator: \"dilate\",\n};\n"]}

package/lib/commonjs/renderer/components/imageFilters/Shadow.js

@@ -39,7 +39,7 @@ const onDeclare = (0, _Declaration.createDeclaration)((_ref, children, _ref2) =>
   if (inner) {
     factory = _InnerShadow.MakeInnerShadow.bind(null, Skia, shadowOnly);
   } else {
-    factory = shadowOnly ? Skia.ImageFilter.MakeDropShadowOnly : Skia.ImageFilter.MakeDropShadow;
+    factory = shadowOnly ? Skia.ImageFilter.MakeDropShadowOnly.bind(Skia.ImageFilter) : Skia.ImageFilter.MakeDropShadow.bind(Skia.ImageFilter);
   }
 
   return factory(dx, dy, blur, blur, color, input);

package/lib/commonjs/renderer/components/imageFilters/Shadow.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Shadow.tsx"],"names":["onDeclare","children","dx","dy","blur","color","cl","shadowOnly","inner","opacity","Skia","input","factory","MakeInnerShadow","bind","ImageFilter","MakeDropShadowOnly","MakeDropShadow","Shadow","props"],"mappings":";;;;;;;AAAA;;AAEA;;AAGA;;AAEA;;AACA;;;;;;AAWA,MAAMA,SAAS,GAAG,oCAChB,OAEEC,QAFF,YAIK;AAAA,MAHH;AAAEC,IAAAA,EAAF;AAAMC,IAAAA,EAAN;AAAUC,IAAAA,IAAV;AAAgBC,IAAAA,KAAK,EAAEC,EAAvB;AAA2BC,IAAAA,UAA3B;AAAuCC,IAAAA;AAAvC,GAGG;AAAA,MADH;AAAEC,IAAAA,OAAF;AAAWC,IAAAA;AAAX,GACG;AACH,QAAMC,KAAK,GAAG,wBAASD,IAAT,EAAeT,QAAf,CAAd;AACA,QAAMI,KAAK,GAAG,yBAAaK,IAAb,EAAmBJ,EAAnB,EAAuBG,OAAvB,CAAd;AACA,MAAIG,OAAJ;;AACA,MAAIJ,KAAJ,EAAW;AACTI,IAAAA,OAAO,GAAGC,6BAAgBC,IAAhB,CAAqB,IAArB,EAA2BJ,IAA3B,EAAiCH,UAAjC,CAAV;AACD,GAFD,MAEO;AACLK,IAAAA,OAAO,GAAGL,UAAU,GAChBG,IAAI,CAACK,WAAL,CAAiBC,kBADD,GAEhBN,IAAI,CAACK,WAAL,CAAiBE,cAFrB;AAGD;;AACD,SAAOL,OAAO,CAACV,EAAD,EAAKC,EAAL,EAASC,IAAT,EAAeA,IAAf,EAAqBC,KAArB,EAA4BM,KAA5B,CAAd;AACD,CAjBe,CAAlB;;AAoBO,MAAMO,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEnB;AAA1B,KAAyCmB,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport type { Color } from \"../../../skia/types\";\nimport { processColor } from \"../../processors/Color\";\n\nimport { getInput } from \"./getInput\";\nimport { MakeInnerShadow } from \"./InnerShadow\";\n\nexport interface ShadowProps {\n  dx: number;\n  dy: number;\n  blur: number;\n  color: Color;\n  inner?: boolean;\n  shadowOnly?: boolean;\n}\n\nconst onDeclare = createDeclaration<ShadowProps>(\n  (\n    { dx, dy, blur, color: cl, shadowOnly, inner },\n    children,\n    { opacity, Skia }\n  ) => {\n    const input = getInput(Skia, children);\n    const color = processColor(Skia, cl, opacity);\n    let factory;\n    if (inner) {\n      factory = MakeInnerShadow.bind(null, Skia, shadowOnly);\n    } else {\n      factory = shadowOnly\n        ? Skia.ImageFilter.MakeDropShadowOnly\n        : Skia.ImageFilter.MakeDropShadow;\n    }\n    return factory(dx, dy, blur, blur, color, input);\n  }\n);\n\nexport const Shadow = (props: AnimatedProps<ShadowProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["Shadow.tsx"],"names":["onDeclare","children","dx","dy","blur","color","cl","shadowOnly","inner","opacity","Skia","input","factory","MakeInnerShadow","bind","ImageFilter","MakeDropShadowOnly","MakeDropShadow","Shadow","props"],"mappings":";;;;;;;AAAA;;AAEA;;AAGA;;AAEA;;AACA;;;;;;AAWA,MAAMA,SAAS,GAAG,oCAChB,OAEEC,QAFF,YAIK;AAAA,MAHH;AAAEC,IAAAA,EAAF;AAAMC,IAAAA,EAAN;AAAUC,IAAAA,IAAV;AAAgBC,IAAAA,KAAK,EAAEC,EAAvB;AAA2BC,IAAAA,UAA3B;AAAuCC,IAAAA;AAAvC,GAGG;AAAA,MADH;AAAEC,IAAAA,OAAF;AAAWC,IAAAA;AAAX,GACG;AACH,QAAMC,KAAK,GAAG,wBAASD,IAAT,EAAeT,QAAf,CAAd;AACA,QAAMI,KAAK,GAAG,yBAAaK,IAAb,EAAmBJ,EAAnB,EAAuBG,OAAvB,CAAd;AACA,MAAIG,OAAJ;;AACA,MAAIJ,KAAJ,EAAW;AACTI,IAAAA,OAAO,GAAGC,6BAAgBC,IAAhB,CAAqB,IAArB,EAA2BJ,IAA3B,EAAiCH,UAAjC,CAAV;AACD,GAFD,MAEO;AACLK,IAAAA,OAAO,GAAGL,UAAU,GAChBG,IAAI,CAACK,WAAL,CAAiBC,kBAAjB,CAAoCF,IAApC,CAAyCJ,IAAI,CAACK,WAA9C,CADgB,GAEhBL,IAAI,CAACK,WAAL,CAAiBE,cAAjB,CAAgCH,IAAhC,CAAqCJ,IAAI,CAACK,WAA1C,CAFJ;AAGD;;AACD,SAAOH,OAAO,CAACV,EAAD,EAAKC,EAAL,EAASC,IAAT,EAAeA,IAAf,EAAqBC,KAArB,EAA4BM,KAA5B,CAAd;AACD,CAjBe,CAAlB;;AAoBO,MAAMO,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEnB;AAA1B,KAAyCmB,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport type { Color } from \"../../../skia/types\";\nimport { processColor } from \"../../processors/Color\";\n\nimport { getInput } from \"./getInput\";\nimport { MakeInnerShadow } from \"./InnerShadow\";\n\nexport interface ShadowProps {\n  dx: number;\n  dy: number;\n  blur: number;\n  color: Color;\n  inner?: boolean;\n  shadowOnly?: boolean;\n}\n\nconst onDeclare = createDeclaration<ShadowProps>(\n  (\n    { dx, dy, blur, color: cl, shadowOnly, inner },\n    children,\n    { opacity, Skia }\n  ) => {\n    const input = getInput(Skia, children);\n    const color = processColor(Skia, cl, opacity);\n    let factory;\n    if (inner) {\n      factory = MakeInnerShadow.bind(null, Skia, shadowOnly);\n    } else {\n      factory = shadowOnly\n        ? Skia.ImageFilter.MakeDropShadowOnly.bind(Skia.ImageFilter)\n        : Skia.ImageFilter.MakeDropShadow.bind(Skia.ImageFilter);\n    }\n    return factory(dx, dy, blur, blur, color, input);\n  }\n);\n\nexport const Shadow = (props: AnimatedProps<ShadowProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/nodes/Declaration.js

@@ -42,13 +42,12 @@ class DeclarationNode extends _Node.Node {
   }
 
   get props() {
-    return this._props;
+    return this.resolvedProps;
   }
 
   draw(ctx) {
     const children = this.visit(ctx);
-    const props = (0, _processors.materialize)(this.props);
-    const obj = this.onDeclare(props, children, ctx);
+    const obj = this.onDeclare(this.props, children, ctx);
     return obj;
   }
 

package/lib/commonjs/renderer/nodes/Declaration.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Declaration.tsx"],"names":["createDeclaration","cb","useDeclaration","deps","isDeclarationNode","node","DeclarationNode","Node","constructor","depMgr","onDeclare","props","memoizable","_props","draw","ctx","children","visit","obj"],"mappings":";;;;;;;AACA;;AAIA;;AAIA;;;;AAUO,MAAMA,iBAAiB,GAC5BC,EAD+B,IAEJA,EAFtB;;;;AAIA,MAAMC,cAAc,GAAG,CAC5BD,EAD4B,EAE5BE,IAF4B,KAI5B;AACA,wBAAYF,EAAZ,EAAgBE,IAAhB,aAAgBA,IAAhB,cAAgBA,IAAhB,GAAwB,EAAxB,CALK;;;;AAOA,MAAMC,iBAAiB,GAC5BC,IAD+B,IAEMA,IAAI,YAAYC,eAFhD;;;;AAQA,MAAMA,eAAN,SAAiCC,UAAjC,CAAyC;AAG9CC,EAAAA,WAAW,CACTC,MADS,EAETC,SAFS,EAGTC,KAHS,EAIT;AACA,UAAMF,MAAN,EAAcE,KAAd;;AADA;;AAEA,UAAMC,UAAN,GAAmB,CAAC,4BAAWD,KAAX,CAApB;AACA,SAAKD,SAAL,GAAiBA,SAAjB;AACD;;AAEQ,MAALC,KAAK,CAACA,KAAD,EAA0B;AACjC,SAAKC,UAAL,GAAkB,CAAC,4BAAWD,KAAX,CAAnB;AACA,UAAMA,KAAN,GAAcA,KAAd;AACD;;AAEQ,MAALA,KAAK,GAAG;AACV,WAAO,KAAKE,MAAZ;AACD;;AAEDC,EAAAA,IAAI,CAACC,GAAD,EAAsB;AACxB,UAAMC,QAAQ,GAAG,KAAKC,KAAL,CAAWF,GAAX,CAAjB;AACA,UAAMJ,KAAK,GAAG,6BAAY,KAAKA,KAAjB,CAAd;AACA,UAAMO,GAAG,GAAG,KAAKR,SAAL,CAAeC,KAAf,EAAsBK,QAAtB,EAAgCD,GAAhC,CAAZ;AACA,WAAOG,GAAP;AACD;;AA3B6C","sourcesContent":["import type { DependencyList } from \"react\";\nimport { useCallback } from \"react\";\n\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors\";\nimport { isAnimated, materialize } from \"../processors\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport type { SkJSIInstance } from \"../../skia/types\";\n\nimport { Node } from \"./Node\";\n\nexport type DeclarationResult = SkJSIInstance<string> | null;\n\ntype DeclarationCallback<T> = (\n  props: T,\n  children: DeclarationResult[],\n  ctx: DrawingContext\n) => DeclarationResult;\n\nexport const createDeclaration = <T,>(\n  cb: DeclarationCallback<T>\n): DeclarationCallback<T> => cb;\n\nexport const useDeclaration = <P,>(\n  cb: DeclarationCallback<P>,\n  deps?: DependencyList\n) =>\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  useCallback(cb, deps ?? []);\n\nexport const isDeclarationNode = (\n  node: Node\n): node is DeclarationNode<unknown> => node instanceof DeclarationNode;\n\nexport interface DeclarationProps<P> {\n  onDeclare: DeclarationCallback<P>;\n}\n\nexport class DeclarationNode<P> extends Node<P> {\n  private onDeclare: DeclarationCallback<P>;\n\n  constructor(\n    depMgr: DependencyManager,\n    onDeclare: DeclarationCallback<P>,\n    props: AnimatedProps<P>\n  ) {\n    super(depMgr, props);\n    super.memoizable = !isAnimated(props);\n    this.onDeclare = onDeclare;\n  }\n\n  set props(props: AnimatedProps<P>) {\n    this.memoizable = !isAnimated(props);\n    super.props = props;\n  }\n\n  get props() {\n    return this._props;\n  }\n\n  draw(ctx: DrawingContext) {\n    const children = this.visit(ctx);\n    const props = materialize(this.props);\n    const obj = this.onDeclare(props, children, ctx);\n    return obj;\n  }\n}\n"]}
+{"version":3,"sources":["Declaration.tsx"],"names":["createDeclaration","cb","useDeclaration","deps","isDeclarationNode","node","DeclarationNode","Node","constructor","depMgr","onDeclare","props","memoizable","resolvedProps","draw","ctx","children","visit","obj"],"mappings":";;;;;;;AACA;;AAIA;;AAIA;;;;AAUO,MAAMA,iBAAiB,GAC5BC,EAD+B,IAEJA,EAFtB;;;;AAIA,MAAMC,cAAc,GAAG,CAC5BD,EAD4B,EAE5BE,IAF4B,KAI5B;AACA,wBAAYF,EAAZ,EAAgBE,IAAhB,aAAgBA,IAAhB,cAAgBA,IAAhB,GAAwB,EAAxB,CALK;;;;AAOA,MAAMC,iBAAiB,GAAQC,IAAL,IAC/BA,IAAI,YAAYC,eADX;;;;AAOA,MAAMA,eAAN,SAAiCC,UAAjC,CAAyC;AAG9CC,EAAAA,WAAW,CACTC,MADS,EAETC,SAFS,EAGTC,KAHS,EAIT;AACA,UAAMF,MAAN,EAAcE,KAAd;;AADA;;AAEA,UAAMC,UAAN,GAAmB,CAAC,4BAAWD,KAAX,CAApB;AACA,SAAKD,SAAL,GAAiBA,SAAjB;AACD;;AAEQ,MAALC,KAAK,CAACA,KAAD,EAA0B;AACjC,SAAKC,UAAL,GAAkB,CAAC,4BAAWD,KAAX,CAAnB;AACA,UAAMA,KAAN,GAAcA,KAAd;AACD;;AAEQ,MAALA,KAAK,GAAM;AACb,WAAO,KAAKE,aAAZ;AACD;;AAEDC,EAAAA,IAAI,CAACC,GAAD,EAAsB;AACxB,UAAMC,QAAQ,GAAG,KAAKC,KAAL,CAAWF,GAAX,CAAjB;AACA,UAAMG,GAAG,GAAG,KAAKR,SAAL,CAAe,KAAKC,KAApB,EAA2BK,QAA3B,EAAqCD,GAArC,CAAZ;AACA,WAAOG,GAAP;AACD;;AA1B6C","sourcesContent":["import type { DependencyList } from \"react\";\nimport { useCallback } from \"react\";\n\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors\";\nimport { isAnimated } from \"../processors\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport type { SkJSIInstance } from \"../../skia/types\";\n\nimport { Node } from \"./Node\";\n\nexport type DeclarationResult = SkJSIInstance<string> | null;\n\ntype DeclarationCallback<T> = (\n  props: T,\n  children: DeclarationResult[],\n  ctx: DrawingContext\n) => DeclarationResult;\n\nexport const createDeclaration = <T,>(\n  cb: DeclarationCallback<T>\n): DeclarationCallback<T> => cb;\n\nexport const useDeclaration = <P,>(\n  cb: DeclarationCallback<P>,\n  deps?: DependencyList\n) =>\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  useCallback(cb, deps ?? []);\n\nexport const isDeclarationNode = <P,>(node: Node): node is DeclarationNode<P> =>\n  node instanceof DeclarationNode;\n\nexport interface DeclarationProps<P> {\n  onDeclare: DeclarationCallback<P>;\n}\n\nexport class DeclarationNode<P> extends Node<P> {\n  private onDeclare: DeclarationCallback<P>;\n\n  constructor(\n    depMgr: DependencyManager,\n    onDeclare: DeclarationCallback<P>,\n    props: AnimatedProps<P>\n  ) {\n    super(depMgr, props);\n    super.memoizable = !isAnimated(props);\n    this.onDeclare = onDeclare;\n  }\n\n  set props(props: AnimatedProps<P>) {\n    this.memoizable = !isAnimated(props);\n    super.props = props;\n  }\n\n  get props(): P {\n    return this.resolvedProps;\n  }\n\n  draw(ctx: DrawingContext) {\n    const children = this.visit(ctx);\n    const obj = this.onDeclare(this.props, children, ctx);\n    return obj;\n  }\n}\n"]}

package/lib/commonjs/renderer/nodes/Drawing.js

@@ -7,8 +7,6 @@ exports.useDrawing = exports.createDrawing = exports.DrawingNode = void 0;
 
 var _react = require("react");
 
-var _Animations = require("../processors/Animations/Animations");
-
 var _types = require("../../skia/types");
 
 var _processors = require("../processors");
@@ -39,17 +37,15 @@ class DrawingNode extends _Node.Node {
   }
 
   draw(ctx) {
-    const drawingProps = (0, _Animations.materialize)(this.props);
-
     if (this.skipProcessing) {
-      this.onDraw(ctx, drawingProps, this);
+      this.onDraw(ctx, this.props, this);
     } else {
       const declarations = this.visit(ctx);
-      const paint = (0, _processors.processPaint)(ctx.Skia, ctx.paint.copy(), ctx.opacity, drawingProps, declarations);
+      const paint = (0, _processors.processPaint)(ctx.Skia, ctx.paint.copy(), ctx.opacity, this.props, declarations);
       [paint, ...declarations.filter(_types.isPaint)].forEach(currentPaint => {
         this.onDraw({ ...ctx,
           paint: currentPaint
-        }, drawingProps, this);
+        }, this.props, this);
       });
     }
   }

package/lib/commonjs/renderer/nodes/Drawing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Drawing.tsx"],"names":["createDrawing","cb","useDrawing","deps","DrawingNode","Node","constructor","depMgr","onDraw","skipProcessing","props","draw","ctx","drawingProps","declarations","visit","paint","Skia","copy","opacity","filter","isPaint","forEach","currentPaint"],"mappings":";;;;;;;AACA;;AAIA;;AACA;;AAEA;;AAEA;;;;AAUO,MAAMA,aAAa,GAAQC,EAAL,IAC3BA,EADK;;;;AAGA,MAAMC,UAAU,GAAG,CAAKD,EAAL,EAA4BE,IAA5B,KACxB;AACA,wBAAYF,EAAZ,EAAgBE,IAAhB,aAAgBA,IAAhB,cAAgBA,IAAhB,GAAwB,EAAxB,CAFK;;;;AAUA,MAAMC,WAAN,SAA6BC,UAA7B,CAAqC;AAI1CC,EAAAA,WAAW,CACTC,MADS,EAETC,MAFS,EAGTC,cAHS,EAITC,KAJS,EAKT;AACA,UAAMH,MAAN,EAAcG,KAAd;;AADA;;AAAA;;AAEA,SAAKF,MAAL,GAAcA,MAAd;AACA,SAAKC,cAAL,GAAsBA,cAAtB;AACD;;AAEDE,EAAAA,IAAI,CAACC,GAAD,EAAsB;AACxB,UAAMC,YAAY,GAAG,6BAAY,KAAKH,KAAjB,CAArB;;AACA,QAAI,KAAKD,cAAT,EAAyB;AACvB,WAAKD,MAAL,CAAYI,GAAZ,EAAiBC,YAAjB,EAA+B,IAA/B;AACD,KAFD,MAEO;AACL,YAAMC,YAAY,GAAG,KAAKC,KAAL,CAAWH,GAAX,CAArB;AACA,YAAMI,KAAK,GAAG,8BACZJ,GAAG,CAACK,IADQ,EAEZL,GAAG,CAACI,KAAJ,CAAUE,IAAV,EAFY,EAGZN,GAAG,CAACO,OAHQ,EAIZN,YAJY,EAKZC,YALY,CAAd;AAOA,OAACE,KAAD,EAAQ,GAAGF,YAAY,CAACM,MAAb,CAAoBC,cAApB,CAAX,EAAyCC,OAAzC,CAAkDC,YAAD,IAAkB;AACjE,aAAKf,MAAL,CAAY,EAAE,GAAGI,GAAL;AAAUI,UAAAA,KAAK,EAAEO;AAAjB,SAAZ,EAA6CV,YAA7C,EAA2D,IAA3D;AACD,OAFD;AAGD;AACF;;AAhCyC","sourcesContent":["import type { DependencyList, ReactNode } from \"react\";\nimport { useCallback } from \"react\";\n\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors/Animations/Animations\";\nimport { materialize } from \"../processors/Animations/Animations\";\nimport { isPaint } from \"../../skia/types\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport { processPaint } from \"../processors\";\n\nimport { Node } from \"./Node\";\n\ntype DrawingCallback<P> = (\n  ctx: DrawingContext,\n  props: P,\n  node: Node<P>\n) => void;\n\ntype OnDrawCallback<P> = (ctx: DrawingContext, props: P, node: Node<P>) => void;\n\nexport const createDrawing = <P,>(cb: OnDrawCallback<P>): DrawingCallback<P> =>\n  cb;\n\nexport const useDrawing = <P,>(cb: OnDrawCallback<P>, deps?: DependencyList) =>\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  useCallback(cb, deps ?? []);\n\nexport type DrawingProps<T> = {\n  onDraw: DrawingCallback<T>;\n  skipProcessing?: boolean;\n  children?: ReactNode | ReactNode[];\n};\n\nexport class DrawingNode<P> extends Node<P> {\n  onDraw: DrawingCallback<P>;\n  skipProcessing: boolean;\n\n  constructor(\n    depMgr: DependencyManager,\n    onDraw: DrawingCallback<P>,\n    skipProcessing: boolean,\n    props: AnimatedProps<P>\n  ) {\n    super(depMgr, props);\n    this.onDraw = onDraw;\n    this.skipProcessing = skipProcessing;\n  }\n\n  draw(ctx: DrawingContext) {\n    const drawingProps = materialize(this.props);\n    if (this.skipProcessing) {\n      this.onDraw(ctx, drawingProps, this);\n    } else {\n      const declarations = this.visit(ctx);\n      const paint = processPaint(\n        ctx.Skia,\n        ctx.paint.copy(),\n        ctx.opacity,\n        drawingProps,\n        declarations\n      );\n      [paint, ...declarations.filter(isPaint)].forEach((currentPaint) => {\n        this.onDraw({ ...ctx, paint: currentPaint }, drawingProps, this);\n      });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["Drawing.tsx"],"names":["createDrawing","cb","useDrawing","deps","DrawingNode","Node","constructor","depMgr","onDraw","skipProcessing","props","draw","ctx","declarations","visit","paint","Skia","copy","opacity","filter","isPaint","forEach","currentPaint"],"mappings":";;;;;;;AACA;;AAIA;;AAEA;;AAEA;;;;AAUO,MAAMA,aAAa,GAAQC,EAAL,IAC3BA,EADK;;;;AAGA,MAAMC,UAAU,GAAG,CAAKD,EAAL,EAA4BE,IAA5B,KACxB;AACA,wBAAYF,EAAZ,EAAgBE,IAAhB,aAAgBA,IAAhB,cAAgBA,IAAhB,GAAwB,EAAxB,CAFK;;;;AAUA,MAAMC,WAAN,SAA6BC,UAA7B,CAAqC;AAI1CC,EAAAA,WAAW,CACTC,MADS,EAETC,MAFS,EAGTC,cAHS,EAITC,KAJS,EAKT;AACA,UAAMH,MAAN,EAAcG,KAAd;;AADA;;AAAA;;AAEA,SAAKF,MAAL,GAAcA,MAAd;AACA,SAAKC,cAAL,GAAsBA,cAAtB;AACD;;AAEDE,EAAAA,IAAI,CAACC,GAAD,EAAsB;AACxB,QAAI,KAAKH,cAAT,EAAyB;AACvB,WAAKD,MAAL,CAAYI,GAAZ,EAAiB,KAAKF,KAAtB,EAA6B,IAA7B;AACD,KAFD,MAEO;AACL,YAAMG,YAAY,GAAG,KAAKC,KAAL,CAAWF,GAAX,CAArB;AACA,YAAMG,KAAK,GAAG,8BACZH,GAAG,CAACI,IADQ,EAEZJ,GAAG,CAACG,KAAJ,CAAUE,IAAV,EAFY,EAGZL,GAAG,CAACM,OAHQ,EAIZ,KAAKR,KAJO,EAKZG,YALY,CAAd;AAOA,OAACE,KAAD,EAAQ,GAAGF,YAAY,CAACM,MAAb,CAAoBC,cAApB,CAAX,EAAyCC,OAAzC,CAAkDC,YAAD,IAAkB;AACjE,aAAKd,MAAL,CAAY,EAAE,GAAGI,GAAL;AAAUG,UAAAA,KAAK,EAAEO;AAAjB,SAAZ,EAA6C,KAAKZ,KAAlD,EAAyD,IAAzD;AACD,OAFD;AAGD;AACF;;AA/ByC","sourcesContent":["import type { DependencyList, ReactNode } from \"react\";\nimport { useCallback } from \"react\";\n\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors/Animations/Animations\";\nimport { isPaint } from \"../../skia/types\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport { processPaint } from \"../processors\";\n\nimport { Node } from \"./Node\";\n\ntype DrawingCallback<P> = (\n  ctx: DrawingContext,\n  props: P,\n  node: Node<P>\n) => void;\n\ntype OnDrawCallback<P> = (ctx: DrawingContext, props: P, node: Node<P>) => void;\n\nexport const createDrawing = <P,>(cb: OnDrawCallback<P>): DrawingCallback<P> =>\n  cb;\n\nexport const useDrawing = <P,>(cb: OnDrawCallback<P>, deps?: DependencyList) =>\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  useCallback(cb, deps ?? []);\n\nexport type DrawingProps<P> = {\n  onDraw: DrawingCallback<P>;\n  skipProcessing?: boolean;\n  children?: ReactNode | ReactNode[];\n};\n\nexport class DrawingNode<P> extends Node<P> {\n  onDraw: DrawingCallback<P>;\n  skipProcessing: boolean;\n\n  constructor(\n    depMgr: DependencyManager,\n    onDraw: DrawingCallback<P>,\n    skipProcessing: boolean,\n    props: AnimatedProps<P>\n  ) {\n    super(depMgr, props);\n    this.onDraw = onDraw;\n    this.skipProcessing = skipProcessing;\n  }\n\n  draw(ctx: DrawingContext) {\n    if (this.skipProcessing) {\n      this.onDraw(ctx, this.props, this);\n    } else {\n      const declarations = this.visit(ctx);\n      const paint = processPaint(\n        ctx.Skia,\n        ctx.paint.copy(),\n        ctx.opacity,\n        this.props,\n        declarations\n      );\n      [paint, ...declarations.filter(isPaint)].forEach((currentPaint) => {\n        this.onDraw({ ...ctx, paint: currentPaint }, this.props, this);\n      });\n    }\n  }\n}\n"]}

package/lib/commonjs/renderer/nodes/Node.js

@@ -16,10 +16,11 @@ exports.NodeType = NodeType;
 })(NodeType || (exports.NodeType = NodeType = {}));
 
 class Node {
+  // This cast is ok because we understand that the dependency manager will setup the initial props
   constructor(depMgr, props) {
     _defineProperty(this, "children", []);
 
-    _defineProperty(this, "_props", void 0);
+    _defineProperty(this, "resolvedProps", {});
 
     _defineProperty(this, "memoizable", false);
 
@@ -29,20 +30,21 @@ class Node {
 
     _defineProperty(this, "depMgr", void 0);
 
-    this._props = props;
     this.depMgr = depMgr;
-    this.depMgr.unSubscribeNode(this);
+    this.updatePropSubscriptions(props);
+  }
+
+  updatePropSubscriptions(props) {
     this.depMgr.subscribeNode(this, props);
   }
 
   set props(props) {
-    this.depMgr.unSubscribeNode(this);
-    this.depMgr.subscribeNode(this, props);
-    this._props = props;
+    this.depMgr.unsubscribeNode(this);
+    this.updatePropSubscriptions(props);
   }
 
   get props() {
-    return this._props;
+    return this.resolvedProps;
   }
 
   visit(ctx, children) {

package/lib/commonjs/renderer/nodes/Node.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Node.ts"],"names":["NodeType","Node","constructor","depMgr","props","_props","unSubscribeNode","subscribeNode","visit","ctx","children","returnedValues","forEach","child","memoized","memoizable","push","ret","draw"],"mappings":";;;;;;;;;IAKYA,Q;;;WAAAA,Q;AAAAA,EAAAA,Q;AAAAA,EAAAA,Q;GAAAA,Q,wBAAAA,Q;;AAOL,MAAeC,IAAf,CAAiC;AAQtCC,EAAAA,WAAW,CAACC,MAAD,EAA4BC,KAA5B,EAAqD;AAAA,sCAPpC,EAOoC;;AAAA;;AAAA,wCALnD,KAKmD;;AAAA,sCAJ3B,IAI2B;;AAAA;;AAAA;;AAC9D,SAAKC,MAAL,GAAcD,KAAd;AACA,SAAKD,MAAL,GAAcA,MAAd;AACA,SAAKA,MAAL,CAAYG,eAAZ,CAA4B,IAA5B;AACA,SAAKH,MAAL,CAAYI,aAAZ,CAA0B,IAA1B,EAAgCH,KAAhC;AACD;;AAIQ,MAALA,KAAK,CAACA,KAAD,EAA0B;AACjC,SAAKD,MAAL,CAAYG,eAAZ,CAA4B,IAA5B;AACA,SAAKH,MAAL,CAAYI,aAAZ,CAA0B,IAA1B,EAAgCH,KAAhC;AACA,SAAKC,MAAL,GAAcD,KAAd;AACD;;AAEQ,MAALA,KAAK,GAAG;AACV,WAAO,KAAKC,MAAZ;AACD;;AAEDG,EAAAA,KAAK,CAACC,GAAD,EAAsBC,QAAtB,EAAyC;AAC5C,UAAMC,cAAkD,GAAG,EAA3D;AACA,KAACD,QAAD,aAACA,QAAD,cAACA,QAAD,GAAa,KAAKA,QAAlB,EAA4BE,OAA5B,CAAqCC,KAAD,IAAW;AAC7C,UAAIA,KAAK,CAACC,QAAN,IAAkBD,KAAK,CAACE,UAA5B,EAAwC;AACtCJ,QAAAA,cAAc,CAACK,IAAf,CAAoBH,KAAK,CAACC,QAA1B;AACD,OAFD,MAEO;AACL,cAAMG,GAAG,GAAGJ,KAAK,CAACK,IAAN,CAAWT,GAAX,CAAZ;;AACA,YAAIQ,GAAJ,EAAS;AACPN,UAAAA,cAAc,CAACK,IAAf,CAAoBC,GAApB;;AACA,cAAIJ,KAAK,CAACE,UAAV,EAAsB;AACpBF,YAAAA,KAAK,CAACC,QAAN,GAAiBG,GAAjB;AACD;AACF;AACF;AACF,KAZD;AAaA,WAAON,cAAP;AACD;;AA3CqC","sourcesContent":["import type { SkJSIInstance } from \"../../skia/types\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors\";\n\nexport enum NodeType {\n  Declaration = \"skDeclaration\",\n  Drawing = \"skDrawing\",\n}\n\ntype DeclarationResult = SkJSIInstance<string> | null;\n\nexport abstract class Node<P = unknown> {\n  readonly children: Node[] = [];\n  _props: AnimatedProps<P>;\n  memoizable = false;\n  memoized: DeclarationResult | null = null;\n  parent?: Node;\n  depMgr: DependencyManager;\n\n  constructor(depMgr: DependencyManager, props: AnimatedProps<P>) {\n    this._props = props;\n    this.depMgr = depMgr;\n    this.depMgr.unSubscribeNode(this);\n    this.depMgr.subscribeNode(this, props);\n  }\n\n  abstract draw(ctx: DrawingContext): void | DeclarationResult;\n\n  set props(props: AnimatedProps<P>) {\n    this.depMgr.unSubscribeNode(this);\n    this.depMgr.subscribeNode(this, props);\n    this._props = props;\n  }\n\n  get props() {\n    return this._props;\n  }\n\n  visit(ctx: DrawingContext, children?: Node[]) {\n    const returnedValues: Exclude<DeclarationResult, null>[] = [];\n    (children ?? this.children).forEach((child) => {\n      if (child.memoized && child.memoizable) {\n        returnedValues.push(child.memoized);\n      } else {\n        const ret = child.draw(ctx);\n        if (ret) {\n          returnedValues.push(ret);\n          if (child.memoizable) {\n            child.memoized = ret;\n          }\n        }\n      }\n    });\n    return returnedValues;\n  }\n}\n"]}
+{"version":3,"sources":["Node.ts"],"names":["NodeType","Node","constructor","depMgr","props","updatePropSubscriptions","subscribeNode","unsubscribeNode","resolvedProps","visit","ctx","children","returnedValues","forEach","child","memoized","memoizable","push","ret","draw"],"mappings":";;;;;;;;;IAKYA,Q;;;WAAAA,Q;AAAAA,EAAAA,Q;AAAAA,EAAAA,Q;GAAAA,Q,wBAAAA,Q;;AAOL,MAAeC,IAAf,CAAiC;AAEtC;AAOAC,EAAAA,WAAW,CAACC,MAAD,EAA4BC,KAA5B,EAAqD;AAAA,sCARpC,EAQoC;;AAAA,2CAN7C,EAM6C;;AAAA,wCALnD,KAKmD;;AAAA,sCAJ3B,IAI2B;;AAAA;;AAAA;;AAC9D,SAAKD,MAAL,GAAcA,MAAd;AACA,SAAKE,uBAAL,CAA6BD,KAA7B;AACD;;AAIDC,EAAAA,uBAAuB,CAACD,KAAD,EAA0B;AAC/C,SAAKD,MAAL,CAAYG,aAAZ,CAA0B,IAA1B,EAAgCF,KAAhC;AACD;;AAEQ,MAALA,KAAK,CAACA,KAAD,EAA0B;AACjC,SAAKD,MAAL,CAAYI,eAAZ,CAA4B,IAA5B;AACA,SAAKF,uBAAL,CAA6BD,KAA7B;AACD;;AAEQ,MAALA,KAAK,GAAM;AACb,WAAO,KAAKI,aAAZ;AACD;;AAEDC,EAAAA,KAAK,CAACC,GAAD,EAAsBC,QAAtB,EAAyC;AAC5C,UAAMC,cAAkD,GAAG,EAA3D;AACA,KAACD,QAAD,aAACA,QAAD,cAACA,QAAD,GAAa,KAAKA,QAAlB,EAA4BE,OAA5B,CAAqCC,KAAD,IAAW;AAC7C,UAAIA,KAAK,CAACC,QAAN,IAAkBD,KAAK,CAACE,UAA5B,EAAwC;AACtCJ,QAAAA,cAAc,CAACK,IAAf,CAAoBH,KAAK,CAACC,QAA1B;AACD,OAFD,MAEO;AACL,cAAMG,GAAG,GAAGJ,KAAK,CAACK,IAAN,CAAWT,GAAX,CAAZ;;AACA,YAAIQ,GAAJ,EAAS;AACPN,UAAAA,cAAc,CAACK,IAAf,CAAoBC,GAApB;;AACA,cAAIJ,KAAK,CAACE,UAAV,EAAsB;AACpBF,YAAAA,KAAK,CAACC,QAAN,GAAiBG,GAAjB;AACD;AACF;AACF;AACF,KAZD;AAaA,WAAON,cAAP;AACD;;AA7CqC","sourcesContent":["import type { SkJSIInstance } from \"../../skia/types\";\nimport type { DependencyManager } from \"../DependencyManager\";\nimport type { DrawingContext } from \"../DrawingContext\";\nimport type { AnimatedProps } from \"../processors\";\n\nexport enum NodeType {\n  Declaration = \"skDeclaration\",\n  Drawing = \"skDrawing\",\n}\n\ntype DeclarationResult = SkJSIInstance<string> | null;\n\nexport abstract class Node<P = unknown> {\n  readonly children: Node[] = [];\n  // This cast is ok because we understand that the dependency manager will setup the initial props\n  resolvedProps: P = {} as P;\n  memoizable = false;\n  memoized: DeclarationResult | null = null;\n  parent?: Node;\n  depMgr: DependencyManager;\n\n  constructor(depMgr: DependencyManager, props: AnimatedProps<P>) {\n    this.depMgr = depMgr;\n    this.updatePropSubscriptions(props);\n  }\n\n  abstract draw(ctx: DrawingContext): void | DeclarationResult;\n\n  updatePropSubscriptions(props: AnimatedProps<P>) {\n    this.depMgr.subscribeNode(this, props);\n  }\n\n  set props(props: AnimatedProps<P>) {\n    this.depMgr.unsubscribeNode(this);\n    this.updatePropSubscriptions(props);\n  }\n\n  get props(): P {\n    return this.resolvedProps;\n  }\n\n  visit(ctx: DrawingContext, children?: Node[]) {\n    const returnedValues: Exclude<DeclarationResult, null>[] = [];\n    (children ?? this.children).forEach((child) => {\n      if (child.memoized && child.memoizable) {\n        returnedValues.push(child.memoized);\n      } else {\n        const ret = child.draw(ctx);\n        if (ret) {\n          returnedValues.push(ret);\n          if (child.memoizable) {\n            child.memoized = ret;\n          }\n        }\n      }\n    });\n    return returnedValues;\n  }\n}\n"]}

package/lib/commonjs/renderer/processors/Animations/Animations.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.materialize = exports.isValue = exports.isSelector = exports.isAnimated = void 0;
-
-var _typeddash = require("../../typeddash");
+exports.isValue = exports.isSelector = exports.isAnimated = void 0;
 
 const isValue = value => {
   if (value === undefined || value === null) {
@@ -35,31 +33,14 @@ exports.isSelector = isSelector;
 
 const isAnimated = props => {
   for (const value of Object.values(props)) {
-    if (isValue(value)) {
+    if (isValue(value) || isSelector(value)) {
       return true;
     }
   }
 
   return false;
-};
-
-exports.isAnimated = isAnimated;
-
-const materialize = props => {
-  const result = { ...props
-  };
-  (0, _typeddash.mapKeys)(props).forEach(key => {
-    const prop = props[key];
-
-    if (isValue(prop)) {
-      result[key] = prop.current;
-    } else if (isSelector(prop)) {
-      result[key] = prop.selector(prop.value.current);
-    }
-  });
-  return result;
 }; // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
 
-exports.materialize = materialize;
+exports.isAnimated = isAnimated;
 //# sourceMappingURL=Animations.js.map

package/lib/commonjs/renderer/processors/Animations/Animations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Animations.ts"],"names":["isValue","value","undefined","__typename__","isSelector","selector","isAnimated","props","Object","values","materialize","result","forEach","key","prop","current"],"mappings":";;;;;;;AACA;;AAEO,MAAMA,OAAO,GAAIC,KAAD,IAAiD;AACtE,MAAIA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAArC,EAA2C;AACzC,WAAO,KAAP;AACD;;AACD,MAAI;AACF,QACE,OAAOA,KAAP,KAAiB,QAAjB,IACA,kBAAkBA,KADlB,IAECA,KAAD,CAAyCE,YAAzC,KAA0D,WAH5D,EAIE;AACA,aAAO,IAAP;AACD;AACF,GARD,CAQE,MAAM,CAAE;;AACV,SAAO,KAAP;AACD,CAdM;;;;AAgBA,MAAMC,UAAU,GACrBH,KADwB,IAKrB;AACH,MAAIA,KAAJ,EAAW;AACT,WACE,OAAOA,KAAP,KAAiB,QAAjB,IACA,cAAcA,KADd,IAEA,WAAWA,KAFX,IAGCA,KAAD,CAAmCI,QAAnC,KAAgDH,SAHhD,IAICD,KAAD,CAAmCA,KAAnC,KAA6CC,SAL/C;AAOD;;AACD,SAAO,KAAP;AACD,CAhBM;;;;AAkBA,MAAMI,UAAU,GAAOC,KAAJ,IAAgC;AACxD,OAAK,MAAMN,KAAX,IAAoBO,MAAM,CAACC,MAAP,CAAcF,KAAd,CAApB,EAA0C;AACxC,QAAIP,OAAO,CAACC,KAAD,CAAX,EAAoB;AAClB,aAAO,IAAP;AACD;AACF;;AACD,SAAO,KAAP;AACD,CAPM;;;;AASA,MAAMS,WAAW,GAAOH,KAAJ,IAAgC;AACzD,QAAMI,MAAM,GAAG,EAAE,GAAGJ;AAAL,GAAf;AACA,0BAAQA,KAAR,EAAeK,OAAf,CAAwBC,GAAD,IAAS;AAC9B,UAAMC,IAAI,GAAGP,KAAK,CAACM,GAAD,CAAlB;;AACA,QAAIb,OAAO,CAACc,IAAD,CAAX,EAAmB;AACjBH,MAAAA,MAAM,CAACE,GAAD,CAAN,GAAeC,IAAD,CAAmCC,OAAjD;AACD,KAFD,MAEO,IAAIX,UAAU,CAACU,IAAD,CAAd,EAAsB;AAC3BH,MAAAA,MAAM,CAACE,GAAD,CAAN,GAAcC,IAAI,CAACT,QAAL,CAAcS,IAAI,CAACb,KAAL,CAAWc,OAAzB,CAAd;AACD;AACF,GAPD;AAQA,SAAOJ,MAAP;AACD,CAXM,C,CAaP","sourcesContent":["import type { SkiaSelector, SkiaValue } from \"../../../values\";\nimport { mapKeys } from \"../../typeddash\";\n\nexport const isValue = (value: unknown): value is SkiaValue<unknown> => {\n  if (value === undefined || value === null) {\n    return false;\n  }\n  try {\n    if (\n      typeof value === \"object\" &&\n      \"__typename__\" in value &&\n      (value as unknown as SkiaValue<unknown>).__typename__ === \"RNSkValue\"\n    ) {\n      return true;\n    }\n  } catch {}\n  return false;\n};\n\nexport const isSelector = <T, R>(\n  value: unknown\n): value is {\n  selector: (v: T) => R;\n  value: SkiaValue<T>;\n} => {\n  if (value) {\n    return (\n      typeof value === \"object\" &&\n      \"selector\" in value &&\n      \"value\" in value &&\n      (value as Record<string, unknown>).selector !== undefined &&\n      (value as Record<string, unknown>).value !== undefined\n    );\n  }\n  return false;\n};\n\nexport const isAnimated = <T>(props: AnimatedProps<T>) => {\n  for (const value of Object.values(props)) {\n    if (isValue(value)) {\n      return true;\n    }\n  }\n  return false;\n};\n\nexport const materialize = <T>(props: AnimatedProps<T>) => {\n  const result = { ...props };\n  mapKeys(props).forEach((key) => {\n    const prop = props[key];\n    if (isValue(prop)) {\n      result[key] = (prop as SkiaValue<T[typeof key]>).current;\n    } else if (isSelector(prop)) {\n      result[key] = prop.selector(prop.value.current) as T[typeof key];\n    }\n  });\n  return result as T;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnimatedProp<T, P = any> = T | SkiaValue<T> | SkiaSelector<T, P>;\nexport type AnimatedProps<T> = {\n  [K in keyof T]: AnimatedProp<T[K]>;\n};\n"]}
+{"version":3,"sources":["Animations.ts"],"names":["isValue","value","undefined","__typename__","isSelector","selector","isAnimated","props","Object","values"],"mappings":";;;;;;;AAEO,MAAMA,OAAO,GAAIC,KAAD,IAAiD;AACtE,MAAIA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAArC,EAA2C;AACzC,WAAO,KAAP;AACD;;AACD,MAAI;AACF,QACE,OAAOA,KAAP,KAAiB,QAAjB,IACA,kBAAkBA,KADlB,IAECA,KAAD,CAAyCE,YAAzC,KAA0D,WAH5D,EAIE;AACA,aAAO,IAAP;AACD;AACF,GARD,CAQE,MAAM,CAAE;;AACV,SAAO,KAAP;AACD,CAdM;;;;AAgBA,MAAMC,UAAU,GACrBH,KADwB,IAKrB;AACH,MAAIA,KAAJ,EAAW;AACT,WACE,OAAOA,KAAP,KAAiB,QAAjB,IACA,cAAcA,KADd,IAEA,WAAWA,KAFX,IAGCA,KAAD,CAAmCI,QAAnC,KAAgDH,SAHhD,IAICD,KAAD,CAAmCA,KAAnC,KAA6CC,SAL/C;AAOD;;AACD,SAAO,KAAP;AACD,CAhBM;;;;AAkBA,MAAMI,UAAU,GAAOC,KAAJ,IAAgC;AACxD,OAAK,MAAMN,KAAX,IAAoBO,MAAM,CAACC,MAAP,CAAcF,KAAd,CAApB,EAA0C;AACxC,QAAIP,OAAO,CAACC,KAAD,CAAP,IAAkBG,UAAU,CAACH,KAAD,CAAhC,EAAyC;AACvC,aAAO,IAAP;AACD;AACF;;AACD,SAAO,KAAP;AACD,CAPM,C,CASP","sourcesContent":["import type { SkiaSelector, SkiaValue } from \"../../../values\";\n\nexport const isValue = (value: unknown): value is SkiaValue<unknown> => {\n  if (value === undefined || value === null) {\n    return false;\n  }\n  try {\n    if (\n      typeof value === \"object\" &&\n      \"__typename__\" in value &&\n      (value as unknown as SkiaValue<unknown>).__typename__ === \"RNSkValue\"\n    ) {\n      return true;\n    }\n  } catch {}\n  return false;\n};\n\nexport const isSelector = <T, R>(\n  value: unknown\n): value is {\n  selector: (v: T) => R;\n  value: SkiaValue<T>;\n} => {\n  if (value) {\n    return (\n      typeof value === \"object\" &&\n      \"selector\" in value &&\n      \"value\" in value &&\n      (value as Record<string, unknown>).selector !== undefined &&\n      (value as Record<string, unknown>).value !== undefined\n    );\n  }\n  return false;\n};\n\nexport const isAnimated = <T>(props: AnimatedProps<T>) => {\n  for (const value of Object.values(props)) {\n    if (isValue(value) || isSelector(value)) {\n      return true;\n    }\n  }\n  return false;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnimatedProp<T, P = any> = T | SkiaValue<T> | SkiaSelector<T, P>;\n\nexport type AnimatedProps<T> = {\n  [K in keyof T]: AnimatedProp<T[K]>;\n};\n"]}

package/lib/commonjs/skia/types/Paint/Paint.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Paint.ts"],"names":["PaintStyle","StrokeCap","StrokeJoin","isPaint","obj","__typename__"],"mappings":";;;;;;IAUYA,U;;;WAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;IAKAC,S;;;WAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,yBAAAA,S;;IAMAC,U;;;WAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;AAML,MAAMC,OAAO,GAAIC,GAAD,IACrBA,GAAG,KAAK,IAAR,IAAgBA,GAAG,CAACC,YAAJ,KAAqB,OADhC","sourcesContent":["import type { SkImageFilter } from \"../ImageFilter\";\nimport type { SkMaskFilter } from \"../MaskFilter\";\nimport type { SkColorFilter } from \"../ColorFilter\";\nimport type { SkColor } from \"../Color\";\nimport type { SkPathEffect } from \"../PathEffect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { BlendMode } from \"./BlendMode\";\n\nexport enum PaintStyle {\n  Fill,\n  Stroke,\n}\n\nexport enum StrokeCap {\n  Butt,\n  Round,\n  Square,\n}\n\nexport enum StrokeJoin {\n  Miter,\n  Round,\n  Bevel,\n}\n\nexport const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>\n  obj !== null && obj.__typename__ === \"Paint\";\n\nexport interface SkPaint extends SkJSIInstance<\"Paint\"> {\n  /**\n   * Returns a copy of this paint.\n   */\n  copy(): SkPaint;\n\n  /**\n   * Retrieves the alpha and RGB unpremultiplied. RGB are extended sRGB values\n   * (sRGB gamut, and encoded with the sRGB transfer function).\n   */\n  getColor(): SkColor;\n\n  /**\n   * Returns the geometry drawn at the beginning and end of strokes.\n   */\n  getStrokeCap(): StrokeCap;\n\n  /**\n   * Returns the geometry drawn at the corners of strokes.\n   */\n  getStrokeJoin(): StrokeJoin;\n\n  /**\n   *  Returns the limit at which a sharp corner is drawn beveled.\n   */\n  getStrokeMiter(): number;\n\n  /**\n   * Returns the thickness of the pen used to outline the shape.\n   */\n  getStrokeWidth(): number;\n\n  /**\n   * Replaces alpha, leaving RGBA unchanged. 0 means fully transparent, 1.0 means opaque.\n   * @param alpha\n   */\n  setAlphaf(alpha: number): void;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with\n   * partial transparency.\n   * @param aa\n   */\n  setAntiAlias: (aa: boolean) => void;\n\n  /**\n   * Sets the blend mode that is, the mode used to combine source color\n   * with destination color.\n   * @param mode\n   */\n  setBlendMode: (blendMode: BlendMode) => void;\n\n  /**\n   *  Sets alpha and RGB used when stroking and filling. The color is a 32-bit\n   *  value, unpremultiplied, packing 8-bit components for alpha, red, blue,\n   *  and green.\n   *\n   *   @param color  unpremultiplied ARGB\n   *\n   *    example: https://fiddle.skia.org/c/@Paint_setColor\n   */\n  setColor(color: SkColor): void;\n\n  /**\n   * Sets the current color filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setColorFilter(filter: SkColorFilter | null): void;\n\n  /**\n   * Sets the current image filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setImageFilter(filter: SkImageFilter | null): void;\n\n  /**\n   * Sets the current mask filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setMaskFilter(filter: SkMaskFilter | null): void;\n\n  /**\n   * Sets the current path effect, replacing the existing one if there was one.\n   * @param effect\n   */\n  setPathEffect(effect: SkPathEffect | null): void;\n\n  /**\n   * Sets the current shader, replacing the existing one if there was one.\n   * @param shader\n   */\n  setShader(shader: SkShader | null): void;\n\n  /**\n   * Sets the geometry drawn at the beginning and end of strokes.\n   * @param cap\n   */\n  setStrokeCap(cap: StrokeCap): void;\n\n  /**\n   * Sets the geometry drawn at the corners of strokes.\n   * @param join\n   */\n  setStrokeJoin(join: StrokeJoin): void;\n\n  /**\n   * Sets the limit at which a sharp corner is drawn beveled.\n   * @param limit\n   */\n  setStrokeMiter(limit: number): void;\n\n  /**\n   * Sets the thickness of the pen used to outline the shape.\n   * @param width\n   */\n  setStrokeWidth(width: number): void;\n\n  /**\n   * Sets whether the geometry is filled or stroked.\n   * @param style\n   */\n  setStyle(style: PaintStyle): void;\n}\n"]}
+{"version":3,"sources":["Paint.ts"],"names":["PaintStyle","StrokeCap","StrokeJoin","isPaint","obj","__typename__"],"mappings":";;;;;;IAUYA,U;;;WAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;IAKAC,S;;;WAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;AAAAA,EAAAA,S,CAAAA,S;GAAAA,S,yBAAAA,S;;IAMAC,U;;;WAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;AAAAA,EAAAA,U,CAAAA,U;GAAAA,U,0BAAAA,U;;AAML,MAAMC,OAAO,GAAIC,GAAD,IACrBA,GAAG,KAAK,IAAR,IAAgBA,GAAG,CAACC,YAAJ,KAAqB,OADhC","sourcesContent":["import type { SkImageFilter } from \"../ImageFilter\";\nimport type { SkMaskFilter } from \"../MaskFilter\";\nimport type { SkColorFilter } from \"../ColorFilter\";\nimport type { SkColor } from \"../Color\";\nimport type { SkPathEffect } from \"../PathEffect\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { BlendMode } from \"./BlendMode\";\n\nexport enum PaintStyle {\n  Fill,\n  Stroke,\n}\n\nexport enum StrokeCap {\n  Butt,\n  Round,\n  Square,\n}\n\nexport enum StrokeJoin {\n  Miter,\n  Round,\n  Bevel,\n}\n\nexport const isPaint = (obj: SkJSIInstance<string> | null): obj is SkPaint =>\n  obj !== null && obj.__typename__ === \"Paint\";\n\nexport interface SkPaint extends SkJSIInstance<\"Paint\"> {\n  /**\n   * Returns a copy of this paint.\n   */\n  copy(): SkPaint;\n\n  /**\n   * Sets all SkPaint contents to their initial values. This is equivalent to replacing\n     SkPaint with the result of SkPaint().\n   */\n  reset(): void;\n\n  /**\n   * Retrieves the alpha and RGB unpremultiplied. RGB are extended sRGB values\n   * (sRGB gamut, and encoded with the sRGB transfer function).\n   */\n  getColor(): SkColor;\n\n  /**\n   * Returns the geometry drawn at the beginning and end of strokes.\n   */\n  getStrokeCap(): StrokeCap;\n\n  /**\n   * Returns the geometry drawn at the corners of strokes.\n   */\n  getStrokeJoin(): StrokeJoin;\n\n  /**\n   *  Returns the limit at which a sharp corner is drawn beveled.\n   */\n  getStrokeMiter(): number;\n\n  /**\n   * Returns the thickness of the pen used to outline the shape.\n   */\n  getStrokeWidth(): number;\n\n  /**\n   * Replaces alpha, leaving RGBA unchanged. 0 means fully transparent, 1.0 means opaque.\n   * @param alpha\n   */\n  setAlphaf(alpha: number): void;\n\n  /**\n   * Requests, but does not require, that edge pixels draw opaque or with\n   * partial transparency.\n   * @param aa\n   */\n  setAntiAlias: (aa: boolean) => void;\n\n  /**\n   * Sets the blend mode that is, the mode used to combine source color\n   * with destination color.\n   * @param mode\n   */\n  setBlendMode: (blendMode: BlendMode) => void;\n\n  /**\n   *  Sets alpha and RGB used when stroking and filling. The color is a 32-bit\n   *  value, unpremultiplied, packing 8-bit components for alpha, red, blue,\n   *  and green.\n   *\n   *   @param color  unpremultiplied ARGB\n   *\n   *    example: https://fiddle.skia.org/c/@Paint_setColor\n   */\n  setColor(color: SkColor): void;\n\n  /**\n   * Sets the current color filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setColorFilter(filter: SkColorFilter | null): void;\n\n  /**\n   * Sets the current image filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setImageFilter(filter: SkImageFilter | null): void;\n\n  /**\n   * Sets the current mask filter, replacing the existing one if there was one.\n   * @param filter\n   */\n  setMaskFilter(filter: SkMaskFilter | null): void;\n\n  /**\n   * Sets the current path effect, replacing the existing one if there was one.\n   * @param effect\n   */\n  setPathEffect(effect: SkPathEffect | null): void;\n\n  /**\n   * Sets the current shader, replacing the existing one if there was one.\n   * @param shader\n   */\n  setShader(shader: SkShader | null): void;\n\n  /**\n   * Sets the geometry drawn at the beginning and end of strokes.\n   * @param cap\n   */\n  setStrokeCap(cap: StrokeCap): void;\n\n  /**\n   * Sets the geometry drawn at the corners of strokes.\n   * @param join\n   */\n  setStrokeJoin(join: StrokeJoin): void;\n\n  /**\n   * Sets the limit at which a sharp corner is drawn beveled.\n   * @param limit\n   */\n  setStrokeMiter(limit: number): void;\n\n  /**\n   * Sets the thickness of the pen used to outline the shape.\n   * @param width\n   */\n  setStrokeWidth(width: number): void;\n\n  /**\n   * Sets whether the geometry is filled or stroked.\n   * @param style\n   */\n  setStyle(style: PaintStyle): void;\n}\n"]}

package/lib/commonjs/skia/web/Host.js

@@ -3,14 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toValue = exports.toUndefinedableValue = exports.toOptionalValue = exports.toNullableValue = exports.optEnum = exports.ckEnum = exports.NotImplementedOnRNWeb = exports.HostObject = exports.Host = void 0;
+exports.optEnum = exports.ckEnum = exports.NotImplementedOnRNWeb = exports.HostObject = exports.Host = exports.BaseHostObject = void 0;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-/* eslint-disable no-nested-ternary */
 class NotImplementedOnRNWeb extends Error {
-  constructor() {
-    super("Not implemented on React Native Web");
+  constructor(msg) {
+    super(msg !== null && msg !== void 0 ? msg : "Not implemented on React Native Web");
   }
 
 }
@@ -28,7 +27,7 @@ class Host {
 
 exports.Host = Host;
 
-class HostObject extends Host {
+class BaseHostObject extends Host {
   constructor(CanvasKit, ref, typename) {
     super(CanvasKit);
 
@@ -40,26 +39,18 @@ class HostObject extends Host {
     this.__typename__ = typename;
   }
 
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
-
-exports.HostObject = HostObject;
-
-const toOptionalValue = value => value === undefined ? undefined : value === null ? null : toValue(value);
-
-exports.toOptionalValue = toOptionalValue;
-
-const toUndefinedableValue = value => value === undefined ? undefined : toValue(value);
-
-exports.toUndefinedableValue = toUndefinedableValue;
+}
 
-const toNullableValue = value => value === null ? null : toValue(value);
+exports.BaseHostObject = BaseHostObject;
 
-exports.toNullableValue = toNullableValue;
+class HostObject extends BaseHostObject {
+  static fromValue(value) {
+    return value.ref;
+  }
 
-const toValue = value => value.ref;
+}
 
-exports.toValue = toValue;
+exports.HostObject = HostObject;
 
 const ckEnum = value => ({
   value

package/lib/commonjs/skia/web/Host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Host.ts"],"names":["NotImplementedOnRNWeb","Error","constructor","Host","CanvasKit","HostObject","ref","typename","__typename__","toOptionalValue","value","undefined","toValue","toUndefinedableValue","toNullableValue","ckEnum","optEnum"],"mappings":";;;;;;;;;AAAA;AAKO,MAAMA,qBAAN,SAAoCC,KAApC,CAA0C;AAC/CC,EAAAA,WAAW,GAAG;AACZ,UAAM,qCAAN;AACD;;AAH8C;;;;AAM1C,MAAeC,IAAf,CAAoB;AAGzBD,EAAAA,WAAW,CAACE,SAAD,EAAuB;AAAA;;AAChC,SAAKA,SAAL,GAAiBA,SAAjB;AACD;;AALwB;;;;AAQpB,MAAeC,UAAf,SACGF,IADH,CAGP;AAIED,EAAAA,WAAW,CAACE,SAAD,EAAuBE,GAAvB,EAA+BC,QAA/B,EAA4C;AACrD,UAAMH,SAAN;;AADqD;;AAAA;;AAErD,SAAKE,GAAL,GAAWA,GAAX;AACA,SAAKE,YAAL,GAAoBD,QAApB;AACD;;AARH,C,CAWA;;;;;AAGO,MAAME,eAAe,GAC1BC,KAD6B,IAG7BA,KAAK,KAAKC,SAAV,GAAsBA,SAAtB,GAAkCD,KAAK,KAAK,IAAV,GAAiB,IAAjB,GAAwBE,OAAO,CAACF,KAAD,CAH5D;;;;AAKA,MAAMG,oBAAoB,GAC/BH,KADkC,IAEfA,KAAK,KAAKC,SAAV,GAAsBA,SAAtB,GAAkCC,OAAO,CAACF,KAAD,CAFvD;;;;AAIA,MAAMI,eAAe,GAAOJ,KAAJ,IAC7BA,KAAK,KAAK,IAAV,GAAiB,IAAjB,GAAwBE,OAAO,CAACF,KAAD,CAD1B;;;;AAGA,MAAME,OAAO,GAAOF,KAAJ,IACpBA,KAAD,CAAiCJ,GAD5B;;;;AAGA,MAAMS,MAAM,GAAIL,KAAD,KAAsC;AAAEA,EAAAA;AAAF,CAAtC,CAAf;;;;AACA,MAAMM,OAAO,GAClBN,KADqB,IAGrBA,KAAK,KAAKC,SAAV,GAAsBA,SAAtB,GAAkC;AAAED,EAAAA;AAAF,CAH7B","sourcesContent":["/* eslint-disable no-nested-ternary */\nimport type { CanvasKit, EmbindEnumEntity } from \"canvaskit-wasm\";\n\nimport type { SkJSIInstance } from \"../types\";\n\nexport class NotImplementedOnRNWeb extends Error {\n  constructor() {\n    super(\"Not implemented on React Native Web\");\n  }\n}\n\nexport abstract class Host {\n  readonly CanvasKit: CanvasKit;\n\n  constructor(CanvasKit: CanvasKit) {\n    this.CanvasKit = CanvasKit;\n  }\n}\n\nexport abstract class HostObject<T, N extends string>\n  extends Host\n  implements SkJSIInstance<N>\n{\n  readonly __typename__: N;\n  readonly ref: T;\n\n  constructor(CanvasKit: CanvasKit, ref: T, typename: N) {\n    super(CanvasKit);\n    this.ref = ref;\n    this.__typename__ = typename;\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/ban-types\nexport type NonNullish = {};\n\nexport const toOptionalValue = <T>(\n  value: NonNullish | undefined | null\n): T | undefined | null =>\n  value === undefined ? undefined : value === null ? null : toValue(value);\n\nexport const toUndefinedableValue = <T>(\n  value: NonNullish | undefined\n): T | undefined => (value === undefined ? undefined : toValue(value));\n\nexport const toNullableValue = <T>(value: NonNullish | null): T | null =>\n  value === null ? null : toValue(value);\n\nexport const toValue = <T>(value: NonNullish): T =>\n  (value as HostObject<T, string>).ref;\n\nexport const ckEnum = (value: number): EmbindEnumEntity => ({ value });\nexport const optEnum = (\n  value: number | undefined\n): EmbindEnumEntity | undefined =>\n  value === undefined ? undefined : { value };\n"]}
+{"version":3,"sources":["Host.ts"],"names":["NotImplementedOnRNWeb","Error","constructor","msg","Host","CanvasKit","BaseHostObject","ref","typename","__typename__","HostObject","fromValue","value","ckEnum","optEnum","undefined"],"mappings":";;;;;;;;;AAIO,MAAMA,qBAAN,SAAoCC,KAApC,CAA0C;AAC/CC,EAAAA,WAAW,CAACC,GAAD,EAAe;AACxB,UAAMA,GAAN,aAAMA,GAAN,cAAMA,GAAN,GAAa,qCAAb;AACD;;AAH8C;;;;AAM1C,MAAeC,IAAf,CAAoB;AAGzBF,EAAAA,WAAW,CAACG,SAAD,EAAuB;AAAA;;AAChC,SAAKA,SAAL,GAAiBA,SAAjB;AACD;;AALwB;;;;AAQpB,MAAeC,cAAf,SACGF,IADH,CAGP;AAIEF,EAAAA,WAAW,CAACG,SAAD,EAAuBE,GAAvB,EAA+BC,QAA/B,EAA4C;AACrD,UAAMH,SAAN;;AADqD;;AAAA;;AAErD,SAAKE,GAAL,GAAWA,GAAX;AACA,SAAKE,YAAL,GAAoBD,QAApB;AACD;;AARH;;;;AAWO,MAAeE,UAAf,SAAuDJ,cAAvD,CAGL;AACgB,SAATK,SAAS,CAAIC,KAAJ,EAAkC;AAChD,WAAQA,KAAD,CAAiCL,GAAxC;AACD;;AAHD;;;;AAMK,MAAMM,MAAM,GAAID,KAAD,KAAsC;AAAEA,EAAAA;AAAF,CAAtC,CAAf;;;;AACA,MAAME,OAAO,GAClBF,KADqB,IAGrBA,KAAK,KAAKG,SAAV,GAAsBA,SAAtB,GAAkC;AAAEH,EAAAA;AAAF,CAH7B","sourcesContent":["import type { CanvasKit, EmbindEnumEntity } from \"canvaskit-wasm\";\n\nimport type { SkJSIInstance } from \"../types\";\n\nexport class NotImplementedOnRNWeb extends Error {\n  constructor(msg?: string) {\n    super(msg ?? \"Not implemented on React Native Web\");\n  }\n}\n\nexport abstract class Host {\n  readonly CanvasKit: CanvasKit;\n\n  constructor(CanvasKit: CanvasKit) {\n    this.CanvasKit = CanvasKit;\n  }\n}\n\nexport abstract class BaseHostObject<T, N extends string>\n  extends Host\n  implements SkJSIInstance<N>\n{\n  readonly __typename__: N;\n  ref: T;\n\n  constructor(CanvasKit: CanvasKit, ref: T, typename: N) {\n    super(CanvasKit);\n    this.ref = ref;\n    this.__typename__ = typename;\n  }\n}\n\nexport abstract class HostObject<T, N extends string> extends BaseHostObject<\n  T,\n  N\n> {\n  static fromValue<T>(value: SkJSIInstance<string>) {\n    return (value as HostObject<T, string>).ref;\n  }\n}\n\nexport const ckEnum = (value: number): EmbindEnumEntity => ({ value });\nexport const optEnum = (\n  value: number | undefined\n): EmbindEnumEntity | undefined =>\n  value === undefined ? undefined : { value };\n"]}

package/lib/commonjs/skia/web/JsiSkCanvas.js

@@ -7,61 +7,81 @@ exports.JsiSkCanvas = void 0;
 
 var _Host = require("./Host");
 
+var _JsiSkPaint = require("./JsiSkPaint");
+
 var _JsiSkRect = require("./JsiSkRect");
 
 var _JsiSkRRect = require("./JsiSkRRect");
 
+var _JsiSkImage = require("./JsiSkImage");
+
+var _JsiSkVertices = require("./JsiSkVertices");
+
+var _JsiSkPath = require("./JsiSkPath");
+
+var _JsiSkFont = require("./JsiSkFont");
+
+var _JsiSkTextBlob = require("./JsiSkTextBlob");
+
+var _JsiSkPicture = require("./JsiSkPicture");
+
+var _JsiSkMatrix = require("./JsiSkMatrix");
+
+var _JsiSkImageFilter = require("./JsiSkImageFilter");
+
+var _JsiSkPoint = require("./JsiSkPoint");
+
 class JsiSkCanvas extends _Host.HostObject {
   constructor(CanvasKit, ref) {
     super(CanvasKit, ref, "Canvas");
   }
 
   drawRect(rect, paint) {
-    this.ref.drawRect(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, rect), (0, _Host.toValue)(paint));
+    this.ref.drawRect(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, rect), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawImage(image, x, y, paint) {
-    this.ref.drawImage((0, _Host.toValue)(image), x, y, (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImage(_JsiSkImage.JsiSkImage.fromValue(image), x, y, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawImageRect(img, src, dest, paint, fastSample) {
-    this.ref.drawImageRect((0, _Host.toValue)(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.toValue)(paint), fastSample);
+    this.ref.drawImageRect(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), _JsiSkPaint.JsiSkPaint.fromValue(paint), fastSample);
   }
 
   drawImageCubic(img, left, top, B, C, paint) {
-    this.ref.drawImageCubic((0, _Host.toValue)(img), left, top, B, C, (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImageCubic(_JsiSkImage.JsiSkImage.fromValue(img), left, top, B, C, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawImageOptions(img, left, top, fm, mm, paint) {
-    this.ref.drawImageOptions((0, _Host.toValue)(img), left, top, (0, _Host.ckEnum)(fm), (0, _Host.ckEnum)(mm), (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImageOptions(_JsiSkImage.JsiSkImage.fromValue(img), left, top, (0, _Host.ckEnum)(fm), (0, _Host.ckEnum)(mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawImageNine(img, center, dest, filter, paint) {
-    this.ref.drawImageNine((0, _Host.toValue)(img), (0, _Host.toValue)(center), (0, _Host.toValue)(dest), (0, _Host.ckEnum)(filter), (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImageNine(_JsiSkImage.JsiSkImage.fromValue(img), Array.from(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, center)), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.ckEnum)(filter), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawImageRectCubic(img, src, dest, B, C, paint) {
-    this.ref.drawImageRectCubic((0, _Host.toValue)(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), B, C, (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImageRectCubic(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), B, C, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawImageRectOptions(img, src, dest, fm, mm, paint) {
-    this.ref.drawImageRectOptions((0, _Host.toValue)(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.ckEnum)(fm), (0, _Host.ckEnum)(mm), (0, _Host.toOptionalValue)(paint));
+    this.ref.drawImageRectOptions(_JsiSkImage.JsiSkImage.fromValue(img), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, src), _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, dest), (0, _Host.ckEnum)(fm), (0, _Host.ckEnum)(mm), paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : paint);
   }
 
   drawPaint(paint) {
-    this.ref.drawPaint((0, _Host.toValue)(paint));
+    this.ref.drawPaint(_JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawLine(x0, y0, x1, y1, paint) {
-    this.ref.drawLine(x0, y0, x1, y1, (0, _Host.toValue)(paint));
+    this.ref.drawLine(x0, y0, x1, y1, _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawCircle(cx, cy, radius, paint) {
-    this.ref.drawCircle(cx, cy, radius, (0, _Host.toValue)(paint));
+    this.ref.drawCircle(cx, cy, radius, _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawVertices(verts, mode, paint) {
-    this.ref.drawVertices((0, _Host.toValue)(verts), (0, _Host.ckEnum)(mode), (0, _Host.toValue)(paint));
+    this.ref.drawVertices(_JsiSkVertices.JsiSkVertices.fromValue(verts), (0, _Host.ckEnum)(mode), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawPatch(cubics, colors, texs, mode, paint) {
@@ -71,7 +91,7 @@ class JsiSkCanvas extends _Host.HostObject {
         y
       } = _ref;
       return [x, y];
-    }).flat(), colors, (0, _Host.toOptionalValue)(texs), mode ? (0, _Host.ckEnum)(mode) : null, (0, _Host.toUndefinedableValue)(paint));
+    }).flat(), colors, texs ? texs.flatMap(p => Array.from(_JsiSkPoint.JsiSkPoint.fromValue(p))) : texs, mode ? (0, _Host.ckEnum)(mode) : null, paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : undefined);
   }
 
   restoreToCount(saveCount) {
@@ -85,39 +105,39 @@ class JsiSkCanvas extends _Host.HostObject {
         y
       } = _ref2;
       return [x, y];
-    }).flat(), (0, _Host.toValue)(paint));
+    }).flat(), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawArc(oval, startAngle, sweepAngle, useCenter, paint) {
-    this.ref.drawArc((0, _Host.toValue)(oval), startAngle, sweepAngle, useCenter, (0, _Host.toValue)(paint));
+    this.ref.drawArc(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, oval), startAngle, sweepAngle, useCenter, _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawRRect(rrect, paint) {
-    this.ref.drawRRect(_JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, rrect), (0, _Host.toValue)(paint));
+    this.ref.drawRRect(_JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, rrect), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawDRRect(outer, inner, paint) {
-    this.ref.drawDRRect((0, _Host.toValue)(outer), (0, _Host.toValue)(inner), (0, _Host.toValue)(paint));
+    this.ref.drawDRRect(_JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, outer), _JsiSkRRect.JsiSkRRect.fromValue(this.CanvasKit, inner), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawOval(oval, paint) {
-    this.ref.drawOval((0, _Host.toValue)(oval), (0, _Host.toValue)(paint));
+    this.ref.drawOval(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, oval), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawPath(path, paint) {
-    this.ref.drawPath((0, _Host.toValue)(path), (0, _Host.toValue)(paint));
+    this.ref.drawPath(_JsiSkPath.JsiSkPath.fromValue(path), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawText(str, x, y, paint, font) {
-    this.ref.drawText(str, x, y, (0, _Host.toValue)(paint), (0, _Host.toValue)(font));
+    this.ref.drawText(str, x, y, _JsiSkPaint.JsiSkPaint.fromValue(paint), _JsiSkFont.JsiSkFont.fromValue(font));
   }
 
   drawTextBlob(blob, x, y, paint) {
-    this.ref.drawTextBlob((0, _Host.toValue)(blob), x, y, (0, _Host.toValue)(paint));
+    this.ref.drawTextBlob(_JsiSkTextBlob.JsiSkTextBlob.fromValue(blob), x, y, _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawGlyphs(glyphs, positions, x, y, font, paint) {
-    this.ref.drawGlyphs(glyphs, positions.map(p => [p.x, p.y]).flat(), x, y, (0, _Host.toValue)(font), (0, _Host.toValue)(paint));
+    this.ref.drawGlyphs(glyphs, positions.map(p => [p.x, p.y]).flat(), x, y, _JsiSkFont.JsiSkFont.fromValue(font), _JsiSkPaint.JsiSkPaint.fromValue(paint));
   }
 
   drawSvg(_svgDom, _width, _height) {
@@ -129,7 +149,7 @@ class JsiSkCanvas extends _Host.HostObject {
   }
 
   saveLayer(paint, bounds, backdrop, flags) {
-    return this.ref.saveLayer((0, _Host.toUndefinedableValue)(paint), (0, _Host.toOptionalValue)(bounds), (0, _Host.toOptionalValue)(backdrop), flags);
+    return this.ref.saveLayer(paint ? _JsiSkPaint.JsiSkPaint.fromValue(paint) : undefined, bounds ? _JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, bounds) : bounds, backdrop ? _JsiSkImageFilter.JsiSkImageFilter.fromValue(backdrop) : backdrop, flags);
   }
 
   restore() {
@@ -161,7 +181,7 @@ class JsiSkCanvas extends _Host.HostObject {
   }
 
   clipPath(path, op, doAntiAlias) {
-    this.ref.clipPath((0, _Host.toValue)(path), (0, _Host.ckEnum)(op), doAntiAlias);
+    this.ref.clipPath(_JsiSkPath.JsiSkPath.fromValue(path), (0, _Host.ckEnum)(op), doAntiAlias);
   }
 
   clipRect(rect, op, doAntiAlias) {
@@ -173,11 +193,11 @@ class JsiSkCanvas extends _Host.HostObject {
   }
 
   concat(m) {
-    this.ref.concat((0, _Host.toValue)(m));
+    this.ref.concat(_JsiSkMatrix.JsiSkMatrix.fromValue(m));
   }
 
   drawPicture(skp) {
-    this.ref.drawPicture((0, _Host.toValue)(skp));
+    this.ref.drawPicture(_JsiSkPicture.JsiSkPicture.fromValue(skp));
   }
 
 }