@shopify/react-native-skia 0.1.180 → 0.1.182

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

@@ -22,32 +22,34 @@ public:
     _pathProp = defineProperty<NodeProp>(name);
   }
 
-  void updateDerivedValue() override {
-    if (!_pathProp->isSet()) {
-      setDerivedValue(nullptr);
-      return;
-    }
-
-    if (_pathProp->value().getType() == PropType::HostObject) {
+  static std::shared_ptr<SkPath> processPath(const JsiValue &value) {
+    if (value.getType() == PropType::HostObject) {
       // Try reading as Path
-      auto ptr = std::dynamic_pointer_cast<JsiSkPath>(
-          _pathProp->value().getAsHostObject());
+      auto ptr = std::dynamic_pointer_cast<JsiSkPath>(value.getAsHostObject());
       if (ptr != nullptr) {
-        setDerivedValue(ptr->getObject());
+        return ptr->getObject();
       }
-    } else if (_pathProp->value().getType() == PropType::String) {
+    } else if (value.getType() == PropType::String) {
       // Read as string
-      auto pathString = _pathProp->value().getAsString();
+      auto pathString = value.getAsString();
       SkPath result;
 
       if (SkParsePath::FromSVGString(pathString.c_str(), &result)) {
-        setDerivedValue(std::make_shared<SkPath>(result));
+        return std::make_shared<SkPath>(result);
       } else {
         throw std::runtime_error("Could not parse path from string.");
       }
-    } else {
+    }
+    return nullptr;
+  }
+
+  void updateDerivedValue() override {
+    if (!_pathProp->isSet()) {
       setDerivedValue(nullptr);
+      return;
     }
+    auto value = _pathProp->value();
+    setDerivedValue(PathProp::processPath(value));
   }
 
 private:

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

@@ -29,7 +29,7 @@ public:
   void updateDerivedValue() override {
     if (_pointProp->isSet()) {
       // Check for JsiSkRect and JsiSkPoint
-      setDerivedValue(std::move(processValue(_pointProp->value())));
+      setDerivedValue(processValue(_pointProp->value()));
     } else {
       setDerivedValue(nullptr);
     }

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

@@ -33,35 +33,33 @@ public:
     _prop = defineProperty<NodeProp>(name);
   }
 
-  void updateDerivedValue() override {
-    if (_prop->isSet()) {
-      // Check for JsiSkRRect
-      if (_prop->value().getType() == PropType::HostObject) {
-        // Try reading as rect
-        auto rectPtr = std::dynamic_pointer_cast<JsiSkRRect>(
-            _prop->value().getAsHostObject());
-        if (rectPtr != nullptr) {
-          auto rrect = rectPtr->getObject();
-          setDerivedValue(SkRRect::MakeRectXY(
-              SkRect::MakeXYWH(rrect->rect().x(), rrect->rect().y(),
-                               rrect->rect().width(), rrect->rect().height()),
-              rrect->getSimpleRadii().x(), rrect->getSimpleRadii().y()));
-        }
-      } else {
-        if (_prop->isSet() && _prop->value().getType() == PropType::Object) {
-          auto p = _prop->value();
-          if (p.hasValue(PropNameX) && p.hasValue(PropNameY) &&
-              p.hasValue(PropNameWidth) && p.hasValue(PropNameHeight) &&
-              p.hasValue(PropNameRx) && p.hasValue(PropNameRy)) {
-            auto x = _prop->value().getValue(PropNameX);
-            auto y = _prop->value().getValue(PropNameY);
-            auto width = _prop->value().getValue(PropNameWidth);
-            auto height = _prop->value().getValue(PropNameHeight);
-            auto rx = _prop->value().getValue(PropNameRx);
-            auto ry = _prop->value().getValue(PropNameRy);
+  static std::shared_ptr<SkRRect> processRRect(const JsiValue &value) {
+    if (value.getType() == PropType::HostObject) {
+      // Try reading as rect
+      auto rectPtr =
+          std::dynamic_pointer_cast<JsiSkRRect>(value.getAsHostObject());
+      if (rectPtr != nullptr) {
+        auto rrect = rectPtr->getObject();
+        return std::make_shared<SkRRect>(
+            SkRRect::MakeRectXY(rrect->rect(), rrect->getSimpleRadii().x(),
+                                rrect->getSimpleRadii().y()));
+      }
+    } else {
+      if (value.getType() == PropType::Object) {
+        if (value.hasValue(PropNameRect) && value.hasValue(PropNameRx) &&
+            value.hasValue(PropNameRy)) {
+          auto rect = value.getValue(PropNameRect);
+          if (rect.hasValue(PropNameX) && rect.hasValue(PropNameY) &&
+              rect.hasValue(PropNameWidth) && rect.hasValue(PropNameHeight)) {
+            auto x = rect.getValue(PropNameX);
+            auto y = rect.getValue(PropNameY);
+            auto width = rect.getValue(PropNameWidth);
+            auto height = rect.getValue(PropNameHeight);
+            auto rx = value.getValue(PropNameRx);
+            auto ry = value.getValue(PropNameRy);
 
             // Update cache from js object value
-            setDerivedValue(SkRRect::MakeRectXY(
+            return std::make_shared<SkRRect>(SkRRect::MakeRectXY(
                 SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
                                  width.getAsNumber(), height.getAsNumber()),
                 rx.getAsNumber(), ry.getAsNumber()));
@@ -69,6 +67,14 @@ public:
         }
       }
     }
+    return nullptr;
+  }
+
+  void updateDerivedValue() override {
+    if (_prop->isSet()) {
+      auto value = _prop->value();
+      setDerivedValue(RRectProp::processRRect(value));
+    }
   }
 
 private:
@@ -150,40 +156,12 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_boxProp->value().getType() == PropType::HostObject) {
-      auto rectPtr = std::dynamic_pointer_cast<JsiSkRect>(
-          _boxProp->value().getAsHostObject());
-      auto rrectPtr = std::dynamic_pointer_cast<JsiSkRRect>(
-          _boxProp->value().getAsHostObject());
-      // 1. box is SkRect
-      if (rectPtr != nullptr) {
-        auto rect = rectPtr->getObject();
-        setDerivedValue(SkRRect::MakeRect(*rect));
-        // 2. box is SkRRect
-      } else if (rrectPtr != nullptr) {
-        setDerivedValue(rrectPtr->getObject());
-      }
-    } else if (_boxProp->value().getType() == PropType::Object) {
-      if (_boxProp->value().hasValue(PropNameRect)) {
-        // 3. box is { rect: { x, y, width, height }, rx, ry }
-        auto rectProp = _boxProp->value().getValue(PropNameRect);
-        auto x = rectProp.getValue(PropNameX).getAsNumber();
-        auto y = rectProp.getValue(PropNameY).getAsNumber();
-        auto width = rectProp.getValue(PropNameWidth).getAsNumber();
-        auto height = rectProp.getValue(PropNameHeight).getAsNumber();
-        auto rx = _boxProp->value().getValue(PropNameRx).getAsNumber();
-        auto ry = _boxProp->value().getValue(PropNameRy).getAsNumber();
-        setDerivedValue(
-            SkRRect::MakeRectXY(SkRect::MakeXYWH(x, y, width, height), rx, ry));
-      } else {
-        // 4. box is { x, y, width, height }
-        auto x = _boxProp->value().getValue(PropNameX).getAsNumber();
-        auto y = _boxProp->value().getValue(PropNameY).getAsNumber();
-        auto width = _boxProp->value().getValue(PropNameWidth).getAsNumber();
-        auto height = _boxProp->value().getValue(PropNameHeight).getAsNumber();
-        setDerivedValue(
-            SkRRect::MakeRect(SkRect::MakeXYWH(x, y, width, height)));
-      }
+    auto value = _boxProp->value();
+    auto rect = RectProp::processRect(value);
+    if (rect) {
+      setDerivedValue(SkRRect::MakeRect(*rect));
+    } else {
+      setDerivedValue(RRectProp::processRRect(value));
     }
   }
 

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

@@ -31,33 +31,35 @@ public:
     _prop = defineProperty<NodeProp>(name);
   }
 
+  static std::shared_ptr<SkRect> processRect(const JsiValue &value) {
+    if (value.getType() == PropType::HostObject) {
+      auto rectPtr =
+          std::dynamic_pointer_cast<JsiSkRect>(value.getAsHostObject());
+      if (rectPtr != nullptr) {
+        return std::make_shared<SkRect>(SkRect::MakeXYWH(
+            rectPtr->getObject()->x(), rectPtr->getObject()->y(),
+            rectPtr->getObject()->width(), rectPtr->getObject()->height()));
+      }
+    } else if (value.getType() == PropType::Object &&
+               value.hasValue(PropNameX) && value.hasValue(PropNameY) &&
+               value.hasValue(PropNameWidth) &&
+               value.hasValue(PropNameHeight)) {
+      // Save props for fast access
+      auto x = value.getValue(PropNameX);
+      auto y = value.getValue(PropNameY);
+      auto width = value.getValue(PropNameWidth);
+      auto height = value.getValue(PropNameHeight);
+      // Update cache from js object value
+      return std::make_shared<SkRect>(
+          SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
+                           width.getAsNumber(), height.getAsNumber()));
+    }
+    return nullptr;
+  }
+
   void updateDerivedValue() override {
     if (_prop->isSet()) {
-      // Check for JsiSkRect
-      if (_prop->value().getType() == PropType::HostObject) {
-        auto rectPtr = std::dynamic_pointer_cast<JsiSkRect>(
-            _prop->value().getAsHostObject());
-        if (rectPtr != nullptr) {
-          setDerivedValue(SkRect::MakeXYWH(
-              rectPtr->getObject()->x(), rectPtr->getObject()->y(),
-              rectPtr->getObject()->width(), rectPtr->getObject()->height()));
-        }
-      } else {
-        auto p = _prop->value();
-        if (p.hasValue(PropNameX) && p.hasValue(PropNameY) &&
-            p.hasValue(PropNameWidth) && p.hasValue(PropNameHeight)) {
-          // Save props for fast access
-          auto x = p.getValue(PropNameX);
-          auto y = p.getValue(PropNameY);
-          auto width = p.getValue(PropNameWidth);
-          auto height = p.getValue(PropNameHeight);
-
-          // Update cache from js object value
-          setDerivedValue(SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
-                                           width.getAsNumber(),
-                                           height.getAsNumber()));
-        }
-      }
+      setDerivedValue(RectProp::processRect(_prop->value()));
     }
   }
 

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm

@@ -4,7 +4,6 @@
 #include <thread>
 #include <utility>
 
-#include <RNSkMeasureTime.h>
 #include <SkiaMetalRenderer.h>
 
 #pragma clang diagnostic push
@@ -20,7 +19,6 @@ void RNSkiOSPlatformContext::performStreamOperation(
     const std::string &sourceUri,
     const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) {
 
-  RNSkMeasureTime("PlatformContext::performStreamOperation");
   auto loader = [=]() {
     NSURL *url = [[NSURL alloc]
         initWithString:[NSString stringWithUTF8String:sourceUri.c_str()]];

package/lib/commonjs/dom/nodes/JsiSkDOM.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JsiSkDOM = void 0;
 
+var _HostComponents = require("../../renderer/HostComponents");
+
 var _drawings = require("./drawings");
 
 var _paint = require("./paint");
@@ -27,139 +29,139 @@ class JsiSkDOM {
   }
 
   Layer(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.LayerNode ? global.SkiaDomApi.LayerNode(props ?? {}) : new _LayerNode.LayerNode(this.ctx, props ?? {});
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LayerNode(props ?? {}) : new _LayerNode.LayerNode(this.ctx, props ?? {});
   }
 
   Group(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.GroupNode ? global.SkiaDomApi.GroupNode(props ?? {}) : new _GroupNode.GroupNode(this.ctx, props ?? {});
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.GroupNode(props ?? {}) : new _GroupNode.GroupNode(this.ctx, props ?? {});
   }
 
   Paint(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.PaintNode ? global.SkiaDomApi.PaintNode(props ?? {}) : new _PaintNode.PaintNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PaintNode(props ?? {}) : new _PaintNode.PaintNode(this.ctx, props);
   } // Drawings
 
 
   Fill(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.FillNode ? global.SkiaDomApi.FillNode(props ?? {}) : new _drawings.FillNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.FillNode(props ?? {}) : new _drawings.FillNode(this.ctx, props);
   }
 
   Image(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.ImageNode ? global.SkiaDomApi.ImageNode(props ?? {}) : new _drawings.ImageNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.ImageNode(props ?? {}) : new _drawings.ImageNode(this.ctx, props);
   }
 
   Circle(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.CircleNode ? global.SkiaDomApi.CircleNode(props ?? {}) : new _drawings.CircleNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.CircleNode(props ?? {}) : new _drawings.CircleNode(this.ctx, props);
   }
 
   Path(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.PathNode ? global.SkiaDomApi.PathNode(props ?? {}) : new _drawings.PathNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PathNode(props ?? {}) : new _drawings.PathNode(this.ctx, props);
   }
 
   CustomDrawing(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.CustomDrawingNode ? global.SkiaDomApi.CustomDrawingNode(props ?? {}) : new _drawings.CustomDrawingNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.CustomDrawingNode(props ?? {}) : new _drawings.CustomDrawingNode(this.ctx, props);
   }
 
   Line(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.LineNode ? global.SkiaDomApi.LineNode(props ?? {}) : new _drawings.LineNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LineNode(props ?? {}) : new _drawings.LineNode(this.ctx, props);
   }
 
   Oval(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.OvalNode ? global.SkiaDomApi.OvalNode(props ?? {}) : new _drawings.OvalNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.OvalNode(props ?? {}) : new _drawings.OvalNode(this.ctx, props);
   }
 
   Patch(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.PatchNode ? global.SkiaDomApi.PatchNode(props ?? {}) : new _drawings.PatchNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PatchNode(props ?? {}) : new _drawings.PatchNode(this.ctx, props);
   }
 
   Points(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.PointsNode ? global.SkiaDomApi.PointsNode(props ?? {}) : new _drawings.PointsNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PointsNode(props ?? {}) : new _drawings.PointsNode(this.ctx, props);
   }
 
   Rect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.RectNode ? global.SkiaDomApi.RectNode(props) : new _drawings.RectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.RectNode(props) : new _drawings.RectNode(this.ctx, props);
   }
 
   RRect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.RRectNode ? global.SkiaDomApi.RRectNode(props) : new _drawings.RRectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.RRectNode(props) : new _drawings.RRectNode(this.ctx, props);
   }
 
   Vertices(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.VerticesNode ? global.SkiaDomApi.VerticesNode(props) : new _drawings.VerticesNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.VerticesNode(props) : new _drawings.VerticesNode(this.ctx, props);
   }
 
   Text(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.TextNode ? global.SkiaDomApi.TextNode(props) : new _drawings.TextNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.TextNode(props) : new _drawings.TextNode(this.ctx, props);
   }
 
   TextPath(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.TextPathNode ? global.SkiaDomApi.TextPathNode(props) : new _drawings.TextPathNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.TextPathNode(props) : new _drawings.TextPathNode(this.ctx, props);
   }
 
   TextBlob(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.TextBlobNode ? global.SkiaDomApi.TextBlobNode(props) : new _drawings.TextBlobNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.TextBlobNode(props) : new _drawings.TextBlobNode(this.ctx, props);
   }
 
   Glyphs(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.GlyphsNode ? global.SkiaDomApi.GlyphsNode(props) : new _drawings.GlyphsNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.GlyphsNode(props) : new _drawings.GlyphsNode(this.ctx, props);
   }
 
   DiffRect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.DiffRectNode ? global.SkiaDomApi.DiffRectNode(props) : new _drawings.DiffRectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.DiffRectNode(props) : new _drawings.DiffRectNode(this.ctx, props);
   }
 
   Picture(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.PictureNode ? global.SkiaDomApi.PictureNode(props) : new _drawings.PictureNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.PictureNode(props) : new _drawings.PictureNode(this.ctx, props);
   }
 
   ImageSVG(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.ImageSVGNode ? global.SkiaDomApi.ImageSVGNode(props) : new _drawings.ImageSVGNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.ImageSVGNode(props) : new _drawings.ImageSVGNode(this.ctx, props);
   } // BlurMaskFilters
 
 
   BlurMaskFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BlurMaskFilterNode ? global.SkiaDomApi.BlurMaskFilterNode(props) : new _paint.BlurMaskFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BlurMaskFilterNode(props) : new _paint.BlurMaskFilterNode(this.ctx, props);
   } // ImageFilters
 
 
   BlendImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BlendImageFilterNode ? global.SkiaDomApi.BlendImageFilterNode(props) : new _paint.BlendImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BlendImageFilterNode(props) : new _paint.BlendImageFilterNode(this.ctx, props);
   }
 
   DropShadowImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.DropShadowImageFilterNode ? global.SkiaDomApi.DropShadowImageFilterNode(props) : new _paint.DropShadowImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.DropShadowImageFilterNode(props) : new _paint.DropShadowImageFilterNode(this.ctx, props);
   }
 
   DisplacementMapImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.DisplacementMapImageFilterNode ? global.SkiaDomApi.DisplacementMapImageFilterNode(props) : new _paint.DisplacementMapImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.DisplacementMapImageFilterNode(props) : new _paint.DisplacementMapImageFilterNode(this.ctx, props);
   }
 
   BlurImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BlurImageFilterNode ? global.SkiaDomApi.BlurImageFilterNode(props) : new _paint.BlurImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BlurImageFilterNode(props) : new _paint.BlurImageFilterNode(this.ctx, props);
   }
 
   OffsetImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.OffsetImageFilterNode ? global.SkiaDomApi.OffsetImageFilterNode(props) : new _paint.OffsetImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.OffsetImageFilterNode(props) : new _paint.OffsetImageFilterNode(this.ctx, props);
   }
 
   MorphologyImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.MorphologyImageFilterNode ? global.SkiaDomApi.MorphologyImageFilterNode(props) : new _ImageFilters.MorphologyImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.MorphologyImageFilterNode(props) : new _ImageFilters.MorphologyImageFilterNode(this.ctx, props);
   }
 
   RuntimeShaderImageFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.RuntimeShaderImageFilterNode ? global.SkiaDomApi.RuntimeShaderImageFilterNode(props) : new _paint.RuntimeShaderImageFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.RuntimeShaderImageFilterNode(props) : new _paint.RuntimeShaderImageFilterNode(this.ctx, props);
   } // Color Filters
 
 
   MatrixColorFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.MatrixColorFilterNode ? global.SkiaDomApi.MatrixColorFilterNode(props) : new _ColorFilters.MatrixColorFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.MatrixColorFilterNode(props) : new _ColorFilters.MatrixColorFilterNode(this.ctx, props);
   }
 
   BlendColorFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BlendColorFilterNode ? global.SkiaDomApi.BlendColorFilterNode(props) : new _ColorFilters.BlendColorFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BlendColorFilterNode(props) : new _ColorFilters.BlendColorFilterNode(this.ctx, props);
   }
 
   LumaColorFilter() {
-    return global.SkiaDomApi && global.SkiaDomApi.LumaColorFilterNode ? global.SkiaDomApi.LumaColorFilterNode() : new _ColorFilters.LumaColorFilterNode(this.ctx);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LumaColorFilterNode() : new _ColorFilters.LumaColorFilterNode(this.ctx);
   }
 
   LinearToSRGBGammaColorFilter() {
@@ -171,89 +173,89 @@ class JsiSkDOM {
   }
 
   LerpColorFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.LerpColorFilterNode ? global.SkiaDomApi.LerpColorFilterNode(props) : new _ColorFilters.LerpColorFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LerpColorFilterNode(props) : new _ColorFilters.LerpColorFilterNode(this.ctx, props);
   } // Shaders
 
 
   Shader(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.ShaderNode ? global.SkiaDomApi.ShaderNode(props) : new _Shaders.ShaderNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.ShaderNode(props) : new _Shaders.ShaderNode(this.ctx, props);
   }
 
   ImageShader(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.ImageShaderNode ? global.SkiaDomApi.ImageShaderNode(props) : new _Shaders.ImageShaderNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.ImageShaderNode(props) : new _Shaders.ImageShaderNode(this.ctx, props);
   }
 
   ColorShader(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.ColorShaderNode ? global.SkiaDomApi.ColorShaderNode(props) : new _Shaders.ColorNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.ColorShaderNode(props) : new _Shaders.ColorNode(this.ctx, props);
   }
 
   SweepGradient(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.SweepGradientNode ? global.SkiaDomApi.SweepGradientNode(props) : new _Shaders.SweepGradientNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.SweepGradientNode(props) : new _Shaders.SweepGradientNode(this.ctx, props);
   }
 
   Turbulence(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.TurbulenceNode ? global.SkiaDomApi.TurbulenceNode(props) : new _Shaders.TurbulenceNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.TurbulenceNode(props) : new _Shaders.TurbulenceNode(this.ctx, props);
   }
 
   FractalNoise(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.FractalNoiseNode ? global.SkiaDomApi.FractalNoiseNode(props) : new _Shaders.FractalNoiseNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.FractalNoiseNode(props) : new _Shaders.FractalNoiseNode(this.ctx, props);
   }
 
   LinearGradient(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.LinearGradientNode ? global.SkiaDomApi.LinearGradientNode(props) : new _Shaders.LinearGradientNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.LinearGradientNode(props) : new _Shaders.LinearGradientNode(this.ctx, props);
   }
 
   RadialGradient(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.RadialGradientNode ? global.SkiaDomApi.RadialGradientNode(props) : new _Shaders.RadialGradientNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.RadialGradientNode(props) : new _Shaders.RadialGradientNode(this.ctx, props);
   }
 
   TwoPointConicalGradient(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.TwoPointConicalGradientNode ? global.SkiaDomApi.TwoPointConicalGradientNode(props) : new _Shaders.TwoPointConicalGradientNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.TwoPointConicalGradientNode(props) : new _Shaders.TwoPointConicalGradientNode(this.ctx, props);
   } // Path Effects
 
 
   CornerPathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.CornerPathEffectNode ? global.SkiaDomApi.CornerPathEffectNode(props) : new _paint.CornerPathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.CornerPathEffectNode(props) : new _paint.CornerPathEffectNode(this.ctx, props);
   }
 
   DiscretePathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.DiscretePathEffectNode ? global.SkiaDomApi.DiscretePathEffectNode(props) : new _paint.DiscretePathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.DiscretePathEffectNode(props) : new _paint.DiscretePathEffectNode(this.ctx, props);
   }
 
   DashPathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.DashPathEffectNode ? global.SkiaDomApi.DashPathEffectNode(props) : new _paint.DashPathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.DashPathEffectNode(props) : new _paint.DashPathEffectNode(this.ctx, props);
   }
 
   Path1DPathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.Path1DPathEffectNode ? global.SkiaDomApi.Path1DPathEffectNode(props) : new _paint.Path1DPathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.Path1DPathEffectNode(props) : new _paint.Path1DPathEffectNode(this.ctx, props);
   }
 
   Path2DPathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.Path2DPathEffectNode ? global.SkiaDomApi.Path2DPathEffectNode(props) : new _paint.Path2DPathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.Path2DPathEffectNode(props) : new _paint.Path2DPathEffectNode(this.ctx, props);
   }
 
   SumPathEffect() {
-    return global.SkiaDomApi && global.SkiaDomApi.SumPathEffectNode ? global.SkiaDomApi.SumPathEffectNode() : new _paint.SumPathEffectNode(this.ctx);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.SumPathEffectNode() : new _paint.SumPathEffectNode(this.ctx);
   }
 
   Line2DPathEffect(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.Line2DPathEffectNode ? global.SkiaDomApi.Line2DPathEffectNode(props) : new _paint.Line2DPathEffectNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.Line2DPathEffectNode(props) : new _paint.Line2DPathEffectNode(this.ctx, props);
   }
 
   Blend(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BlendNode ? global.SkiaDomApi.BlendNode(props) : new _paint.BlendNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BlendNode(props) : new _paint.BlendNode(this.ctx, props);
   }
 
   BackdropFilter(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BackdropFilterNode ? global.SkiaDomApi.BackdropFilterNode(props) : new _drawings.BackdropFilterNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BackdropFilterNode(props) : new _drawings.BackdropFilterNode(this.ctx, props);
   }
 
   Box(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BoxNode ? global.SkiaDomApi.BoxNode(props) : new _drawings.BoxNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BoxNode(props) : new _drawings.BoxNode(this.ctx, props);
   }
 
   BoxShadow(props) {
-    return global.SkiaDomApi && global.SkiaDomApi.BoxShadowNode ? global.SkiaDomApi.BoxShadowNode(props) : new _drawings.BoxShadowNode(this.ctx, props);
+    return _HostComponents.NATIVE_DOM ? global.SkiaDomApi.BoxShadowNode(props) : new _drawings.BoxShadowNode(this.ctx, props);
   }
 
 }