@shopify/react-native-skia 0.1.129 → 0.1.130

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

@@ -1 +1 @@
-{"version":3,"sources":["Shader.tsx"],"names":["isVector","obj","x","undefined","y","processValue","value","onDeclare","children","uniforms","source","opaque","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","isShader","Shader","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AAGA;;AACA;;;;;;AAEA,MAAMA,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;;AAcA,MAAMC,SAAS,GAAG,oCAChB,OAA6CC,QAA7C,KAA0D;AAAA,MAAzD;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,MAAZ;AAAoBC,IAAAA,MAApB;AAA4B,OAAGC;AAA/B,GAAyD;AACxD,QAAMC,iBAAiB,GAAG,IAAIC,KAAJ,CAAUJ,MAAM,CAACK,eAAP,EAAV,EACvBC,IADuB,CAClB,CADkB,EAEvBC,OAFuB,CAEf,CAACC,CAAD,EAAIC,CAAJ,KAAU;AACjB,UAAMC,IAAI,GAAGV,MAAM,CAACW,cAAP,CAAsBF,CAAtB,CAAb;AACA,UAAMb,KAAK,GAAGG,QAAQ,CAACW,IAAD,CAAtB;;AACA,QAAId,KAAK,KAAKH,SAAd,EAAyB;AACvB,YAAM,IAAImB,KAAJ,CAAW,kCAAiCF,IAAK,EAAjD,CAAN;AACD;;AACD,QAAIN,KAAK,CAACS,OAAN,CAAcjB,KAAd,CAAJ,EAA0B;AACxB,aAAOA,KAAK,CAACW,OAAN,CAAcZ,YAAd,CAAP;AACD;;AACD,WAAOA,YAAY,CAACC,KAAD,CAAnB;AACD,GAZuB,CAA1B;AAaA,QAAMkB,KAAK,GAAGC,MAAM,CAACC,IAAP,CAAYjB,QAAZ,CAAd;;AACA,MAAIe,KAAK,CAACG,MAAN,GAAejB,MAAM,CAACK,eAAP,EAAnB,EAA6C;AAC3C,UAAMa,YAAY,GAAG,IAAId,KAAJ,CAAUJ,MAAM,CAACK,eAAP,EAAV,EAClBC,IADkB,CACb,CADa,EAElBa,GAFkB,CAEd,CAACX,CAAD,EAAIC,CAAJ,KAAUT,MAAM,CAACW,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,SAAO1B,MAAM,CAAC2B,sBAAP,CACLxB,iBADK,EAELF,MAFK,EAGLH,QAAQ,CAACwB,MAAT,CAAgBM,cAAhB,CAHK,EAIL,6BAAY1B,SAAZ,CAJK,CAAP;AAMD,CAtCe,CAAlB;;AAyCO,MAAM2B,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEjC;AAA1B,KAAyCiC,KAAzC,EAAP;AACD,CAFM;;;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpBhC,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  opaque?: boolean;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ShaderProps>(\n  ({ uniforms, source, opaque, ...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      opaque,\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":["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","isShader","Shader","props","defaultProps"],"mappings":";;;;;;;AAAA;;AAGA;;AAGA;;AACA;;;;;;AAEA,MAAMA,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,GAAG,oCAChB,OAAqCC,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,CAAgBM,cAAhB,CAFK,EAGL,6BAAY1B,SAAZ,CAHK,CAAP;AAKD,CArCe,CAAlB;;AAwCO,MAAM2B,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEhC;AAA1B,KAAyCgC,KAAzC,EAAP;AACD,CAFM;;;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpB/B,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"]}

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

@@ -21,7 +21,6 @@ const onDeclare = createDeclaration((_ref, children) => {
   let {
     uniforms,
     source,
-    opaque,
     ...transform
   } = _ref;
   const processedUniforms = new Array(source.getUniformCount()).fill(0).flatMap((_, i) => {
@@ -52,7 +51,7 @@ const onDeclare = createDeclaration((_ref, children) => {
     console.warn("Unused uniforms were provided: " + unusedUniform.join(", "));
   }
 
-  return source.makeShaderWithChildren(processedUniforms, opaque, children.filter(isShader), localMatrix(transform));
+  return source.makeShaderWithChildren(processedUniforms, children.filter(isShader), localMatrix(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","opaque","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;;AAcA,MAAMC,SAAS,GAAGT,iBAAiB,CACjC,OAA6CU,QAA7C,KAA0D;AAAA,MAAzD;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,MAAZ;AAAoBC,IAAAA,MAApB;AAA4B,OAAGC;AAA/B,GAAyD;AACxD,QAAMC,iBAAiB,GAAG,IAAIC,KAAJ,CAAUJ,MAAM,CAACK,eAAP,EAAV,EACvBC,IADuB,CAClB,CADkB,EAEvBC,OAFuB,CAEf,CAACC,CAAD,EAAIC,CAAJ,KAAU;AACjB,UAAMC,IAAI,GAAGV,MAAM,CAACW,cAAP,CAAsBF,CAAtB,CAAb;AACA,UAAMb,KAAK,GAAGG,QAAQ,CAACW,IAAD,CAAtB;;AACA,QAAId,KAAK,KAAKH,SAAd,EAAyB;AACvB,YAAM,IAAImB,KAAJ,CAAW,kCAAiCF,IAAK,EAAjD,CAAN;AACD;;AACD,QAAIN,KAAK,CAACS,OAAN,CAAcjB,KAAd,CAAJ,EAA0B;AACxB,aAAOA,KAAK,CAACW,OAAN,CAAcZ,YAAd,CAAP;AACD;;AACD,WAAOA,YAAY,CAACC,KAAD,CAAnB;AACD,GAZuB,CAA1B;AAaA,QAAMkB,KAAK,GAAGC,MAAM,CAACC,IAAP,CAAYjB,QAAZ,CAAd;;AACA,MAAIe,KAAK,CAACG,MAAN,GAAejB,MAAM,CAACK,eAAP,EAAnB,EAA6C;AAC3C,UAAMa,YAAY,GAAG,IAAId,KAAJ,CAAUJ,MAAM,CAACK,eAAP,EAAV,EAClBC,IADkB,CACb,CADa,EAElBa,GAFkB,CAEd,CAACX,CAAD,EAAIC,CAAJ,KAAUT,MAAM,CAACW,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,SAAO1B,MAAM,CAAC2B,sBAAP,CACLxB,iBADK,EAELF,MAFK,EAGLH,QAAQ,CAACwB,MAAT,CAAgBnC,QAAhB,CAHK,EAILE,WAAW,CAACa,SAAD,CAJN,CAAP;AAMD,CAtCgC,CAAnC;AAyCA,OAAO,MAAM0B,MAAM,GAAIC,KAAD,IAAuC;AAC3D,sBAAO;AAAe,IAAA,SAAS,EAAEhC;AAA1B,KAAyCgC,KAAzC,EAAP;AACD,CAFM;AAIPD,MAAM,CAACE,YAAP,GAAsB;AACpB/B,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  opaque?: boolean;\n  children?: ReactNode | ReactNode[];\n}\n\nconst onDeclare = createDeclaration<ShaderProps>(\n  ({ uniforms, source, opaque, ...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      opaque,\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","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"]}

package/lib/typescript/src/renderer/components/shaders/Shader.d.ts

@@ -9,7 +9,6 @@ interface Uniforms {
 export interface ShaderProps extends TransformProps {
     source: SkRuntimeEffect;
     uniforms: Uniforms;
-    opaque?: boolean;
     children?: ReactNode | ReactNode[];
 }
 export declare const Shader: {

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

@@ -13,18 +13,16 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
     /**
      * Returns a shader executed using the given uniform data.
      * @param uniforms
-     * @param isOpaque
      * @param localMatrix
      */
-    makeShader(uniforms: number[], isOpaque?: boolean, localMatrix?: SkMatrix): SkShader;
+    makeShader(uniforms: number[], localMatrix?: SkMatrix): SkShader;
     /**
      * Returns a shader executed using the given uniform data and the children as inputs.
      * @param uniforms
-     * @param isOpaque
      * @param children
      * @param localMatrix
      */
-    makeShaderWithChildren(uniforms: number[], isOpaque?: boolean, children?: SkShader[], localMatrix?: SkMatrix): SkShader;
+    makeShaderWithChildren(uniforms: number[], children?: SkShader[], localMatrix?: SkMatrix): SkShader;
     /**
      * Returns the nth uniform from the effect.
      * @param index

package/libs/ios/libskia.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskia.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/libs/ios/libskshaper.xcframework/Info.plist

@@ -6,32 +6,32 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e</string>
+			<string>ios-arm64_arm64e_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_x86_64-simulator</string>
+			<string>ios-arm64_arm64e</string>
 			<key>LibraryPath</key>
 			<string>libskshaper.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
 				<string>arm64e</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "React Native Skia",
-  "version": "0.1.129",
+  "version": "0.1.130",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [
@@ -35,7 +35,7 @@
     "tsc": "tsc --noEmit",
     "lint": "eslint . --ext .ts,.tsx  --max-warnings 0",
     "test": "jest",
-    "postinstall": "node scripts/install-npm.js && patch-package",
+    "postinstall": "node scripts/install-npm.js",
     "build": "bob build"
   },
   "repository": {

package/src/renderer/components/shaders/Shader.tsx

@@ -30,12 +30,11 @@ const processValue = (value: UniformValue): number | readonly number[] => {
 export interface ShaderProps extends TransformProps {
   source: SkRuntimeEffect;
   uniforms: Uniforms;
-  opaque?: boolean;
   children?: ReactNode | ReactNode[];
 }
 
 const onDeclare = createDeclaration<ShaderProps>(
-  ({ uniforms, source, opaque, ...transform }, children) => {
+  ({ uniforms, source, ...transform }, children) => {
     const processedUniforms = new Array(source.getUniformCount())
       .fill(0)
       .flatMap((_, i) => {
@@ -68,7 +67,6 @@ const onDeclare = createDeclaration<ShaderProps>(
     }
     return source.makeShaderWithChildren(
       processedUniforms,
-      opaque,
       children.filter(isShader),
       localMatrix(transform)
     );

package/src/skia/types/RuntimeEffect/RuntimeEffect.ts

@@ -16,25 +16,18 @@ export interface SkRuntimeEffect extends SkJSIInstance<"RuntimeEffect"> {
   /**
    * Returns a shader executed using the given uniform data.
    * @param uniforms
-   * @param isOpaque
    * @param localMatrix
    */
-  makeShader(
-    uniforms: number[],
-    isOpaque?: boolean,
-    localMatrix?: SkMatrix
-  ): SkShader;
+  makeShader(uniforms: number[], localMatrix?: SkMatrix): SkShader;
 
   /**
    * Returns a shader executed using the given uniform data and the children as inputs.
    * @param uniforms
-   * @param isOpaque
    * @param children
    * @param localMatrix
    */
   makeShaderWithChildren(
     uniforms: number[],
-    isOpaque?: boolean,
     children?: SkShader[],
     localMatrix?: SkMatrix
   ): SkShader;

package/cpp/skia/include/core/SkCustomMesh.h

@@ -1,202 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkCustomMesh_DEFINED
-#define SkCustomMesh_DEFINED
-
-#include "include/core/SkTypes.h"
-
-#ifdef SK_ENABLE_SKSL
-#include "include/core/SkColorSpace.h"
-#include "include/core/SkImageInfo.h"
-#include "include/core/SkRect.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkSpan.h"
-#include "include/core/SkString.h"
-
-#include <vector>
-
-namespace SkSL { struct Program; }
-
-/**
- * A specification for custom meshes. Specifies the vertex buffer attributes and stride, the
- * vertex program that produces a user-defined set of varyings, a fragment program that ingests
- * the interpolated varyings and produces local coordinates and optionally a color.
- *
- * The signature of the vertex program must be:
- *   float2 main(Attributes, out Varyings)
- * where the return value is a local position that will be transformed by SkCanvas's matrix.
- *
- * The signature of the fragment program must be either:
- *   (float2|void) main(Varyings)
- * or
- *   (float2|void) main(Varyings, out (half4|float4) color)
- *
- * where the return value is the local coordinates that will be used to access SkShader. If the
- * return type is void then the interpolated position from vertex shader return is used as the local
- * coordinate. If the color variant is used it will be blended with SkShader (or SkPaint color in
- * absence of a shader) using the SkBlender provided to the SkCanvas draw call.
- */
-class SkCustomMeshSpecification : public SkNVRefCnt<SkCustomMeshSpecification> {
-public:
-    /** These values are enforced when creating a specification. */
-    static constexpr size_t kMaxStride       = 1024;
-    static constexpr size_t kMaxAttributes   = 8;
-    static constexpr size_t kStrideAlignment = 4;
-    static constexpr size_t kOffsetAlignment = 4;
-    static constexpr size_t kMaxVaryings     = 6;
-
-    struct Attribute {
-        enum class Type : uint32_t {  // CPU representation     Shader Type
-            kFloat,                   // float                  float
-            kFloat2,                  // two floats             float2
-            kFloat3,                  // three floats           float3
-            kFloat4,                  // four floats            float4
-            kUByte4_unorm,            // four bytes             half4
-
-            kLast = kUByte4_unorm
-        };
-        Type     type;
-        size_t   offset;
-        SkString name;
-    };
-
-    struct Varying {
-        enum class Type : uint32_t {
-            kFloat,   // "float"
-            kFloat2,  // "float2"
-            kFloat3,  // "float3"
-            kFloat4,  // "float4"
-            kHalf,    // "half"
-            kHalf2,   // "half2"
-            kHalf3,   // "half3"
-            kHalf4,   // "half4"
-
-            kLast = kHalf4
-        };
-        Type     type;
-        SkString name;
-    };
-
-    ~SkCustomMeshSpecification();
-
-    struct Result {
-        sk_sp<SkCustomMeshSpecification> specification;
-        SkString                         error;
-    };
-
-    /**
-     * If successful the return is a specification and an empty error string. Otherwise, it is a
-     * null specification a non-empty error string.
-     *
-     * @param attributes     The vertex attributes that will be consumed by 'vs'. Attributes need
-     *                       not be tightly packed but attribute offsets must be aligned to
-     *                       kOffsetAlignment and offset + size may not be greater than
-     *                       'vertexStride'. At least one attribute is required.
-     * @param vertexStride   The offset between successive attribute values. This must be aligned to
-     *                       kStrideAlignment.
-     * @param varyings       The varyings that will be written by 'vs' and read by 'fs'. This may
-     *                       be empty.
-     * @param vs             The vertex shader code that computes a vertex position and the varyings
-     *                       from the attributes.
-     * @param fs             The fragment code that computes a local coordinate and optionally a
-     *                       color from the varyings. The local coordinate is used to sample
-     *                       SkShader.
-     * @param cs             The colorspace of the color produced by 'fs'. Ignored if 'fs's main()
-     *                       function does not have a color out param.
-     * @param at             The alpha type of the color produced by 'fs'. Ignored if 'fs's main()
-     *                       function does not have a color out param. Cannot be kUnknown.
-     */
-    static Result Make(SkSpan<const Attribute> attributes,
-                       size_t                  vertexStride,
-                       SkSpan<const Varying>   varyings,
-                       const SkString&         vs,
-                       const SkString&         fs,
-                       sk_sp<SkColorSpace>     cs = SkColorSpace::MakeSRGB(),
-                       SkAlphaType             at = kPremul_SkAlphaType);
-
-    SkSpan<const Attribute> attributes() const { return SkMakeSpan(fAttributes); }
-
-    size_t stride() const { return fStride; }
-
-private:
-    friend struct SkCustomMeshSpecificationPriv;
-
-    enum class ColorType {
-        kNone,
-        kHalf4,
-        kFloat4,
-    };
-
-    static Result MakeFromSourceWithStructs(SkSpan<const Attribute> attributes,
-                                            size_t                  stride,
-                                            SkSpan<const Varying>   varyings,
-                                            const SkString&         vs,
-                                            const SkString&         fs,
-                                            sk_sp<SkColorSpace>     cs,
-                                            SkAlphaType             at);
-
-    SkCustomMeshSpecification(SkSpan<const Attribute>,
-                              size_t,
-                              SkSpan<const Varying>,
-                              std::unique_ptr<SkSL::Program>,
-                              std::unique_ptr<SkSL::Program>,
-                              ColorType,
-                              bool hasLocalCoords,
-                              sk_sp<SkColorSpace>,
-                              SkAlphaType);
-
-    SkCustomMeshSpecification(const SkCustomMeshSpecification&) = delete;
-    SkCustomMeshSpecification(SkCustomMeshSpecification&&) = delete;
-
-    SkCustomMeshSpecification& operator=(const SkCustomMeshSpecification&) = delete;
-    SkCustomMeshSpecification& operator=(SkCustomMeshSpecification&&) = delete;
-
-    const std::vector<Attribute>       fAttributes;
-    const std::vector<Varying>         fVaryings;
-    std::unique_ptr<SkSL::Program>     fVS;
-    std::unique_ptr<SkSL::Program>     fFS;
-    size_t                             fStride;
-    uint32_t                           fHash;
-    ColorType                          fColorType;
-    bool                               fHasLocalCoords;
-    sk_sp<SkColorSpace>                fColorSpace;
-    SkAlphaType                        fAlphaType;
-};
-
-/**
- * This is a placeholder object. We will want something that allows the client to incrementally
- * update the mesh that can be synchronized with the GPU backend without requiring extra copies.
- *
- * A buffer of vertices, a topology, optionally indices, and a compatible SkCustomMeshSpecification.
- * The data in 'vb' is expected to contain the attributes described in 'spec' for 'vcount' vertices.
- * The size of the buffer must be at least spec->stride()*vcount (even if vertex attributes contains
- * pad at the end of the stride). If 'bounds' does not contain all points output by 'spec''s vertex
- * program when applied to the vertices in 'vb' a draw of the custom mesh produces undefined
- * results.
- *
- * If indices is null then then 'icount' must be <= 0. 'vcount' vertices will be selected from 'vb'
- * to create the topology indicated by 'mode'.
- *
- * If indices is not null then icount must be >= 3. 'vb' will be indexed by 'icount' successive
- * values in 'indices' to create the topology indicated by 'mode'. The values in 'indices' must be
- * less than 'vcount'
- */
-struct SkCustomMesh {
-    enum class Mode { kTriangles, kTriangleStrip };
-    sk_sp<SkCustomMeshSpecification>  spec;
-    Mode                              mode     = Mode::kTriangles;
-    SkRect                            bounds   = SkRect::MakeEmpty();
-    const void*                       vb       = nullptr;
-    int                               vcount   = 0;
-    const uint16_t*                   indices  = nullptr;
-    int                               icount   = 0;
-};
-
-#endif  // SK_ENABLE_SKSL
-
-#endif