@shopify/react-native-skia 0.1.162 → 0.1.164

package/cpp/rnskia/dom/nodes/JsiColorFilterNodes.h

@@ -77,8 +77,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _matrixProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("matrix")));
+    _matrixProp = container->defineProperty<NodeProp>("matrix");
     _matrixProp->require();
   }
 
@@ -103,10 +102,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _blendModeProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("mode")));
-    _colorProp = container->defineProperty(
-        std::make_shared<ColorProp>(JsiPropId::get("color")));
+    _blendModeProp = container->defineProperty<BlendModeProp>("mode");
+    _colorProp = container->defineProperty<ColorProp>("color");
 
     _blendModeProp->require();
     _colorProp->require();
@@ -180,8 +177,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _tProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("t")));
+    _tProp = container->defineProperty<NodeProp>("t");
     _tProp->require();
   }
 

package/cpp/rnskia/dom/nodes/JsiCustomDrawingNode.h

@@ -100,8 +100,7 @@ protected:
         std::bind(&JsiCustomDrawingNode::notifyPictureNeeded, this,
                   std::placeholders::_1);
 
-    _drawingProp = container->defineProperty(
-        std::make_shared<DrawingProp>(JsiPropId::get("drawing"), cb));
+    _drawingProp = container->defineProperty<DrawingProp>("drawing", cb);
   }
 
 private:

package/cpp/rnskia/dom/nodes/JsiDiffRectNode.h

@@ -7,9 +7,6 @@
 
 namespace RNSkia {
 
-static PropId PropNameInner = JsiPropId::get("inner");
-static PropId PropNameOuter = JsiPropId::get("outer");
-
 class JsiDiffRectNode : public JsiDomDrawingNode,
                         public JsiDomNodeCtor<JsiDiffRectNode> {
 public:
@@ -25,10 +22,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _innerRectProp =
-        container->defineProperty(std::make_shared<RRectProp>(PropNameInner));
-    _outerRectProp =
-        container->defineProperty(std::make_shared<RRectProp>(PropNameOuter));
+    _innerRectProp = container->defineProperty<RRectProp>("inner");
+    _outerRectProp = container->defineProperty<RRectProp>("outer");
 
     _innerRectProp->require();
     _outerRectProp->require();

package/cpp/rnskia/dom/nodes/JsiGlyphsNode.h

@@ -31,14 +31,10 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
 
-    _fontProp = container->defineProperty(
-        std::make_shared<FontProp>(JsiPropId::get("font")));
-    _glyphsProp = container->defineProperty(
-        std::make_shared<GlyphsProp>(JsiPropId::get("glyphs")));
-    _xProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("x")));
-    _yProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("y")));
+    _fontProp = container->defineProperty<FontProp>("font");
+    _glyphsProp = container->defineProperty<GlyphsProp>("glyphs");
+    _xProp = container->defineProperty<NodeProp>("x");
+    _yProp = container->defineProperty<NodeProp>("y");
 
     _fontProp->require();
     _glyphsProp->require();

package/cpp/rnskia/dom/nodes/JsiImageFilterNodes.h

@@ -94,8 +94,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _blendModeProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("mode")));
+    _blendModeProp = container->defineProperty<BlendModeProp>("mode");
     _blendModeProp->require();
   }
 
@@ -154,19 +153,13 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _dxProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("dx")));
-    _dyProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("dy")));
-    _blurProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("blur")));
-    _colorProp = container->defineProperty(
-        std::make_shared<ColorProp>(JsiPropId::get("color")));
-
-    _innerProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("inner")));
-    _shadowOnlyProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("shadowOnly")));
+    _dxProp = container->defineProperty<NodeProp>("dx");
+    _dyProp = container->defineProperty<NodeProp>("dy");
+    _blurProp = container->defineProperty<NodeProp>("blur");
+    _colorProp = container->defineProperty<ColorProp>("color");
+
+    _innerProp = container->defineProperty<NodeProp>("inner");
+    _shadowOnlyProp = container->defineProperty<NodeProp>("shadowOnly");
 
     _dxProp->require();
     _dyProp->require();
@@ -212,12 +205,9 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _channelXProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("channelX")));
-    _channelYProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("channelY")));
-    _scaleProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("scale")));
+    _channelXProp = container->defineProperty<NodeProp>("channelX");
+    _channelYProp = container->defineProperty<NodeProp>("channelY");
+    _scaleProp = container->defineProperty<NodeProp>("scale");
 
     _channelXProp->require();
     _channelYProp->require();
@@ -266,10 +256,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _blurProp = container->defineProperty(
-        std::make_shared<RadiusProp>(JsiPropId::get("blur")));
-    _tileModeProp = container->defineProperty(
-        std::make_shared<TileModeProp>(JsiPropId::get("mode")));
+    _blurProp = container->defineProperty<RadiusProp>("blur");
+    _tileModeProp = container->defineProperty<TileModeProp>("mode");
 
     _blurProp->require();
   }
@@ -302,10 +290,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _xProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("x")));
-    _yProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("y")));
+    _xProp = container->defineProperty<NodeProp>("x");
+    _yProp = container->defineProperty<NodeProp>("y");
 
     _xProp->require();
     _yProp->require();
@@ -346,10 +332,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _operatorProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("operator")));
-    _radiusProp = container->defineProperty(
-        std::make_shared<RadiusProp>(JsiPropId::get("radius")));
+    _operatorProp = container->defineProperty<NodeProp>("operator");
+    _radiusProp = container->defineProperty<RadiusProp>("radius");
 
     _operatorProp->require();
     _radiusProp->require();
@@ -398,11 +382,9 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _sourceProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("source")));
+    _sourceProp = container->defineProperty<NodeProp>("source");
     _uniformsProp =
-        container->defineProperty(std::make_shared<SimpleUniformsProp>(
-            JsiPropId::get("uniforms"), _sourceProp));
+        container->defineProperty<SimpleUniformsProp>("uniforms", _sourceProp);
 
     _sourceProp->require();
   }

package/cpp/rnskia/dom/nodes/JsiImageNode.h

@@ -23,7 +23,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _imageProps = container->defineProperty(std::make_shared<ImageProps>());
+    _imageProps = container->defineProperty<ImageProps>();
     _imageProps->require();
   }
 

package/cpp/rnskia/dom/nodes/JsiImageSvgNode.h

@@ -28,10 +28,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _svgDomProp = container->defineProperty(
-        std::make_shared<SvgProp>(JsiPropId::get("svg")));
-    _rectProp = container->defineProperty(
-        std::make_shared<RectProps>(JsiPropId::get("rect")));
+    _svgDomProp = container->defineProperty<SvgProp>("svg");
+    _rectProp = container->defineProperty<RectProps>("rect");
 
     _svgDomProp->require();
   }

package/cpp/rnskia/dom/nodes/JsiLineNode.h

@@ -7,9 +7,6 @@
 
 namespace RNSkia {
 
-static PropId PropNamePoint1 = JsiPropId::get("p1");
-static PropId PropNamePoint2 = JsiPropId::get("p2");
-
 class JsiLineNode : public JsiDomDrawingNode,
                     public JsiDomNodeCtor<JsiLineNode> {
 public:
@@ -26,10 +23,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _p1Prop =
-        container->defineProperty(std::make_shared<PointProp>(PropNamePoint1));
-    _p2Prop =
-        container->defineProperty(std::make_shared<PointProp>(PropNamePoint2));
+    _p1Prop = container->defineProperty<PointProp>("p1");
+    _p2Prop = container->defineProperty<PointProp>("p2");
 
     _p1Prop->require();
     _p2Prop->require();

package/cpp/rnskia/dom/nodes/JsiOvalNode.h

@@ -15,15 +15,13 @@ public:
 
 protected:
   void draw(DrawingContext *context) override {
-    RNSkLogger::logToConsole(context->getDebugDescription());
     context->getCanvas()->drawOval(*_rectProp->getDerivedValue(),
                                    *context->getPaint());
   }
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _rectProp =
-        container->defineProperty(std::make_shared<RectProps>(PropNameRect));
+    _rectProp = container->defineProperty<RectProps>("rect");
     _rectProp->require();
   }
 

package/cpp/rnskia/dom/nodes/JsiPaintNode.h

@@ -64,9 +64,8 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _paintProps = container->defineProperty(std::make_shared<PaintProps>());
-    _opacityProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameOpacity));
+    _paintProps = container->defineProperty<PaintProps>();
+    _opacityProp = container->defineProperty<NodeProp>("opacity");
   }
 
 private:

package/cpp/rnskia/dom/nodes/JsiPatchNode.h

@@ -32,14 +32,10 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _colorsProp = container->defineProperty(
-        std::make_shared<ColorsProp>(JsiPropId::get("colors")));
-    _textureProp = container->defineProperty(
-        std::make_shared<PointsProp>(JsiPropId::get("texture")));
-    _blendModeProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("blendMode")));
-    _patchProp = container->defineProperty(
-        std::make_shared<BezierProp>(JsiPropId::get("patch")));
+    _colorsProp = container->defineProperty<ColorsProp>("colors");
+    _textureProp = container->defineProperty<PointsProp>("texture");
+    _blendModeProp = container->defineProperty<BlendModeProp>("blendMode");
+    _patchProp = container->defineProperty<BezierProp>("patch");
 
     _patchProp->require();
   }

package/cpp/rnskia/dom/nodes/JsiPathEffectNodes.h

@@ -85,10 +85,8 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _intervals = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("intervals")));
-    _phase = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("phase")));
+    _intervals = container->defineProperty<NodeProp>("intervals");
+    _phase = container->defineProperty<NodeProp>("phase");
 
     _intervals->require();
   }
@@ -123,12 +121,9 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _lengthProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("length")));
-    _deviationProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("deviation")));
-    _seedProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("seed")));
+    _lengthProp = container->defineProperty<NodeProp>("length");
+    _deviationProp = container->defineProperty<NodeProp>("deviation");
+    _seedProp = container->defineProperty<NodeProp>("seed");
 
     _lengthProp->require();
     _deviationProp->require();
@@ -161,8 +156,7 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _rProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("r")));
+    _rProp = container->defineProperty<NodeProp>("r");
     _rProp->require();
   }
 
@@ -193,14 +187,10 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _phaseProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("phase")));
-    _advanceProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("advance")));
-    _pathProp = container->defineProperty(
-        std::make_shared<PathProp>(JsiPropId::get("path")));
-    _styleProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("style")));
+    _phaseProp = container->defineProperty<NodeProp>("phase");
+    _advanceProp = container->defineProperty<NodeProp>("advance");
+    _pathProp = container->defineProperty<PathProp>("path");
+    _styleProp = container->defineProperty<NodeProp>("style");
 
     _phaseProp->require();
     _advanceProp->require();
@@ -248,10 +238,8 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _matrixProp = container->defineProperty(
-        std::make_shared<MatrixProp>(JsiPropId::get("matrix")));
-    _pathProp = container->defineProperty(
-        std::make_shared<PathProp>(JsiPropId::get("path")));
+    _matrixProp = container->defineProperty<MatrixProp>("matrix");
+    _pathProp = container->defineProperty<PathProp>("path");
 
     _matrixProp->require();
     _pathProp->require();
@@ -283,10 +271,8 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _matrixProp = container->defineProperty(
-        std::make_shared<MatrixProp>(JsiPropId::get("matrix")));
-    _widthProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("width")));
+    _matrixProp = container->defineProperty<MatrixProp>("matrix");
+    _widthProp = container->defineProperty<NodeProp>("width");
 
     _matrixProp->require();
     _widthProp->require();

package/cpp/rnskia/dom/nodes/JsiPathNode.h

@@ -15,12 +15,7 @@
 
 namespace RNSkia {
 
-static PropId PropNamePath = JsiPropId::get("path");
-static PropId PropNameStart = JsiPropId::get("start");
-static PropId PropNameEnd = JsiPropId::get("end");
-static PropId PropNameFillType = JsiPropId::get("fillType");
 static PropId PropNameMiterLimit = JsiPropId::get("miter_limit");
-static PropId PropNameStroke = JsiPropId::get("stroke");
 static PropId PropNamePrecision = JsiPropId::get("precision");
 
 class JsiPathNode : public JsiDomDrawingNode,
@@ -43,25 +38,27 @@ protected:
           _strokeOptsProp->isSet() &&
           _strokeOptsProp->value().getType() == PropType::Object;
 
-      auto willMutatePath =
-          hasStartOffset || hasEndOffset || hasFillStyle || hasStrokeOptions;
+      auto willMutatePath = hasStartOffset == true || hasEndOffset == true ||
+                            hasFillStyle == true || hasStrokeOptions == true;
 
       if (willMutatePath) {
         // We'll trim the path
         SkPath filteredPath(*_pathProp->getDerivedValue());
-        auto pe = SkTrimPathEffect::Make(_startProp->value().getAsNumber(),
-                                         _endProp->value().getAsNumber(),
-                                         SkTrimPathEffect::Mode::kNormal);
+        auto start =
+            _startProp->isSet() ? _startProp->value().getAsNumber() : 0.0;
+        auto end = _endProp->isSet() ? _endProp->value().getAsNumber() : 1.0;
+        auto pe =
+            SkTrimPathEffect::Make(start, end, SkTrimPathEffect::Mode::kNormal);
 
         if (pe != nullptr) {
           SkStrokeRec rec(SkStrokeRec::InitStyle::kHairline_InitStyle);
-          if (!pe->filterPath(_pathProp->getDerivedValue().get(), filteredPath,
-                              &rec, nullptr)) {
+          if (!pe->filterPath(&filteredPath, filteredPath, &rec, nullptr)) {
             throw std::runtime_error(
                 "Failed trimming path with parameters start: " +
                 std::to_string(_startProp->value().getAsNumber()) +
                 ", end: " + std::to_string(_endProp->value().getAsNumber()));
           }
+          filteredPath.swap(filteredPath);
           _path = std::make_shared<SkPath>(filteredPath);
         } else if (hasStartOffset || hasEndOffset) {
           throw std::runtime_error(
@@ -69,7 +66,7 @@ protected:
               std::to_string(_startProp->value().getAsNumber()) +
               ", end: " + std::to_string(_endProp->value().getAsNumber()));
         } else {
-          _path = std::make_shared<SkPath>(*_pathProp->getDerivedValue());
+          _path = std::make_shared<SkPath>(filteredPath);
         }
 
         // Set fill style
@@ -130,16 +127,11 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _pathProp =
-        container->defineProperty(std::make_shared<PathProp>(PropNamePath));
-    _startProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameStart));
-    _endProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameEnd));
-    _fillTypeProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameFillType));
-    _strokeOptsProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameStroke));
+    _pathProp = container->defineProperty<PathProp>("path");
+    _startProp = container->defineProperty<NodeProp>("start");
+    _endProp = container->defineProperty<NodeProp>("end");
+    _fillTypeProp = container->defineProperty<NodeProp>("fillType");
+    _strokeOptsProp = container->defineProperty<NodeProp>("stroke");
 
     _pathProp->require();
   }
@@ -171,7 +163,7 @@ private:
 class StrokeOptsProps : public BaseDerivedProp {
 public:
   StrokeOptsProps() : BaseDerivedProp() {
-    _strokeProp = addProperty(std::make_shared<NodeProp>(PropNameStroke));
+    _strokeProp = addProperty(std::make_shared<NodeProp>("stroke"));
   }
 
 private:

package/cpp/rnskia/dom/nodes/JsiPictureNode.h

@@ -20,8 +20,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _pictureProp = container->defineProperty(
-        std::make_shared<PictureProp>(JsiPropId::get("picture")));
+    _pictureProp = container->defineProperty<PictureProp>("picture");
     _pictureProp->require();
   }
 

package/cpp/rnskia/dom/nodes/JsiPointsNode.h

@@ -14,7 +14,6 @@
 
 namespace RNSkia {
 
-static PropId PropNamePoints = JsiPropId::get("points");
 static PropId PropNamePointsMode = JsiPropId::get("mode");
 
 class JsiPointsNode : public JsiDomDrawingNode,
@@ -34,10 +33,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _pointModeProp = container->defineProperty(
-        std::make_shared<PointModeProp>(PropNamePointsMode));
-    _pointsProp =
-        container->defineProperty(std::make_shared<PointsProp>(PropNamePoints));
+    _pointModeProp = container->defineProperty<PointModeProp>("mode");
+    _pointsProp = container->defineProperty<PointsProp>("points");
 
     _pointsProp->require();
     _pointModeProp->require();

package/cpp/rnskia/dom/nodes/JsiRRectNode.h

@@ -22,8 +22,7 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
 
-    _rrectProp =
-        container->defineProperty(std::make_shared<RRectProps>(PropNameRect));
+    _rrectProp = container->defineProperty<RRectProps>("rect");
     _rrectProp->require();
   }
 

package/cpp/rnskia/dom/nodes/JsiRectNode.h

@@ -22,8 +22,7 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
 
-    _rectProp =
-        container->defineProperty(std::make_shared<RectProps>(PropNameRect));
+    _rectProp = container->defineProperty<RectProps>("rect");
     _rectProp->require();
   }