@shopify/react-native-skia 0.1.130 → 0.1.133

package/lib/commonjs/renderer/components/colorFilters/BlendColor.js

@@ -7,7 +7,7 @@ exports.BlendColor = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
 var _nodes = require("../../nodes");
 
@@ -19,15 +19,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _nodes.createDeclaration)((_ref, children) => {
+const onDeclare = (0, _nodes.createDeclaration)((_ref, children, _ref2) => {
   let {
     mode,
     color
   } = _ref;
-
-  const cf = _skia.Skia.ColorFilter.MakeBlend(_skia.Skia.Color(color), _skia.BlendMode[(0, _processors.enumKey)(mode)]);
-
-  return (0, _Compose.composeColorFilter)(cf, children);
+  let {
+    Skia
+  } = _ref2;
+  const cf = Skia.ColorFilter.MakeBlend(Skia.Color(color), _types.BlendMode[(0, _processors.enumKey)(mode)]);
+  return (0, _Compose.composeColorFilter)(Skia, cf, children);
 });
 
 const BlendColor = props => {

package/lib/commonjs/renderer/components/colorFilters/BlendColor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["BlendColor.tsx"],"names":["onDeclare","children","mode","color","cf","Skia","ColorFilter","MakeBlend","Color","BlendMode","BlendColor","props"],"mappings":";;;;;;;AAAA;;AAIA;;AACA;;AAEA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,8BAChB,OAAkBC,QAAlB,KAA+B;AAAA,MAA9B;AAAEC,IAAAA,IAAF;AAAQC,IAAAA;AAAR,GAA8B;;AAC7B,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,SAAjB,CACTF,WAAKG,KAAL,CAAWL,KAAX,CADS,EAETM,gBAAU,yBAAQP,IAAR,CAAV,CAFS,CAAX;;AAIA,SAAO,iCAAmBE,EAAnB,EAAuBH,QAAvB,CAAP;AACD,CAPe,CAAlB;;AAUO,MAAMS,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEX;AAA1B,KAAyCW,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport type { Color } from \"../../../skia\";\nimport { BlendMode, Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes\";\nimport type { SkEnum, AnimatedProps } from \"../../processors\";\nimport { enumKey } from \"../../processors\";\n\nimport { composeColorFilter } from \"./Compose\";\n\nexport interface BlendColorProps {\n  mode: SkEnum<typeof BlendMode>;\n  color: Color;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlendColorProps>(\n  ({ mode, color }, children) => {\n    const cf = Skia.ColorFilter.MakeBlend(\n      Skia.Color(color),\n      BlendMode[enumKey(mode)]\n    );\n    return composeColorFilter(cf, children);\n  }\n);\n\nexport const BlendColor = (props: AnimatedProps<BlendColorProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["BlendColor.tsx"],"names":["onDeclare","children","mode","color","Skia","cf","ColorFilter","MakeBlend","Color","BlendMode","BlendColor","props"],"mappings":";;;;;;;AAAA;;AAIA;;AACA;;AAEA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,8BAChB,OAAkBC,QAAlB,YAAyC;AAAA,MAAxC;AAAEC,IAAAA,IAAF;AAAQC,IAAAA;AAAR,GAAwC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AACvC,QAAMC,EAAE,GAAGD,IAAI,CAACE,WAAL,CAAiBC,SAAjB,CACTH,IAAI,CAACI,KAAL,CAAWL,KAAX,CADS,EAETM,iBAAU,yBAAQP,IAAR,CAAV,CAFS,CAAX;AAIA,SAAO,iCAAmBE,IAAnB,EAAyBC,EAAzB,EAA6BJ,QAA7B,CAAP;AACD,CAPe,CAAlB;;AAUO,MAAMS,UAAU,GAAIC,KAAD,IAA2C;AACnE,sBAAO;AAAe,IAAA,SAAS,EAAEX;AAA1B,KAAyCW,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport type { Color } from \"../../../skia/types\";\nimport { BlendMode } from \"../../../skia/types\";\nimport { createDeclaration } from \"../../nodes\";\nimport type { SkEnum, AnimatedProps } from \"../../processors\";\nimport { enumKey } from \"../../processors\";\n\nimport { composeColorFilter } from \"./Compose\";\n\nexport interface BlendColorProps {\n  mode: SkEnum<typeof BlendMode>;\n  color: Color;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlendColorProps>(\n  ({ mode, color }, children, { Skia }) => {\n    const cf = Skia.ColorFilter.MakeBlend(\n      Skia.Color(color),\n      BlendMode[enumKey(mode)]\n    );\n    return composeColorFilter(Skia, cf, children);\n  }\n);\n\nexport const BlendColor = (props: AnimatedProps<BlendColorProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/colorFilters/Compose.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.composeColorFilter = void 0;
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
-const composeColorFilter = (cf, children) => {
-  const [col] = children.filter(_skia.isColorFilter);
-  const [img] = children.filter(_skia.isImageFilter);
+const composeColorFilter = (Skia, cf, children) => {
+  const [col] = children.filter(_types.isColorFilter);
+  const [img] = children.filter(_types.isImageFilter);
 
   if (col) {
-    return _skia.Skia.ColorFilter.MakeCompose(cf, col);
+    return Skia.ColorFilter.MakeCompose(cf, col);
   } else if (img) {
-    return _skia.Skia.ImageFilter.MakeColorFilter(cf, img);
+    return Skia.ImageFilter.MakeColorFilter(cf, img);
   }
 
   return cf;

package/lib/commonjs/renderer/components/colorFilters/Compose.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Compose.ts"],"names":["composeColorFilter","cf","children","col","filter","isColorFilter","img","isImageFilter","Skia","ColorFilter","MakeCompose","ImageFilter","MakeColorFilter"],"mappings":";;;;;;;AACA;;AAGO,MAAMA,kBAAkB,GAAG,CAChCC,EADgC,EAEhCC,QAFgC,KAG7B;AACH,QAAM,CAACC,GAAD,IAAQD,QAAQ,CAACE,MAAT,CAAgBC,mBAAhB,CAAd;AACA,QAAM,CAACC,GAAD,IAAQJ,QAAQ,CAACE,MAAT,CAAgBG,mBAAhB,CAAd;;AACA,MAAIJ,GAAJ,EAAS;AACP,WAAOK,WAAKC,WAAL,CAAiBC,WAAjB,CAA6BT,EAA7B,EAAiCE,GAAjC,CAAP;AACD,GAFD,MAEO,IAAIG,GAAJ,EAAS;AACd,WAAOE,WAAKG,WAAL,CAAiBC,eAAjB,CAAiCX,EAAjC,EAAqCK,GAArC,CAAP;AACD;;AACD,SAAOL,EAAP;AACD,CAZM","sourcesContent":["import type { SkColorFilter } from \"../../../skia\";\nimport { isColorFilter, isImageFilter, Skia } from \"../../../skia\";\nimport type { DeclarationResult } from \"../../nodes\";\n\nexport const composeColorFilter = (\n  cf: SkColorFilter,\n  children: DeclarationResult[]\n) => {\n  const [col] = children.filter(isColorFilter);\n  const [img] = children.filter(isImageFilter);\n  if (col) {\n    return Skia.ColorFilter.MakeCompose(cf, col);\n  } else if (img) {\n    return Skia.ImageFilter.MakeColorFilter(cf, img);\n  }\n  return cf;\n};\n"]}
+{"version":3,"sources":["Compose.ts"],"names":["composeColorFilter","Skia","cf","children","col","filter","isColorFilter","img","isImageFilter","ColorFilter","MakeCompose","ImageFilter","MakeColorFilter"],"mappings":";;;;;;;AACA;;AAGO,MAAMA,kBAAkB,GAAG,CAChCC,IADgC,EAEhCC,EAFgC,EAGhCC,QAHgC,KAI7B;AACH,QAAM,CAACC,GAAD,IAAQD,QAAQ,CAACE,MAAT,CAAgBC,oBAAhB,CAAd;AACA,QAAM,CAACC,GAAD,IAAQJ,QAAQ,CAACE,MAAT,CAAgBG,oBAAhB,CAAd;;AACA,MAAIJ,GAAJ,EAAS;AACP,WAAOH,IAAI,CAACQ,WAAL,CAAiBC,WAAjB,CAA6BR,EAA7B,EAAiCE,GAAjC,CAAP;AACD,GAFD,MAEO,IAAIG,GAAJ,EAAS;AACd,WAAON,IAAI,CAACU,WAAL,CAAiBC,eAAjB,CAAiCV,EAAjC,EAAqCK,GAArC,CAAP;AACD;;AACD,SAAOL,EAAP;AACD,CAbM","sourcesContent":["import type { SkColorFilter, Skia } from \"../../../skia/types\";\nimport { isColorFilter, isImageFilter } from \"../../../skia/types\";\nimport type { DeclarationResult } from \"../../nodes\";\n\nexport const composeColorFilter = (\n  Skia: Skia,\n  cf: SkColorFilter,\n  children: DeclarationResult[]\n) => {\n  const [col] = children.filter(isColorFilter);\n  const [img] = children.filter(isImageFilter);\n  if (col) {\n    return Skia.ColorFilter.MakeCompose(cf, col);\n  } else if (img) {\n    return Skia.ImageFilter.MakeColorFilter(cf, img);\n  }\n  return cf;\n};\n"]}

package/lib/commonjs/renderer/components/colorFilters/Lerp.js

@@ -7,7 +7,7 @@ exports.Lerp = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
 var _Declaration = require("../../nodes/Declaration");
 
@@ -17,15 +17,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _Declaration.createDeclaration)((_ref, children) => {
+const onDeclare = (0, _Declaration.createDeclaration)((_ref, children, _ref2) => {
   let {
     t
   } = _ref;
-  const [src, dst] = children.filter(_skia.isColorFilter);
-
-  const cf = _skia.Skia.ColorFilter.MakeLerp(t, src, dst);
-
-  return (0, _Compose.composeColorFilter)(cf, children.filter(c => c !== src && c !== dst));
+  let {
+    Skia
+  } = _ref2;
+  const [src, dst] = children.filter(_types.isColorFilter);
+  const cf = Skia.ColorFilter.MakeLerp(t, src, dst);
+  return (0, _Compose.composeColorFilter)(Skia, cf, children.filter(c => c !== src && c !== dst));
 });
 
 const Lerp = props => {

package/lib/commonjs/renderer/components/colorFilters/Lerp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Lerp.tsx"],"names":["onDeclare","children","t","src","dst","filter","isColorFilter","cf","Skia","ColorFilter","MakeLerp","c","Lerp","props"],"mappings":";;;;;;;AAAA;;AAGA;;AACA;;AAGA;;;;;;AAOA,MAAMA,SAAS,GAAG,oCAA6B,OAAQC,QAAR,KAAqB;AAAA,MAApB;AAAEC,IAAAA;AAAF,GAAoB;AAClE,QAAM,CAACC,GAAD,EAAMC,GAAN,IAAaH,QAAQ,CAACI,MAAT,CAAgBC,mBAAhB,CAAnB;;AACA,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,QAAjB,CAA0BR,CAA1B,EAA6BC,GAA7B,EAAkCC,GAAlC,CAAX;;AACA,SAAO,iCACLG,EADK,EAELN,QAAQ,CAACI,MAAT,CAAiBM,CAAD,IAAOA,CAAC,KAAKR,GAAN,IAAaQ,CAAC,KAAKP,GAA1C,CAFK,CAAP;AAID,CAPiB,CAAlB;;AASO,MAAMQ,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAe,IAAA,SAAS,EAAEb;AAA1B,KAAyCa,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { Skia, isColorFilter } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\nexport interface LerpProps {\n  t: number;\n  children: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<LerpProps>(({ t }, children) => {\n  const [src, dst] = children.filter(isColorFilter);\n  const cf = Skia.ColorFilter.MakeLerp(t, src, dst);\n  return composeColorFilter(\n    cf,\n    children.filter((c) => c !== src && c !== dst)\n  );\n});\n\nexport const Lerp = (props: AnimatedProps<LerpProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["Lerp.tsx"],"names":["onDeclare","children","t","Skia","src","dst","filter","isColorFilter","cf","ColorFilter","MakeLerp","c","Lerp","props"],"mappings":";;;;;;;AAAA;;AAGA;;AACA;;AAGA;;;;;;AAOA,MAAMA,SAAS,GAAG,oCAA6B,OAAQC,QAAR,YAA+B;AAAA,MAA9B;AAAEC,IAAAA;AAAF,GAA8B;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAC5E,QAAM,CAACC,GAAD,EAAMC,GAAN,IAAaJ,QAAQ,CAACK,MAAT,CAAgBC,oBAAhB,CAAnB;AACA,QAAMC,EAAE,GAAGL,IAAI,CAACM,WAAL,CAAiBC,QAAjB,CAA0BR,CAA1B,EAA6BE,GAA7B,EAAkCC,GAAlC,CAAX;AACA,SAAO,iCACLF,IADK,EAELK,EAFK,EAGLP,QAAQ,CAACK,MAAT,CAAiBK,CAAD,IAAOA,CAAC,KAAKP,GAAN,IAAaO,CAAC,KAAKN,GAA1C,CAHK,CAAP;AAKD,CARiB,CAAlB;;AAUO,MAAMO,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAe,IAAA,SAAS,EAAEb;AAA1B,KAAyCa,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { isColorFilter } from \"../../../skia/types\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\nexport interface LerpProps {\n  t: number;\n  children: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<LerpProps>(({ t }, children, { Skia }) => {\n  const [src, dst] = children.filter(isColorFilter);\n  const cf = Skia.ColorFilter.MakeLerp(t, src, dst);\n  return composeColorFilter(\n    Skia,\n    cf,\n    children.filter((c) => c !== src && c !== dst)\n  );\n});\n\nexport const Lerp = (props: AnimatedProps<LerpProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/colorFilters/LinearToSRGBGamma.js

@@ -7,8 +7,6 @@ exports.LinearToSRGBGamma = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
-
 var _Declaration = require("../../nodes/Declaration");
 
 var _Compose = require("./Compose");
@@ -17,10 +15,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _Declaration.createDeclaration)((_props, children) => {
-  const cf = _skia.Skia.ColorFilter.MakeLinearToSRGBGamma();
-
-  return (0, _Compose.composeColorFilter)(cf, children);
+const onDeclare = (0, _Declaration.createDeclaration)((_props, children, _ref) => {
+  let {
+    Skia
+  } = _ref;
+  const cf = Skia.ColorFilter.MakeLinearToSRGBGamma();
+  return (0, _Compose.composeColorFilter)(Skia, cf, children);
 });
 
 const LinearToSRGBGamma = props => {

package/lib/commonjs/renderer/components/colorFilters/LinearToSRGBGamma.js.map

@@ -1 +1 @@
-{"version":3,"sources":["LinearToSRGBGamma.tsx"],"names":["onDeclare","_props","children","cf","Skia","ColorFilter","MakeLinearToSRGBGamma","LinearToSRGBGamma","props"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,KAAsB;AACxD,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,qBAAjB,EAAX;;AACA,SAAO,iCAAmBH,EAAnB,EAAuBD,QAAvB,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,iBAAiB,GAC5BC,KAD+B,IAE5B;AACH,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface LinearToSRGBGammaProps {}\n\nconst onDeclare = createDeclaration((_props, children) => {\n  const cf = Skia.ColorFilter.MakeLinearToSRGBGamma();\n  return composeColorFilter(cf, children);\n});\n\nexport const LinearToSRGBGamma = (\n  props: AnimatedProps<LinearToSRGBGammaProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["LinearToSRGBGamma.tsx"],"names":["onDeclare","_props","children","Skia","cf","ColorFilter","MakeLinearToSRGBGamma","LinearToSRGBGamma","props"],"mappings":";;;;;;;AAAA;;AAEA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,WAAgC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAClE,QAAMC,EAAE,GAAGD,IAAI,CAACE,WAAL,CAAiBC,qBAAjB,EAAX;AACA,SAAO,iCAAmBH,IAAnB,EAAyBC,EAAzB,EAA6BF,QAA7B,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,iBAAiB,GAC5BC,KAD+B,IAE5B;AACH,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface LinearToSRGBGammaProps {}\n\nconst onDeclare = createDeclaration((_props, children, { Skia }) => {\n  const cf = Skia.ColorFilter.MakeLinearToSRGBGamma();\n  return composeColorFilter(Skia, cf, children);\n});\n\nexport const LinearToSRGBGamma = (\n  props: AnimatedProps<LinearToSRGBGammaProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/colorFilters/LumaColorFilter.js

@@ -7,8 +7,6 @@ exports.LumaColorFilter = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
-
 var _Declaration = require("../../nodes/Declaration");
 
 var _Compose = require("./Compose");
@@ -17,10 +15,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _Declaration.createDeclaration)((_props, children) => {
-  const cf = _skia.Skia.ColorFilter.MakeLumaColorFilter();
-
-  return (0, _Compose.composeColorFilter)(cf, children);
+const onDeclare = (0, _Declaration.createDeclaration)((_props, children, _ref) => {
+  let {
+    Skia
+  } = _ref;
+  const cf = Skia.ColorFilter.MakeLumaColorFilter();
+  return (0, _Compose.composeColorFilter)(Skia, cf, children);
 });
 
 const LumaColorFilter = props => {

package/lib/commonjs/renderer/components/colorFilters/LumaColorFilter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["LumaColorFilter.tsx"],"names":["onDeclare","_props","children","cf","Skia","ColorFilter","MakeLumaColorFilter","LumaColorFilter","props"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,KAAsB;AACxD,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,mBAAjB,EAAX;;AACA,SAAO,iCAAmBH,EAAnB,EAAuBD,QAAvB,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,eAAe,GAAIC,KAAD,IAAgD;AAC7E,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface LumaColorFilterProps {}\n\nconst onDeclare = createDeclaration((_props, children) => {\n  const cf = Skia.ColorFilter.MakeLumaColorFilter();\n  return composeColorFilter(cf, children);\n});\n\nexport const LumaColorFilter = (props: AnimatedProps<LumaColorFilterProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["LumaColorFilter.tsx"],"names":["onDeclare","_props","children","Skia","cf","ColorFilter","MakeLumaColorFilter","LumaColorFilter","props"],"mappings":";;;;;;;AAAA;;AAEA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,WAAgC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAClE,QAAMC,EAAE,GAAGD,IAAI,CAACE,WAAL,CAAiBC,mBAAjB,EAAX;AACA,SAAO,iCAAmBH,IAAnB,EAAyBC,EAAzB,EAA6BF,QAA7B,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,eAAe,GAAIC,KAAD,IAAgD;AAC7E,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface LumaColorFilterProps {}\n\nconst onDeclare = createDeclaration((_props, children, { Skia }) => {\n  const cf = Skia.ColorFilter.MakeLumaColorFilter();\n  return composeColorFilter(Skia, cf, children);\n});\n\nexport const LumaColorFilter = (props: AnimatedProps<LumaColorFilterProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/colorFilters/Matrix.js

@@ -7,8 +7,6 @@ exports.OpacityMatrix = exports.ColorMatrix = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
-
 var _nodes = require("../../nodes");
 
 var _Compose = require("./Compose");
@@ -17,14 +15,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _nodes.createDeclaration)((_ref, children) => {
+const onDeclare = (0, _nodes.createDeclaration)((_ref, children, _ref2) => {
   let {
     matrix
   } = _ref;
-
-  const cf = _skia.Skia.ColorFilter.MakeMatrix(matrix);
-
-  return (0, _Compose.composeColorFilter)(cf, children);
+  let {
+    Skia
+  } = _ref2;
+  const cf = Skia.ColorFilter.MakeMatrix(matrix);
+  return (0, _Compose.composeColorFilter)(Skia, cf, children);
 });
 
 const ColorMatrix = props => {

package/lib/commonjs/renderer/components/colorFilters/Matrix.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Matrix.tsx"],"names":["onDeclare","children","matrix","cf","Skia","ColorFilter","MakeMatrix","ColorMatrix","props","OpacityMatrix","opacity"],"mappings":";;;;;;;AAAA;;AAGA;;AACA;;AAGA;;;;;;AAOA,MAAMA,SAAS,GAAG,8BAChB,OAAaC,QAAb,KAA0B;AAAA,MAAzB;AAAEC,IAAAA;AAAF,GAAyB;;AACxB,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,UAAjB,CAA4BJ,MAA5B,CAAX;;AACA,SAAO,iCAAmBC,EAAnB,EAAuBF,QAAvB,CAAP;AACD,CAJe,CAAlB;;AAOO,MAAMM,WAAW,GAAIC,KAAD,IAA4C;AACrE,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAFM;;;;AAIA,MAAMC,aAAa,GAAIC,OAAD,IAAqB,CAChD,CADgD,EAEhD,CAFgD,EAGhD,CAHgD,EAIhD,CAJgD,EAKhD,CALgD,EAMhD,CANgD,EAOhD,CAPgD,EAQhD,CARgD,EAShD,CATgD,EAUhD,CAVgD,EAWhD,CAXgD,EAYhD,CAZgD,EAahD,CAbgD,EAchD,CAdgD,EAehD,CAfgD,EAgBhD,CAhBgD,EAiBhD,CAjBgD,EAkBhD,CAlBgD,EAmBhDA,OAnBgD,EAoBhD,CApBgD,CAA3C","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes\";\nimport type { AnimatedProps } from \"../../processors\";\n\nimport { composeColorFilter } from \"./Compose\";\n\ninterface ColorMatrixProps {\n  matrix: number[];\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ColorMatrixProps>(\n  ({ matrix }, children) => {\n    const cf = Skia.ColorFilter.MakeMatrix(matrix);\n    return composeColorFilter(cf, children);\n  }\n);\n\nexport const ColorMatrix = (props: AnimatedProps<ColorMatrixProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nexport const OpacityMatrix = (opacity: number) => [\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  opacity,\n  0,\n];\n"]}
+{"version":3,"sources":["Matrix.tsx"],"names":["onDeclare","children","matrix","Skia","cf","ColorFilter","MakeMatrix","ColorMatrix","props","OpacityMatrix","opacity"],"mappings":";;;;;;;AAAA;;AAGA;;AAGA;;;;;;AAOA,MAAMA,SAAS,GAAG,8BAChB,OAAaC,QAAb,YAAoC;AAAA,MAAnC;AAAEC,IAAAA;AAAF,GAAmC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAClC,QAAMC,EAAE,GAAGD,IAAI,CAACE,WAAL,CAAiBC,UAAjB,CAA4BJ,MAA5B,CAAX;AACA,SAAO,iCAAmBC,IAAnB,EAAyBC,EAAzB,EAA6BH,QAA7B,CAAP;AACD,CAJe,CAAlB;;AAOO,MAAMM,WAAW,GAAIC,KAAD,IAA4C;AACrE,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAFM;;;;AAIA,MAAMC,aAAa,GAAIC,OAAD,IAAqB,CAChD,CADgD,EAEhD,CAFgD,EAGhD,CAHgD,EAIhD,CAJgD,EAKhD,CALgD,EAMhD,CANgD,EAOhD,CAPgD,EAQhD,CARgD,EAShD,CATgD,EAUhD,CAVgD,EAWhD,CAXgD,EAYhD,CAZgD,EAahD,CAbgD,EAchD,CAdgD,EAehD,CAfgD,EAgBhD,CAhBgD,EAiBhD,CAjBgD,EAkBhD,CAlBgD,EAmBhDA,OAnBgD,EAoBhD,CApBgD,CAA3C","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { createDeclaration } from \"../../nodes\";\nimport type { AnimatedProps } from \"../../processors\";\n\nimport { composeColorFilter } from \"./Compose\";\n\ninterface ColorMatrixProps {\n  matrix: number[];\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ColorMatrixProps>(\n  ({ matrix }, children, { Skia }) => {\n    const cf = Skia.ColorFilter.MakeMatrix(matrix);\n    return composeColorFilter(Skia, cf, children);\n  }\n);\n\nexport const ColorMatrix = (props: AnimatedProps<ColorMatrixProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nexport const OpacityMatrix = (opacity: number) => [\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  1,\n  0,\n  0,\n  0,\n  0,\n  0,\n  opacity,\n  0,\n];\n"]}

package/lib/commonjs/renderer/components/colorFilters/SRGBToLinearGamma.js

@@ -7,8 +7,6 @@ exports.SRGBToLinearGamma = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
-
 var _Declaration = require("../../nodes/Declaration");
 
 var _Compose = require("./Compose");
@@ -17,10 +15,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _Declaration.createDeclaration)((_props, children) => {
-  const cf = _skia.Skia.ColorFilter.MakeSRGBToLinearGamma();
-
-  return (0, _Compose.composeColorFilter)(cf, children);
+const onDeclare = (0, _Declaration.createDeclaration)((_props, children, _ref) => {
+  let {
+    Skia
+  } = _ref;
+  const cf = Skia.ColorFilter.MakeSRGBToLinearGamma();
+  return (0, _Compose.composeColorFilter)(Skia, cf, children);
 });
 
 const SRGBToLinearGamma = props => {

package/lib/commonjs/renderer/components/colorFilters/SRGBToLinearGamma.js.map

@@ -1 +1 @@
-{"version":3,"sources":["SRGBToLinearGamma.tsx"],"names":["onDeclare","_props","children","cf","Skia","ColorFilter","MakeSRGBToLinearGamma","SRGBToLinearGamma","props"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,KAAsB;AACxD,QAAMC,EAAE,GAAGC,WAAKC,WAAL,CAAiBC,qBAAjB,EAAX;;AACA,SAAO,iCAAmBH,EAAnB,EAAuBD,QAAvB,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,iBAAiB,GAC5BC,KAD+B,IAE5B;AACH,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport { Skia } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface SRGBToLinearGammaProps {}\n\nconst onDeclare = createDeclaration((_props, children) => {\n  const cf = Skia.ColorFilter.MakeSRGBToLinearGamma();\n  return composeColorFilter(cf, children);\n});\n\nexport const SRGBToLinearGamma = (\n  props: AnimatedProps<SRGBToLinearGammaProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}
+{"version":3,"sources":["SRGBToLinearGamma.tsx"],"names":["onDeclare","_props","children","Skia","cf","ColorFilter","MakeSRGBToLinearGamma","SRGBToLinearGamma","props"],"mappings":";;;;;;;AAAA;;AAEA;;AAGA;;;;;;AAKA,MAAMA,SAAS,GAAG,oCAAkB,CAACC,MAAD,EAASC,QAAT,WAAgC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AAClE,QAAMC,EAAE,GAAGD,IAAI,CAACE,WAAL,CAAiBC,qBAAjB,EAAX;AACA,SAAO,iCAAmBH,IAAnB,EAAyBC,EAAzB,EAA6BF,QAA7B,CAAP;AACD,CAHiB,CAAlB;;AAKO,MAAMK,iBAAiB,GAC5BC,KAD+B,IAE5B;AACH,sBAAO;AAAe,IAAA,SAAS,EAAER;AAA1B,KAAyCQ,KAAzC,EAAP;AACD,CAJM","sourcesContent":["import React from \"react\";\n\nimport { createDeclaration } from \"../../nodes/Declaration\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\n\nimport { composeColorFilter } from \"./Compose\";\n\n// eslint-disable-next-line @typescript-eslint/no-empty-interface\nexport interface SRGBToLinearGammaProps {}\n\nconst onDeclare = createDeclaration((_props, children, { Skia }) => {\n  const cf = Skia.ColorFilter.MakeSRGBToLinearGamma();\n  return composeColorFilter(Skia, cf, children);\n});\n\nexport const SRGBToLinearGamma = (\n  props: AnimatedProps<SRGBToLinearGammaProps>\n) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/image/BoxFit.js

@@ -7,8 +7,6 @@ exports.size = exports.rect2rect = exports.fitRects = void 0;
 
 var _typeddash = require("../../typeddash");
 
-var _skia = require("../../../skia");
-
 const size = function () {
   let width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   let height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -52,12 +50,7 @@ const fitRects = (fit, rect, _ref) => {
     width,
     height
   });
-  const src = inscribe(sizes.src, {
-    x: 0,
-    y: 0,
-    width: rect.width,
-    height: rect.height
-  });
+  const src = inscribe(sizes.src, rect);
   const dst = inscribe(sizes.dst, {
     x,
     y,
@@ -79,7 +72,12 @@ const inscribe = (_ref2, rect) => {
   } = _ref2;
   const halfWidthDelta = (rect.width - width) / 2.0;
   const halfHeightDelta = (rect.height - height) / 2.0;
-  return _skia.Skia.XYWHRect(rect.x + halfWidthDelta, rect.y + halfHeightDelta, width, height);
+  return {
+    x: rect.x + halfWidthDelta,
+    y: rect.y + halfHeightDelta,
+    width,
+    height
+  };
 };
 
 const applyBoxFit = (fit, input, output) => {

package/lib/commonjs/renderer/components/image/BoxFit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["BoxFit.ts"],"names":["size","width","height","rect2rect","src","dst","scaleX","scaleY","translateX","x","translateY","y","fitRects","fit","rect","sizes","applyBoxFit","inscribe","halfWidthDelta","halfHeightDelta","Skia","XYWHRect","input","output","Math","min","aspectRatio"],"mappings":"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","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport { Skia } from \"../../../skia\";\nimport type { SkRect } from \"../../../skia\";\n\n// https://api.flutter.dev/flutter/painting/BoxFit-class.html\nexport type Fit =\n  | \"cover\"\n  | \"contain\"\n  | \"fill\"\n  | \"fitHeight\"\n  | \"fitWidth\"\n  | \"none\"\n  | \"scaleDown\";\n\nexport interface Size {\n  width: number;\n  height: number;\n}\n\nexport const size = (width = 0, height = 0) => ({ width, height });\n\nexport const rect2rect = (src: SkRect, dst: SkRect) => {\n  const scaleX = dst.width / src.width;\n  const scaleY = dst.height / src.height;\n  const translateX = dst.x - src.x * scaleX;\n  const translateY = dst.y - src.y * scaleY;\n  return [{ translateX }, { translateY }, { scaleX }, { scaleY }] as const;\n};\n\nexport const fitRects = (\n  fit: Fit,\n  rect: SkRect,\n  { x, y, width, height }: SkRect\n) => {\n  const sizes = applyBoxFit(\n    fit,\n    { width: rect.width, height: rect.height },\n    { width, height }\n  );\n  const src = inscribe(sizes.src, {\n    x: 0,\n    y: 0,\n    width: rect.width,\n    height: rect.height,\n  });\n  const dst = inscribe(sizes.dst, {\n    x,\n    y,\n    width,\n    height,\n  });\n  return { src, dst };\n};\n\nconst inscribe = (\n  { width, height }: Size,\n  rect: { x: number; y: number; width: number; height: number }\n) => {\n  const halfWidthDelta = (rect.width - width) / 2.0;\n  const halfHeightDelta = (rect.height - height) / 2.0;\n  return Skia.XYWHRect(\n    rect.x + halfWidthDelta,\n    rect.y + halfHeightDelta,\n    width,\n    height\n  );\n};\n\nconst applyBoxFit = (fit: Fit, input: Size, output: Size) => {\n  let src = size(),\n    dst = size();\n  if (\n    input.height <= 0.0 ||\n    input.width <= 0.0 ||\n    output.height <= 0.0 ||\n    output.width <= 0.0\n  ) {\n    return { src, dst };\n  }\n  switch (fit) {\n    case \"fill\":\n      src = input;\n      dst = output;\n      break;\n    case \"contain\":\n      src = input;\n      if (output.width / output.height > src.width / src.height) {\n        dst = size((src.width * output.height) / src.height, output.height);\n      } else {\n        dst = size(output.width, (src.height * output.width) / src.width);\n      }\n      break;\n    case \"cover\":\n      if (output.width / output.height > input.width / input.height) {\n        src = size(input.width, (input.width * output.height) / output.width);\n      } else {\n        src = size((input.height * output.width) / output.height, input.height);\n      }\n      dst = output;\n      break;\n    case \"fitWidth\":\n      src = size(input.width, (input.width * output.height) / output.width);\n      dst = size(output.width, (src.height * output.width) / src.width);\n      break;\n    case \"fitHeight\":\n      src = size((input.height * output.width) / output.height, input.height);\n      dst = size((src.width * output.height) / src.height, output.height);\n      break;\n    case \"none\":\n      src = size(\n        Math.min(input.width, output.width),\n        Math.min(input.height, output.height)\n      );\n      dst = src;\n      break;\n    case \"scaleDown\":\n      src = input;\n      dst = input;\n      const aspectRatio = input.width / input.height;\n      if (dst.height > output.height) {\n        dst = size(output.height * aspectRatio, output.height);\n      }\n      if (dst.width > output.width) {\n        dst = size(output.width, output.width / aspectRatio);\n      }\n      break;\n    default:\n      exhaustiveCheck(fit);\n  }\n  return { src, dst };\n};\n"]}
+{"version":3,"sources":["BoxFit.ts"],"names":["size","width","height","rect2rect","src","dst","scaleX","scaleY","translateX","x","translateY","y","fitRects","fit","rect","sizes","applyBoxFit","inscribe","halfWidthDelta","halfHeightDelta","input","output","Math","min","aspectRatio"],"mappings":"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","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport type { SkRect } from \"../../../skia/types\";\n\n// https://api.flutter.dev/flutter/painting/BoxFit-class.html\nexport type Fit =\n  | \"cover\"\n  | \"contain\"\n  | \"fill\"\n  | \"fitHeight\"\n  | \"fitWidth\"\n  | \"none\"\n  | \"scaleDown\";\n\nexport interface Size {\n  width: number;\n  height: number;\n}\n\nexport const size = (width = 0, height = 0) => ({ width, height });\n\nexport const rect2rect = (src: SkRect, dst: SkRect) => {\n  const scaleX = dst.width / src.width;\n  const scaleY = dst.height / src.height;\n  const translateX = dst.x - src.x * scaleX;\n  const translateY = dst.y - src.y * scaleY;\n  return [{ translateX }, { translateY }, { scaleX }, { scaleY }] as const;\n};\n\nexport const fitRects = (\n  fit: Fit,\n  rect: SkRect,\n  { x, y, width, height }: SkRect\n) => {\n  const sizes = applyBoxFit(\n    fit,\n    { width: rect.width, height: rect.height },\n    { width, height }\n  );\n  const src = inscribe(sizes.src, rect);\n  const dst = inscribe(sizes.dst, {\n    x,\n    y,\n    width,\n    height,\n  });\n  return { src, dst };\n};\n\nconst inscribe = (\n  { width, height }: Size,\n  rect: { x: number; y: number; width: number; height: number }\n) => {\n  const halfWidthDelta = (rect.width - width) / 2.0;\n  const halfHeightDelta = (rect.height - height) / 2.0;\n  return {\n    x: rect.x + halfWidthDelta,\n    y: rect.y + halfHeightDelta,\n    width,\n    height,\n  };\n};\n\nconst applyBoxFit = (fit: Fit, input: Size, output: Size) => {\n  let src = size(),\n    dst = size();\n  if (\n    input.height <= 0.0 ||\n    input.width <= 0.0 ||\n    output.height <= 0.0 ||\n    output.width <= 0.0\n  ) {\n    return { src, dst };\n  }\n  switch (fit) {\n    case \"fill\":\n      src = input;\n      dst = output;\n      break;\n    case \"contain\":\n      src = input;\n      if (output.width / output.height > src.width / src.height) {\n        dst = size((src.width * output.height) / src.height, output.height);\n      } else {\n        dst = size(output.width, (src.height * output.width) / src.width);\n      }\n      break;\n    case \"cover\":\n      if (output.width / output.height > input.width / input.height) {\n        src = size(input.width, (input.width * output.height) / output.width);\n      } else {\n        src = size((input.height * output.width) / output.height, input.height);\n      }\n      dst = output;\n      break;\n    case \"fitWidth\":\n      src = size(input.width, (input.width * output.height) / output.width);\n      dst = size(output.width, (src.height * output.width) / src.width);\n      break;\n    case \"fitHeight\":\n      src = size((input.height * output.width) / output.height, input.height);\n      dst = size((src.width * output.height) / src.height, output.height);\n      break;\n    case \"none\":\n      src = size(\n        Math.min(input.width, output.width),\n        Math.min(input.height, output.height)\n      );\n      dst = src;\n      break;\n    case \"scaleDown\":\n      src = input;\n      dst = input;\n      const aspectRatio = input.width / input.height;\n      if (dst.height > output.height) {\n        dst = size(output.height * aspectRatio, output.height);\n      }\n      if (dst.width > output.width) {\n        dst = size(output.width, output.width / aspectRatio);\n      }\n      break;\n    default:\n      exhaustiveCheck(fit);\n  }\n  return { src, dst };\n};\n"]}

package/lib/commonjs/renderer/components/image/Image.js

@@ -20,14 +20,15 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 const onDraw = (0, _Drawing.createDrawing)((_ref, _ref2) => {
   let {
     canvas,
-    paint
+    paint,
+    Skia
   } = _ref;
   let {
     fit,
     image,
     ...rectProps
   } = _ref2;
-  const rect = (0, _processors.processRect)(rectProps);
+  const rect = (0, _processors.processRect)(Skia, rectProps);
   const {
     src,
     dst

package/lib/commonjs/renderer/components/image/Image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Image.tsx"],"names":["onDraw","canvas","paint","fit","image","rectProps","rect","src","dst","x","y","width","height","drawImageRect","Image","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAQA;;AACA;;AAGA;;;;;;AAaA,MAAMA,MAAM,GAAG,4BACb,iBAAqD;AAAA,MAApD;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAoD;AAAA,MAAjC;AAAEC,IAAAA,GAAF;AAAOC,IAAAA,KAAP;AAAc,OAAGC;AAAjB,GAAiC;AACnD,QAAMC,IAAI,GAAG,6BAAYD,SAAZ,CAAb;AACA,QAAM;AAAEE,IAAAA,GAAF;AAAOC,IAAAA;AAAP,MAAe,sBACnBL,GADmB,EAEnB;AACEM,IAAAA,CAAC,EAAE,CADL;AAEEC,IAAAA,CAAC,EAAE,CAFL;AAGEC,IAAAA,KAAK,EAAEP,KAAK,CAACO,KAAN,EAHT;AAIEC,IAAAA,MAAM,EAAER,KAAK,CAACQ,MAAN;AAJV,GAFmB,EAQnBN,IARmB,CAArB;AAUAL,EAAAA,MAAM,CAACY,aAAP,CAAqBT,KAArB,EAA4BG,GAA5B,EAAiCC,GAAjC,EAAsCN,KAAtC;AACD,CAdY,CAAf;;AAgBO,MAAMY,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAW,IAAA,MAAM,EAAEf;AAAnB,KAA+Be,KAA/B,EAAP;AACD,CAFM;;;AAIPD,KAAK,CAACE,YAAN,GAAqB;AACnBP,EAAAA,CAAC,EAAE,CADgB;AAEnBC,EAAAA,CAAC,EAAE,CAFgB;AAGnBP,EAAAA,GAAG,EAAE;AAHc,CAArB","sourcesContent":["import React from \"react\";\n\nimport type { SkImage } from \"../../../skia\";\nimport type {\n  CustomPaintProps,\n  RectDef,\n  AnimatedProps,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport { processRect } from \"../../processors\";\n\nimport type { Fit } from \"./BoxFit\";\nimport { fitRects } from \"./BoxFit\";\n\nexport type SourceImageProps = {\n  image: SkImage;\n};\n\nexport type BaseImageProps = RectDef &\n  SourceImageProps & {\n    fit: Fit;\n  };\n\nexport type ImageProps = CustomPaintProps & BaseImageProps;\n\nconst onDraw = createDrawing<ImageProps>(\n  ({ canvas, paint }, { fit, image, ...rectProps }) => {\n    const rect = processRect(rectProps);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    canvas.drawImageRect(image, src, dst, paint);\n  }\n);\nexport const Image = (props: AnimatedProps<ImageProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nImage.defaultProps = {\n  x: 0,\n  y: 0,\n  fit: \"contain\",\n};\n"]}
+{"version":3,"sources":["Image.tsx"],"names":["onDraw","canvas","paint","Skia","fit","image","rectProps","rect","src","dst","x","y","width","height","drawImageRect","Image","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAQA;;AACA;;AAGA;;;;;;AAaA,MAAMA,MAAM,GAAG,4BACb,iBAA2D;AAAA,MAA1D;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,KAAV;AAAiBC,IAAAA;AAAjB,GAA0D;AAAA,MAAjC;AAAEC,IAAAA,GAAF;AAAOC,IAAAA,KAAP;AAAc,OAAGC;AAAjB,GAAiC;AACzD,QAAMC,IAAI,GAAG,6BAAYJ,IAAZ,EAAkBG,SAAlB,CAAb;AACA,QAAM;AAAEE,IAAAA,GAAF;AAAOC,IAAAA;AAAP,MAAe,sBACnBL,GADmB,EAEnB;AACEM,IAAAA,CAAC,EAAE,CADL;AAEEC,IAAAA,CAAC,EAAE,CAFL;AAGEC,IAAAA,KAAK,EAAEP,KAAK,CAACO,KAAN,EAHT;AAIEC,IAAAA,MAAM,EAAER,KAAK,CAACQ,MAAN;AAJV,GAFmB,EAQnBN,IARmB,CAArB;AAUAN,EAAAA,MAAM,CAACa,aAAP,CAAqBT,KAArB,EAA4BG,GAA5B,EAAiCC,GAAjC,EAAsCP,KAAtC;AACD,CAdY,CAAf;;AAgBO,MAAMa,KAAK,GAAIC,KAAD,IAAsC;AACzD,sBAAO;AAAW,IAAA,MAAM,EAAEhB;AAAnB,KAA+BgB,KAA/B,EAAP;AACD,CAFM;;;AAIPD,KAAK,CAACE,YAAN,GAAqB;AACnBP,EAAAA,CAAC,EAAE,CADgB;AAEnBC,EAAAA,CAAC,EAAE,CAFgB;AAGnBP,EAAAA,GAAG,EAAE;AAHc,CAArB","sourcesContent":["import React from \"react\";\n\nimport type { SkImage } from \"../../../skia/types\";\nimport type {\n  CustomPaintProps,\n  RectDef,\n  AnimatedProps,\n} from \"../../processors\";\nimport { createDrawing } from \"../../nodes/Drawing\";\nimport { processRect } from \"../../processors\";\n\nimport type { Fit } from \"./BoxFit\";\nimport { fitRects } from \"./BoxFit\";\n\nexport type SourceImageProps = {\n  image: SkImage;\n};\n\nexport type BaseImageProps = RectDef &\n  SourceImageProps & {\n    fit: Fit;\n  };\n\nexport type ImageProps = CustomPaintProps & BaseImageProps;\n\nconst onDraw = createDrawing<ImageProps>(\n  ({ canvas, paint, Skia }, { fit, image, ...rectProps }) => {\n    const rect = processRect(Skia, rectProps);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    canvas.drawImageRect(image, src, dst, paint);\n  }\n);\nexport const Image = (props: AnimatedProps<ImageProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n\nImage.defaultProps = {\n  x: 0,\n  y: 0,\n  fit: \"contain\",\n};\n"]}

package/lib/commonjs/renderer/components/image/ImageSVG.js

@@ -17,7 +17,8 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 const onDraw = (0, _nodes.createDrawing)((_ref, _ref2) => {
   let {
-    canvas
+    canvas,
+    Skia
   } = _ref;
   let {
     svg,
@@ -28,7 +29,7 @@ const onDraw = (0, _nodes.createDrawing)((_ref, _ref2) => {
     y,
     width,
     height
-  } = (0, _processors.processRect)(rectProps);
+  } = (0, _processors.processRect)(Skia, rectProps);
   canvas.save();
   canvas.translate(x, y);
   canvas.drawSvg(svg, width, height);

package/lib/commonjs/renderer/components/image/ImageSVG.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ImageSVG.tsx"],"names":["onDraw","canvas","svg","rectProps","x","y","width","height","save","translate","drawSvg","restore","ImageSVG","props"],"mappings":";;;;;;;AAAA;;AAGA;;AAEA;;;;;;AAMA,MAAMA,MAAM,GAAG,0BACb,iBAAuC;AAAA,MAAtC;AAAEC,IAAAA;AAAF,GAAsC;AAAA,MAA1B;AAAEC,IAAAA,GAAF;AAAO,OAAGC;AAAV,GAA0B;AACrC,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQC,IAAAA,KAAR;AAAeC,IAAAA;AAAf,MAA0B,6BAAYJ,SAAZ,CAAhC;AACAF,EAAAA,MAAM,CAACO,IAAP;AACAP,EAAAA,MAAM,CAACQ,SAAP,CAAiBL,CAAjB,EAAoBC,CAApB;AACAJ,EAAAA,MAAM,CAACS,OAAP,CAAeR,GAAf,EAAoBI,KAApB,EAA2BC,MAA3B;AACAN,EAAAA,MAAM,CAACU,OAAP;AACD,CAPY,CAAf;;AAUO,MAAMC,QAAQ,GAAIC,KAAD,IAAyC;AAC/D,sBAAO;AAAW,IAAA,MAAM,EAAEb;AAAnB,KAA+Ba,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { SkSVG } from \"../../../skia\";\nimport { createDrawing } from \"../../nodes\";\nimport type { AnimatedProps, RectDef } from \"../../processors\";\nimport { processRect } from \"../../processors\";\n\nexport type ImageSVGProps = RectDef & {\n  svg: SkSVG;\n};\n\nconst onDraw = createDrawing<ImageSVGProps>(\n  ({ canvas }, { svg, ...rectProps }) => {\n    const { x, y, width, height } = processRect(rectProps);\n    canvas.save();\n    canvas.translate(x, y);\n    canvas.drawSvg(svg, width, height);\n    canvas.restore();\n  }\n);\n\nexport const ImageSVG = (props: AnimatedProps<ImageSVGProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}
+{"version":3,"sources":["ImageSVG.tsx"],"names":["onDraw","canvas","Skia","svg","rectProps","x","y","width","height","save","translate","drawSvg","restore","ImageSVG","props"],"mappings":";;;;;;;AAAA;;AAGA;;AAEA;;;;;;AAMA,MAAMA,MAAM,GAAG,0BACb,iBAA6C;AAAA,MAA5C;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAA4C;AAAA,MAA1B;AAAEC,IAAAA,GAAF;AAAO,OAAGC;AAAV,GAA0B;AAC3C,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQC,IAAAA,KAAR;AAAeC,IAAAA;AAAf,MAA0B,6BAAYN,IAAZ,EAAkBE,SAAlB,CAAhC;AACAH,EAAAA,MAAM,CAACQ,IAAP;AACAR,EAAAA,MAAM,CAACS,SAAP,CAAiBL,CAAjB,EAAoBC,CAApB;AACAL,EAAAA,MAAM,CAACU,OAAP,CAAeR,GAAf,EAAoBI,KAApB,EAA2BC,MAA3B;AACAP,EAAAA,MAAM,CAACW,OAAP;AACD,CAPY,CAAf;;AAUO,MAAMC,QAAQ,GAAIC,KAAD,IAAyC;AAC/D,sBAAO;AAAW,IAAA,MAAM,EAAEd;AAAnB,KAA+Bc,KAA/B,EAAP;AACD,CAFM","sourcesContent":["import React from \"react\";\n\nimport type { SkSVG } from \"../../../skia/types\";\nimport { createDrawing } from \"../../nodes\";\nimport type { AnimatedProps, RectDef } from \"../../processors\";\nimport { processRect } from \"../../processors\";\n\nexport type ImageSVGProps = RectDef & {\n  svg: SkSVG;\n};\n\nconst onDraw = createDrawing<ImageSVGProps>(\n  ({ canvas, Skia }, { svg, ...rectProps }) => {\n    const { x, y, width, height } = processRect(Skia, rectProps);\n    canvas.save();\n    canvas.translate(x, y);\n    canvas.drawSvg(svg, width, height);\n    canvas.restore();\n  }\n);\n\nexport const ImageSVG = (props: AnimatedProps<ImageSVGProps>) => {\n  return <skDrawing onDraw={onDraw} {...props} />;\n};\n"]}

package/lib/commonjs/renderer/components/image/ImageShader.js

@@ -7,7 +7,7 @@ exports.ImageShader = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
 var _nodes = require("../../nodes");
 
@@ -19,7 +19,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const getRect = props => {
+const getRect = (Skia, props) => {
   const {
     x,
     y,
@@ -30,13 +30,13 @@ const getRect = props => {
   if (props.rect) {
     return props.rect;
   } else if (x !== undefined && y !== undefined && width !== undefined && height !== undefined) {
-    return (0, _processors.rect)(x, y, width, height);
+    return Skia.XYWHRect(x, y, width, height);
   } else {
     return undefined;
   }
 };
 
-const onDeclare = (0, _nodes.createDeclaration)(_ref => {
+const onDeclare = (0, _nodes.createDeclaration)((_ref, _, _ref2) => {
   let {
     tx,
     ty,
@@ -46,7 +46,10 @@ const onDeclare = (0, _nodes.createDeclaration)(_ref => {
     image,
     ...imageShaderProps
   } = _ref;
-  const rct = getRect(imageShaderProps);
+  let {
+    Skia
+  } = _ref2;
+  const rct = getRect(Skia, imageShaderProps);
 
   if (rct) {
     var _imageShaderProps$tra;
@@ -61,7 +64,7 @@ const onDeclare = (0, _nodes.createDeclaration)(_ref => {
     imageShaderProps.transform = [...((_imageShaderProps$tra = imageShaderProps.transform) !== null && _imageShaderProps$tra !== void 0 ? _imageShaderProps$tra : []), ...m3];
   }
 
-  return image.makeShaderOptions(_skia.TileMode[(0, _processors.enumKey)(tx)], _skia.TileMode[(0, _processors.enumKey)(ty)], _skia.FilterMode[(0, _processors.enumKey)(fm)], _skia.MipmapMode[(0, _processors.enumKey)(mm)], (0, _processors.localMatrix)(imageShaderProps));
+  return image.makeShaderOptions(_types.TileMode[(0, _processors.enumKey)(tx)], _types.TileMode[(0, _processors.enumKey)(ty)], _types.FilterMode[(0, _processors.enumKey)(fm)], _types.MipmapMode[(0, _processors.enumKey)(mm)], (0, _processors.localMatrix)(Skia.Matrix(), imageShaderProps));
 });
 
 const ImageShader = props => {

package/lib/commonjs/renderer/components/image/ImageShader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["ImageShader.tsx"],"names":["getRect","props","x","y","width","height","rect","undefined","onDeclare","tx","ty","fm","mm","fit","image","imageShaderProps","rct","rects","m3","src","dst","transform","makeShaderOptions","TileMode","FilterMode","MipmapMode","ImageShader","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AACA;;AAOA;;AAGA;;;;;;AAEA,MAAMA,OAAO,GACXC,KADc,IAES;AACvB,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQC,IAAAA,KAAR;AAAeC,IAAAA;AAAf,MAA0BJ,KAAhC;;AACA,MAAIA,KAAK,CAACK,IAAV,EAAgB;AACd,WAAOL,KAAK,CAACK,IAAb;AACD,GAFD,MAEO,IACLJ,CAAC,KAAKK,SAAN,IACAJ,CAAC,KAAKI,SADN,IAEAH,KAAK,KAAKG,SAFV,IAGAF,MAAM,KAAKE,SAJN,EAKL;AACA,WAAO,sBAAKL,CAAL,EAAQC,CAAR,EAAWC,KAAX,EAAkBC,MAAlB,CAAP;AACD,GAPM,MAOA;AACL,WAAOE,SAAP;AACD;AACF,CAhBD;;AA4BA,MAAMC,SAAS,GAAG,8BAChB,QAAyD;AAAA,MAAxD;AAAEC,IAAAA,EAAF;AAAMC,IAAAA,EAAN;AAAUC,IAAAA,EAAV;AAAcC,IAAAA,EAAd;AAAkBC,IAAAA,GAAlB;AAAuBC,IAAAA,KAAvB;AAA8B,OAAGC;AAAjC,GAAwD;AACvD,QAAMC,GAAG,GAAGhB,OAAO,CAACe,gBAAD,CAAnB;;AACA,MAAIC,GAAJ,EAAS;AAAA;;AACP,UAAMC,KAAK,GAAG,sBACZJ,GADY,EAEZ;AAAEX,MAAAA,CAAC,EAAE,CAAL;AAAQC,MAAAA,CAAC,EAAE,CAAX;AAAcC,MAAAA,KAAK,EAAEU,KAAK,CAACV,KAAN,EAArB;AAAoCC,MAAAA,MAAM,EAAES,KAAK,CAACT,MAAN;AAA5C,KAFY,EAGZW,GAHY,CAAd;AAKA,UAAME,EAAE,GAAG,uBAAUD,KAAK,CAACE,GAAhB,EAAqBF,KAAK,CAACG,GAA3B,CAAX;AACAL,IAAAA,gBAAgB,CAACM,SAAjB,GAA6B,CAC3B,6BAAIN,gBAAgB,CAACM,SAArB,yEAAkC,EAAlC,CAD2B,EAE3B,GAAGH,EAFwB,CAA7B;AAID;;AACD,SAAOJ,KAAK,CAACQ,iBAAN,CACLC,eAAS,yBAAQd,EAAR,CAAT,CADK,EAELc,eAAS,yBAAQb,EAAR,CAAT,CAFK,EAGLc,iBAAW,yBAAQb,EAAR,CAAX,CAHK,EAILc,iBAAW,yBAAQb,EAAR,CAAX,CAJK,EAKL,6BAAYG,gBAAZ,CALK,CAAP;AAOD,CAtBe,CAAlB;;AAyBO,MAAMW,WAAW,GAAIzB,KAAD,IAA4C;AACrE,sBAAO;AAAe,IAAA,SAAS,EAAEO;AAA1B,KAAyCP,KAAzC,EAAP;AACD,CAFM;;;AAIPyB,WAAW,CAACC,YAAZ,GAA2B;AACzBlB,EAAAA,EAAE,EAAE,OADqB;AAEzBC,EAAAA,EAAE,EAAE,OAFqB;AAGzBC,EAAAA,EAAE,EAAE,SAHqB;AAIzBC,EAAAA,EAAE,EAAE,MAJqB;AAKzBC,EAAAA,GAAG,EAAE,MALoB;AAMzBQ,EAAAA,SAAS,EAAE;AANc,CAA3B","sourcesContent":["import React from \"react\";\n\nimport type { SkRect, SkImage } from \"../../../skia\";\nimport { TileMode, FilterMode, MipmapMode } from \"../../../skia\";\nimport { createDeclaration } from \"../../nodes\";\nimport type {\n  TransformProps,\n  SkEnum,\n  AnimatedProps,\n  RectCtor,\n} from \"../../processors\";\nimport { localMatrix, enumKey, rect } from \"../../processors\";\n\nimport type { Fit } from \"./BoxFit\";\nimport { rect2rect, fitRects } from \"./BoxFit\";\n\nconst getRect = (\n  props: Omit<ImageShaderProps, \"tx\" | \"ty\" | \"fm\" | \"mm\" | \"fit\" | \"image\">\n): SkRect | undefined => {\n  const { x, y, width, height } = props;\n  if (props.rect) {\n    return props.rect;\n  } else if (\n    x !== undefined &&\n    y !== undefined &&\n    width !== undefined &&\n    height !== undefined\n  ) {\n    return rect(x, y, width, height);\n  } else {\n    return undefined;\n  }\n};\n\ninterface ImageShaderProps extends TransformProps, Partial<RectCtor> {\n  tx: SkEnum<typeof TileMode>;\n  ty: SkEnum<typeof TileMode>;\n  fm: SkEnum<typeof FilterMode>;\n  mm: SkEnum<typeof MipmapMode>;\n  fit: Fit;\n  rect?: SkRect;\n  image: SkImage;\n}\n\nconst onDeclare = createDeclaration<ImageShaderProps>(\n  ({ tx, ty, fm, mm, fit, image, ...imageShaderProps }) => {\n    const rct = getRect(imageShaderProps);\n    if (rct) {\n      const rects = fitRects(\n        fit,\n        { x: 0, y: 0, width: image.width(), height: image.height() },\n        rct\n      );\n      const m3 = rect2rect(rects.src, rects.dst);\n      imageShaderProps.transform = [\n        ...(imageShaderProps.transform ?? []),\n        ...m3,\n      ];\n    }\n    return image.makeShaderOptions(\n      TileMode[enumKey(tx)],\n      TileMode[enumKey(ty)],\n      FilterMode[enumKey(fm)],\n      MipmapMode[enumKey(mm)],\n      localMatrix(imageShaderProps)\n    );\n  }\n);\n\nexport const ImageShader = (props: AnimatedProps<ImageShaderProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nImageShader.defaultProps = {\n  tx: \"decal\",\n  ty: \"decal\",\n  fm: \"nearest\",\n  mm: \"none\",\n  fit: \"none\",\n  transform: [],\n} as const;\n"]}
+{"version":3,"sources":["ImageShader.tsx"],"names":["getRect","Skia","props","x","y","width","height","rect","undefined","XYWHRect","onDeclare","_","tx","ty","fm","mm","fit","image","imageShaderProps","rct","rects","m3","src","dst","transform","makeShaderOptions","TileMode","FilterMode","MipmapMode","Matrix","ImageShader","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AACA;;AAOA;;AAGA;;;;;;AAEA,MAAMA,OAAO,GAAG,CACdC,IADc,EAEdC,KAFc,KAGS;AACvB,QAAM;AAAEC,IAAAA,CAAF;AAAKC,IAAAA,CAAL;AAAQC,IAAAA,KAAR;AAAeC,IAAAA;AAAf,MAA0BJ,KAAhC;;AACA,MAAIA,KAAK,CAACK,IAAV,EAAgB;AACd,WAAOL,KAAK,CAACK,IAAb;AACD,GAFD,MAEO,IACLJ,CAAC,KAAKK,SAAN,IACAJ,CAAC,KAAKI,SADN,IAEAH,KAAK,KAAKG,SAFV,IAGAF,MAAM,KAAKE,SAJN,EAKL;AACA,WAAOP,IAAI,CAACQ,QAAL,CAAcN,CAAd,EAAiBC,CAAjB,EAAoBC,KAApB,EAA2BC,MAA3B,CAAP;AACD,GAPM,MAOA;AACL,WAAOE,SAAP;AACD;AACF,CAjBD;;AA6BA,MAAME,SAAS,GAAG,8BAChB,OAAsDC,CAAtD,YAAsE;AAAA,MAArE;AAAEC,IAAAA,EAAF;AAAMC,IAAAA,EAAN;AAAUC,IAAAA,EAAV;AAAcC,IAAAA,EAAd;AAAkBC,IAAAA,GAAlB;AAAuBC,IAAAA,KAAvB;AAA8B,OAAGC;AAAjC,GAAqE;AAAA,MAAb;AAAEjB,IAAAA;AAAF,GAAa;AACpE,QAAMkB,GAAG,GAAGnB,OAAO,CAACC,IAAD,EAAOiB,gBAAP,CAAnB;;AACA,MAAIC,GAAJ,EAAS;AAAA;;AACP,UAAMC,KAAK,GAAG,sBACZJ,GADY,EAEZ;AAAEb,MAAAA,CAAC,EAAE,CAAL;AAAQC,MAAAA,CAAC,EAAE,CAAX;AAAcC,MAAAA,KAAK,EAAEY,KAAK,CAACZ,KAAN,EAArB;AAAoCC,MAAAA,MAAM,EAAEW,KAAK,CAACX,MAAN;AAA5C,KAFY,EAGZa,GAHY,CAAd;AAKA,UAAME,EAAE,GAAG,uBAAUD,KAAK,CAACE,GAAhB,EAAqBF,KAAK,CAACG,GAA3B,CAAX;AACAL,IAAAA,gBAAgB,CAACM,SAAjB,GAA6B,CAC3B,6BAAIN,gBAAgB,CAACM,SAArB,yEAAkC,EAAlC,CAD2B,EAE3B,GAAGH,EAFwB,CAA7B;AAID;;AACD,SAAOJ,KAAK,CAACQ,iBAAN,CACLC,gBAAS,yBAAQd,EAAR,CAAT,CADK,EAELc,gBAAS,yBAAQb,EAAR,CAAT,CAFK,EAGLc,kBAAW,yBAAQb,EAAR,CAAX,CAHK,EAILc,kBAAW,yBAAQb,EAAR,CAAX,CAJK,EAKL,6BAAYd,IAAI,CAAC4B,MAAL,EAAZ,EAA2BX,gBAA3B,CALK,CAAP;AAOD,CAtBe,CAAlB;;AAyBO,MAAMY,WAAW,GAAI5B,KAAD,IAA4C;AACrE,sBAAO;AAAe,IAAA,SAAS,EAAEQ;AAA1B,KAAyCR,KAAzC,EAAP;AACD,CAFM;;;AAIP4B,WAAW,CAACC,YAAZ,GAA2B;AACzBnB,EAAAA,EAAE,EAAE,OADqB;AAEzBC,EAAAA,EAAE,EAAE,OAFqB;AAGzBC,EAAAA,EAAE,EAAE,SAHqB;AAIzBC,EAAAA,EAAE,EAAE,MAJqB;AAKzBC,EAAAA,GAAG,EAAE,MALoB;AAMzBQ,EAAAA,SAAS,EAAE;AANc,CAA3B","sourcesContent":["import React from \"react\";\n\nimport type { SkRect, SkImage, Skia } from \"../../../skia/types\";\nimport { TileMode, FilterMode, MipmapMode } from \"../../../skia/types\";\nimport { createDeclaration } from \"../../nodes\";\nimport type {\n  TransformProps,\n  SkEnum,\n  AnimatedProps,\n  RectCtor,\n} from \"../../processors\";\nimport { localMatrix, enumKey } from \"../../processors\";\n\nimport type { Fit } from \"./BoxFit\";\nimport { rect2rect, fitRects } from \"./BoxFit\";\n\nconst getRect = (\n  Skia: Skia,\n  props: Omit<ImageShaderProps, \"tx\" | \"ty\" | \"fm\" | \"mm\" | \"fit\" | \"image\">\n): SkRect | undefined => {\n  const { x, y, width, height } = props;\n  if (props.rect) {\n    return props.rect;\n  } else if (\n    x !== undefined &&\n    y !== undefined &&\n    width !== undefined &&\n    height !== undefined\n  ) {\n    return Skia.XYWHRect(x, y, width, height);\n  } else {\n    return undefined;\n  }\n};\n\ninterface ImageShaderProps extends TransformProps, Partial<RectCtor> {\n  tx: SkEnum<typeof TileMode>;\n  ty: SkEnum<typeof TileMode>;\n  fm: SkEnum<typeof FilterMode>;\n  mm: SkEnum<typeof MipmapMode>;\n  fit: Fit;\n  rect?: SkRect;\n  image: SkImage;\n}\n\nconst onDeclare = createDeclaration<ImageShaderProps>(\n  ({ tx, ty, fm, mm, fit, image, ...imageShaderProps }, _, { Skia }) => {\n    const rct = getRect(Skia, imageShaderProps);\n    if (rct) {\n      const rects = fitRects(\n        fit,\n        { x: 0, y: 0, width: image.width(), height: image.height() },\n        rct\n      );\n      const m3 = rect2rect(rects.src, rects.dst);\n      imageShaderProps.transform = [\n        ...(imageShaderProps.transform ?? []),\n        ...m3,\n      ];\n    }\n    return image.makeShaderOptions(\n      TileMode[enumKey(tx)],\n      TileMode[enumKey(ty)],\n      FilterMode[enumKey(fm)],\n      MipmapMode[enumKey(mm)],\n      localMatrix(Skia.Matrix(), imageShaderProps)\n    );\n  }\n);\n\nexport const ImageShader = (props: AnimatedProps<ImageShaderProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nImageShader.defaultProps = {\n  tx: \"decal\",\n  ty: \"decal\",\n  fm: \"nearest\",\n  mm: \"none\",\n  fit: \"none\",\n  transform: [],\n} as const;\n"]}

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

@@ -7,7 +7,7 @@ exports.Blur = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
 var _processors = require("../../processors");
 
@@ -21,13 +21,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _nodes.createDeclaration)((_ref, children) => {
+const onDeclare = (0, _nodes.createDeclaration)((_ref, children, _ref2) => {
   let {
     blur,
     mode
   } = _ref;
-  const sigma = (0, _Radius.processRadius)(blur);
-  return _skia.Skia.ImageFilter.MakeBlur(sigma.x, sigma.y, _skia.TileMode[(0, _processors.enumKey)(mode)], (0, _getInput.getInput)(children));
+  let {
+    Skia
+  } = _ref2;
+  const sigma = (0, _Radius.processRadius)(Skia, blur);
+  return Skia.ImageFilter.MakeBlur(sigma.x, sigma.y, _types.TileMode[(0, _processors.enumKey)(mode)], (0, _getInput.getInput)(Skia, children));
 });
 
 const Blur = props => {

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

@@ -1 +1 @@
-{"version":3,"sources":["Blur.tsx"],"names":["onDeclare","children","blur","mode","sigma","Skia","ImageFilter","MakeBlur","x","y","TileMode","Blur","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AAEA;;AAEA;;AACA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,8BAA6B,OAAiBC,QAAjB,KAA8B;AAAA,MAA7B;AAAEC,IAAAA,IAAF;AAAQC,IAAAA;AAAR,GAA6B;AAC3E,QAAMC,KAAK,GAAG,2BAAcF,IAAd,CAAd;AACA,SAAOG,WAAKC,WAAL,CAAiBC,QAAjB,CACLH,KAAK,CAACI,CADD,EAELJ,KAAK,CAACK,CAFD,EAGLC,eAAS,yBAAQP,IAAR,CAAT,CAHK,EAIL,wBAASF,QAAT,CAJK,CAAP;AAMD,CARiB,CAAlB;;AAUO,MAAMU,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAe,IAAA,SAAS,EAAEZ;AAA1B,KAAyCY,KAAzC,EAAP;AACD,CAFM;;;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBV,EAAAA,IAAI,EAAE;AADY,CAApB","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { Skia, TileMode } from \"../../../skia\";\nimport type { Radius, SkEnum } from \"../../processors\";\nimport { enumKey } from \"../../processors\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport { processRadius } from \"../../processors/Radius\";\nimport { createDeclaration } from \"../../nodes\";\n\nimport { getInput } from \"./getInput\";\n\nexport interface BlurProps {\n  blur: Radius;\n  mode: SkEnum<typeof TileMode>;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlurProps>(({ blur, mode }, children) => {\n  const sigma = processRadius(blur);\n  return Skia.ImageFilter.MakeBlur(\n    sigma.x,\n    sigma.y,\n    TileMode[enumKey(mode)],\n    getInput(children)\n  );\n});\n\nexport const Blur = (props: AnimatedProps<BlurProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nBlur.defaultProps = {\n  mode: \"decal\",\n};\n"]}
+{"version":3,"sources":["Blur.tsx"],"names":["onDeclare","children","blur","mode","Skia","sigma","ImageFilter","MakeBlur","x","y","TileMode","Blur","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AAEA;;AAEA;;AACA;;AAEA;;;;;;AAQA,MAAMA,SAAS,GAAG,8BAChB,OAAiBC,QAAjB,YAAwC;AAAA,MAAvC;AAAEC,IAAAA,IAAF;AAAQC,IAAAA;AAAR,GAAuC;AAAA,MAAb;AAAEC,IAAAA;AAAF,GAAa;AACtC,QAAMC,KAAK,GAAG,2BAAcD,IAAd,EAAoBF,IAApB,CAAd;AACA,SAAOE,IAAI,CAACE,WAAL,CAAiBC,QAAjB,CACLF,KAAK,CAACG,CADD,EAELH,KAAK,CAACI,CAFD,EAGLC,gBAAS,yBAAQP,IAAR,CAAT,CAHK,EAIL,wBAASC,IAAT,EAAeH,QAAf,CAJK,CAAP;AAMD,CATe,CAAlB;;AAYO,MAAMU,IAAI,GAAIC,KAAD,IAAqC;AACvD,sBAAO;AAAe,IAAA,SAAS,EAAEZ;AAA1B,KAAyCY,KAAzC,EAAP;AACD,CAFM;;;AAIPD,IAAI,CAACE,YAAL,GAAoB;AAClBV,EAAAA,IAAI,EAAE;AADY,CAApB","sourcesContent":["import React from \"react\";\nimport type { ReactNode } from \"react\";\n\nimport { TileMode } from \"../../../skia/types\";\nimport type { Radius, SkEnum } from \"../../processors\";\nimport { enumKey } from \"../../processors\";\nimport type { AnimatedProps } from \"../../processors/Animations/Animations\";\nimport { processRadius } from \"../../processors/Radius\";\nimport { createDeclaration } from \"../../nodes\";\n\nimport { getInput } from \"./getInput\";\n\nexport interface BlurProps {\n  blur: Radius;\n  mode: SkEnum<typeof TileMode>;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<BlurProps>(\n  ({ blur, mode }, children, { Skia }) => {\n    const sigma = processRadius(Skia, blur);\n    return Skia.ImageFilter.MakeBlur(\n      sigma.x,\n      sigma.y,\n      TileMode[enumKey(mode)],\n      getInput(Skia, children)\n    );\n  }\n);\n\nexport const Blur = (props: AnimatedProps<BlurProps>) => {\n  return <skDeclaration onDeclare={onDeclare} {...props} />;\n};\n\nBlur.defaultProps = {\n  mode: \"decal\",\n};\n"]}

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

@@ -7,7 +7,7 @@ exports.DisplacementMap = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _skia = require("../../../skia");
+var _types = require("../../../skia/types");
 
 var _nodes = require("../../nodes");
 
@@ -19,26 +19,29 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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); }
 
-const onDeclare = (0, _nodes.createDeclaration)((_ref, children) => {
+const onDeclare = (0, _nodes.createDeclaration)((_ref, children, _ref2) => {
   let {
     channelX,
     channelY,
     scale
   } = _ref;
+  let {
+    Skia
+  } = _ref2;
   const [in1, in2] = children.filter(c => !!c);
 
-  const x = _skia.ColorChannel[(0, _processors.enumKey)(channelX)];
+  const x = _types.ColorChannel[(0, _processors.enumKey)(channelX)];
 
-  const y = _skia.ColorChannel[(0, _processors.enumKey)(channelY)];
+  const y = _types.ColorChannel[(0, _processors.enumKey)(channelY)];
 
-  const map = (0, _getInput.getInput)([in1]);
-  const input = in2 ? (0, _getInput.getInput)([in2]) : null;
+  const map = (0, _getInput.getInput)(Skia, [in1]);
+  const input = in2 ? (0, _getInput.getInput)(Skia, [in2]) : null;
 
   if (!map) {
     throw new Error("No DisplacementMap provided");
   }
 
-  return _skia.Skia.ImageFilter.MakeDisplacementMap(x, y, scale, map, input);
+  return Skia.ImageFilter.MakeDisplacementMap(x, y, scale, map, input);
 });
 
 const DisplacementMap = props => {