@shopify/react-native-skia 0.1.163 → 0.1.165

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,
@@ -132,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();
   }
@@ -173,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();
   }
 

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

@@ -89,12 +89,10 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _sourceProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("source")));
-    _uniformsProp = container->defineProperty(std::make_shared<UniformsProp>(
-        JsiPropId::get("uniforms"), _sourceProp));
-    _transformProp = container->defineProperty(
-        std::make_shared<TransformProp>(JsiPropId::get("transform")));
+    _sourceProp = container->defineProperty<NodeProp>("source");
+    _uniformsProp =
+        container->defineProperty<UniformsProp>("uniforms", _sourceProp);
+    _transformProp = container->defineProperty<TransformProp>("transform");
 
     _sourceProp->require();
   }
@@ -141,18 +139,13 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _txProp = container->defineProperty(
-        std::make_shared<TileModeProp>(JsiPropId::get("tx")));
-    _tyProp = container->defineProperty(
-        std::make_shared<TileModeProp>(JsiPropId::get("ty")));
-    _filterModeProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("fm")));
-    _mipmapModeProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("mm")));
-
-    _imageProps = container->defineProperty(std::make_shared<ImageProps>());
-    _transformProp = container->defineProperty(
-        std::make_shared<TransformProp>(JsiPropId::get("transform")));
+    _txProp = container->defineProperty<TileModeProp>("tx");
+    _tyProp = container->defineProperty<TileModeProp>("ty");
+    _filterModeProp = container->defineProperty<NodeProp>("fm");
+    _mipmapModeProp = container->defineProperty<NodeProp>("mm");
+
+    _imageProps = container->defineProperty<ImageProps>();
+    _transformProp = container->defineProperty<TransformProp>("transform");
 
     _txProp->require();
     _tyProp->require();
@@ -161,10 +154,8 @@ protected:
 
     _transformProp->require();
 
-    // Just require the image
-    container
-        ->defineProperty(std::make_shared<NodeProp>(JsiPropId::get("image")))
-        ->require();
+    // Add and require the image
+    container->defineProperty<NodeProp>("image")->require();
   }
 
 private:
@@ -221,8 +212,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _colorProp = container->defineProperty(
-        std::make_shared<ColorProp>(JsiPropId::get("color")));
+    _colorProp = container->defineProperty<ColorProp>("color");
     _colorProp->require();
   }
 
@@ -239,18 +229,12 @@ public:
 protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _freqXProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("freqX")));
-    _freqYProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("freqY")));
-    _octavesProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("octaves")));
-    _seedProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("seed")));
-    _tileWidthProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("tileWidth")));
-    _tileHeightProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("tileHeight")));
+    _freqXProp = container->defineProperty<NodeProp>("freqX");
+    _freqYProp = container->defineProperty<NodeProp>("freqY");
+    _octavesProp = container->defineProperty<NodeProp>("octaves");
+    _seedProp = container->defineProperty<NodeProp>("seed");
+    _tileWidthProp = container->defineProperty<NodeProp>("tileWidth");
+    _tileHeightProp = container->defineProperty<NodeProp>("tileHeight");
 
     _freqXProp->require();
     _freqYProp->require();
@@ -317,17 +301,12 @@ public:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _transformsProps =
-        container->defineProperty(std::make_shared<TransformsProps>());
-
-    _colorsProp = container->defineProperty(
-        std::make_shared<ColorsProp>(JsiPropId::get("colors")));
-    _positionsProp = container->defineProperty(
-        std::make_shared<NumbersProp>(JsiPropId::get("positions")));
-    _modeProp = container->defineProperty(
-        std::make_shared<TileModeProp>(JsiPropId::get("mode")));
-    _flagsProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("flags")));
+    _transformsProps = container->defineProperty<TransformsProps>();
+
+    _colorsProp = container->defineProperty<ColorsProp>("colors");
+    _positionsProp = container->defineProperty<NumbersProp>("positions");
+    _modeProp = container->defineProperty<TileModeProp>("mode");
+    _flagsProp = container->defineProperty<NodeProp>("flags");
 
     _colorsProp->require();
   }
@@ -385,10 +364,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseGradientNode::defineProperties(container);
-    _startProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("start")));
-    _endProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("end")));
+    _startProp = container->defineProperty<PointProp>("start");
+    _endProp = container->defineProperty<PointProp>("end");
 
     _startProp->require();
     _endProp->require();
@@ -420,10 +397,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseGradientNode::defineProperties(container);
-    _centerProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("c")));
-    _radiusProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("r")));
+    _centerProp = container->defineProperty<PointProp>("c");
+    _radiusProp = container->defineProperty<NodeProp>("r");
 
     _centerProp->require();
     _radiusProp->require();
@@ -457,12 +432,9 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseGradientNode::defineProperties(container);
-    _startProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("start")));
-    _endProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("end")));
-    _centerProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("c")));
+    _startProp = container->defineProperty<NodeProp>("start");
+    _endProp = container->defineProperty<NodeProp>("end");
+    _centerProp = container->defineProperty<PointProp>("c");
   }
 
 private:
@@ -497,14 +469,10 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseGradientNode::defineProperties(container);
-    _startProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("start")));
-    _startRProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("startR")));
-    _endProp = container->defineProperty(
-        std::make_shared<PointProp>(JsiPropId::get("end")));
-    _endRProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("endR")));
+    _startProp = container->defineProperty<PointProp>("start");
+    _startRProp = container->defineProperty<NodeProp>("startR");
+    _endProp = container->defineProperty<PointProp>("end");
+    _endRProp = container->defineProperty<NodeProp>("endR");
   }
 
 private:

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

@@ -26,12 +26,9 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
 
-    _textBlobProp = container->defineProperty(
-        std::make_shared<TextBlobProp>(JsiPropId::get("blob")));
-    _xProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("x")));
-    _yProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("y")));
+    _textBlobProp = container->defineProperty<TextBlobProp>("blob");
+    _xProp = container->defineProperty<NodeProp>("x");
+    _yProp = container->defineProperty<NodeProp>("y");
 
     _textBlobProp->require();
     _xProp->require();

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

@@ -29,14 +29,10 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
 
-    _fontProp = container->defineProperty(
-        std::make_shared<FontProp>(JsiPropId::get("font")));
-    _textProp = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("text")));
-    _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");
+    _textProp = container->defineProperty<NodeProp>("text");
+    _xProp = container->defineProperty<NodeProp>("x");
+    _yProp = container->defineProperty<NodeProp>("y");
 
     _fontProp->require();
     _textProp->require();

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

@@ -21,8 +21,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _textBlobProp =
-        container->defineProperty(std::make_shared<TextPathBlobProp>());
+    _textBlobProp = container->defineProperty<TextPathBlobProp>();
   }
 
 private:

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

@@ -29,10 +29,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _verticesProps =
-        container->defineProperty(std::make_shared<VerticesProps>());
-    _blendModeProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("blendMode")));
+    _verticesProps = container->defineProperty<VerticesProps>();
+    _blendModeProp = container->defineProperty<BlendModeProp>("blendMode");
   }
 
 private:

package/cpp/rnskia/dom/props/CircleProp.h

@@ -34,6 +34,8 @@ public:
                                     _cy->value().getAsNumber()));
     } else if (_c->isSet()) {
       setDerivedValue(_c->getDerivedValue());
+    } else {
+      setDerivedValue(SkPoint::Make(0.0, 0.0));
     }
   }
 

package/cpp/rnskia/dom/props/ColorProp.h

@@ -9,6 +9,11 @@
 
 namespace RNSkia {
 
+static PropId PropName0 = JsiPropId::get("0");
+static PropId PropName1 = JsiPropId::get("1");
+static PropId PropName2 = JsiPropId::get("2");
+static PropId PropName3 = JsiPropId::get("3");
+
 class ColorProp : public DerivedProp<SkColor> {
 public:
   explicit ColorProp(PropId name) : DerivedProp<SkColor>() {
@@ -28,10 +33,10 @@ public:
   static SkColor parseColorValue(const JsiValue &color) {
     if (color.getType() == PropType::Object) {
       // Float array
-      auto r = color.getValue(JsiPropId::get("0"));
-      auto g = color.getValue(JsiPropId::get("1"));
-      auto b = color.getValue(JsiPropId::get("2"));
-      auto a = color.getValue(JsiPropId::get("3"));
+      auto r = color.getValue(PropName0);
+      auto g = color.getValue(PropName1);
+      auto b = color.getValue(PropName2);
+      auto a = color.getValue(PropName3);
       return SkColorSetARGB(a.getAsNumber() * 255.0f, r.getAsNumber() * 255.0f,
                             g.getAsNumber() * 255.0f, b.getAsNumber() * 255.0f);
 

package/cpp/rnskia/dom/props/ImageProps.h

@@ -30,7 +30,8 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_imageProp->value().getType() != PropType::HostObject) {
+    if (!_imageProp->isSet() ||
+        _imageProp->value().getType() != PropType::HostObject) {
       throw std::runtime_error("Expected SkImage object for the " +
                                std::string(getName()) + " property.");
     }
@@ -67,7 +68,7 @@ public:
 
     auto rect = _rectProp->getDerivedValue() ? *_rectProp->getDerivedValue()
                                              : imageRect;
-    auto fit = _fitProp->isSet() ? _fitProp->value().getAsString() : "none";
+    auto fit = _fitProp->isSet() ? _fitProp->value().getAsString() : "contain";
 
     setDerivedValue(fitRects(fit, imageRect, rect));
   }

package/cpp/rnskia/dom/props/PaintProps.h

@@ -92,23 +92,31 @@ public:
 
     // Opacity
     if (_opacity->isChanged() || context->isChanged()) {
+      auto parent = context->getParent();
+      auto paint = context->getMutablePaint();
       if (_opacity->isSet()) {
-        context->setOpacity(context->getOpacity() *
-                            _opacity->value().getAsNumber());
+        auto currentOpacity = _opacity->value().getAsNumber();
+        auto parent = context->getParent();
+        if (parent != nullptr) {
+          currentOpacity *= parent->getPaint()->getAlphaf();
+        }
+        paint->setAlphaf(currentOpacity);
       } else {
-        context->clearOpacity();
+        if (parent != nullptr) {
+          paint->setAlphaf(parent->getPaint()->getAlphaf());
+        } else {
+          paint->setAlphaf(1.0);
+        }
       }
     }
 
     // COLOR
     if (_color->isSet() && (_color->isChanged() || context->isChanged())) {
       auto paint = context->getMutablePaint();
+      auto opacity = paint->getAlphaf();
       paint->setShader(nullptr);
       paint->setColor(*_color->getDerivedValue());
-      paint->setAlphaf(context->getOpacity() * paint->getColor4f().fA);
-    } else if (context->isChanged()) {
-      auto paint = context->getMutablePaint();
-      paint->setAlphaf(context->getOpacity());
+      paint->setAlphaf(opacity * paint->getColor4f().fA);
     }
 
     // Style

package/cpp/rnskia/dom/props/RectProp.h

@@ -76,10 +76,17 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_x->isSet() && _y->isSet() && _width->isSet() && _height->isSet()) {
-      setDerivedValue(SkRect::MakeXYWH(
-          _x->value().getAsNumber(), _y->value().getAsNumber(),
-          _width->value().getAsNumber(), _height->value().getAsNumber()));
+    if (_width->isSet() && _height->isSet()) {
+      auto x = 0.0;
+      auto y = 0.0;
+      if (_x->isSet()) {
+        x = _x->value().getAsNumber();
+      }
+      if (_y->isSet()) {
+        y = _y->value().getAsNumber();
+      }
+      setDerivedValue(SkRect::MakeXYWH(x, y, _width->value().getAsNumber(),
+                                       _height->value().getAsNumber()));
     }
   }
 

package/cpp/rnskia/dom/props/TransformProp.h

@@ -8,8 +8,6 @@
 
 namespace RNSkia {
 
-static PropId PropNameTransform = JsiPropId::get("transform");
-
 static PropId PropNameTranslateX = JsiPropId::get("translateX");
 static PropId PropNameTranslateY = JsiPropId::get("translateY");
 static PropId PropNameScale = JsiPropId::get("scale");