@shopify/react-native-skia 0.1.234 → 0.1.236

package/cpp/skia/modules/skparagraph/include/FontArguments.h

@@ -19,7 +19,7 @@ public:
     FontArguments& operator=(const FontArguments&) = default;
     FontArguments& operator=(FontArguments&&) = default;
 
-    sk_sp<SkTypeface> CloneTypeface(sk_sp<SkTypeface> typeface) const;
+    sk_sp<SkTypeface> CloneTypeface(const sk_sp<SkTypeface>& typeface) const;
 
     friend bool operator==(const FontArguments& a, const FontArguments& b);
     friend bool operator!=(const FontArguments& a, const FontArguments& b);

package/cpp/skia/modules/skparagraph/include/FontCollection.h

@@ -7,6 +7,7 @@
 #include <set>
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "modules/skparagraph/include/FontArguments.h"
 #include "modules/skparagraph/include/ParagraphCache.h"
 #include "modules/skparagraph/include/TextStyle.h"
@@ -36,6 +37,7 @@ public:
     std::vector<sk_sp<SkTypeface>> findTypefaces(const std::vector<SkString>& familyNames, SkFontStyle fontStyle, const std::optional<FontArguments>& fontArgs);
 
     sk_sp<SkTypeface> defaultFallback(SkUnichar unicode, SkFontStyle fontStyle, const SkString& locale);
+    sk_sp<SkTypeface> defaultEmojiFallback(SkUnichar emojiStart, SkFontStyle fontStyle, const SkString& locale);
     sk_sp<SkTypeface> defaultFallback();
 
     void disableFontFallback();

package/cpp/skia/modules/skparagraph/include/Paragraph.h

@@ -241,8 +241,8 @@ public:
     virtual bool getClosestUTF16GlyphInfoAt(SkScalar dx, SkScalar dy, GlyphInfo* glyphInfo) = 0;
 
     struct FontInfo {
-        FontInfo(const SkFont font, const TextRange textRange)
-            : fFont(font), fTextRange(textRange) { }
+        FontInfo(const SkFont& font, const TextRange textRange)
+                : fFont(font), fTextRange(textRange) {}
         virtual ~FontInfo() = default;
         FontInfo(const FontInfo& ) = default;
         SkFont fFont;

package/cpp/skia/modules/skparagraph/include/TextStyle.h

@@ -113,7 +113,7 @@ enum class PlaceholderAlignment {
 };
 
 struct FontFeature {
-    FontFeature(const SkString name, int value) : fName(name), fValue(value) {}
+    FontFeature(SkString name, int value) : fName(std::move(name)), fValue(value) {}
     bool operator==(const FontFeature& that) const {
         return fName == that.fName && fValue == that.fValue;
     }
@@ -178,7 +178,8 @@ public:
         fForeground = std::move(paint);
     }
     // DEPRECATED: prefer `setForegroundPaint`.
-    void setForegroundColor(SkPaint paint) { setForegroundPaint(paint); }
+    void setForegroundColor(SkPaint paint) { setForegroundPaint(std::move(paint)); }
+
     // Set the foreground to a paint ID.  This is intended for use by clients
     // that implement a custom ParagraphPainter that can not accept an SkPaint.
     void setForegroundPaintID(ParagraphPainter::PaintID paintID) {
@@ -200,7 +201,7 @@ public:
         fBackground = std::move(paint);
     }
     // DEPRECATED: prefer `setBackgroundPaint`.
-    void setBackgroundColor(SkPaint paint) { setBackgroundPaint(paint); }
+    void setBackgroundColor(SkPaint paint) { setBackgroundPaint(std::move(paint)); }
     void setBackgroundPaintID(ParagraphPainter::PaintID paintID) {
         fHasBackground = true;
         fBackground = paintID;

package/cpp/skia/modules/skparagraph/include/TypefaceFontProvider.h

@@ -47,9 +47,7 @@ public:
     sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const override;
 
     sk_sp<SkFontStyleSet> onCreateStyleSet(int) const override { return nullptr; }
-    sk_sp<SkTypeface> onMatchFamilyStyle(const char[], const SkFontStyle&) const override {
-        return nullptr;
-    }
+    sk_sp<SkTypeface> onMatchFamilyStyle(const char familyName[], const SkFontStyle& pattern) const override;
     sk_sp<SkTypeface> onMatchFamilyStyleCharacter(const char[], const SkFontStyle&,
                                                   const char*[], int,
                                                   SkUnichar) const override {

package/cpp/skia/modules/skresources/include/SkResources.h

@@ -87,29 +87,32 @@ public:
     virtual FrameData getFrameData(float t);
 };
 
+enum class ImageDecodeStrategy {
+    // Images are decoded on-the-fly, at rasterization time.
+    // Large images may cause jank as decoding is expensive (and can thrash internal caches).
+    kLazyDecode,
+    // Force-decode all images upfront, at the cost of potentially more RAM and slower
+    // animation build times.
+    kPreDecode,
+};
+
 class MultiFrameImageAsset final : public ImageAsset {
 public:
-    /**
-    * By default, images are decoded on-the-fly, at rasterization time.
-    * Large images may cause jank as decoding is expensive (and can thrash internal caches).
-    *
-    * Pass |predecode| true to force-decode all images upfront, at the cost of potentially more RAM
-    * and slower animation build times.
-    */
-    static sk_sp<MultiFrameImageAsset> Make(sk_sp<SkData>, bool predecode = false);
+    static sk_sp<MultiFrameImageAsset> Make(sk_sp<SkData>,
+                                            ImageDecodeStrategy = ImageDecodeStrategy::kLazyDecode);
 
     bool isMultiFrame() override;
 
     sk_sp<SkImage> getFrame(float t) override;
 
 private:
-    explicit MultiFrameImageAsset(std::unique_ptr<SkAnimCodecPlayer>, bool predecode);
+    explicit MultiFrameImageAsset(std::unique_ptr<SkAnimCodecPlayer>, ImageDecodeStrategy);
 
     sk_sp<SkImage> generateFrame(float t);
 
     std::unique_ptr<SkAnimCodecPlayer> fPlayer;
     sk_sp<SkImage>                     fCachedFrame;
-    bool                               fPreDecode;
+    ImageDecodeStrategy fStrategy;
 
     using INHERITED = ImageAsset;
 };
@@ -200,17 +203,18 @@ public:
 
 class FileResourceProvider final : public ResourceProvider {
 public:
-    static sk_sp<FileResourceProvider> Make(SkString base_dir, bool predecode = false);
+    static sk_sp<FileResourceProvider> Make(SkString base_dir,
+                                            ImageDecodeStrategy = ImageDecodeStrategy::kLazyDecode);
 
     sk_sp<SkData> load(const char resource_path[], const char resource_name[]) const override;
 
     sk_sp<ImageAsset> loadImageAsset(const char[], const char[], const char[]) const override;
 
 private:
-    FileResourceProvider(SkString, bool);
+    FileResourceProvider(SkString, ImageDecodeStrategy);
 
     const SkString fDir;
-    const bool     fPredecode;
+    const ImageDecodeStrategy fStrategy;
 
     using INHERITED = ResourceProvider;
 };
@@ -249,16 +253,23 @@ private:
 
 class DataURIResourceProviderProxy final : public ResourceProviderProxyBase {
 public:
-    static sk_sp<DataURIResourceProviderProxy> Make(sk_sp<ResourceProvider> rp,
-                                                    bool predecode = false);
+    // If font data is supplied via base64 encoding, this needs a provided SkFontMgr to process
+    // that font data into an SkTypeface.
+    static sk_sp<DataURIResourceProviderProxy> Make(
+            sk_sp<ResourceProvider> rp,
+            ImageDecodeStrategy = ImageDecodeStrategy::kLazyDecode,
+            sk_sp<const SkFontMgr> fontMgr = nullptr);
 
 private:
-    DataURIResourceProviderProxy(sk_sp<ResourceProvider>, bool);
+    DataURIResourceProviderProxy(sk_sp<ResourceProvider>,
+                                 ImageDecodeStrategy,
+                                 sk_sp<const SkFontMgr> fontMgr);
 
     sk_sp<ImageAsset> loadImageAsset(const char[], const char[], const char[]) const override;
     sk_sp<SkTypeface> loadTypeface(const char[], const char[]) const override;
 
-    const bool fPredecode;
+    const ImageDecodeStrategy fStrategy;
+    sk_sp<const SkFontMgr> fFontMgr;
 
     using INHERITED = ResourceProviderProxyBase;
 };

package/cpp/skia/modules/skunicode/include/SkUnicode.h

@@ -129,7 +129,17 @@ class SKUNICODE_API SkUnicode {
         virtual bool isSpace(SkUnichar utf8) = 0;
         virtual bool isTabulation(SkUnichar utf8) = 0;
         virtual bool isHardBreak(SkUnichar utf8) = 0;
+        /**
+         * Returns if a code point may start an emoji sequence.
+         * Returns true for '#', '*', and '0'-'9' since they may start an emoji sequence.
+         * To determine if a list of code points begins with an emoji sequence, use
+         * getEmojiSequence.
+         **/
         virtual bool isEmoji(SkUnichar utf8) = 0;
+        virtual bool isEmojiComponent(SkUnichar utf8) = 0;
+        virtual bool isEmojiModifierBase(SkUnichar utf8) = 0;
+        virtual bool isEmojiModifier(SkUnichar utf8) = 0;
+        virtual bool isRegionalIndicator(SkUnichar utf8) = 0;
         virtual bool isIdeographic(SkUnichar utf8) = 0;
 
         // Methods used in SkShaper and SkText
@@ -303,6 +313,8 @@ class SKUNICODE_API SkUnicode {
                 std::vector<SkUnicode::LineBreakBefore> lineBreaks);
 
         static std::unique_ptr<SkUnicode> MakeLibgraphemeBasedUnicode();
+
+        static std::unique_ptr<SkUnicode> MakeIcu4xBasedUnicode();
 };
 
 namespace sknonstd {

package/cpp/skia/modules/svg/include/SkSVGDOM.h

@@ -27,7 +27,10 @@ public:
     class Builder final {
     public:
         /**
-         * Specify a font manager for loading SVG fonts.
+         * Specify a font manager for loading fonts (e.g. from the system) to render <text>
+         * SVG nodes.
+         * If this is not set, but a font is required as part of rendering, the text will
+         * not be displayed.
          */
         Builder& setFontManager(sk_sp<SkFontMgr>);
 

package/cpp/skia/modules/svg/include/SkSVGRenderContext.h

@@ -138,7 +138,10 @@ public:
     }
 
     sk_sp<SkFontMgr> fontMgr() const {
-        return fFontMgr ? fFontMgr : SkFontMgr::RefDefault();
+        // It is probably an oversight to try to render <text> without having set the SkFontMgr.
+        // We will assert this in debug mode, but fallback to an empty fontmgr in release builds.
+        SkASSERT(fFontMgr);
+        return fFontMgr ? fFontMgr : SkFontMgr::RefEmpty();
     }
 
     // Returns the translate/scale transformation required to map into the current OBB scope,

package/cpp/skia/src/base/SkUTF.h

@@ -35,6 +35,13 @@ SK_SPI int CountUTF32(const int32_t* utf32, size_t byteLength);
 */
 SK_SPI SkUnichar NextUTF8(const char** ptr, const char* end);
 
+/** Given a sequence of UTF-8 bytes, return the first unicode codepoint.
+    The pointer will be incremented to point at the next codepoint's start.  If
+    invalid UTF-8 is encountered, set *ptr to end and
+    return the replacement character (0xFFFD)
+*/
+SK_SPI SkUnichar NextUTF8WithReplacement(const char** ptr, const char* end);
+
 /** Given a sequence of aligned UTF-16 characters in machine-endian form,
     return the first unicode codepoint.  The pointer will be incremented to
     point at the next codepoint's start.  If invalid UTF-16 is encountered,

package/cpp/skia/src/core/SkTHash.h

@@ -119,24 +119,32 @@ public:
         return nullptr;
     }
 
-    // Remove the value with this key from the hash table.
-    void remove(const K& key) {
-        SkASSERT(this->find(key));
-
+    // If a value with this key exists in the hash table, removes it and returns true.
+    // Otherwise, returns false.
+    bool removeIfExists(const K& key) {
         uint32_t hash = Hash(key);
         int index = hash & (fCapacity-1);
         for (int n = 0; n < fCapacity; n++) {
             Slot& s = fSlots[index];
-            SkASSERT(s.has_value());
+            if (s.empty()) {
+                return false;
+            }
             if (hash == s.fHash && key == Traits::GetKey(*s)) {
                this->removeSlot(index);
                if (4 * fCount <= fCapacity && fCapacity > 4) {
                    this->resize(fCapacity / 2);
                }
-               return;
+               return true;
             }
             index = this->next(index);
         }
+        SkASSERT(fCapacity == fCount);
+        return false;
+    }
+
+    // Removes the value with this key from the hash table. Asserts if it is missing.
+    void remove(const K& key) {
+        SkAssertResult(this->removeIfExists(key));
     }
 
     // Hash tables will automatically resize themselves when set() and remove() are called, but
@@ -482,12 +490,16 @@ public:
         return *this->set(key, V{});
     }
 
-    // Remove the key/value entry in the table with this key.
+    // Removes the key/value entry in the table with this key. Asserts if the key is not present.
     void remove(const K& key) {
-        SkASSERT(this->find(key));
         fTable.remove(key);
     }
 
+    // If the key exists in the table, removes it and returns true. Otherwise, returns false.
+    bool removeIfExists(const K& key) {
+        return fTable.removeIfExists(key);
+    }
+
     // Call fn on every key/value pair in the table.  You may mutate the value but not the key.
     template <typename Fn,  // f(K, V*) or f(const K&, V*)
               std::enable_if_t<std::is_invocable_v<Fn, K, V*>>* = nullptr>

package/lib/commonjs/dom/nodes/JsiSkDOM.d.ts

@@ -6,7 +6,8 @@ import { RRectNode } from "./drawings";
 import type { NodeContext } from "./Node";
 export declare class JsiSkDOM implements SkDOM {
     private ctx;
-    constructor(ctx: NodeContext);
+    private native;
+    constructor(ctx: NodeContext, native: boolean);
     Layer(props?: ChildrenProps): import("../types").RenderNode<ChildrenProps>;
     Group(props?: GroupProps): import("../types").RenderNode<GroupProps>;
     Paint(props: PaintProps): import("../types").DeclarationNode<PaintProps>;
@@ -19,7 +20,7 @@ export declare class JsiSkDOM implements SkDOM {
     Patch(props: PatchProps): import("../types").RenderNode<PatchProps>;
     Points(props: PointsProps): import("../types").RenderNode<PointsProps>;
     Rect(props: RectProps): import("./DrawingNode").JsiDrawingNode<RectProps, import("../..").SkRect>;
-    RRect(props: RoundedRectProps): import("./DrawingNode").JsiDrawingNode<RoundedRectProps, import("../..").SkRRect> | RRectNode;
+    RRect(props: RoundedRectProps): RRectNode | import("./DrawingNode").JsiDrawingNode<RoundedRectProps, import("../..").SkRRect>;
     Vertices(props: VerticesProps): import("../types").RenderNode<VerticesProps>;
     Text(props: TextProps): import("../types").RenderNode<TextProps>;
     TextPath(props: TextPathProps): import("../types").RenderNode<TextPathProps>;

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

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