@shopify/react-native-skia 0.1.207 → 0.1.209

package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java

@@ -18,8 +18,11 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
 
     private String tag = "SkiaView";
 
-    public SkiaBaseView(Context context) {
+    private boolean manageTexture = false;
+
+    public SkiaBaseView(Context context, boolean manageTexture) {
         super(context);
+        this.manageTexture = manageTexture;
         mTexture = new TextureView(context);
         mTexture.setSurfaceTextureListener(this);
         mTexture.setOpaque(false);
@@ -27,19 +30,23 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
     }
 
     public void destroySurface() {
-        Log.i(tag, "destroySurface");
-        surfaceDestroyed();
-        mSurface.release();
-        mSurface = null;
+        if (mSurface != null) {
+            Log.i(tag, "destroySurface");
+            surfaceDestroyed();
+            mSurface.release();
+            mSurface = null;
+        }
     }
 
     private void createSurfaceTexture() {
-        // This API Level is >= 26, we created our own SurfaceTexture to have a faster time to first frame
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Log.i(tag, "Create SurfaceTexture");
-            SurfaceTexture surface = new SurfaceTexture(false);
-            mTexture.setSurfaceTexture(surface);
-            this.onSurfaceTextureAvailable(surface, this.getMeasuredWidth(), this.getMeasuredHeight());
+        if (manageTexture) {
+            // This API Level is >= 26, we created our own SurfaceTexture to have a faster time to first frame
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                Log.i(tag, "Create SurfaceTexture");
+                SurfaceTexture surface = new SurfaceTexture(false);
+                mTexture.setSurfaceTexture(surface);
+                this.onSurfaceTextureAvailable(surface, this.getMeasuredWidth(), this.getMeasuredHeight());
+            }
         }
     }
 
@@ -145,7 +152,7 @@ public abstract class SkiaBaseView extends ReactViewGroup implements TextureView
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
         Log.i(tag, "onSurfaceTextureDestroyed");
         // https://developer.android.com/reference/android/view/TextureView.SurfaceTextureListener#onSurfaceTextureDestroyed(android.graphics.SurfaceTexture)
-        surfaceDestroyed();
+        destroySurface();
         createSurfaceTexture();
         return false;
     }

package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseViewManager.java

@@ -29,7 +29,7 @@ public abstract class SkiaBaseViewManager extends ReactViewManager {
     @Override
     public void onDropViewInstance(@NonNull ReactViewGroup view) {
         super.onDropViewInstance(view);
-        ((SkiaBaseView)view).unregisterView();
         ((SkiaBaseView)view).destroySurface();
+        ((SkiaBaseView)view).unregisterView();
     }
 }

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDomView.java

@@ -11,7 +11,7 @@ public class SkiaDomView extends SkiaBaseView {
     private HybridData mHybridData;
 
     public SkiaDomView(Context context) {
-        super(context);
+        super(context, true);
         RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }

package/android/src/main/java/com/shopify/reactnative/skia/SkiaDrawView.java

@@ -11,7 +11,7 @@ public class SkiaDrawView extends SkiaBaseView {
     private HybridData mHybridData;
 
     public SkiaDrawView(Context context) {
-        super(context);
+        super(context, false);
         RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }

package/android/src/main/java/com/shopify/reactnative/skia/SkiaPictureView.java

@@ -11,7 +11,7 @@ public class SkiaPictureView extends SkiaBaseView {
     private HybridData mHybridData;
 
     public SkiaPictureView(Context context) {
-        super(context);
+        super(context, true);
         RNSkiaModule skiaModule = ((ReactContext) context).getNativeModule(RNSkiaModule.class);
         mHybridData = initHybrid(skiaModule.getSkiaManager());
     }

package/android/src/main/java/com/shopify/reactnative/skia/ViewScreenshotService.java

@@ -93,7 +93,9 @@ public class ViewScreenshotService {
             }
 
             // Draw ourselves
+            canvas.saveLayerAlpha(null, Math.round(view.getAlpha() * 255));
             view.draw(canvas);
+            canvas.restore();
 
             // Enable children again
             for (int i = 0; i < visibleChildren.size(); i++) {

package/cpp/api/JsiSkColorFilter.h

@@ -23,7 +23,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkColorFilter>(std::move(context),
                                                     std::move(colorFilter)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkColorFilter, "ColorFilter")
+  EXPORT_JSI_API_TYPENAME(JsiSkColorFilter, ColorFilter)
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 

package/cpp/api/JsiSkContourMeasure.h

@@ -68,7 +68,7 @@ public:
     return JsiSkPath::toValue(runtime, getContext(), std::move(path));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasure, "ContourMeasure")
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasure, ContourMeasure)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasure, getPosTan),
                        JSI_EXPORT_FUNC(JsiSkContourMeasure, length),

package/cpp/api/JsiSkContourMeasureIter.h

@@ -40,7 +40,7 @@ public:
     return jsi::Object::createFromHostObject(runtime, std::move(nextObject));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasureIter, "ContourMeasureIter")
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasureIter, ContourMeasureIter)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next),
                        JSI_EXPORT_FUNC(JsiSkContourMeasureIter, dispose))

package/cpp/api/JsiSkData.h

@@ -24,7 +24,7 @@ public:
   JsiSkData(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkData> asset)
       : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(asset)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkData, "Data")
+  EXPORT_JSI_API_TYPENAME(JsiSkData, Data)
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkData, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkFont.h

@@ -239,7 +239,7 @@ public:
     return jsi::Value::undefined();
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkFont, "Font")
+  EXPORT_JSI_API_TYPENAME(JsiSkFont, Font)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkFont, getSize),
                        JSI_EXPORT_FUNC(JsiSkFont, getMetrics),

package/cpp/api/JsiSkFontMgr.h

@@ -23,7 +23,7 @@ namespace jsi = facebook::jsi;
 
 class JsiSkFontMgr : public JsiSkWrappingSkPtrHostObject<SkFontMgr> {
 public:
-  EXPORT_JSI_API_TYPENAME(JsiSkFontMgr, "FontMgr")
+  EXPORT_JSI_API_TYPENAME(JsiSkFontMgr, FontMgr)
 
   JsiSkFontMgr(std::shared_ptr<RNSkPlatformContext> context,
                sk_sp<SkFontMgr> fontMgr)
@@ -51,4 +51,4 @@ public:
                        JSI_EXPORT_FUNC(JsiSkFontMgr, matchFamilyStyle))
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkFontStyle.h

@@ -36,12 +36,18 @@ public:
     if (object.isHostObject(runtime)) {
       return object.asHostObject<JsiSkFontStyle>(runtime)->getObject();
     } else {
-      auto weight =
-          static_cast<int>(object.getProperty(runtime, "weight").asNumber());
-      auto width =
-          static_cast<int>(object.getProperty(runtime, "width").asNumber());
+      auto weightProp = object.getProperty(runtime, "weight");
+      auto weight = static_cast<int>(weightProp.isUndefined()
+                                         ? SkFontStyle::Weight::kNormal_Weight
+                                         : weightProp.asNumber());
+      auto widthProp = object.getProperty(runtime, "width");
+      auto width = static_cast<int>(widthProp.isUndefined()
+                                        ? SkFontStyle::Width::kNormal_Width
+                                        : widthProp.asNumber());
+      auto slantProp = object.getProperty(runtime, "slant");
       auto slant = static_cast<SkFontStyle::Slant>(
-          object.getProperty(runtime, "slant").asNumber());
+          slantProp.isUndefined() ? SkFontStyle::Slant::kUpright_Slant
+                                  : slantProp.asNumber());
       SkFontStyle style(weight, width, slant);
       return std::make_shared<SkFontStyle>(style);
     }

package/cpp/api/JsiSkImage.h

@@ -131,7 +131,7 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkImage, "Image")
+  EXPORT_JSI_API_TYPENAME(JsiSkImage, Image)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImage, width),
                        JSI_EXPORT_FUNC(JsiSkImage, height),

package/cpp/api/JsiSkImageFilter.h

@@ -25,7 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkImageFilter>(std::move(context),
                                                     std::move(imageFilter)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkImageFilter, "ImageFilter")
+  EXPORT_JSI_API_TYPENAME(JsiSkImageFilter, ImageFilter)
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMaskFilter.h

@@ -25,7 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkMaskFilter>(std::move(context),
                                                    std::move(maskFilter)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkMaskFilter, "MaskFilter")
+  EXPORT_JSI_API_TYPENAME(JsiSkMaskFilter, MaskFilter)
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMatrix.h

@@ -86,7 +86,7 @@ public:
     return values;
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkMatrix, "Matrix")
+  EXPORT_JSI_API_TYPENAME(JsiSkMatrix, Matrix)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMatrix, concat),
                        JSI_EXPORT_FUNC(JsiSkMatrix, translate),

package/cpp/api/JsiSkPaint.h

@@ -25,7 +25,7 @@ namespace jsi = facebook::jsi;
 
 class JsiSkPaint : public JsiSkWrappingSharedPtrHostObject<SkPaint> {
 public:
-  EXPORT_JSI_API_TYPENAME(JsiSkPaint, "Paint")
+  EXPORT_JSI_API_TYPENAME(JsiSkPaint, Paint)
 
   JSI_HOST_FUNCTION(copy) {
     const auto *paint = getObject().get();
@@ -81,6 +81,12 @@ public:
     return jsi::Value::undefined();
   }
 
+  JSI_HOST_FUNCTION(setDither) {
+    bool dithered = arguments[0].getBool();
+    getObject()->setDither(dithered);
+    return jsi::Value::undefined();
+  }
+
   JSI_HOST_FUNCTION(setStrokeWidth) {
     SkScalar width = arguments[0].asNumber();
     getObject()->setStrokeWidth(width);
@@ -175,6 +181,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkPaint, setStrokeJoin),
                        JSI_EXPORT_FUNC(JsiSkPaint, setStrokeCap),
                        JSI_EXPORT_FUNC(JsiSkPaint, setAntiAlias),
+                       JSI_EXPORT_FUNC(JsiSkPaint, setDither),
                        JSI_EXPORT_FUNC(JsiSkPaint, setStrokeWidth),
                        JSI_EXPORT_FUNC(JsiSkPaint, setStyle),
                        JSI_EXPORT_FUNC(JsiSkPaint, setColor),

package/cpp/api/JsiSkPath.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -34,6 +35,11 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
+private:
+  float pinT(double value) {
+    // Clamp the double value between 0 and 1 and then cast it to float
+    return static_cast<float>(std::clamp(value, 0.0, 1.0));
+  }
 
 public:
   JSI_HOST_FUNCTION(addPath) {
@@ -293,24 +299,21 @@ public:
   }
 
   JSI_HOST_FUNCTION(trim) {
-    auto start = arguments[0].asNumber();
-    auto end = arguments[1].asNumber();
+    auto start = pinT(arguments[0].asNumber());
+    auto end = pinT(arguments[1].asNumber());
     auto isComplement = arguments[2].getBool();
     auto path = *getObject();
     auto mode = isComplement ? SkTrimPathEffect::Mode::kInverted
                              : SkTrimPathEffect::Mode::kNormal;
     auto pe = SkTrimPathEffect::Make(start, end, mode);
+    SkStrokeRec rec(SkStrokeRec::InitStyle::kHairline_InitStyle);
     if (!pe) {
-      // SkDebugf("Invalid args to trim(): startT and stopT must be in
-      // [0,1]\n");
-      return jsi::Value::null();
+      return thisValue.getObject(runtime);
     }
-    SkStrokeRec rec(SkStrokeRec::InitStyle::kHairline_InitStyle);
     if (pe->filterPath(&path, path, &rec, nullptr)) {
       getObject()->swap(path);
       return thisValue.getObject(runtime);
     }
-    SkDebugf("Could not trim path\n");
     return jsi::Value::null();
   }
 
@@ -523,7 +526,7 @@ public:
     return cmds;
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPath, "Path")
+  EXPORT_JSI_API_TYPENAME(JsiSkPath, Path)
 
   JSI_EXPORT_FUNCTIONS(
       JSI_EXPORT_FUNC(JsiSkPath, addPath), JSI_EXPORT_FUNC(JsiSkPath, addArc),

package/cpp/api/JsiSkPathEffect.h

@@ -25,7 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkPathEffect>(std::move(context),
                                                    std::move(pathEffect)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, "PathEffect")
+  EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, PathEffect)
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 

package/cpp/api/JsiSkPicture.h

@@ -60,7 +60,7 @@ public:
     return array;
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPicture, "Picture")
+  EXPORT_JSI_API_TYPENAME(JsiSkPicture, Picture)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPicture, makeShader),
                        JSI_EXPORT_FUNC(JsiSkPicture, serialize),

package/cpp/api/JsiSkPictureRecorder.h

@@ -40,7 +40,7 @@ public:
         runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPictureRecorder, "PictureRecorder")
+  EXPORT_JSI_API_TYPENAME(JsiSkPictureRecorder, PictureRecorder)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureRecorder, beginRecording),
                        JSI_EXPORT_FUNC(JsiSkPictureRecorder,

package/cpp/api/JsiSkRuntimeEffect.h

@@ -115,7 +115,7 @@ public:
     return jsi::String::createFromAscii(runtime, getObject()->source());
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkRuntimeEffect, "RuntimeEffect")
+  EXPORT_JSI_API_TYPENAME(JsiSkRuntimeEffect, RuntimeEffect)
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,

package/cpp/api/JsiSkSVG.h

@@ -24,7 +24,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
                                                std::move(svgdom)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkSVG, "SVG")
+  EXPORT_JSI_API_TYPENAME(JsiSkSVG, SVG)
 
   JSI_HOST_FUNCTION(width) {
     return static_cast<double>(getObject()->containerSize().width());

package/cpp/api/JsiSkShader.h

@@ -26,7 +26,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkShader>(std::move(context),
                                                std::move(shader)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkShader, "Shader")
+  EXPORT_JSI_API_TYPENAME(JsiSkShader, Shader)
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkShader, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkSurface.h

@@ -28,7 +28,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkSurface>(std::move(context),
                                                 std::move(surface)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkSurface, "Surface")
+  EXPORT_JSI_API_TYPENAME(JsiSkSurface, Surface)
 
   JSI_HOST_FUNCTION(getCanvas) {
     return jsi::Object::createFromHostObject(

package/cpp/api/JsiSkTextBlob.h

@@ -25,7 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkTextBlob>(std::move(context),
                                                  std::move(shader)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkTextBlob, "TextBlob")
+  EXPORT_JSI_API_TYPENAME(JsiSkTextBlob, TextBlob)
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTextBlob, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkTypeFaceFontProvider.h

@@ -27,7 +27,8 @@ namespace para = skia::textlayout;
 class JsiSkTypefaceFontProvider
     : public JsiSkWrappingSkPtrHostObject<para::TypefaceFontProvider> {
 public:
-  EXPORT_JSI_API_TYPENAME(JsiSkTypefaceFontProvider, "FontMgr")
+  EXPORT_JSI_API_TYPENAME(JsiSkTypefaceFontProvider, TypefaceFontProvider)
+
   JSI_EXPORT_FUNCTIONS(
       JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, dispose),
       JSI_EXPORT_FUNC(JsiSkTypefaceFontProvider, registerFont),
@@ -46,7 +47,8 @@ public:
   JSI_HOST_FUNCTION(matchFamilyStyle) {
     auto name = arguments[0].asString(runtime).utf8(runtime);
     auto fontStyle = JsiSkFontStyle::fromValue(runtime, arguments[1]);
-    auto typeface = getObject()->matchFamilyStyle(name.c_str(), *fontStyle);
+    sk_sp<SkFontStyleSet> set(getObject()->onMatchFamily(name.c_str()));
+    sk_sp<SkTypeface> typeface(set->matchStyle(*fontStyle));
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkTypeface>(getContext(), typeface));
   }

package/cpp/api/JsiSkTypeface.h

@@ -2,6 +2,7 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <jsi/jsi.h>
 
@@ -22,13 +23,34 @@ namespace jsi = facebook::jsi;
 
 class JsiSkTypeface : public JsiSkWrappingSkPtrHostObject<SkTypeface> {
 public:
-  EXPORT_JSI_API_TYPENAME(JsiSkTypeface, "Typeface")
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTypeface, dispose))
+  EXPORT_JSI_API_TYPENAME(JsiSkTypeface, Typeface)
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTypeface, getGlyphIDs),
+                       JSI_EXPORT_FUNC(JsiSkTypeface, dispose))
 
   JsiSkTypeface(std::shared_ptr<RNSkPlatformContext> context,
                 sk_sp<SkTypeface> typeface)
       : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(typeface)) {}
 
+  JSI_HOST_FUNCTION(getGlyphIDs) {
+    auto str = arguments[0].asString(runtime).utf8(runtime);
+    int numGlyphIDs =
+        count > 1 && !arguments[1].isNull() && !arguments[1].isUndefined()
+            ? static_cast<int>(arguments[1].asNumber())
+            : getObject()->textToGlyphs(str.c_str(), str.length(),
+                                        SkTextEncoding::kUTF8, nullptr, 0);
+    std::vector<SkGlyphID> glyphIDs;
+    glyphIDs.resize(numGlyphIDs);
+    getObject()->textToGlyphs(str.c_str(), str.length(), SkTextEncoding::kUTF8,
+                              static_cast<SkGlyphID *>(glyphIDs.data()),
+                              numGlyphIDs);
+    auto jsiGlyphIDs = jsi::Array(runtime, numGlyphIDs);
+    for (int i = 0; i < numGlyphIDs; i++) {
+      jsiGlyphIDs.setValueAtIndex(runtime, i,
+                                  jsi::Value(static_cast<int>(glyphIDs[i])));
+    }
+    return jsiGlyphIDs;
+  }
+
   /**
    Returns the jsi object from a host object of this type
   */

package/cpp/api/JsiSkVertices.h

@@ -25,7 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkVertices>(std::move(context),
                                                  std::move(vertices)) {}
 
-  EXPORT_JSI_API_TYPENAME(JsiSkVertices, "Vertices")
+  EXPORT_JSI_API_TYPENAME(JsiSkVertices, Vertices)
 
   JSI_HOST_FUNCTION(bounds) {
     const auto &result = getObject()->bounds();

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

@@ -206,7 +206,7 @@ protected:
         JsiPropId::get("blendMode"),  JsiPropId::get("strokeCap"),
         JsiPropId::get("strokeJoin"), JsiPropId::get("strokeMiter"),
         JsiPropId::get("style"),      JsiPropId::get("antiAlias"),
-        JsiPropId::get("opacity")};
+        JsiPropId::get("opacity"),    JsiPropId::get("dither")};
 
     // We'll invalidate paint if a prop change happened in a paint property
     if (std::find(paintProps.begin(), paintProps.end(), prop->getName()) !=

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

@@ -67,6 +67,10 @@ public:
       paint->setAntiAlias(_paintProps->getAntiAlias()->value().getAsBool());
     }
 
+    if (_paintProps->getDither()->isSet()) {
+      paint->setDither(_paintProps->getDither()->value().getAsBool());
+    }
+
     context->save();
     decorateChildren(context);
 

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

@@ -31,7 +31,9 @@ public:
             "Expected SkFont object or null/undefined for the Font property.");
       }
     } else {
-      setDerivedValue(nullptr);
+      auto font = std::make_shared<SkFont>(SkFont());
+      font->setSize(14);
+      setDerivedValue(font);
     }
   }
 

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

@@ -100,6 +100,7 @@ public:
     _strokeCap = defineProperty<StrokeCapProp>("strokeCap");
     _strokeMiter = defineProperty<NodeProp>("strokeMiter");
     _antiAlias = defineProperty<NodeProp>("antiAlias");
+    _dither = defineProperty<NodeProp>("dither");
     _opacity = defineProperty<NodeProp>("opacity");
   }
 
@@ -113,6 +114,7 @@ public:
   StrokeCapProp *getStrokeCap() { return _strokeCap; }
   NodeProp *getStrokeMiter() { return _strokeMiter; }
   NodeProp *getAntiAlias() { return _antiAlias; }
+  NodeProp *getDither() { return _dither; }
   NodeProp *getOpacity() { return _opacity; }
 
 private:
@@ -124,6 +126,7 @@ private:
   StrokeCapProp *_strokeCap;
   NodeProp *_strokeMiter;
   NodeProp *_antiAlias;
+  NodeProp *_dither;
   NodeProp *_opacity;
 };
 

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

@@ -10,6 +10,7 @@ export interface PaintContext {
     strokeMiter?: number;
     opacity?: number;
     antiAlias?: boolean;
+    dither?: boolean;
     shader?: SkShader;
     colorFilter?: SkColorFilter;
     imageFilter?: SkImageFilter;

package/lib/commonjs/dom/nodes/PaintContext.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["PaintContext.ts"],"sourcesContent":["import type {\n  BlendMode,\n  PaintStyle,\n  SkColorFilter,\n  SkImageFilter,\n  SkMaskFilter,\n  SkPathEffect,\n  SkShader,\n  StrokeCap,\n  StrokeJoin,\n} from \"../../skia/types\";\nimport type { SkColor } from \"../../skia/types/Color\";\n\n// TODO: to remove\nexport interface PaintContext {\n  color?: SkColor;\n  strokeWidth?: number;\n  blendMode?: BlendMode;\n  style?: PaintStyle;\n  strokeJoin?: StrokeJoin;\n  strokeCap?: StrokeCap;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n\n  shader?: SkShader;\n  colorFilter?: SkColorFilter;\n  imageFilter?: SkImageFilter;\n  maskFilter?: SkMaskFilter;\n  pathEffect?: SkPathEffect;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["PaintContext.ts"],"sourcesContent":["import type {\n  BlendMode,\n  PaintStyle,\n  SkColorFilter,\n  SkImageFilter,\n  SkMaskFilter,\n  SkPathEffect,\n  SkShader,\n  StrokeCap,\n  StrokeJoin,\n} from \"../../skia/types\";\nimport type { SkColor } from \"../../skia/types/Color\";\n\n// TODO: to remove\nexport interface PaintContext {\n  color?: SkColor;\n  strokeWidth?: number;\n  blendMode?: BlendMode;\n  style?: PaintStyle;\n  strokeJoin?: StrokeJoin;\n  strokeCap?: StrokeCap;\n  strokeMiter?: number;\n  opacity?: number;\n  antiAlias?: boolean;\n  dither?: boolean;\n\n  shader?: SkShader;\n  colorFilter?: SkColorFilter;\n  imageFilter?: SkImageFilter;\n  maskFilter?: SkMaskFilter;\n  pathEffect?: SkPathEffect;\n}\n"],"mappings":""}

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

@@ -29,7 +29,8 @@ class PaintNode extends _Node.JsiDeclarationNode {
       strokeCap,
       strokeMiter,
       opacity,
-      antiAlias
+      antiAlias,
+      dither
     } = this.props;
     const paint = this.Skia.Paint();
 
@@ -69,6 +70,10 @@ class PaintNode extends _Node.JsiDeclarationNode {
       paint.setAntiAlias(antiAlias);
     }
 
+    if (dither !== undefined) {
+      paint.setDither(dither);
+    }
+
     ctx.save();
 
     this._children.forEach(child => {

package/lib/commonjs/dom/nodes/PaintNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["PaintNode","JsiDeclarationNode","constructor","ctx","props","DeclarationType","Paint","NodeType","decorate","color","strokeWidth","blendMode","style","strokeJoin","strokeCap","strokeMiter","opacity","antiAlias","paint","Skia","undefined","setColor","Color","setStrokeWidth","setBlendMode","BlendMode","enumKey","setStyle","PaintStyle","setStrokeJoin","StrokeJoin","setStrokeCap","StrokeCap","setStrokeMiter","setAlphaf","setAntiAlias","save","_children","forEach","child","colorFilter","colorFilters","popAllAsOne","imageFilter","imageFilters","shader","shaders","pop","maskFilter","maskFilters","pathEffect","pathEffects","restore","setImageFilter","setShader","setPathEffect","setColorFilter","setMaskFilter","paints","push"],"sources":["PaintNode.ts"],"sourcesContent":["import { StrokeCap, StrokeJoin, PaintStyle, BlendMode } from \"../../skia/types\";\nimport type { DeclarationNode, PaintProps } from \"../types\";\nimport { DeclarationType, NodeType } from \"../types\";\nimport type { DeclarationContext } from \"../types/DeclarationContext\";\n\nimport { enumKey } from \"./datatypes\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\n\nexport class PaintNode\n  extends JsiDeclarationNode<PaintProps>\n  implements DeclarationNode<PaintProps>\n{\n  constructor(ctx: NodeContext, props: PaintProps = {}) {\n    super(ctx, DeclarationType.Paint, NodeType.Paint, props);\n  }\n\n  decorate(ctx: DeclarationContext) {\n    const {\n      color,\n      strokeWidth,\n      blendMode,\n      style,\n      strokeJoin,\n      strokeCap,\n      strokeMiter,\n      opacity,\n      antiAlias,\n    } = this.props;\n    const paint = this.Skia.Paint();\n    if (color !== undefined) {\n      paint.setColor(this.Skia.Color(color));\n    }\n    if (strokeWidth !== undefined) {\n      paint.setStrokeWidth(strokeWidth);\n    }\n    if (blendMode !== undefined) {\n      paint.setBlendMode(BlendMode[enumKey(blendMode)]);\n    }\n    if (style !== undefined) {\n      paint.setStyle(PaintStyle[enumKey(style)]);\n    }\n    if (strokeJoin !== undefined) {\n      paint.setStrokeJoin(StrokeJoin[enumKey(strokeJoin)]);\n    }\n    if (strokeCap !== undefined) {\n      paint.setStrokeCap(StrokeCap[enumKey(strokeCap)]);\n    }\n    if (strokeMiter !== undefined) {\n      paint.setStrokeMiter(strokeMiter);\n    }\n    if (opacity !== undefined) {\n      paint.setAlphaf(opacity);\n    }\n    if (antiAlias !== undefined) {\n      paint.setAntiAlias(antiAlias);\n    }\n    ctx.save();\n    this._children.forEach((child) => {\n      if (child instanceof JsiDeclarationNode) {\n        child.decorate(ctx);\n      }\n    });\n    const colorFilter = ctx.colorFilters.popAllAsOne();\n    const imageFilter = ctx.imageFilters.popAllAsOne();\n    const shader = ctx.shaders.pop();\n    const maskFilter = ctx.maskFilters.pop();\n    const pathEffect = ctx.pathEffects.popAllAsOne();\n    ctx.restore();\n    if (imageFilter) {\n      paint.setImageFilter(imageFilter);\n    }\n    if (shader) {\n      paint.setShader(shader);\n    }\n    if (pathEffect) {\n      paint.setPathEffect(pathEffect);\n    }\n    if (colorFilter) {\n      paint.setColorFilter(colorFilter);\n    }\n    if (maskFilter) {\n      paint.setMaskFilter(maskFilter);\n    }\n    ctx.paints.push(paint);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["PaintNode","JsiDeclarationNode","constructor","ctx","props","DeclarationType","Paint","NodeType","decorate","color","strokeWidth","blendMode","style","strokeJoin","strokeCap","strokeMiter","opacity","antiAlias","dither","paint","Skia","undefined","setColor","Color","setStrokeWidth","setBlendMode","BlendMode","enumKey","setStyle","PaintStyle","setStrokeJoin","StrokeJoin","setStrokeCap","StrokeCap","setStrokeMiter","setAlphaf","setAntiAlias","setDither","save","_children","forEach","child","colorFilter","colorFilters","popAllAsOne","imageFilter","imageFilters","shader","shaders","pop","maskFilter","maskFilters","pathEffect","pathEffects","restore","setImageFilter","setShader","setPathEffect","setColorFilter","setMaskFilter","paints","push"],"sources":["PaintNode.ts"],"sourcesContent":["import { StrokeCap, StrokeJoin, PaintStyle, BlendMode } from \"../../skia/types\";\nimport type { DeclarationNode, PaintProps } from \"../types\";\nimport { DeclarationType, NodeType } from \"../types\";\nimport type { DeclarationContext } from \"../types/DeclarationContext\";\n\nimport { enumKey } from \"./datatypes\";\nimport type { NodeContext } from \"./Node\";\nimport { JsiDeclarationNode } from \"./Node\";\n\nexport class PaintNode\n  extends JsiDeclarationNode<PaintProps>\n  implements DeclarationNode<PaintProps>\n{\n  constructor(ctx: NodeContext, props: PaintProps = {}) {\n    super(ctx, DeclarationType.Paint, NodeType.Paint, props);\n  }\n\n  decorate(ctx: DeclarationContext) {\n    const {\n      color,\n      strokeWidth,\n      blendMode,\n      style,\n      strokeJoin,\n      strokeCap,\n      strokeMiter,\n      opacity,\n      antiAlias,\n      dither,\n    } = this.props;\n    const paint = this.Skia.Paint();\n    if (color !== undefined) {\n      paint.setColor(this.Skia.Color(color));\n    }\n    if (strokeWidth !== undefined) {\n      paint.setStrokeWidth(strokeWidth);\n    }\n    if (blendMode !== undefined) {\n      paint.setBlendMode(BlendMode[enumKey(blendMode)]);\n    }\n    if (style !== undefined) {\n      paint.setStyle(PaintStyle[enumKey(style)]);\n    }\n    if (strokeJoin !== undefined) {\n      paint.setStrokeJoin(StrokeJoin[enumKey(strokeJoin)]);\n    }\n    if (strokeCap !== undefined) {\n      paint.setStrokeCap(StrokeCap[enumKey(strokeCap)]);\n    }\n    if (strokeMiter !== undefined) {\n      paint.setStrokeMiter(strokeMiter);\n    }\n    if (opacity !== undefined) {\n      paint.setAlphaf(opacity);\n    }\n    if (antiAlias !== undefined) {\n      paint.setAntiAlias(antiAlias);\n    }\n    if (dither !== undefined) {\n      paint.setDither(dither);\n    }\n    ctx.save();\n    this._children.forEach((child) => {\n      if (child instanceof JsiDeclarationNode) {\n        child.decorate(ctx);\n      }\n    });\n    const colorFilter = ctx.colorFilters.popAllAsOne();\n    const imageFilter = ctx.imageFilters.popAllAsOne();\n    const shader = ctx.shaders.pop();\n    const maskFilter = ctx.maskFilters.pop();\n    const pathEffect = ctx.pathEffects.popAllAsOne();\n    ctx.restore();\n    if (imageFilter) {\n      paint.setImageFilter(imageFilter);\n    }\n    if (shader) {\n      paint.setShader(shader);\n    }\n    if (pathEffect) {\n      paint.setPathEffect(pathEffect);\n    }\n    if (colorFilter) {\n      paint.setColorFilter(colorFilter);\n    }\n    if (maskFilter) {\n      paint.setMaskFilter(maskFilter);\n    }\n    ctx.paints.push(paint);\n  }\n}\n"],"mappings":"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"}

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

@@ -13,7 +13,7 @@ var _Node = require("./Node");
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const paintProps = ["color", "strokeWidth", "blendMode", "strokeCap", "strokeJoin", "strokeMiter", "style", "antiAlias", "opacity"];
+const paintProps = ["color", "strokeWidth", "blendMode", "strokeCap", "strokeJoin", "strokeMiter", "style", "antiAlias", "dither", "opacity"];
 
 class JsiRenderNode extends _Node.JsiNode {
   constructor(ctx, type, props) {