@shopify/react-native-skia 0.1.130 → 0.1.133

package/lib/module/renderer/components/shaders/LinearGradient.js

@@ -1,22 +1,24 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { Skia } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
 import { processGradientProps } from "./Gradient";
-const onDeclare = createDeclaration(_ref => {
+const onDeclare = createDeclaration((_ref, _, _ref2) => {
   let {
     start,
     end,
     ...gradientProps
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   const {
     colors,
     positions,
     mode,
     localMatrix,
     flags
-  } = processGradientProps(gradientProps);
+  } = processGradientProps(Skia, gradientProps);
   return Skia.Shader.MakeLinearGradient(start, end, colors, positions, mode, localMatrix, flags);
 });
 export const LinearGradient = props => {

package/lib/module/renderer/components/shaders/LinearGradient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["LinearGradient.tsx"],"names":["React","Skia","createDeclaration","processGradientProps","onDeclare","start","end","gradientProps","colors","positions","mode","localMatrix","flags","Shader","MakeLinearGradient","LinearGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,IAAT,QAAqB,eAArB;AACA,SAASC,iBAAT,QAAkC,yBAAlC;AAGA,SAASC,oBAAT,QAAqC,YAArC;AAOA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,QAAsC;AAAA,MAArC;AAAEG,IAAAA,KAAF;AAASC,IAAAA,GAAT;AAAc,OAAGC;AAAjB,GAAqC;AACpC,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJT,oBAAoB,CAACI,aAAD,CADtB;AAEA,SAAON,IAAI,CAACY,MAAL,CAAYC,kBAAZ,CACLT,KADK,EAELC,GAFK,EAGLE,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,CAAP;AASD,CAbgC,CAAnC;AAgBA,OAAO,MAAMG,cAAc,GAAIC,KAAD,IAA+C;AAC3E,sBAAO;AAAe,IAAA,SAAS,EAAEZ;AAA1B,KAAyCY,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { Vector, AnimatedProps } from \"../../processors\";\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface LinearGradientProps extends GradientProps {\n  start: Vector;\n  end: Vector;\n}\n\nconst onDeclare = createDeclaration<LinearGradientProps>(\n  ({ start, end, ...gradientProps }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(gradientProps);\n    return Skia.Shader.MakeLinearGradient(\n      start,\n      end,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const LinearGradient = (props: AnimatedProps<LinearGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["LinearGradient.tsx"],"names":["React","createDeclaration","processGradientProps","onDeclare","_","start","end","gradientProps","Skia","colors","positions","mode","localMatrix","flags","Shader","MakeLinearGradient","LinearGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,iBAAT,QAAkC,yBAAlC;AAIA,SAASC,oBAAT,QAAqC,YAArC;AAOA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,OAAmCG,CAAnC,YAAmD;AAAA,MAAlD;AAAEC,IAAAA,KAAF;AAASC,IAAAA,GAAT;AAAc,OAAGC;AAAjB,GAAkD;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AACjD,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJX,oBAAoB,CAACM,IAAD,EAAOD,aAAP,CADtB;AAEA,SAAOC,IAAI,CAACM,MAAL,CAAYC,kBAAZ,CACLV,KADK,EAELC,GAFK,EAGLG,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,CAAP;AASD,CAbgC,CAAnC;AAgBA,OAAO,MAAMG,cAAc,GAAIC,KAAD,IAA+C;AAC3E,sBAAO;AAAe,IAAA,SAAS,EAAEd;AAA1B,KAAyCc,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { Vector } from \"../../../skia/types\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface LinearGradientProps extends GradientProps {\n  start: Vector;\n  end: Vector;\n}\n\nconst onDeclare = createDeclaration<LinearGradientProps>(\n  ({ start, end, ...gradientProps }, _, { Skia }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(Skia, gradientProps);\n    return Skia.Shader.MakeLinearGradient(\n      start,\n      end,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const LinearGradient = (props: AnimatedProps<LinearGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shaders/RadialGradient.js

@@ -1,22 +1,24 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { Skia } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
 import { processGradientProps } from "./Gradient";
-const onDeclare = createDeclaration(_ref => {
+const onDeclare = createDeclaration((_ref, _, _ref2) => {
   let {
     c,
     r,
     ...gradientProps
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   const {
     colors,
     positions,
     mode,
     localMatrix,
     flags
-  } = processGradientProps(gradientProps);
+  } = processGradientProps(Skia, gradientProps);
   return Skia.Shader.MakeRadialGradient(c, r, colors, positions, mode, localMatrix, flags);
 });
 export const RadialGradient = props => {

package/lib/module/renderer/components/shaders/RadialGradient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["RadialGradient.tsx"],"names":["React","Skia","createDeclaration","processGradientProps","onDeclare","c","r","gradientProps","colors","positions","mode","localMatrix","flags","Shader","MakeRadialGradient","RadialGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,IAAT,QAAqB,eAArB;AACA,SAASC,iBAAT,QAAkC,yBAAlC;AAGA,SAASC,oBAAT,QAAqC,YAArC;AAOA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,QAAgC;AAAA,MAA/B;AAAEG,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQ,OAAGC;AAAX,GAA+B;AAC9B,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJT,oBAAoB,CAACI,aAAD,CADtB;AAEA,SAAON,IAAI,CAACY,MAAL,CAAYC,kBAAZ,CACLT,CADK,EAELC,CAFK,EAGLE,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,CAAP;AASD,CAbgC,CAAnC;AAgBA,OAAO,MAAMG,cAAc,GAAIC,KAAD,IAA+C;AAC3E,sBAAO;AAAe,IAAA,SAAS,EAAEZ;AAA1B,KAAyCY,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { Vector, AnimatedProps } from \"../../processors\";\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface RadialGradientProps extends GradientProps {\n  c: Vector;\n  r: number;\n}\n\nconst onDeclare = createDeclaration<RadialGradientProps>(\n  ({ c, r, ...gradientProps }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(gradientProps);\n    return Skia.Shader.MakeRadialGradient(\n      c,\n      r,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const RadialGradient = (props: AnimatedProps<RadialGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["RadialGradient.tsx"],"names":["React","createDeclaration","processGradientProps","onDeclare","_","c","r","gradientProps","Skia","colors","positions","mode","localMatrix","flags","Shader","MakeRadialGradient","RadialGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,iBAAT,QAAkC,yBAAlC;AAIA,SAASC,oBAAT,QAAqC,YAArC;AAOA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,OAA6BG,CAA7B,YAA6C;AAAA,MAA5C;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQ,OAAGC;AAAX,GAA4C;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC3C,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJX,oBAAoB,CAACM,IAAD,EAAOD,aAAP,CADtB;AAEA,SAAOC,IAAI,CAACM,MAAL,CAAYC,kBAAZ,CACLV,CADK,EAELC,CAFK,EAGLG,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,CAAP;AASD,CAbgC,CAAnC;AAgBA,OAAO,MAAMG,cAAc,GAAIC,KAAD,IAA+C;AAC3E,sBAAO;AAAe,IAAA,SAAS,EAAEd;AAA1B,KAAyCc,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { Vector } from \"../../../skia/types\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface RadialGradientProps extends GradientProps {\n  c: Vector;\n  r: number;\n}\n\nconst onDeclare = createDeclaration<RadialGradientProps>(\n  ({ c, r, ...gradientProps }, _, { Skia }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(Skia, gradientProps);\n    return Skia.Shader.MakeRadialGradient(\n      c,\n      r,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const RadialGradient = (props: AnimatedProps<RadialGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shaders/Shader.js

@@ -1,57 +1,19 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { isShader } from "../../../skia";
+import { isShader, processUniforms } from "../../../skia/types";
 import { createDeclaration } from "../../nodes/Declaration";
 import { localMatrix } from "../../processors";
-
-const isVector = obj => // We have an issue to check property existence on JSI backed instances
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-obj.x !== undefined && obj.y !== undefined;
-
-const processValue = value => {
-  if (isVector(value)) {
-    return [value.x, value.y];
-  }
-
-  return value;
-};
-
-const onDeclare = createDeclaration((_ref, children) => {
+const onDeclare = createDeclaration((_ref, children, _ref2) => {
   let {
     uniforms,
     source,
     ...transform
   } = _ref;
-  const processedUniforms = new Array(source.getUniformCount()).fill(0).flatMap((_, i) => {
-    const name = source.getUniformName(i);
-    const value = uniforms[name];
-
-    if (value === undefined) {
-      throw new Error(`No value specified for uniform ${name}`);
-    }
-
-    if (Array.isArray(value)) {
-      return value.flatMap(processValue);
-    }
-
-    return processValue(value);
-  });
-  const names = Object.keys(uniforms);
-
-  if (names.length > source.getUniformCount()) {
-    const usedUniforms = new Array(source.getUniformCount()).fill(0).map((_, i) => source.getUniformName(i));
-    const unusedUniform = names.map(name => {
-      if (usedUniforms.indexOf(name) === -1) {
-        return name;
-      }
-
-      return null;
-    }).filter(n => n !== null);
-    console.warn("Unused uniforms were provided: " + unusedUniform.join(", "));
-  }
-
-  return source.makeShaderWithChildren(processedUniforms, children.filter(isShader), localMatrix(transform));
+  let {
+    Skia
+  } = _ref2;
+  return source.makeShaderWithChildren(processUniforms(source, uniforms), children.filter(isShader), localMatrix(Skia.Matrix(), transform));
 });
 export const Shader = props => {
   return /*#__PURE__*/React.createElement("skDeclaration", _extends({

package/lib/module/renderer/components/shaders/Shader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Shader.tsx"],"names":["React","isShader","createDeclaration","localMatrix","isVector","obj","x","undefined","y","processValue","value","onDeclare","children","uniforms","source","transform","processedUniforms","Array","getUniformCount","fill","flatMap","_","i","name","getUniformName","Error","isArray","names","Object","keys","length","usedUniforms","map","unusedUniform","indexOf","filter","n","console","warn","join","makeShaderWithChildren","Shader","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,QAAT,QAAyB,eAAzB;AAGA,SAASC,iBAAT,QAAkC,yBAAlC;AACA,SAASC,WAAT,QAA4B,kBAA5B;;AAEA,MAAMC,QAAQ,GAAIC,GAAD,IACf;AACA;AACCA,GAAD,CAAaC,CAAb,KAAmBC,SAAnB,IAAiCF,GAAD,CAAaG,CAAb,KAAmBD,SAHrD;;AAaA,MAAME,YAAY,GAAIC,KAAD,IAAqD;AACxE,MAAIN,QAAQ,CAACM,KAAD,CAAZ,EAAqB;AACnB,WAAO,CAACA,KAAK,CAACJ,CAAP,EAAUI,KAAK,CAACF,CAAhB,CAAP;AACD;;AACD,SAAOE,KAAP;AACD,CALD;;AAaA,MAAMC,SAAS,GAAGT,iBAAiB,CACjC,OAAqCU,QAArC,KAAkD;AAAA,MAAjD;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,MAAZ;AAAoB,OAAGC;AAAvB,GAAiD;AAChD,QAAMC,iBAAiB,GAAG,IAAIC,KAAJ,CAAUH,MAAM,CAACI,eAAP,EAAV,EACvBC,IADuB,CAClB,CADkB,EAEvBC,OAFuB,CAEf,CAACC,CAAD,EAAIC,CAAJ,KAAU;AACjB,UAAMC,IAAI,GAAGT,MAAM,CAACU,cAAP,CAAsBF,CAAtB,CAAb;AACA,UAAMZ,KAAK,GAAGG,QAAQ,CAACU,IAAD,CAAtB;;AACA,QAAIb,KAAK,KAAKH,SAAd,EAAyB;AACvB,YAAM,IAAIkB,KAAJ,CAAW,kCAAiCF,IAAK,EAAjD,CAAN;AACD;;AACD,QAAIN,KAAK,CAACS,OAAN,CAAchB,KAAd,CAAJ,EAA0B;AACxB,aAAOA,KAAK,CAACU,OAAN,CAAcX,YAAd,CAAP;AACD;;AACD,WAAOA,YAAY,CAACC,KAAD,CAAnB;AACD,GAZuB,CAA1B;AAaA,QAAMiB,KAAK,GAAGC,MAAM,CAACC,IAAP,CAAYhB,QAAZ,CAAd;;AACA,MAAIc,KAAK,CAACG,MAAN,GAAehB,MAAM,CAACI,eAAP,EAAnB,EAA6C;AAC3C,UAAMa,YAAY,GAAG,IAAId,KAAJ,CAAUH,MAAM,CAACI,eAAP,EAAV,EAClBC,IADkB,CACb,CADa,EAElBa,GAFkB,CAEd,CAACX,CAAD,EAAIC,CAAJ,KAAUR,MAAM,CAACU,cAAP,CAAsBF,CAAtB,CAFI,CAArB;AAGA,UAAMW,aAAa,GAAGN,KAAK,CACxBK,GADmB,CACdT,IAAD,IAAU;AACb,UAAIQ,YAAY,CAACG,OAAb,CAAqBX,IAArB,MAA+B,CAAC,CAApC,EAAuC;AACrC,eAAOA,IAAP;AACD;;AACD,aAAO,IAAP;AACD,KANmB,EAOnBY,MAPmB,CAOXC,CAAD,IAAOA,CAAC,KAAK,IAPD,CAAtB;AAQAC,IAAAA,OAAO,CAACC,IAAR,CACE,oCAAoCL,aAAa,CAACM,IAAd,CAAmB,IAAnB,CADtC;AAGD;;AACD,SAAOzB,MAAM,CAAC0B,sBAAP,CACLxB,iBADK,EAELJ,QAAQ,CAACuB,MAAT,CAAgBlC,QAAhB,CAFK,EAGLE,WAAW,CAACY,SAAD,CAHN,CAAP;AAKD,CArCgC,CAAnC;AAwCA,OAAO,MAAM0B,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAE/B;AAA1B,KAAyC+B,KAAzC,EAAP;AACD,CAFM;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpB9B,EAAAA,QAAQ,EAAE;AADU,CAAtB","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { isShader } from \"../../../skia\";\nimport type { SkRuntimeEffect } from \"../../../skia\";\nimport type { Vector, AnimatedProps, TransformProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport { localMatrix } from \"../../processors\";\n\nconst isVector = (obj: unknown): obj is Vector =>\n  // We have an issue to check property existence on JSI backed instances\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  (obj as any).x !== undefined && (obj as any).y !== undefined;\n\ntype UniformValue = number | Vector | readonly number[];\n\ntype Uniform = UniformValue | readonly UniformValue[];\n\ninterface Uniforms {\n  [name: string]: Uniform;\n}\n\nconst processValue = (value: UniformValue): number | readonly number[] => {\n  if (isVector(value)) {\n    return [value.x, value.y];\n  }\n  return value;\n};\n\nexport interface ShaderProps extends TransformProps {\n  source: SkRuntimeEffect;\n  uniforms: Uniforms;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ShaderProps>(\n  ({ uniforms, source, ...transform }, children) => {\n    const processedUniforms = new Array(source.getUniformCount())\n      .fill(0)\n      .flatMap((_, i) => {\n        const name = source.getUniformName(i);\n        const value = uniforms[name];\n        if (value === undefined) {\n          throw new Error(`No value specified for uniform ${name}`);\n        }\n        if (Array.isArray(value)) {\n          return value.flatMap(processValue);\n        }\n        return processValue(value as UniformValue);\n      });\n    const names = Object.keys(uniforms);\n    if (names.length > source.getUniformCount()) {\n      const usedUniforms = new Array(source.getUniformCount())\n        .fill(0)\n        .map((_, i) => source.getUniformName(i));\n      const unusedUniform = names\n        .map((name) => {\n          if (usedUniforms.indexOf(name) === -1) {\n            return name;\n          }\n          return null;\n        })\n        .filter((n) => n !== null);\n      console.warn(\n        \"Unused uniforms were provided: \" + unusedUniform.join(\", \")\n      );\n    }\n    return source.makeShaderWithChildren(\n      processedUniforms,\n      children.filter(isShader),\n      localMatrix(transform)\n    );\n  }\n);\n\nexport const Shader = (props: AnimatedProps<ShaderProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nShader.defaultProps = {\n  uniforms: [],\n};\n"]}
+{"version":3,"sources":["Shader.tsx"],"names":["React","isShader","processUniforms","createDeclaration","localMatrix","onDeclare","children","uniforms","source","transform","Skia","makeShaderWithChildren","filter","Matrix","Shader","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAIA,SAASC,QAAT,EAAmBC,eAAnB,QAA0C,qBAA1C;AAEA,SAASC,iBAAT,QAAkC,yBAAlC;AACA,SAASC,WAAT,QAA4B,kBAA5B;AAQA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,OAAqCG,QAArC,YAA4D;AAAA,MAA3D;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,MAAZ;AAAoB,OAAGC;AAAvB,GAA2D;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC1D,SAAOF,MAAM,CAACG,sBAAP,CACLT,eAAe,CAACM,MAAD,EAASD,QAAT,CADV,EAELD,QAAQ,CAACM,MAAT,CAAgBX,QAAhB,CAFK,EAGLG,WAAW,CAACM,IAAI,CAACG,MAAL,EAAD,EAAgBJ,SAAhB,CAHN,CAAP;AAKD,CAPgC,CAAnC;AAUA,OAAO,MAAMK,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEV;AAA1B,KAAyCU,KAAzC,EAAP;AACD,CAFM;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpBT,EAAAA,QAAQ,EAAE;AADU,CAAtB","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport type { SkRuntimeEffect, Uniforms } from \"../../../skia/types\";\nimport { isShader, processUniforms } from \"../../../skia/types\";\nimport type { AnimatedProps, TransformProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport { localMatrix } from \"../../processors\";\n\nexport interface ShaderProps extends TransformProps {\n  source: SkRuntimeEffect;\n  uniforms: Uniforms;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ShaderProps>(\n  ({ uniforms, source, ...transform }, children, { Skia }) => {\n    return source.makeShaderWithChildren(\n      processUniforms(source, uniforms),\n      children.filter(isShader),\n      localMatrix(Skia.Matrix(), transform)\n    );\n  }\n);\n\nexport const Shader = (props: AnimatedProps<ShaderProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nShader.defaultProps = {\n  uniforms: [],\n};\n"]}

package/lib/module/renderer/components/shaders/SweepGradient.js

@@ -1,23 +1,25 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { Skia } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
 import { processGradientProps } from "./Gradient";
-const onDeclare = createDeclaration(_ref => {
+const onDeclare = createDeclaration((_ref, _, _ref2) => {
   let {
     c,
     start,
     end,
     ...gradientProps
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   const {
     colors,
     positions,
     mode,
     localMatrix,
     flags
-  } = processGradientProps(gradientProps);
+  } = processGradientProps(Skia, gradientProps);
   return Skia.Shader.MakeSweepGradient(c.x, c.y, colors, positions, mode, localMatrix, flags, start, end);
 });
 export const SweepGradient = props => {

package/lib/module/renderer/components/shaders/SweepGradient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["SweepGradient.tsx"],"names":["React","Skia","createDeclaration","processGradientProps","onDeclare","c","start","end","gradientProps","colors","positions","mode","localMatrix","flags","Shader","MakeSweepGradient","x","y","SweepGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,IAAT,QAAqB,eAArB;AACA,SAASC,iBAAT,QAAkC,yBAAlC;AAGA,SAASC,oBAAT,QAAqC,YAArC;AAQA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,QAAyC;AAAA,MAAxC;AAAEG,IAAAA,CAAF;AAAKC,IAAAA,KAAL;AAAYC,IAAAA,GAAZ;AAAiB,OAAGC;AAApB,GAAwC;AACvC,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJV,oBAAoB,CAACK,aAAD,CADtB;AAEA,SAAOP,IAAI,CAACa,MAAL,CAAYC,iBAAZ,CACLV,CAAC,CAACW,CADG,EAELX,CAAC,CAACY,CAFG,EAGLR,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,EAQLP,KARK,EASLC,GATK,CAAP;AAWD,CAfgC,CAAnC;AAkBA,OAAO,MAAMW,aAAa,GAAIC,KAAD,IAA8C;AACzE,sBAAO;AAAe,IAAA,SAAS,EAAEf;AAA1B,KAAyCe,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { Vector, AnimatedProps } from \"../../processors\";\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface SweepGradientProps extends GradientProps {\n  c: Vector;\n  start?: number;\n  end?: number;\n}\n\nconst onDeclare = createDeclaration<SweepGradientProps>(\n  ({ c, start, end, ...gradientProps }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(gradientProps);\n    return Skia.Shader.MakeSweepGradient(\n      c.x,\n      c.y,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags,\n      start,\n      end\n    );\n  }\n);\n\nexport const SweepGradient = (props: AnimatedProps<SweepGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["SweepGradient.tsx"],"names":["React","createDeclaration","processGradientProps","onDeclare","_","c","start","end","gradientProps","Skia","colors","positions","mode","localMatrix","flags","Shader","MakeSweepGradient","x","y","SweepGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,iBAAT,QAAkC,yBAAlC;AAIA,SAASC,oBAAT,QAAqC,YAArC;AAQA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,OAAsCG,CAAtC,YAAsD;AAAA,MAArD;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,KAAL;AAAYC,IAAAA,GAAZ;AAAiB,OAAGC;AAApB,GAAqD;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AACpD,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJZ,oBAAoB,CAACO,IAAD,EAAOD,aAAP,CADtB;AAEA,SAAOC,IAAI,CAACM,MAAL,CAAYC,iBAAZ,CACLX,CAAC,CAACY,CADG,EAELZ,CAAC,CAACa,CAFG,EAGLR,MAHK,EAILC,SAJK,EAKLC,IALK,EAMLC,WANK,EAOLC,KAPK,EAQLR,KARK,EASLC,GATK,CAAP;AAWD,CAfgC,CAAnC;AAkBA,OAAO,MAAMY,aAAa,GAAIC,KAAD,IAA8C;AACzE,sBAAO;AAAe,IAAA,SAAS,EAAEjB;AAA1B,KAAyCiB,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { Vector } from \"../../../skia/types\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface SweepGradientProps extends GradientProps {\n  c: Vector;\n  start?: number;\n  end?: number;\n}\n\nconst onDeclare = createDeclaration<SweepGradientProps>(\n  ({ c, start, end, ...gradientProps }, _, { Skia }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(Skia, gradientProps);\n    return Skia.Shader.MakeSweepGradient(\n      c.x,\n      c.y,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags,\n      start,\n      end\n    );\n  }\n);\n\nexport const SweepGradient = (props: AnimatedProps<SweepGradientProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shaders/Turbulence.js

@@ -1,9 +1,8 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { Skia } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
-const onDeclare = createDeclaration(_ref => {
+const onDeclare = createDeclaration((_ref, _, _ref2) => {
   let {
     freqX,
     freqY,
@@ -12,6 +11,9 @@ const onDeclare = createDeclaration(_ref => {
     tileWidth,
     tileHeight
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   return Skia.Shader.MakeTurbulence(freqX, freqY, octaves, seed, tileWidth, tileHeight);
 });
 export const Turbulence = props => {

package/lib/module/renderer/components/shaders/Turbulence.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Turbulence.tsx"],"names":["React","Skia","createDeclaration","onDeclare","freqX","freqY","octaves","seed","tileWidth","tileHeight","Shader","MakeTurbulence","Turbulence","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAEA,SAASC,IAAT,QAAqB,eAArB;AACA,SAASC,iBAAT,QAAkC,yBAAlC;AAYA,MAAMC,SAAS,GAAGD,iBAAiB,CACjC,QAA4D;AAAA,MAA3D;AAAEE,IAAAA,KAAF;AAASC,IAAAA,KAAT;AAAgBC,IAAAA,OAAhB;AAAyBC,IAAAA,IAAzB;AAA+BC,IAAAA,SAA/B;AAA0CC,IAAAA;AAA1C,GAA2D;AAC1D,SAAOR,IAAI,CAACS,MAAL,CAAYC,cAAZ,CACLP,KADK,EAELC,KAFK,EAGLC,OAHK,EAILC,IAJK,EAKLC,SALK,EAMLC,UANK,CAAP;AAQD,CAVgC,CAAnC;AAaA,OAAO,MAAMG,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEV;AAA1B,KAAyCU,KAAzC,EAAP;AACD,CAFM;AAIPD,UAAU,CAACE,YAAX,GAA0B;AACxBP,EAAAA,IAAI,EAAE,CADkB;AAExBC,EAAAA,SAAS,EAAE,CAFa;AAGxBC,EAAAA,UAAU,EAAE;AAHY,CAA1B","sourcesContent":["import React from \"react\";\n\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nexport interface TurbulenceProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nconst onDeclare = createDeclaration<TurbulenceProps>(\n  ({ freqX, freqY, octaves, seed, tileWidth, tileHeight }) => {\n    return Skia.Shader.MakeTurbulence(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n);\n\nexport const Turbulence = (props: AnimatedProps<TurbulenceProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nTurbulence.defaultProps = {\n  seed: 0,\n  tileWidth: 0,\n  tileHeight: 0,\n};\n"]}
+{"version":3,"sources":["Turbulence.tsx"],"names":["React","createDeclaration","onDeclare","_","freqX","freqY","octaves","seed","tileWidth","tileHeight","Skia","Shader","MakeTurbulence","Turbulence","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAEA,SAASC,iBAAT,QAAkC,yBAAlC;AAYA,MAAMC,SAAS,GAAGD,iBAAiB,CACjC,OAAyDE,CAAzD,YAAyE;AAAA,MAAxE;AAAEC,IAAAA,KAAF;AAASC,IAAAA,KAAT;AAAgBC,IAAAA,OAAhB;AAAyBC,IAAAA,IAAzB;AAA+BC,IAAAA,SAA/B;AAA0CC,IAAAA;AAA1C,GAAwE;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AACvE,SAAOA,IAAI,CAACC,MAAL,CAAYC,cAAZ,CACLR,KADK,EAELC,KAFK,EAGLC,OAHK,EAILC,IAJK,EAKLC,SALK,EAMLC,UANK,CAAP;AAQD,CAVgC,CAAnC;AAaA,OAAO,MAAMI,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEZ;AAA1B,KAAyCY,KAAzC,EAAP;AACD,CAFM;AAIPD,UAAU,CAACE,YAAX,GAA0B;AACxBR,EAAAA,IAAI,EAAE,CADkB;AAExBC,EAAAA,SAAS,EAAE,CAFa;AAGxBC,EAAAA,UAAU,EAAE;AAHY,CAA1B","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nexport interface TurbulenceProps {\n  freqX: number;\n  freqY: number;\n  octaves: number;\n  seed: number;\n  tileWidth: number;\n  tileHeight: number;\n}\n\nconst onDeclare = createDeclaration<TurbulenceProps>(\n  ({ freqX, freqY, octaves, seed, tileWidth, tileHeight }, _, { Skia }) => {\n    return Skia.Shader.MakeTurbulence(\n      freqX,\n      freqY,\n      octaves,\n      seed,\n      tileWidth,\n      tileHeight\n    );\n  }\n);\n\nexport const Turbulence = (props: AnimatedProps<TurbulenceProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nTurbulence.defaultProps = {\n  seed: 0,\n  tileWidth: 0,\n  tileHeight: 0,\n};\n"]}

package/lib/module/renderer/components/shaders/TwoPointConicalGradient.js

@@ -1,10 +1,9 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { Skia } from "../../../skia";
 import { createDeclaration } from "../../nodes/Declaration";
 import { processGradientProps } from "./Gradient";
-const onDeclare = createDeclaration(_ref => {
+const onDeclare = createDeclaration((_ref, _, _ref2) => {
   let {
     start,
     startR,
@@ -12,13 +11,16 @@ const onDeclare = createDeclaration(_ref => {
     endR,
     ...gradientProps
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   const {
     colors,
     positions,
     mode,
     localMatrix,
     flags
-  } = processGradientProps(gradientProps);
+  } = processGradientProps(Skia, gradientProps);
   return Skia.Shader.MakeTwoPointConicalGradient(start, startR, end, endR, colors, positions, mode, localMatrix, flags);
 });
 export const TwoPointConicalGradient = props => {

package/lib/module/renderer/components/shaders/TwoPointConicalGradient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["TwoPointConicalGradient.tsx"],"names":["React","Skia","createDeclaration","processGradientProps","onDeclare","start","startR","end","endR","gradientProps","colors","positions","mode","localMatrix","flags","Shader","MakeTwoPointConicalGradient","TwoPointConicalGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,IAAT,QAAqB,eAArB;AACA,SAASC,iBAAT,QAAkC,yBAAlC;AAGA,SAASC,oBAAT,QAAqC,YAArC;AASA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,QAAoD;AAAA,MAAnD;AAAEG,IAAAA,KAAF;AAASC,IAAAA,MAAT;AAAiBC,IAAAA,GAAjB;AAAsBC,IAAAA,IAAtB;AAA4B,OAAGC;AAA/B,GAAmD;AAClD,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJX,oBAAoB,CAACM,aAAD,CADtB;AAEA,SAAOR,IAAI,CAACc,MAAL,CAAYC,2BAAZ,CACLX,KADK,EAELC,MAFK,EAGLC,GAHK,EAILC,IAJK,EAKLE,MALK,EAMLC,SANK,EAOLC,IAPK,EAQLC,WARK,EASLC,KATK,CAAP;AAWD,CAfgC,CAAnC;AAkBA,OAAO,MAAMG,uBAAuB,GAClCC,KADqC,IAElC;AACH,sBAAO;AAAe,IAAA,SAAS,EAAEd;AAA1B,KAAyCc,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport type { Vector, AnimatedProps } from \"../../processors\";\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface TwoPointConicalGradientProps extends GradientProps {\n  start: Vector;\n  startR: number;\n  end: Vector;\n  endR: number;\n}\n\nconst onDeclare = createDeclaration<TwoPointConicalGradientProps>(\n  ({ start, startR, end, endR, ...gradientProps }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(gradientProps);\n    return Skia.Shader.MakeTwoPointConicalGradient(\n      start,\n      startR,\n      end,\n      endR,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const TwoPointConicalGradient = (\n  props: AnimatedProps<TwoPointConicalGradientProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["TwoPointConicalGradient.tsx"],"names":["React","createDeclaration","processGradientProps","onDeclare","_","start","startR","end","endR","gradientProps","Skia","colors","positions","mode","localMatrix","flags","Shader","MakeTwoPointConicalGradient","TwoPointConicalGradient","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,iBAAT,QAAkC,yBAAlC;AAIA,SAASC,oBAAT,QAAqC,YAArC;AASA,MAAMC,SAAS,GAAGF,iBAAiB,CACjC,OAAiDG,CAAjD,YAAiE;AAAA,MAAhE;AAAEC,IAAAA,KAAF;AAASC,IAAAA,MAAT;AAAiBC,IAAAA,GAAjB;AAAsBC,IAAAA,IAAtB;AAA4B,OAAGC;AAA/B,GAAgE;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC/D,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,SAAV;AAAqBC,IAAAA,IAArB;AAA2BC,IAAAA,WAA3B;AAAwCC,IAAAA;AAAxC,MACJb,oBAAoB,CAACQ,IAAD,EAAOD,aAAP,CADtB;AAEA,SAAOC,IAAI,CAACM,MAAL,CAAYC,2BAAZ,CACLZ,KADK,EAELC,MAFK,EAGLC,GAHK,EAILC,IAJK,EAKLG,MALK,EAMLC,SANK,EAOLC,IAPK,EAQLC,WARK,EASLC,KATK,CAAP;AAWD,CAfgC,CAAnC;AAkBA,OAAO,MAAMG,uBAAuB,GAClCC,KADqC,IAElC;AACH,sBAAO;AAAe,IAAA,SAAS,EAAEhB;AAA1B,KAAyCgB,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport type { AnimatedProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { Vector } from \"../../../skia/types\";\n\nimport type { GradientProps } from \"./Gradient\";\nimport { processGradientProps } from \"./Gradient\";\n\nexport interface TwoPointConicalGradientProps extends GradientProps {\n  start: Vector;\n  startR: number;\n  end: Vector;\n  endR: number;\n}\n\nconst onDeclare = createDeclaration<TwoPointConicalGradientProps>(\n  ({ start, startR, end, endR, ...gradientProps }, _, { Skia }) => {\n    const { colors, positions, mode, localMatrix, flags } =\n      processGradientProps(Skia, gradientProps);\n    return Skia.Shader.MakeTwoPointConicalGradient(\n      start,\n      startR,\n      end,\n      endR,\n      colors,\n      positions,\n      mode,\n      localMatrix,\n      flags\n    );\n  }\n);\n\nexport const TwoPointConicalGradient = (\n  props: AnimatedProps<TwoPointConicalGradientProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shapes/Box.js

@@ -1,22 +1,22 @@
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import React from "react";
-import { ClipOp, BlurStyle, Skia, processColor } from "../../../skia";
+import { ClipOp, BlurStyle } from "../../../skia/types";
 import { createDrawing } from "../../nodes";
-import { add, vec, rrect } from "../../processors";
-import { rect, isRRect } from "../../processors/Rects";
 import { createDeclaration } from "../../nodes/Declaration";
+import { processColor } from "../../processors/Color";
+import { isRRect } from "../../../skia/types/RRect";
 
-const inflate = function (box, dx, dy) {
-  let tx = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  let ty = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-  return rrect(rect(box.rect.x - dx + tx, box.rect.y - dy + ty, box.rect.width + 2 * dx, box.rect.height + 2 * dy), box.rx + dx, box.ry + dy);
+const inflate = function (Skia, box, dx, dy) {
+  let tx = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  let ty = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+  return Skia.RRectXY(Skia.XYWHRect(box.rect.x - dx + tx, box.rect.y - dy + ty, box.rect.width + 2 * dx, box.rect.height + 2 * dy), box.rx + dx, box.ry + dy);
 };
 
-const deflate = function (box, dx, dy) {
-  let tx = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  let ty = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-  return inflate(box, -dx, -dy, tx, ty);
+const deflate = function (Skia, box, dx, dy) {
+  let tx = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  let ty = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+  return inflate(Skia, box, -dx, -dy, tx, ty);
 };
 
 const onDeclare = createDeclaration(_ref => {
@@ -50,12 +50,13 @@ const onDraw = createDrawing((ctx, _ref2, node) => {
   let {
     box: defaultBox
   } = _ref2;
-  const box = isRRect(defaultBox) ? defaultBox : rrect(defaultBox, 0, 0);
   const {
     canvas,
     paint,
-    opacity
+    opacity,
+    Skia
   } = ctx;
+  const box = isRRect(defaultBox) ? defaultBox : Skia.RRectXY(defaultBox, 0, 0);
   const shadows = node.visit(ctx).filter(isBoxShadow);
   shadows.filter(shadow => !shadow.inner).map(shadow => {
     const {
@@ -66,9 +67,9 @@ const onDraw = createDrawing((ctx, _ref2, node) => {
       dy = 0
     } = shadow;
     const lPaint = Skia.Paint();
-    lPaint.setColor(processColor(color, opacity));
+    lPaint.setColor(processColor(Skia, color, opacity));
     lPaint.setMaskFilter(Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true));
-    canvas.drawRRect(inflate(box, spread, spread, dx, dy), lPaint);
+    canvas.drawRRect(inflate(Skia, box, spread, spread, dx, dy), lPaint);
   });
   canvas.drawRRect(box, paint);
   shadows.filter(shadow => shadow.inner).map(shadow => {
@@ -79,14 +80,14 @@ const onDraw = createDrawing((ctx, _ref2, node) => {
       dx = 0,
       dy = 0
     } = shadow;
-    const delta = add(vec(10, 10), vec(Math.abs(dx), Math.abs(dy)));
+    const delta = Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));
     canvas.save();
     canvas.clipRRect(box, ClipOp.Intersect, false);
     const lPaint = Skia.Paint();
-    lPaint.setColor(processColor(color, opacity));
+    lPaint.setColor(processColor(Skia, color, opacity));
     lPaint.setMaskFilter(Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true));
-    const inner = deflate(box, spread, spread, dx, dy);
-    const outer = inflate(box, delta.x, delta.y);
+    const inner = deflate(Skia, box, spread, spread, dx, dy);
+    const outer = inflate(Skia, box, delta.x, delta.y);
     canvas.drawDRRect(outer, inner, lPaint);
     canvas.restore();
   });

package/lib/module/renderer/components/shapes/Box.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Box.tsx"],"names":["React","ClipOp","BlurStyle","Skia","processColor","createDrawing","add","vec","rrect","rect","isRRect","createDeclaration","inflate","box","dx","dy","tx","ty","x","y","width","height","rx","ry","deflate","onDeclare","spread","blur","color","inner","__typename__","BoxShadow","props","isBoxShadow","s","onDraw","ctx","node","defaultBox","canvas","paint","opacity","shadows","visit","filter","shadow","map","lPaint","Paint","setColor","setMaskFilter","MaskFilter","MakeBlur","Normal","drawRRect","delta","Math","abs","save","clipRRect","Intersect","outer","drawDRRect","restore","Box","defaultProps"],"mappings":"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","sourcesContent":["import React from \"react\";\n\nimport type { Color, SkRRect, SkJSIInstance, SkRect } from \"../../../skia\";\nimport { ClipOp, BlurStyle, Skia, processColor } from \"../../../skia\";\nimport { createDrawing } from \"../../nodes\";\nimport type { AnimatedProps, CustomPaintProps } from \"../../processors\";\nimport { add, vec, rrect } from \"../../processors\";\nimport { rect, isRRect } from \"../../processors/Rects\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\n\nconst inflate = (box: SkRRect, dx: number, dy: number, tx = 0, ty = 0) =>\n  rrect(\n    rect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (box: SkRRect, dx: number, dy: number, tx = 0, ty = 0) =>\n  inflate(box, -dx, -dy, tx, ty);\n\ninterface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n\ninterface BoxShadowDecl extends BoxShadowProps, SkJSIInstance<\"BoxShadow\"> {}\n\nconst onDeclare = createDeclaration<BoxShadowProps>(\n  ({ dx, dy, spread, blur, color, inner }) => {\n    return { dx, dy, spread, blur, color, inner, __typename__: \"BoxShadow\" };\n  }\n);\n\nexport const BoxShadow = (props: AnimatedProps<BoxShadowProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nconst isBoxShadow = (s: SkJSIInstance<string>): s is BoxShadowDecl =>\n  s.__typename__ === \"BoxShadow\";\n\ninterface BoxProps extends CustomPaintProps {\n  box: SkRRect | SkRect;\n}\n\nconst onDraw = createDrawing<BoxProps>((ctx, { box: defaultBox }, node) => {\n  const box = isRRect(defaultBox) ? defaultBox : rrect(defaultBox, 0, 0);\n  const { canvas, paint, opacity } = ctx;\n  const shadows = node.visit(ctx).filter<BoxShadowDecl>(isBoxShadow);\n  shadows\n    .filter((shadow) => !shadow.inner)\n    .map((shadow) => {\n      const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n      const lPaint = Skia.Paint();\n      lPaint.setColor(processColor(color, opacity));\n      lPaint.setMaskFilter(\n        Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n      );\n      canvas.drawRRect(inflate(box, spread, spread, dx, dy), lPaint);\n    });\n  canvas.drawRRect(box, paint);\n\n  shadows\n    .filter((shadow) => shadow.inner)\n    .map((shadow) => {\n      const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n      const delta = add(vec(10, 10), vec(Math.abs(dx), Math.abs(dy)));\n      canvas.save();\n      canvas.clipRRect(box, ClipOp.Intersect, false);\n      const lPaint = Skia.Paint();\n      lPaint.setColor(processColor(color, opacity));\n      lPaint.setMaskFilter(\n        Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n      );\n      const inner = deflate(box, spread, spread, dx, dy);\n      const outer = inflate(box, delta.x, delta.y);\n      canvas.drawDRRect(outer, inner, lPaint);\n      canvas.restore();\n    });\n});\n\nexport const Box = (props: AnimatedProps<BoxProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nBox.defaultProps = {\n  shadows: [],\n};\n"]}
+{"version":3,"sources":["Box.tsx"],"names":["React","ClipOp","BlurStyle","createDrawing","createDeclaration","processColor","isRRect","inflate","Skia","box","dx","dy","tx","ty","RRectXY","XYWHRect","rect","x","y","width","height","rx","ry","deflate","onDeclare","spread","blur","color","inner","__typename__","BoxShadow","props","isBoxShadow","s","onDraw","ctx","node","defaultBox","canvas","paint","opacity","shadows","visit","filter","shadow","map","lPaint","Paint","setColor","setMaskFilter","MaskFilter","MakeBlur","Normal","drawRRect","delta","Point","Math","abs","save","clipRRect","Intersect","outer","drawDRRect","restore","Box","defaultProps"],"mappings":"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","sourcesContent":["import React from \"react\";\n\nimport type {\n  Color,\n  SkRRect,\n  SkJSIInstance,\n  SkRect,\n  Skia,\n} from \"../../../skia/types\";\nimport { ClipOp, BlurStyle } from \"../../../skia/types\";\nimport { createDrawing } from \"../../nodes\";\nimport type { AnimatedProps, CustomPaintProps } from \"../../processors\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport { processColor } from \"../../processors/Color\";\nimport { isRRect } from \"../../../skia/types/RRect\";\n\nconst inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) =>\n  Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => inflate(Skia, box, -dx, -dy, tx, ty);\n\ninterface BoxShadowProps {\n  dx?: number;\n  dy?: number;\n  spread?: number;\n  blur: number;\n  color?: Color;\n  inner?: boolean;\n}\n\ninterface BoxShadowDecl extends BoxShadowProps, SkJSIInstance<\"BoxShadow\"> {}\n\nconst onDeclare = createDeclaration<BoxShadowProps>(\n  ({ dx, dy, spread, blur, color, inner }) => {\n    return { dx, dy, spread, blur, color, inner, __typename__: \"BoxShadow\" };\n  }\n);\n\nexport const BoxShadow = (props: AnimatedProps<BoxShadowProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nconst isBoxShadow = (s: SkJSIInstance<string>): s is BoxShadowDecl =>\n  s.__typename__ === \"BoxShadow\";\n\ninterface BoxProps extends CustomPaintProps {\n  box: SkRRect | SkRect;\n}\n\nconst onDraw = createDrawing<BoxProps>((ctx, { box: defaultBox }, node) => {\n  const { canvas, paint, opacity, Skia } = ctx;\n  const box = isRRect(defaultBox) ? defaultBox : Skia.RRectXY(defaultBox, 0, 0);\n  const shadows = node.visit(ctx).filter<BoxShadowDecl>(isBoxShadow);\n  shadows\n    .filter((shadow) => !shadow.inner)\n    .map((shadow) => {\n      const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n      const lPaint = Skia.Paint();\n      lPaint.setColor(processColor(Skia, color, opacity));\n      lPaint.setMaskFilter(\n        Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n      );\n      canvas.drawRRect(inflate(Skia, box, spread, spread, dx, dy), lPaint);\n    });\n  canvas.drawRRect(box, paint);\n\n  shadows\n    .filter((shadow) => shadow.inner)\n    .map((shadow) => {\n      const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n      const delta = Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));\n      canvas.save();\n      canvas.clipRRect(box, ClipOp.Intersect, false);\n      const lPaint = Skia.Paint();\n      lPaint.setColor(processColor(Skia, color, opacity));\n      lPaint.setMaskFilter(\n        Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n      );\n      const inner = deflate(Skia, box, spread, spread, dx, dy);\n      const outer = inflate(Skia, box, delta.x, delta.y);\n      canvas.drawDRRect(outer, inner, lPaint);\n      canvas.restore();\n    });\n});\n\nexport const Box = (props: AnimatedProps<BoxProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nBox.defaultProps = {\n  shadows: [],\n};\n"]}

package/lib/module/renderer/components/shapes/Circle.js

@@ -2,17 +2,17 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 import React from "react";
 import { createDrawing } from "../../nodes/Drawing";
-import { vec } from "../../processors/math/Vector";
 import { processCircle } from "../../processors";
 const onDraw = createDrawing((_ref, def) => {
   let {
     canvas,
-    paint
+    paint,
+    Skia
   } = _ref;
   const {
     c,
     r
-  } = processCircle(def);
+  } = processCircle(Skia, def);
   canvas.drawCircle(c.x, c.y, r, paint);
 });
 export const Circle = props => {
@@ -21,6 +21,9 @@ export const Circle = props => {
   }, props));
 };
 Circle.defaultProps = {
-  c: vec(0, 0)
+  c: {
+    x: 0,
+    y: 0
+  }
 };
 //# sourceMappingURL=Circle.js.map

package/lib/module/renderer/components/shapes/Circle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Circle.tsx"],"names":["React","createDrawing","vec","processCircle","onDraw","def","canvas","paint","c","r","drawCircle","x","y","Circle","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,aAAT,QAA8B,qBAA9B;AACA,SAASC,GAAT,QAAoB,8BAApB;AACA,SAASC,aAAT,QAA8B,kBAA9B;AAIA,MAAMC,MAAM,GAAGH,aAAa,CAAc,OAAoBI,GAApB,KAA4B;AAAA,MAA3B;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAA2B;AACpE,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA;AAAL,MAAWN,aAAa,CAACE,GAAD,CAA9B;AACAC,EAAAA,MAAM,CAACI,UAAP,CAAkBF,CAAC,CAACG,CAApB,EAAuBH,CAAC,CAACI,CAAzB,EAA4BH,CAA5B,EAA+BF,KAA/B;AACD,CAH2B,CAA5B;AAKA,OAAO,MAAMM,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAW,IAAA,MAAM,EAAEV;AAAnB,KAA+BU,KAA/B,EAAP;AACD,CAFM;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpBP,EAAAA,CAAC,EAAEN,GAAG,CAAC,CAAD,EAAI,CAAJ;AADc,CAAtB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  AnimatedProps,\n  CircleDef,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport { vec } from \"../../processors/math/Vector\";\nimport { processCircle } from \"../../processors\";\n\nexport type CircleProps = CircleDef & CustomPaintProps;\n\nconst onDraw = createDrawing<CircleProps>(({ canvas, paint }, def) => {\n  const { c, r } = processCircle(def);\n  canvas.drawCircle(c.x, c.y, r, paint);\n});\n\nexport const Circle = (props: AnimatedProps<CircleProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nCircle.defaultProps = {\n  c: vec(0, 0),\n};\n"]}
+{"version":3,"sources":["Circle.tsx"],"names":["React","createDrawing","processCircle","onDraw","def","canvas","paint","Skia","c","r","drawCircle","x","y","Circle","props","defaultProps"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,aAAT,QAA8B,qBAA9B;AACA,SAASC,aAAT,QAA8B,kBAA9B;AAIA,MAAMC,MAAM,GAAGF,aAAa,CAAc,OAA0BG,GAA1B,KAAkC;AAAA,MAAjC;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA;AAAjB,GAAiC;AAC1E,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA;AAAL,MAAWP,aAAa,CAACK,IAAD,EAAOH,GAAP,CAA9B;AACAC,EAAAA,MAAM,CAACK,UAAP,CAAkBF,CAAC,CAACG,CAApB,EAAuBH,CAAC,CAACI,CAAzB,EAA4BH,CAA5B,EAA+BH,KAA/B;AACD,CAH2B,CAA5B;AAKA,OAAO,MAAMO,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAW,IAAA,MAAM,EAAEX;AAAnB,KAA+BW,KAA/B,EAAP;AACD,CAFM;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpBP,EAAAA,CAAC,EAAE;AAAEG,IAAAA,CAAC,EAAE,CAAL;AAAQC,IAAAA,CAAC,EAAE;AAAX;AADiB,CAAtB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  AnimatedProps,\n  CircleDef,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport { processCircle } from \"../../processors\";\n\nexport type CircleProps = CircleDef & CustomPaintProps;\n\nconst onDraw = createDrawing<CircleProps>(({ canvas, paint, Skia }, def) => {\n  const { c, r } = processCircle(Skia, def);\n  canvas.drawCircle(c.x, c.y, r, paint);\n});\n\nexport const Circle = (props: AnimatedProps<CircleProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nCircle.defaultProps = {\n  c: { x: 0, y: 0 },\n};\n"]}

package/lib/module/renderer/components/shapes/DiffRect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["DiffRect.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","inner","outer","drawDRRect","DiffRect","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAKA,SAASC,aAAT,QAA8B,qBAA9B;AAOA,MAAMC,MAAM,GAAGD,aAAa,CAC1B,iBAAyC;AAAA,MAAxC;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAwC;AAAA,MAArB;AAAEC,IAAAA,KAAF;AAASC,IAAAA;AAAT,GAAqB;AACvCH,EAAAA,MAAM,CAACI,UAAP,CAAkBD,KAAlB,EAAyBD,KAAzB,EAAgCD,KAAhC;AACD,CAHyB,CAA5B;AAMA,OAAO,MAAMI,QAAQ,GAAIC,KAAD,IAAyC;AAC/D,sBAAO;AAAW,IAAA,MAAM,EAAEP;AAAnB,KAA+BO,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps } from \"../../processors\";\nimport type { SkRRect } from \"../../../skia\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport { createDrawing } from \"../../nodes/Drawing\";\n\nexport interface DiffRectProps extends CustomPaintProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nconst onDraw = createDrawing<DiffRectProps>(\n  ({ canvas, paint }, { inner, outer }) => {\n    canvas.drawDRRect(outer, inner, paint);\n  }\n);\n\nexport const DiffRect = (props: AnimatedProps<DiffRectProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}
+{"version":3,"sources":["DiffRect.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","inner","outer","drawDRRect","DiffRect","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAKA,SAASC,aAAT,QAA8B,qBAA9B;AAOA,MAAMC,MAAM,GAAGD,aAAa,CAC1B,iBAAyC;AAAA,MAAxC;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAwC;AAAA,MAArB;AAAEC,IAAAA,KAAF;AAASC,IAAAA;AAAT,GAAqB;AACvCH,EAAAA,MAAM,CAACI,UAAP,CAAkBD,KAAlB,EAAyBD,KAAzB,EAAgCD,KAAhC;AACD,CAHyB,CAA5B;AAMA,OAAO,MAAMI,QAAQ,GAAIC,KAAD,IAAyC;AAC/D,sBAAO;AAAW,IAAA,MAAM,EAAEP;AAAnB,KAA+BO,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps } from \"../../processors\";\nimport type { SkRRect } from \"../../../skia/types\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport { createDrawing } from \"../../nodes/Drawing\";\n\nexport interface DiffRectProps extends CustomPaintProps {\n  inner: SkRRect;\n  outer: SkRRect;\n}\n\nconst onDraw = createDrawing<DiffRectProps>(\n  ({ canvas, paint }, { inner, outer }) => {\n    canvas.drawDRRect(outer, inner, paint);\n  }\n);\n\nexport const DiffRect = (props: AnimatedProps<DiffRectProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shapes/FitBox.js.map

@@ -1 +1 @@
-{"version":3,"sources":["FitBox.tsx"],"names":["React","useMemo","rect2rect","fitRects","Group","fitbox","fit","src","dst","rects","FitBox","children","transform","defaultProps"],"mappings":"AACA,OAAOA,KAAP,IAAgBC,OAAhB,QAA+B,OAA/B;AAGA,SAASC,SAAT,EAAoBC,QAApB,QAAoC,UAApC;AAEA,SAASC,KAAT,QAAsB,UAAtB;AASA,OAAO,MAAMC,MAAM,GAAG,CAACC,GAAD,EAAWC,GAAX,EAAwBC,GAAxB,KAAwC;AAC5D,QAAMC,KAAK,GAAGN,QAAQ,CAACG,GAAD,EAAMC,GAAN,EAAWC,GAAX,CAAtB;AACA,SAAON,SAAS,CAACO,KAAK,CAACF,GAAP,EAAYE,KAAK,CAACD,GAAlB,CAAhB;AACD,CAHM;AAKP,OAAO,MAAME,MAAM,GAAG,QAA2C;AAAA,MAA1C;AAAEJ,IAAAA,GAAF;AAAOC,IAAAA,GAAP;AAAYC,IAAAA,GAAZ;AAAiBG,IAAAA;AAAjB,GAA0C;AAC/D,QAAMC,SAAS,GAAGX,OAAO,CAAC,MAAMI,MAAM,CAACC,GAAD,EAAMC,GAAN,EAAWC,GAAX,CAAb,EAA8B,CAACA,GAAD,EAAMF,GAAN,EAAWC,GAAX,CAA9B,CAAzB;AACA,sBAAO,oBAAC,KAAD;AAAO,IAAA,SAAS,EAAEK;AAAlB,KAA8BD,QAA9B,CAAP;AACD,CAHM;AAKPD,MAAM,CAACG,YAAP,GAAsB;AACpBP,EAAAA,GAAG,EAAE;AADe,CAAtB","sourcesContent":["import type { ReactNode } from \"react\";\nimport React, { useMemo } from \"react\";\n\nimport type { Fit } from \"../image\";\nimport { rect2rect, fitRects } from \"../image\";\nimport type { SkRect } from \"../../../skia\";\nimport { Group } from \"../Group\";\n\ninterface FitProps {\n  fit: Fit;\n  src: SkRect;\n  dst: SkRect;\n  children: ReactNode | ReactNode[];\n}\n\nexport const fitbox = (fit: Fit, src: SkRect, dst: SkRect) => {\n  const rects = fitRects(fit, src, dst);\n  return rect2rect(rects.src, rects.dst);\n};\n\nexport const FitBox = ({ fit, src, dst, children }: FitProps) => {\n  const transform = useMemo(() => fitbox(fit, src, dst), [dst, fit, src]);\n  return <Group transform={transform}>{children}</Group>;\n};\n\nFitBox.defaultProps = {\n  fit: \"contain\",\n};\n"]}
+{"version":3,"sources":["FitBox.tsx"],"names":["React","useMemo","rect2rect","fitRects","Group","fitbox","fit","src","dst","rects","FitBox","children","transform","defaultProps"],"mappings":"AACA,OAAOA,KAAP,IAAgBC,OAAhB,QAA+B,OAA/B;AAGA,SAASC,SAAT,EAAoBC,QAApB,QAAoC,UAApC;AAEA,SAASC,KAAT,QAAsB,UAAtB;AASA,OAAO,MAAMC,MAAM,GAAG,CAACC,GAAD,EAAWC,GAAX,EAAwBC,GAAxB,KAAwC;AAC5D,QAAMC,KAAK,GAAGN,QAAQ,CAACG,GAAD,EAAMC,GAAN,EAAWC,GAAX,CAAtB;AACA,SAAON,SAAS,CAACO,KAAK,CAACF,GAAP,EAAYE,KAAK,CAACD,GAAlB,CAAhB;AACD,CAHM;AAKP,OAAO,MAAME,MAAM,GAAG,QAA2C;AAAA,MAA1C;AAAEJ,IAAAA,GAAF;AAAOC,IAAAA,GAAP;AAAYC,IAAAA,GAAZ;AAAiBG,IAAAA;AAAjB,GAA0C;AAC/D,QAAMC,SAAS,GAAGX,OAAO,CAAC,MAAMI,MAAM,CAACC,GAAD,EAAMC,GAAN,EAAWC,GAAX,CAAb,EAA8B,CAACA,GAAD,EAAMF,GAAN,EAAWC,GAAX,CAA9B,CAAzB;AACA,sBAAO,oBAAC,KAAD;AAAO,IAAA,SAAS,EAAEK;AAAlB,KAA8BD,QAA9B,CAAP;AACD,CAHM;AAKPD,MAAM,CAACG,YAAP,GAAsB;AACpBP,EAAAA,GAAG,EAAE;AADe,CAAtB","sourcesContent":["import type { ReactNode } from \"react\";\nimport React, { useMemo } from \"react\";\n\nimport type { Fit } from \"../image\";\nimport { rect2rect, fitRects } from \"../image\";\nimport type { SkRect } from \"../../../skia/types\";\nimport { Group } from \"../Group\";\n\ninterface FitProps {\n  fit: Fit;\n  src: SkRect;\n  dst: SkRect;\n  children: ReactNode | ReactNode[];\n}\n\nexport const fitbox = (fit: Fit, src: SkRect, dst: SkRect) => {\n  const rects = fitRects(fit, src, dst);\n  return rect2rect(rects.src, rects.dst);\n};\n\nexport const FitBox = ({ fit, src, dst, children }: FitProps) => {\n  const transform = useMemo(() => fitbox(fit, src, dst), [dst, fit, src]);\n  return <Group transform={transform}>{children}</Group>;\n};\n\nFitBox.defaultProps = {\n  fit: \"contain\",\n};\n"]}

package/lib/module/renderer/components/shapes/Line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Line.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","p1","p2","drawLine","x","y","Line","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,aAAT,QAA8B,qBAA9B;AAMA,MAAMC,MAAM,GAAGD,aAAa,CAAY,iBAAmC;AAAA,MAAlC;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAkC;AAAA,MAAf;AAAEC,IAAAA,EAAF;AAAMC,IAAAA;AAAN,GAAe;AACzEH,EAAAA,MAAM,CAACI,QAAP,CAAgBF,EAAE,CAACG,CAAnB,EAAsBH,EAAE,CAACI,CAAzB,EAA4BH,EAAE,CAACE,CAA/B,EAAkCF,EAAE,CAACG,CAArC,EAAwCL,KAAxC;AACD,CAF2B,CAA5B;AAIA,OAAO,MAAMM,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAET;AAAnB,KAA+BS,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps, Vector, AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\n\nexport interface LineProps extends CustomPaintProps {\n  p1: Vector;\n  p2: Vector;\n}\nconst onDraw = createDrawing<LineProps>(({ canvas, paint }, { p1, p2 }) => {\n  canvas.drawLine(p1.x, p1.y, p2.x, p2.y, paint);\n});\n\nexport const Line = (props: AnimatedProps<LineProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}
+{"version":3,"sources":["Line.tsx"],"names":["React","createDrawing","onDraw","canvas","paint","p1","p2","drawLine","x","y","Line","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,aAAT,QAA8B,qBAA9B;AAOA,MAAMC,MAAM,GAAGD,aAAa,CAAY,iBAAmC;AAAA,MAAlC;AAAEE,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAkC;AAAA,MAAf;AAAEC,IAAAA,EAAF;AAAMC,IAAAA;AAAN,GAAe;AACzEH,EAAAA,MAAM,CAACI,QAAP,CAAgBF,EAAE,CAACG,CAAnB,EAAsBH,EAAE,CAACI,CAAzB,EAA4BH,EAAE,CAACE,CAA/B,EAAkCF,EAAE,CAACG,CAArC,EAAwCL,KAAxC;AACD,CAF2B,CAA5B;AAIA,OAAO,MAAMM,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAET;AAAnB,KAA+BS,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps, AnimatedProps } from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport type { Vector } from \"../../../skia/types\";\n\nexport interface LineProps extends CustomPaintProps {\n  p1: Vector;\n  p2: Vector;\n}\nconst onDraw = createDrawing<LineProps>(({ canvas, paint }, { p1, p2 }) => {\n  canvas.drawLine(p1.x, p1.y, p2.x, p2.y, paint);\n});\n\nexport const Line = (props: AnimatedProps<LineProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shapes/Oval.js

@@ -6,9 +6,10 @@ import { createDrawing } from "../../nodes";
 const onDraw = createDrawing((_ref, rectProps) => {
   let {
     canvas,
-    paint
+    paint,
+    Skia
   } = _ref;
-  const rect = processRect(rectProps);
+  const rect = processRect(Skia, rectProps);
   canvas.drawOval(rect, paint);
 });
 export const Oval = props => {

package/lib/module/renderer/components/shapes/Oval.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Oval.tsx"],"names":["React","processRect","createDrawing","onDraw","rectProps","canvas","paint","rect","drawOval","Oval","props","defaultProps","x","y"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,WAAT,QAA4B,kBAA5B;AACA,SAASC,aAAT,QAA8B,aAA9B;AAIA,MAAMC,MAAM,GAAGD,aAAa,CAAY,OAAoBE,SAApB,KAAkC;AAAA,MAAjC;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAiC;AACxE,QAAMC,IAAI,GAAGN,WAAW,CAACG,SAAD,CAAxB;AACAC,EAAAA,MAAM,CAACG,QAAP,CAAgBD,IAAhB,EAAsBD,KAAtB;AACD,CAH2B,CAA5B;AAKA,OAAO,MAAMG,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAEP;AAAnB,KAA+BO,KAA/B,EAAP;AACD,CAFM;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBC,EAAAA,CAAC,EAAE,CADe;AAElBC,EAAAA,CAAC,EAAE;AAFe,CAApB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  RectDef,\n  AnimatedProps,\n} from \"../../processors\";\nimport { processRect } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\n\nexport type OvalProps = RectDef & CustomPaintProps;\n\nconst onDraw = createDrawing<OvalProps>(({ canvas, paint }, rectProps) => {\n  const rect = processRect(rectProps);\n  canvas.drawOval(rect, paint);\n});\n\nexport const Oval = (props: AnimatedProps<OvalProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nOval.defaultProps = {\n  x: 0,\n  y: 0,\n};\n"]}
+{"version":3,"sources":["Oval.tsx"],"names":["React","processRect","createDrawing","onDraw","rectProps","canvas","paint","Skia","rect","drawOval","Oval","props","defaultProps","x","y"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAOA,SAASC,WAAT,QAA4B,kBAA5B;AACA,SAASC,aAAT,QAA8B,aAA9B;AAIA,MAAMC,MAAM,GAAGD,aAAa,CAC1B,OAA0BE,SAA1B,KAAwC;AAAA,MAAvC;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA;AAAjB,GAAuC;AACtC,QAAMC,IAAI,GAAGP,WAAW,CAACM,IAAD,EAAOH,SAAP,CAAxB;AACAC,EAAAA,MAAM,CAACI,QAAP,CAAgBD,IAAhB,EAAsBF,KAAtB;AACD,CAJyB,CAA5B;AAOA,OAAO,MAAMI,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAW,IAAA,MAAM,EAAER;AAAnB,KAA+BQ,KAA/B,EAAP;AACD,CAFM;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBC,EAAAA,CAAC,EAAE,CADe;AAElBC,EAAAA,CAAC,EAAE;AAFe,CAApB","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  RectDef,\n  AnimatedProps,\n} from \"../../processors\";\nimport { processRect } from \"../../processors\";\nimport { createDrawing } from \"../../nodes\";\n\nexport type OvalProps = RectDef & CustomPaintProps;\n\nconst onDraw = createDrawing<OvalProps>(\n  ({ canvas, paint, Skia }, rectProps) => {\n    const rect = processRect(Skia, rectProps);\n    canvas.drawOval(rect, paint);\n  }\n);\n\nexport const Oval = (props: AnimatedProps<OvalProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nOval.defaultProps = {\n  x: 0,\n  y: 0,\n};\n"]}

package/lib/module/renderer/components/shapes/Patch.js

@@ -2,13 +2,15 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 import React from "react";
 import { enumKey } from "../../processors";
-import { BlendMode, processColor } from "../../../skia";
+import { BlendMode } from "../../../skia/types";
 import { createDrawing } from "../../nodes";
+import { processColor } from "../../processors/Color";
 const onDraw = createDrawing((_ref, _ref2) => {
   let {
     canvas,
     paint,
-    opacity
+    opacity,
+    Skia
   } = _ref;
   let {
     colors,
@@ -24,7 +26,7 @@ const onDraw = createDrawing((_ref, _ref2) => {
   // C c1 c2 br
   // C c1 c2 bl
   // C c1 c2 tl (the redundant point in the last command is removed)
-  [patch[0].pos, patch[0].c2, patch[1].c1, patch[1].pos, patch[1].c2, patch[2].c1, patch[2].pos, patch[2].c2, patch[3].c1, patch[3].pos, patch[3].c2, patch[0].c1], colors ? colors.map(c => processColor(c, opacity)) : undefined, texture, mode, paint);
+  [patch[0].pos, patch[0].c2, patch[1].c1, patch[1].pos, patch[1].c2, patch[2].c1, patch[2].pos, patch[2].c2, patch[3].c1, patch[3].pos, patch[3].c2, patch[0].c1], colors ? colors.map(c => processColor(Skia, c, opacity)) : undefined, texture, mode, paint);
 });
 export const Patch = props => {
   return /*#__PURE__*/React.createElement("skDrawing", _extends({

package/lib/module/renderer/components/shapes/Patch.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Patch.tsx"],"names":["React","enumKey","BlendMode","processColor","createDrawing","onDraw","canvas","paint","opacity","colors","patch","texture","blendMode","defaultBlendMode","DstOver","SrcOver","mode","drawPatch","pos","c2","c1","map","c","undefined","Patch","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAQA,SAASC,OAAT,QAAwB,kBAAxB;AAEA,SAASC,SAAT,EAAoBC,YAApB,QAAwC,eAAxC;AACA,SAASC,aAAT,QAA8B,aAA9B;AAoBA,MAAMC,MAAM,GAAGD,aAAa,CAC1B,iBAAuE;AAAA,MAAtE;AAAEE,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA;AAAjB,GAAsE;AAAA,MAA1C;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA,OAAjB;AAA0BC,IAAAA;AAA1B,GAA0C;AACrE;AACA,QAAMC,gBAAgB,GAAGJ,MAAM,GAAGP,SAAS,CAACY,OAAb,GAAuBZ,SAAS,CAACa,OAAhE;AACA,QAAMC,IAAI,GAAGJ,SAAS,GAAGV,SAAS,CAACD,OAAO,CAACW,SAAD,CAAR,CAAZ,GAAmCC,gBAAzD;AACAP,EAAAA,MAAM,CAACW,SAAP,EACE;AACA;AACA;AACA;AACA;AACA,GACEP,KAAK,CAAC,CAAD,CAAL,CAASQ,GADX,EAEER,KAAK,CAAC,CAAD,CAAL,CAASS,EAFX,EAGET,KAAK,CAAC,CAAD,CAAL,CAASU,EAHX,EAIEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAJX,EAKER,KAAK,CAAC,CAAD,CAAL,CAASS,EALX,EAMET,KAAK,CAAC,CAAD,CAAL,CAASU,EANX,EAOEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAPX,EAQER,KAAK,CAAC,CAAD,CAAL,CAASS,EARX,EASET,KAAK,CAAC,CAAD,CAAL,CAASU,EATX,EAUEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAVX,EAWER,KAAK,CAAC,CAAD,CAAL,CAASS,EAXX,EAYET,KAAK,CAAC,CAAD,CAAL,CAASU,EAZX,CANF,EAoBEX,MAAM,GAAGA,MAAM,CAACY,GAAP,CAAYC,CAAD,IAAOnB,YAAY,CAACmB,CAAD,EAAId,OAAJ,CAA9B,CAAH,GAAiDe,SApBzD,EAqBEZ,OArBF,EAsBEK,IAtBF,EAuBET,KAvBF;AAyBD,CA9ByB,CAA5B;AAiCA,OAAO,MAAMiB,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAW,IAAA,MAAM,EAAEpB;AAAnB,KAA+BoB,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type {\n  CustomPaintProps,\n  SkEnum,\n  Vector,\n  AnimatedProps,\n} from \"../../processors\";\nimport { enumKey } from \"../../processors\";\nimport type { SkPoint, Color } from \"../../../skia\";\nimport { BlendMode, processColor } from \"../../../skia\";\nimport { createDrawing } from \"../../nodes\";\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends CustomPaintProps {\n  colors?: readonly Color[];\n  patch: readonly [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nconst onDraw = createDrawing<PatchProps>(\n  ({ canvas, paint, opacity }, { colors, patch, texture, blendMode }) => {\n    // If the colors are provided, the default blendMode is set to dstOver, if not, the default is set to srcOver\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const mode = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    canvas.drawPatch(\n      // Patch requires a path with the following constraints:\n      // M tl\n      // C c1 c2 br\n      // C c1 c2 bl\n      // C c1 c2 tl (the redundant point in the last command is removed)\n      [\n        patch[0].pos,\n        patch[0].c2,\n        patch[1].c1,\n        patch[1].pos,\n        patch[1].c2,\n        patch[2].c1,\n        patch[2].pos,\n        patch[2].c2,\n        patch[3].c1,\n        patch[3].pos,\n        patch[3].c2,\n        patch[0].c1,\n      ],\n      colors ? colors.map((c) => processColor(c, opacity)) : undefined,\n      texture,\n      mode,\n      paint\n    );\n  }\n);\n\nexport const Patch = (props: AnimatedProps<PatchProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}
+{"version":3,"sources":["Patch.tsx"],"names":["React","enumKey","BlendMode","createDrawing","processColor","onDraw","canvas","paint","opacity","Skia","colors","patch","texture","blendMode","defaultBlendMode","DstOver","SrcOver","mode","drawPatch","pos","c2","c1","map","c","undefined","Patch","props"],"mappings":";;AAAA,OAAOA,KAAP,MAAkB,OAAlB;AAGA,SAASC,OAAT,QAAwB,kBAAxB;AAEA,SAASC,SAAT,QAA0B,qBAA1B;AACA,SAASC,aAAT,QAA8B,aAA9B;AACA,SAASC,YAAT,QAA6B,wBAA7B;AAoBA,MAAMC,MAAM,GAAGF,aAAa,CAC1B,iBAA6E;AAAA,MAA5E;AAAEG,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA,OAAjB;AAA0BC,IAAAA;AAA1B,GAA4E;AAAA,MAA1C;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA,OAAjB;AAA0BC,IAAAA;AAA1B,GAA0C;AAC3E;AACA,QAAMC,gBAAgB,GAAGJ,MAAM,GAAGR,SAAS,CAACa,OAAb,GAAuBb,SAAS,CAACc,OAAhE;AACA,QAAMC,IAAI,GAAGJ,SAAS,GAAGX,SAAS,CAACD,OAAO,CAACY,SAAD,CAAR,CAAZ,GAAmCC,gBAAzD;AACAR,EAAAA,MAAM,CAACY,SAAP,EACE;AACA;AACA;AACA;AACA;AACA,GACEP,KAAK,CAAC,CAAD,CAAL,CAASQ,GADX,EAEER,KAAK,CAAC,CAAD,CAAL,CAASS,EAFX,EAGET,KAAK,CAAC,CAAD,CAAL,CAASU,EAHX,EAIEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAJX,EAKER,KAAK,CAAC,CAAD,CAAL,CAASS,EALX,EAMET,KAAK,CAAC,CAAD,CAAL,CAASU,EANX,EAOEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAPX,EAQER,KAAK,CAAC,CAAD,CAAL,CAASS,EARX,EASET,KAAK,CAAC,CAAD,CAAL,CAASU,EATX,EAUEV,KAAK,CAAC,CAAD,CAAL,CAASQ,GAVX,EAWER,KAAK,CAAC,CAAD,CAAL,CAASS,EAXX,EAYET,KAAK,CAAC,CAAD,CAAL,CAASU,EAZX,CANF,EAoBEX,MAAM,GAAGA,MAAM,CAACY,GAAP,CAAYC,CAAD,IAAOnB,YAAY,CAACK,IAAD,EAAOc,CAAP,EAAUf,OAAV,CAA9B,CAAH,GAAuDgB,SApB/D,EAqBEZ,OArBF,EAsBEK,IAtBF,EAuBEV,KAvBF;AAyBD,CA9ByB,CAA5B;AAiCA,OAAO,MAAMkB,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAW,IAAA,MAAM,EAAErB;AAAnB,KAA+BqB,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { CustomPaintProps, SkEnum, AnimatedProps } from \"../../processors\";\nimport { enumKey } from \"../../processors\";\nimport type { SkPoint, Color, Vector } from \"../../../skia/types\";\nimport { BlendMode } from \"../../../skia/types\";\nimport { createDrawing } from \"../../nodes\";\nimport { processColor } from \"../../processors/Color\";\n\nexport interface CubicBezierHandle {\n  pos: Vector;\n  c1: Vector;\n  c2: Vector;\n}\n\nexport interface PatchProps extends CustomPaintProps {\n  colors?: readonly Color[];\n  patch: readonly [\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle,\n    CubicBezierHandle\n  ];\n  texture?: readonly [SkPoint, SkPoint, SkPoint, SkPoint];\n  blendMode?: SkEnum<typeof BlendMode>;\n}\n\nconst onDraw = createDrawing<PatchProps>(\n  ({ canvas, paint, opacity, Skia }, { colors, patch, texture, blendMode }) => {\n    // If the colors are provided, the default blendMode is set to dstOver, if not, the default is set to srcOver\n    const defaultBlendMode = colors ? BlendMode.DstOver : BlendMode.SrcOver;\n    const mode = blendMode ? BlendMode[enumKey(blendMode)] : defaultBlendMode;\n    canvas.drawPatch(\n      // Patch requires a path with the following constraints:\n      // M tl\n      // C c1 c2 br\n      // C c1 c2 bl\n      // C c1 c2 tl (the redundant point in the last command is removed)\n      [\n        patch[0].pos,\n        patch[0].c2,\n        patch[1].c1,\n        patch[1].pos,\n        patch[1].c2,\n        patch[2].c1,\n        patch[2].pos,\n        patch[2].c2,\n        patch[3].c1,\n        patch[3].pos,\n        patch[3].c2,\n        patch[0].c1,\n      ],\n      colors ? colors.map((c) => processColor(Skia, c, opacity)) : undefined,\n      texture,\n      mode,\n      paint\n    );\n  }\n);\n\nexport const Patch = (props: AnimatedProps<PatchProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}

package/lib/module/renderer/components/shapes/Path.js

@@ -3,11 +3,12 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 import React from "react";
 import { createDrawing } from "../../nodes";
 import { processPath, enumKey } from "../../processors";
-import { FillType } from "../../../skia";
+import { FillType } from "../../../skia/types";
 const onDraw = createDrawing((_ref, _ref2) => {
   let {
     canvas,
-    paint
+    paint,
+    Skia
   } = _ref;
   let {
     start,
@@ -21,7 +22,7 @@ const onDraw = createDrawing((_ref, _ref2) => {
   const hasStrokeOptions = stroke !== undefined;
   const hasFillType = !!fillType;
   const willMutatePath = hasStartOffset || hasEndOffset || hasStrokeOptions || hasFillType;
-  const pristinePath = processPath(pathProps.path);
+  const pristinePath = processPath(Skia, pathProps.path);
   const path = willMutatePath ? pristinePath.copy() : pristinePath;
 
   if (hasFillType) {