@shopify/react-native-skia 0.1.125 → 0.1.128

package/cpp/jsi/JsiSimpleValueWrapper.h

@@ -9,6 +9,7 @@ using namespace facebook;
 
 enum JsiWrapperValueType
 {
+    NonInitialized,
     Undefined,
     Null,
     Bool,
@@ -25,7 +26,7 @@ class JsiSimpleValueWrapper
 {
 public:
     JsiSimpleValueWrapper(jsi::Runtime& runtime) :
-      _type(JsiWrapperValueType::Undefined),
+      _type(JsiWrapperValueType::NonInitialized),
       _propNameId(jsi::PropNameID::forUtf8(runtime, "value"))
     {}
 
@@ -33,6 +34,8 @@ public:
     {
       switch (_type)
       {
+          case JsiWrapperValueType::NonInitialized:
+              return nullptr;
           case JsiWrapperValueType::Undefined:
             return jsi::Value::undefined();
           case JsiWrapperValueType::Null:
@@ -72,16 +75,23 @@ public:
     }
 
     bool equals(jsi::Runtime& runtime, const jsi::Value &value) {
-      if(value.isNumber()) {
+      if (_type == JsiWrapperValueType::NonInitialized) {
+          return false;
+      }
+      if(value.isNumber() && _type == JsiWrapperValueType::Number) {
         return _numberValue == value.asNumber();
-      } else if(value.isBool()) {
+      } else if(value.isBool() && _type == JsiWrapperValueType::Bool) {
         return _boolValue == value.getBool();
       } else if(value.isUndefined()) {
         return _type == JsiWrapperValueType::Undefined;
       } else if(value.isNull()) {
         return _type == JsiWrapperValueType::Null;
       } else if(value.isString()) {
-        return jsi::String::strictEquals(runtime, value.asString(runtime), getCurrent(runtime).asString(runtime));
+          auto current = getCurrent(runtime);
+          if (current.isString()) {
+              return jsi::String::strictEquals(runtime, value.asString(runtime), current.asString(runtime));
+          }
+          return false;
       }
       return false;
     }

package/lib/commonjs/renderer/processors/math/Matrix3.js

@@ -32,12 +32,12 @@ const processTransform2d = transforms => {
     }
 
     if (key === "scaleX") {
-      m.preScale(value, 0);
+      m.preScale(value, 1);
       continue;
     }
 
     if (key === "scaleY") {
-      m.preScale(0, value);
+      m.preScale(1, value);
       continue;
     }
 

package/lib/commonjs/renderer/processors/math/Matrix3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Matrix3.ts"],"names":["processTransform2d","transforms","m","Skia","Matrix","transform","key","Object","keys","value","preTranslate","preScale","preSkew","preRotate","Math","PI"],"mappings":";;;;;;;AAAA;;AACA;;AA+BO,MAAMA,kBAAkB,GAAIC,UAAD,IAA8B;AAC9D,QAAMC,CAAC,GAAGC,WAAKC,MAAL,EAAV;;AACA,OAAK,MAAMC,SAAX,IAAwBJ,UAAxB,EAAoC;AAClC,UAAMK,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBJ,MAAAA,CAAC,CAACQ,YAAF,CAAeD,KAAf,EAAsB,CAAtB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBJ,MAAAA,CAAC,CAACQ,YAAF,CAAe,CAAf,EAAkBD,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACS,QAAF,CAAWF,KAAX,EAAkBA,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBJ,MAAAA,CAAC,CAACS,QAAF,CAAWF,KAAX,EAAkB,CAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBJ,MAAAA,CAAC,CAACS,QAAF,CAAW,CAAX,EAAcF,KAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACU,OAAF,CAAUH,KAAV,EAAiB,CAAjB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACU,OAAF,CAAU,CAAV,EAAaH,KAAb;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzCJ,MAAAA,CAAC,CAACW,SAAF,CAAaJ,KAAK,GAAG,GAAT,GAAgBK,IAAI,CAACC,EAAjC;AACA;AACD;;AACD,oCAAgBT,GAAhB;AACD;;AACD,SAAOJ,CAAP;AACD,CAxCM","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport { Skia } from \"../../../skia\";\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport const processTransform2d = (transforms: Transforms2d) => {\n  const m = Skia.Matrix();\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.preTranslate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.preTranslate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.preScale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.preScale(value, 0);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.preScale(0, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.preSkew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.preSkew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      m.preRotate((value * 180) / Math.PI);\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n"]}
+{"version":3,"sources":["Matrix3.ts"],"names":["processTransform2d","transforms","m","Skia","Matrix","transform","key","Object","keys","value","preTranslate","preScale","preSkew","preRotate","Math","PI"],"mappings":";;;;;;;AAAA;;AACA;;AA+BO,MAAMA,kBAAkB,GAAIC,UAAD,IAA8B;AAC9D,QAAMC,CAAC,GAAGC,WAAKC,MAAL,EAAV;;AACA,OAAK,MAAMC,SAAX,IAAwBJ,UAAxB,EAAoC;AAClC,UAAMK,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBJ,MAAAA,CAAC,CAACQ,YAAF,CAAeD,KAAf,EAAsB,CAAtB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBJ,MAAAA,CAAC,CAACQ,YAAF,CAAe,CAAf,EAAkBD,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACS,QAAF,CAAWF,KAAX,EAAkBA,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBJ,MAAAA,CAAC,CAACS,QAAF,CAAWF,KAAX,EAAkB,CAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBJ,MAAAA,CAAC,CAACS,QAAF,CAAW,CAAX,EAAcF,KAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACU,OAAF,CAAUH,KAAV,EAAiB,CAAjB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBJ,MAAAA,CAAC,CAACU,OAAF,CAAU,CAAV,EAAaH,KAAb;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzCJ,MAAAA,CAAC,CAACW,SAAF,CAAaJ,KAAK,GAAG,GAAT,GAAgBK,IAAI,CAACC,EAAjC;AACA;AACD;;AACD,oCAAgBT,GAAhB;AACD;;AACD,SAAOJ,CAAP;AACD,CAxCM","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport { Skia } from \"../../../skia\";\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport const processTransform2d = (transforms: Transforms2d) => {\n  const m = Skia.Matrix();\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.preTranslate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.preTranslate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.preScale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.preScale(value, 1);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.preScale(1, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.preSkew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.preSkew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      m.preRotate((value * 180) / Math.PI);\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n"]}

package/lib/module/renderer/processors/math/Matrix3.js

@@ -23,12 +23,12 @@ export const processTransform2d = transforms => {
     }
 
     if (key === "scaleX") {
-      m.preScale(value, 0);
+      m.preScale(value, 1);
       continue;
     }
 
     if (key === "scaleY") {
-      m.preScale(0, value);
+      m.preScale(1, value);
       continue;
     }
 

package/lib/module/renderer/processors/math/Matrix3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Matrix3.ts"],"names":["exhaustiveCheck","Skia","processTransform2d","transforms","m","Matrix","transform","key","Object","keys","value","preTranslate","preScale","preSkew","preRotate","Math","PI"],"mappings":"AAAA,SAASA,eAAT,QAAgC,iBAAhC;AACA,SAASC,IAAT,QAAqB,eAArB;AA+BA,OAAO,MAAMC,kBAAkB,GAAIC,UAAD,IAA8B;AAC9D,QAAMC,CAAC,GAAGH,IAAI,CAACI,MAAL,EAAV;;AACA,OAAK,MAAMC,SAAX,IAAwBH,UAAxB,EAAoC;AAClC,UAAMI,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,YAAF,CAAeD,KAAf,EAAsB,CAAtB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,YAAF,CAAe,CAAf,EAAkBD,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACQ,QAAF,CAAWF,KAAX,EAAkBA,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,QAAF,CAAWF,KAAX,EAAkB,CAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,QAAF,CAAW,CAAX,EAAcF,KAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,OAAF,CAAUH,KAAV,EAAiB,CAAjB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,OAAF,CAAU,CAAV,EAAaH,KAAb;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzCH,MAAAA,CAAC,CAACU,SAAF,CAAaJ,KAAK,GAAG,GAAT,GAAgBK,IAAI,CAACC,EAAjC;AACA;AACD;;AACDhB,IAAAA,eAAe,CAACO,GAAD,CAAf;AACD;;AACD,SAAOH,CAAP;AACD,CAxCM","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport { Skia } from \"../../../skia\";\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport const processTransform2d = (transforms: Transforms2d) => {\n  const m = Skia.Matrix();\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.preTranslate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.preTranslate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.preScale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.preScale(value, 0);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.preScale(0, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.preSkew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.preSkew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      m.preRotate((value * 180) / Math.PI);\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n"]}
+{"version":3,"sources":["Matrix3.ts"],"names":["exhaustiveCheck","Skia","processTransform2d","transforms","m","Matrix","transform","key","Object","keys","value","preTranslate","preScale","preSkew","preRotate","Math","PI"],"mappings":"AAAA,SAASA,eAAT,QAAgC,iBAAhC;AACA,SAASC,IAAT,QAAqB,eAArB;AA+BA,OAAO,MAAMC,kBAAkB,GAAIC,UAAD,IAA8B;AAC9D,QAAMC,CAAC,GAAGH,IAAI,CAACI,MAAL,EAAV;;AACA,OAAK,MAAMC,SAAX,IAAwBH,UAAxB,EAAoC;AAClC,UAAMI,GAAG,GAAGC,MAAM,CAACC,IAAP,CAAYH,SAAZ,EAAuB,CAAvB,CAAZ;AACA,UAAMI,KAAK,GAAIJ,SAAD,CAAiDC,GAAjD,CAAd;;AACA,QAAIA,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,YAAF,CAAeD,KAAf,EAAsB,CAAtB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,YAAZ,EAA0B;AACxBH,MAAAA,CAAC,CAACO,YAAF,CAAe,CAAf,EAAkBD,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACQ,QAAF,CAAWF,KAAX,EAAkBA,KAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,QAAF,CAAWF,KAAX,EAAkB,CAAlB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAZ,EAAsB;AACpBH,MAAAA,CAAC,CAACQ,QAAF,CAAW,CAAX,EAAcF,KAAd;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,OAAF,CAAUH,KAAV,EAAiB,CAAjB;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,OAAZ,EAAqB;AACnBH,MAAAA,CAAC,CAACS,OAAF,CAAU,CAAV,EAAaH,KAAb;AACA;AACD;;AACD,QAAIH,GAAG,KAAK,QAAR,IAAoBA,GAAG,KAAK,SAAhC,EAA2C;AACzCH,MAAAA,CAAC,CAACU,SAAF,CAAaJ,KAAK,GAAG,GAAT,GAAgBK,IAAI,CAACC,EAAjC;AACA;AACD;;AACDhB,IAAAA,eAAe,CAACO,GAAD,CAAf;AACD;;AACD,SAAOH,CAAP;AACD,CAxCM","sourcesContent":["import { exhaustiveCheck } from \"../../typeddash\";\nimport { Skia } from \"../../../skia\";\n\ntype Transform2dName =\n  | \"translateX\"\n  | \"translateY\"\n  | \"scale\"\n  | \"skewX\"\n  | \"skewY\"\n  | \"scaleX\"\n  | \"scaleY\"\n  | \"rotateZ\"\n  | \"rotate\";\n\nexport interface TransformProp {\n  transform?: Transforms2d;\n}\n\ntype Transformations = {\n  readonly [Name in Transform2dName]: number;\n};\nexport type Transforms2d = readonly (\n  | Pick<Transformations, \"translateX\">\n  | Pick<Transformations, \"translateY\">\n  | Pick<Transformations, \"scale\">\n  | Pick<Transformations, \"scaleX\">\n  | Pick<Transformations, \"scaleY\">\n  | Pick<Transformations, \"skewX\">\n  | Pick<Transformations, \"skewY\">\n  | Pick<Transformations, \"rotate\">\n)[];\n\nexport const processTransform2d = (transforms: Transforms2d) => {\n  const m = Skia.Matrix();\n  for (const transform of transforms) {\n    const key = Object.keys(transform)[0] as Transform2dName;\n    const value = (transform as Pick<Transformations, typeof key>)[key];\n    if (key === \"translateX\") {\n      m.preTranslate(value, 0);\n      continue;\n    }\n    if (key === \"translateY\") {\n      m.preTranslate(0, value);\n      continue;\n    }\n    if (key === \"scale\") {\n      m.preScale(value, value);\n      continue;\n    }\n    if (key === \"scaleX\") {\n      m.preScale(value, 1);\n      continue;\n    }\n    if (key === \"scaleY\") {\n      m.preScale(1, value);\n      continue;\n    }\n    if (key === \"skewX\") {\n      m.preSkew(value, 0);\n      continue;\n    }\n    if (key === \"skewY\") {\n      m.preSkew(0, value);\n      continue;\n    }\n    if (key === \"rotate\" || key === \"rotateZ\") {\n      m.preRotate((value * 180) / Math.PI);\n      continue;\n    }\n    exhaustiveCheck(key);\n  }\n  return m;\n};\n"]}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "React Native Skia",
-  "version": "0.1.125",
+  "version": "0.1.128",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [

package/react-native-skia.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/shopify/react-native-skia/react-native-skia.git", :tag => "#{s.version}" }
 
   s.requires_arc = true
-  s.xcconfig = {
+  s.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) SK_GL=1 SK_METAL=1',
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17'
   }

package/src/renderer/processors/math/Matrix3.ts

@@ -48,11 +48,11 @@ export const processTransform2d = (transforms: Transforms2d) => {
       continue;
     }
     if (key === "scaleX") {
-      m.preScale(value, 0);
+      m.preScale(value, 1);
       continue;
     }
     if (key === "scaleY") {
-      m.preScale(0, value);
+      m.preScale(1, value);
       continue;
     }
     if (key === "skewX") {