@shopify/react-native-skia 0.1.163 → 0.1.165

package/cpp/rnskia/dom/base/JsiDomRenderNode.h

@@ -18,12 +18,6 @@
 
 namespace RNSkia {
 
-static PropId PropNameOrigin = JsiPropId::get("origin");
-static PropId PropNameOpacity = JsiPropId::get("opacity");
-static PropId PropNameClip = JsiPropId::get("clip");
-static PropId PropNameInvertClip = JsiPropId::get("invertClip");
-static PropId PropNameLayer = JsiPropId::get("layer");
-
 class JsiDomRenderNode : public JsiDomNode {
 public:
   JsiDomRenderNode(std::shared_ptr<RNSkPlatformContext> context,
@@ -32,7 +26,7 @@ public:
 
   void render(DrawingContext *context) {
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "Begin Render");
+    printDebugInfo("Begin Render");
 #endif
 
     // Ensure we have a local drawing context inheriting from the parent context
@@ -50,27 +44,27 @@ public:
       if (_layerProp->isSet()) {
         if (_layerProp->isBool()) {
 #if SKIA_DOM_DEBUG
-          printDebugInfo(context, "canvas->saveLayer()");
+          printDebugInfo("canvas->saveLayer()");
 #endif
           _localContext->getCanvas()->saveLayer(
               SkCanvas::SaveLayerRec(nullptr, nullptr, nullptr, 0));
         } else {
 #if SKIA_DOM_DEBUG
-          printDebugInfo(context, "canvas->saveLayer(paint)");
+          printDebugInfo("canvas->saveLayer(paint)");
 #endif
           _localContext->getCanvas()->saveLayer(SkCanvas::SaveLayerRec(
               nullptr, _layerProp->getDerivedValue().get(), nullptr, 0));
         }
       } else {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->save()");
+        printDebugInfo("canvas->save()");
 #endif
         _localContext->getCanvas()->save();
       }
 
       if (_originProp->isSet()) {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->translate(origin)");
+        printDebugInfo("canvas->translate(origin)");
 #endif
         // Handle origin
         _localContext->getCanvas()->translate(
@@ -81,10 +75,9 @@ public:
       if (shouldTransform) {
 #if SKIA_DOM_DEBUG
         printDebugInfo(
-            context,
             "canvas->concat(" +
-                std::string(_matrixProp->isSet() ? "matrix" : "transform") +
-                std::string(")"));
+            std::string(_matrixProp->isSet() ? "matrix" : "transform") +
+            std::string(")"));
 #endif
         auto matrix = _matrixProp->isSet() ? _matrixProp->getDerivedValue()
                                            : _transformProp->getDerivedValue();
@@ -101,7 +94,7 @@ public:
 
       if (_originProp->isSet()) {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->translate(-origin)");
+        printDebugInfo("canvas->translate(-origin)");
 #endif
         // Handle origin
         _localContext->getCanvas()->translate(
@@ -124,13 +117,13 @@ public:
     // Restore if needed
     if (shouldSave) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->restore()");
+      printDebugInfo("canvas->restore()");
 #endif
       _localContext->getCanvas()->restore();
     }
 
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "End Render");
+    printDebugInfo("End Render");
 #endif
   }
 
@@ -158,41 +151,19 @@ public:
 
 protected:
   /**
-   Override to implement rendering where the current state of the drawing
-   context is correctly set.
-   */
-  virtual void renderNode(DrawingContext *context) = 0;
-
-  /**
-   Removes a child
-   */
-  void removeChild(std::shared_ptr<JsiDomNode> child) override {
-    JsiDomNode::removeChild(child);
-    if (_localContext != nullptr) {
-      _localContext->markAsChanged();
-    }
-  }
-
-  /**
-   Validates that only declaration nodes can be children
+   Invalidates and marks then context as changed.
    */
-  void addChild(std::shared_ptr<JsiDomNode> child) override {
-    JsiDomNode::addChild(child);
+  void invalidateContext() override {
     if (_localContext != nullptr) {
       _localContext->markAsChanged();
     }
   }
 
   /**
-   Validates that only declaration nodes can be children
+   Override to implement rendering where the current state of the drawing
+   context is correctly set.
    */
-  void insertChildBefore(std::shared_ptr<JsiDomNode> child,
-                         std::shared_ptr<JsiDomNode> before) override {
-    JsiDomNode::insertChildBefore(child, before);
-    if (_localContext != nullptr) {
-      _localContext->markAsChanged();
-    }
-  }
+  virtual void renderNode(DrawingContext *context) = 0;
 
   /**
    Define common properties for all render nodes
@@ -200,20 +171,14 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomNode::defineProperties(container);
 
-    _paintProps = container->defineProperty(std::make_shared<PaintProps>());
-
-    _matrixProp =
-        container->defineProperty(std::make_shared<MatrixProp>(PropNameMatrix));
-    _transformProp = container->defineProperty(
-        std::make_shared<TransformProp>(PropNameTransform));
-    _originProp =
-        container->defineProperty(std::make_shared<PointProp>(PropNameOrigin));
-    _clipProp =
-        container->defineProperty(std::make_shared<ClipProp>(PropNameClip));
-    _invertClip = container->defineProperty(
-        std::make_shared<NodeProp>(PropNameInvertClip));
-    _layerProp =
-        container->defineProperty(std::make_shared<LayerProp>(PropNameLayer));
+    _paintProps = container->defineProperty<PaintProps>();
+
+    _matrixProp = container->defineProperty<MatrixProp>("matrix");
+    _transformProp = container->defineProperty<TransformProp>("transform");
+    _originProp = container->defineProperty<PointProp>("origin");
+    _clipProp = container->defineProperty<ClipProp>("clip");
+    _invertClip = container->defineProperty<NodeProp>("invertClip");
+    _layerProp = container->defineProperty<LayerProp>("layer");
   }
 
 private:
@@ -224,17 +189,17 @@ private:
     auto op = invert ? SkClipOp::kDifference : SkClipOp::kIntersect;
     if (_clipProp->getRect() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipRect()");
+      printDebugInfo("canvas->clipRect()");
 #endif
       canvas->clipRect(*_clipProp->getRect(), op, true);
     } else if (_clipProp->getRRect() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipRRect()");
+      printDebugInfo("canvas->clipRRect()");
 #endif
       canvas->clipRRect(*_clipProp->getRRect(), op, true);
     } else if (_clipProp->getPath() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipPath()");
+      printDebugInfo("canvas->clipPath()");
 #endif
       canvas->clipPath(*_clipProp->getPath(), op, true);
     }

package/cpp/rnskia/dom/base/NodeProp.h

@@ -19,7 +19,8 @@ public:
   /**
    Constructs a new optional dom node properrty
    */
-  explicit NodeProp(PropId name) : _name(name), BaseNodeProp() {}
+  explicit NodeProp(const std::string &name)
+      : _name(JsiPropId::get(name)), BaseNodeProp() {}
 
   /**
    Reads JS value and swaps out with a new value

package/cpp/rnskia/dom/base/NodePropsContainer.h

@@ -110,6 +110,16 @@ public:
     return prop.get();
   }
 
+  /**
+   Defines a property that will be updated with the container changes.
+   */
+  template <class _Tp, class... _Args,
+            class = std::_EnableIf<!std::is_array<_Tp>::value>>
+  _Tp *defineProperty(_Args &&...__args) {
+    return defineProperty(
+        std::make_shared<_Tp>(std::forward<_Args>(__args)...));
+  }
+
 private:
   std::vector<std::shared_ptr<BaseNodeProp>> _properties;
   std::map<PropId, std::vector<NodeProp *>> _mappedProperties;

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

@@ -70,8 +70,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _blendProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("mode")));
+    _blendProp = container->defineProperty<BlendModeProp>("mode");
     _blendProp->require();
   }
 

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

@@ -44,12 +44,9 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _style = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("style")));
-    _respectCTM = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("respectCTM")));
-    _blur = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("blur")));
+    _style = container->defineProperty<NodeProp>("style");
+    _respectCTM = container->defineProperty<NodeProp>("respectCTM");
+    _blur = container->defineProperty<NodeProp>("blur");
 
     _blur->require();
   }

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

@@ -76,10 +76,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomRenderNode::defineProperties(container);
-    _rrectProp = container->defineProperty(
-        std::make_shared<RRectProp>(JsiPropId::get("box")));
-    _rectProp = container->defineProperty(
-        std::make_shared<RectProp>(JsiPropId::get("box")));
+    _rrectProp = container->defineProperty<RRectProp>("box");
+    _rectProp = container->defineProperty<RectProp>("box");
   }
 
 private:

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

@@ -22,8 +22,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _boxShadowProps =
-        container->defineProperty(std::make_shared<BoxShadowProps>());
+    _boxShadowProps = container->defineProperty<BoxShadowProps>();
   }
 
 private:

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

@@ -22,11 +22,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _circleProp = container->defineProperty(std::make_shared<CircleProp>());
-    _radiusProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameR));
-
-    _circleProp->require();
+    _circleProp = container->defineProperty<CircleProp>();
+    _radiusProp = container->defineProperty<NodeProp>("r");
     _radiusProp->require();
   }
 

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

@@ -28,7 +28,6 @@ protected:
         float scaledWidth = context->getScaledWidth();
         float scaledHeight = context->getScaledHeight();
         auto paint = context->getPaint();
-        auto opacity = context->getOpacity();
         auto platformContext = getContext();
         auto requestRedraw = context->getRequestRedraw();
 
@@ -44,7 +43,7 @@ protected:
         }
 
         // Run rendering on the javascript thread
-        getContext()->runOnJavascriptThread([this, platformContext, opacity,
+        getContext()->runOnJavascriptThread([this, platformContext,
                                              requestRedraw, scaledWidth,
                                              scaledHeight]() {
           // Get the runtime
@@ -65,7 +64,6 @@ protected:
               *runtime, "paint",
               jsi::Object::createFromHostObject(*runtime, this->_jsiPaint));
 
-          jsiCtx.setProperty(*runtime, "opacity", opacity);
           jsiCtx.setProperty(
               *runtime, "canvas",
               jsi::Object::createFromHostObject(*runtime, jsiCanvas));
@@ -100,8 +98,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,18 +382,16 @@ 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<UniformsProp>("uniforms", _sourceProp);
 
     _sourceProp->require();
   }
 
 private:
   NodeProp *_sourceProp;
-  SimpleUniformsProp *_uniformsProp;
+  UniformsProp *_uniformsProp;
 };
 
 } // namespace RNSkia

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();
   }