@shopify/react-native-skia 0.1.164 → 0.1.166

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

@@ -7,25 +7,36 @@ import android.view.Surface;
 import android.view.TextureView;
 
 import com.facebook.jni.annotations.DoNotStrip;
+import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.views.view.ReactViewGroup;
 
-public abstract class SkiaBaseView extends TextureView implements TextureView.SurfaceTextureListener {
+public abstract class SkiaBaseView extends ReactViewGroup implements TextureView.SurfaceTextureListener {
 
     @DoNotStrip
     private Surface mSurface;
+    private TextureView mTexture;
 
     public SkiaBaseView(Context context) {
         super(context);
-        setSurfaceTextureListener(this);
-        setOpaque(false);
+        mTexture = new TextureView(context);
+        mTexture.setSurfaceTextureListener(this);
+        mTexture.setOpaque(false);
+        addView(mTexture);
     }
 
     @Override
-    public void setBackgroundColor(int color) {
-        // Texture view does not support setting the background color.
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        mTexture.layout(0, 0, this.getMeasuredWidth(), this.getMeasuredHeight());
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
+        // We do not accept the touch event if this view is not supposed to receive it.
+        if (!PointerEvents.canBeTouchTarget(getPointerEvents())) {
+            return false;
+        }
+
         // https://developer.android.com/training/gestures/multi
         int action = ev.getActionMasked();
 

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

@@ -0,0 +1,34 @@
+package com.shopify.reactnative.skia;
+
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public abstract class SkiaBaseViewManager extends ReactViewManager {
+
+    @Override
+    public void setNativeId(@NonNull ReactViewGroup view, @Nullable String nativeId) {
+        super.setNativeId(view, nativeId);
+        int nativeIdResolved = Integer.parseInt(nativeId);
+        ((SkiaBaseView)view).registerView(nativeIdResolved);
+    }
+
+    @ReactProp(name = "mode")
+    public void setMode(ReactViewGroup view, String mode) {
+        ((SkiaBaseView)view).setMode(mode);
+    }
+
+    @ReactProp(name = "debug")
+    public void setDebug(ReactViewGroup view, boolean show) {
+        ((SkiaBaseView)view).setDebugMode(show);
+    }
+
+    @Override
+    public void onDropViewInstance(@NonNull ReactViewGroup view) {
+        super.onDropViewInstance(view);
+        ((SkiaBaseView)view).unregisterView();
+    }
+}

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

@@ -1,17 +1,9 @@
 package com.shopify.reactnative.skia;
 
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.BaseViewManager;
-import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.HashMap;
 
-public class SkiaDomViewManager extends BaseViewManager<SkiaDomView, LayoutShadowNode> {
+public class SkiaDomViewManager extends SkiaBaseViewManager {
 
     @NonNull
     @Override
@@ -19,46 +11,9 @@ public class SkiaDomViewManager extends BaseViewManager<SkiaDomView, LayoutShado
         return "SkiaDomView";
     }
 
-    @Override
-    public LayoutShadowNode createShadowNodeInstance() {
-        return new LayoutShadowNode();
-    }
-
-    @Override
-    public Class<? extends LayoutShadowNode> getShadowNodeClass() {
-        return LayoutShadowNode.class;
-    }
-
-    @Override
-    public void updateExtraData(SkiaDomView root, Object extraData) {
-    }
-
-    @Override
-    public void setNativeId(@NonNull SkiaDomView view, @Nullable String nativeId) {
-        super.setNativeId(view, nativeId);
-        int nativeIdResolved = Integer.parseInt(nativeId);
-        view.registerView(nativeIdResolved);
-    }
-
-    @ReactProp(name = "mode")
-    public void setMode(SkiaDomView view, String mode) {
-        view.setMode(mode);
-    }
-
-    @ReactProp(name = "debug")
-    public void setDebug(SkiaDomView view, boolean show) {
-        view.setDebugMode(show);
-    }
-
-    @Override
-    public void onDropViewInstance(@NonNull SkiaDomView view) {
-        super.onDropViewInstance(view);
-        view.unregisterView();
-    }
-
     @NonNull
     @Override
-    protected SkiaDomView createViewInstance(@NonNull ThemedReactContext reactContext) {
+    public SkiaDomView createViewInstance(@NonNull ThemedReactContext reactContext) {
         return new SkiaDomView(reactContext);
     }
 }

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

@@ -1,14 +1,9 @@
 package com.shopify.reactnative.skia;
 
-import com.facebook.react.uimanager.BaseViewManager;
-import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
-public class SkiaDrawViewManager extends BaseViewManager<SkiaDrawView, LayoutShadowNode> {
+public class SkiaDrawViewManager extends SkiaBaseViewManager {
 
     @NonNull
     @Override
@@ -16,46 +11,9 @@ public class SkiaDrawViewManager extends BaseViewManager<SkiaDrawView, LayoutSha
         return "SkiaDrawView";
     }
 
-    @Override
-    public LayoutShadowNode createShadowNodeInstance() {
-        return new LayoutShadowNode();
-    }
-
-    @Override
-    public Class<? extends LayoutShadowNode> getShadowNodeClass() {
-        return LayoutShadowNode.class;
-    }
-
-    @Override
-    public void updateExtraData(SkiaDrawView root, Object extraData) {
-    }
-
-    @Override
-    public void setNativeId(@NonNull SkiaDrawView view, @Nullable String nativeId) {
-        super.setNativeId(view, nativeId);
-        int nativeIdResolved = Integer.parseInt(nativeId);
-        view.registerView(nativeIdResolved);
-    }
-
-    @ReactProp(name = "mode")
-    public void setMode(SkiaDrawView view, String mode) {
-        view.setMode(mode);
-    }
-
-    @ReactProp(name = "debug")
-    public void setDebug(SkiaDrawView view, boolean show) {
-        view.setDebugMode(show);
-    }
-
-    @Override
-    public void onDropViewInstance(@NonNull SkiaDrawView view) {
-        super.onDropViewInstance(view);
-        view.unregisterView();
-    }
-
     @NonNull
     @Override
-    protected SkiaDrawView createViewInstance(@NonNull ThemedReactContext reactContext) {
+    public SkiaDrawView createViewInstance(@NonNull ThemedReactContext reactContext) {
         return new SkiaDrawView(reactContext);
     }
 }

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

@@ -1,17 +1,9 @@
 package com.shopify.reactnative.skia;
 
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.BaseViewManager;
-import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.HashMap;
 
-public class SkiaPictureViewManager extends BaseViewManager<SkiaPictureView, LayoutShadowNode> {
+public class SkiaPictureViewManager extends SkiaBaseViewManager {
 
     @NonNull
     @Override
@@ -19,46 +11,9 @@ public class SkiaPictureViewManager extends BaseViewManager<SkiaPictureView, Lay
         return "SkiaPictureView";
     }
 
-    @Override
-    public LayoutShadowNode createShadowNodeInstance() {
-        return new LayoutShadowNode();
-    }
-
-    @Override
-    public Class<? extends LayoutShadowNode> getShadowNodeClass() {
-        return LayoutShadowNode.class;
-    }
-
-    @Override
-    public void updateExtraData(SkiaPictureView root, Object extraData) {
-    }
-
-    @Override
-    public void setNativeId(@NonNull SkiaPictureView view, @Nullable String nativeId) {
-        super.setNativeId(view, nativeId);
-        int nativeIdResolved = Integer.parseInt(nativeId);
-        view.registerView(nativeIdResolved);
-    }
-
-    @ReactProp(name = "mode")
-    public void setMode(SkiaPictureView view, String mode) {
-        view.setMode(mode);
-    }
-
-    @ReactProp(name = "debug")
-    public void setDebug(SkiaPictureView view, boolean show) {
-        view.setDebugMode(show);
-    }
-
-    @Override
-    public void onDropViewInstance(@NonNull SkiaPictureView view) {
-        super.onDropViewInstance(view);
-        view.unregisterView();
-    }
-
     @NonNull
     @Override
-    protected SkiaPictureView createViewInstance(@NonNull ThemedReactContext reactContext) {
+    public SkiaPictureView createViewInstance(@NonNull ThemedReactContext reactContext) {
         return new SkiaPictureView(reactContext);
     }
 }

package/cpp/api/JsiSkRuntimeEffect.h

@@ -117,6 +117,10 @@ public:
     return result;
   }
 
+  JSI_HOST_FUNCTION(source) {
+    return jsi::String::createFromAscii(runtime, getObject()->source());
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
                                        makeShaderWithChildren),
@@ -124,7 +128,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
                                        getUniformFloatCount),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform))
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, source))
 
   JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
                      sk_sp<SkRuntimeEffect> rt)
@@ -206,7 +211,7 @@ private:
         const std::size_t offset = reu.slot + j;
         float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
         int iValue = static_cast<int>(fValue);
-        auto value = reu.isInteger ? iValue : fValue;
+        auto value = reu.isInteger ? SkBits2Float(iValue) : fValue;
         memcpy(SkTAddOffset<void>(uniforms->writable_data(),
                                   offset * sizeof(value)),
                &value, sizeof(value));

package/cpp/rnskia/RNSkDomView.cpp

@@ -86,7 +86,7 @@ void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
   if (_drawingContext == nullptr) {
     auto paint = std::make_shared<SkPaint>();
     paint->setAntiAlias(true);
-    _drawingContext = std::make_shared<DrawingContext>(paint, 1.0f);
+    _drawingContext = std::make_shared<DrawingContext>(paint);
 
     _drawingContext->setRequestRedraw([weakSelf = weak_from_this()]() {
       auto self = weakSelf.lock();

package/cpp/rnskia/RNSkPlatformContext.h

@@ -178,12 +178,8 @@ public:
     if (!_isValid) {
       return;
     }
-    std::unordered_map<size_t, std::function<void(bool)>> tmp;
-    {
-      std::lock_guard<std::mutex> lock(_drawCallbacksLock);
-      tmp.insert(_drawCallbacks.cbegin(), _drawCallbacks.cend());
-    }
-    for (auto it = tmp.begin(); it != tmp.end(); it++) {
+    std::lock_guard<std::mutex> lock(_drawCallbacksLock);
+    for (auto it = _drawCallbacks.begin(); it != _drawCallbacks.end(); it++) {
       it->second(invalidated);
     }
   }

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

@@ -116,7 +116,7 @@ public:
   /**
   Returns the derived value
    */
-  std::shared_ptr<T> getDerivedValue() { return _derivedValue; }
+  std::shared_ptr<const T> getDerivedValue() { return _derivedValue; }
 
   /**
    Returns true if is optional and one of the child props has a value, or all
@@ -128,7 +128,7 @@ protected:
   /**
    Set derived value from sub classes
    */
-  void setDerivedValue(std::shared_ptr<T> value) {
+  void setDerivedValue(std::shared_ptr<const T> value) {
     setIsChanged(_derivedValue != value);
     _derivedValue = value;
   }
@@ -138,11 +138,11 @@ protected:
    */
   void setDerivedValue(const T &&value) {
     setIsChanged(true);
-    _derivedValue = std::make_shared<T>(std::move(value));
+    _derivedValue = std::make_shared<const T>(std::move(value));
   }
 
 private:
-  std::shared_ptr<T> _derivedValue;
+  std::shared_ptr<const T> _derivedValue;
 };
 
 /**

package/cpp/rnskia/dom/base/DrawingContext.cpp

@@ -2,10 +2,9 @@
 
 namespace RNSkia {
 
-DrawingContext::DrawingContext(std::shared_ptr<SkPaint> paint, double opacity)
+DrawingContext::DrawingContext(std::shared_ptr<SkPaint> paint)
     : DrawingContext("root") {
   _paint = paint;
-  _opacity = opacity;
 }
 
 DrawingContext::DrawingContext(DrawingContext *parent, const char *source)
@@ -43,7 +42,8 @@ std::string DrawingContext::getDebugDescription() {
       v += " blendMode:" + std::to_string(static_cast<size_t>(blendMode));
     }
 
-    v += " opacity:" + std::to_string(_opacity);
+    auto opacity = _paint->getAlphaf();
+    v += " opacity:" + std::to_string(opacity);
 
     if (_paint->getPathEffect() != nullptr) {
       v += " [PathEffect]";
@@ -148,7 +148,6 @@ std::shared_ptr<SkPaint> DrawingContext::getMutablePaint() {
   if (_paint == nullptr) {
     auto parentPaint = _parent->getPaint();
     _paint = std::make_shared<SkPaint>(*parentPaint);
-    _opacity = _parent->getOpacity();
   }
   // Calling the getMutablePaint accessor implies that the paint
   // is about to be mutatet and will therefore invalidate
@@ -165,40 +164,6 @@ void DrawingContext::setMutablePaint(std::shared_ptr<SkPaint> paint) {
   _paint = paint;
 }
 
-/**
- Getd the opacity value
- */
-double DrawingContext::getOpacity() {
-  if (_paint == nullptr) {
-    return _parent->getOpacity();
-  }
-  return _opacity;
-}
-
-/**
- Sets the opacity value
- */
-void DrawingContext::setOpacity(double opacity) {
-  auto currentOpacity = opacity;
-  if (_parent != nullptr) {
-    currentOpacity *= _parent->getOpacity();
-  }
-  getMutablePaint()->setAlphaf(currentOpacity);
-  _opacity = currentOpacity;
-}
-
-/**
- Clears the opacity value
- */
-void DrawingContext::clearOpacity() {
-  if (_parent != nullptr) {
-    _opacity = _parent->getOpacity();
-  } else {
-    _opacity = 1.0;
-  }
-  markChildrenAsChanged();
-}
-
 float DrawingContext::getScaledWidth() {
   if (_parent != nullptr) {
     return _parent->getScaledWidth();
@@ -213,6 +178,8 @@ float DrawingContext::getScaledHeight() {
   return _scaledHeight;
 }
 
+DrawingContext *DrawingContext::getParent() { return _parent; }
+
 void DrawingContext::setScaledWidth(float v) { _scaledWidth = v; }
 void DrawingContext::setScaledHeight(float v) { _scaledHeight = v; }
 

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

@@ -22,7 +22,7 @@ public:
   /**
    Creates a root drawing context with paint and opacity
    */
-  DrawingContext(std::shared_ptr<SkPaint> paint, double opacity);
+  explicit DrawingContext(std::shared_ptr<SkPaint> paint);
 
   /**
    Initilalizes a new draw context.
@@ -87,21 +87,6 @@ public:
    */
   void setMutablePaint(std::shared_ptr<SkPaint> paint);
 
-  /**
-   Getd the opacity value
-   */
-  double getOpacity();
-
-  /**
-   Sets the opacity value
-   */
-  void setOpacity(double opacity);
-
-  /**
-   Clears the opacity
-   */
-  void clearOpacity();
-
   float getScaledWidth();
 
   float getScaledHeight();
@@ -112,6 +97,8 @@ public:
   void setRequestRedraw(std::function<void()> &&requestRedraw);
   const std::function<void()> &getRequestRedraw();
 
+  DrawingContext *getParent();
+
 private:
   explicit DrawingContext(const char *source);
 
@@ -120,7 +107,6 @@ private:
   bool _isChanged = true;
 
   std::shared_ptr<SkPaint> _paint;
-  double _opacity = 1.0f;
 
   SkCanvas *_canvas = nullptr;
   const char *_source;

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

@@ -81,8 +81,8 @@ protected:
   }
 
 private:
-  SkRRect inflate(const SkRRect &box, SkScalar dx, SkScalar dy, size_t tx = 0,
-                  size_t ty = 0) {
+  SkRRect inflate(const SkRRect &box, SkScalar dx, SkScalar dy, SkScalar tx = 0,
+                  SkScalar ty = 0) {
     return SkRRect::MakeRectXY(
         SkRect::MakeXYWH(box.rect().x() - dx + tx, box.rect().y() - dy + ty,
                          box.rect().width() + 2 * dx,
@@ -90,8 +90,8 @@ private:
         box.getSimpleRadii().x() + dx, box.getSimpleRadii().y() + dy);
   }
 
-  SkRRect deflate(const SkRRect &box, SkScalar dx, SkScalar dy, size_t tx = 0,
-                  size_t ty = 0) {
+  SkRRect deflate(const SkRRect &box, SkScalar dx, SkScalar dy, SkScalar tx = 0,
+                  SkScalar ty = 0) {
     return inflate(box, -dx, -dy, tx, ty);
   }
 

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

@@ -24,8 +24,6 @@ protected:
     JsiDomDrawingNode::defineProperties(container);
     _circleProp = container->defineProperty<CircleProp>();
     _radiusProp = container->defineProperty<NodeProp>("r");
-
-    _circleProp->require();
     _radiusProp->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));

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

@@ -384,14 +384,14 @@ protected:
     JsiBaseDomDeclarationNode::defineProperties(container);
     _sourceProp = container->defineProperty<NodeProp>("source");
     _uniformsProp =
-        container->defineProperty<SimpleUniformsProp>("uniforms", _sourceProp);
+        container->defineProperty<UniformsProp>("uniforms", _sourceProp);
 
     _sourceProp->require();
   }
 
 private:
   NodeProp *_sourceProp;
-  SimpleUniformsProp *_uniformsProp;
+  UniformsProp *_uniformsProp;
 };
 
 } // namespace RNSkia

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

@@ -59,20 +59,22 @@ protected:
                 ", end: " + std::to_string(_endProp->value().getAsNumber()));
           }
           filteredPath.swap(filteredPath);
-          _path = std::make_shared<SkPath>(filteredPath);
+          _path = std::make_shared<const SkPath>(filteredPath);
         } else if (hasStartOffset || hasEndOffset) {
           throw std::runtime_error(
               "Failed trimming path with parameters start: " +
               std::to_string(_startProp->value().getAsNumber()) +
               ", end: " + std::to_string(_endProp->value().getAsNumber()));
         } else {
-          _path = std::make_shared<SkPath>(filteredPath);
+          _path = std::make_shared<const SkPath>(filteredPath);
         }
 
         // Set fill style
         if (_fillTypeProp->isSet()) {
           auto fillType = _fillTypeProp->value().getAsString();
-          _path->setFillType(getFillTypeFromStringValue(fillType));
+          auto p = std::make_shared<SkPath>(*_path.get());
+          p->setFillType(getFillTypeFromStringValue(fillType));
+          _path = std::const_pointer_cast<const SkPath>(p);
         }
 
         // do we have a special paint here?
@@ -105,9 +107,14 @@ protected:
             precision = opts.getValue(PropNamePrecision).getAsNumber();
           }
 
-          if (!strokePaint.getFillPath(*_path.get(), _path.get(), nullptr,
+          // _path is const so we can't mutate it directly, let's replace the
+          // path like this:
+          auto p = std::make_shared<SkPath>(*_path.get());
+          if (!strokePaint.getFillPath(*_path.get(), p.get(), nullptr,
                                        precision)) {
             _path = nullptr;
+          } else {
+            _path = std::const_pointer_cast<const SkPath>(p);
           }
         }
 
@@ -157,7 +164,7 @@ private:
   NodeProp *_fillTypeProp;
   NodeProp *_strokeOptsProp;
 
-  std::shared_ptr<SkPath> _path;
+  std::shared_ptr<const SkPath> _path;
 };
 
 class StrokeOptsProps : public BaseDerivedProp {

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

@@ -121,8 +121,16 @@ protected:
       if (rect != nullptr && lm != nullptr) {
         auto rc = _imageProps->getDerivedValue();
         auto m3 = _imageProps->rect2rect(rc->src, rc->dst);
-        lm->preTranslate(m3.x(), m3.y());
-        lm->preScale(m3.width(), m3.height());
+        if (_transformProp->isChanged()) {
+          // To modify the matrix we need to copy it since we're not allowed to
+          // modify values contained in properties - this would have caused the
+          // matrix to be translated and scaled more and more for each render
+          // even thought the matrix prop did not change.
+          _matrix.reset();
+          _matrix.preConcat(*lm);
+          _matrix.preTranslate(m3.x(), m3.y());
+          _matrix.preScale(m3.width(), m3.height());
+        }
       }
 
       setShader(
@@ -133,7 +141,7 @@ protected:
                                     _filterModeProp->value().getAsString()),
                                 getMipmapModeFromString(
                                     _mipmapModeProp->value().getAsString())),
-              lm));
+              &_matrix));
     }
   }
 
@@ -185,6 +193,8 @@ private:
                              "\" is not a valid Mipmap Mode.");
   }
 
+  SkMatrix _matrix;
+
   TileModeProp *_txProp;
   TileModeProp *_tyProp;
   NodeProp *_filterModeProp;
@@ -328,12 +338,12 @@ protected:
     }
   }
 
-  SkColor *_colors;
-  SkTileMode _mode;
+  const SkColor *_colors;
   double _flags;
-  SkScalar *_positions;
-  SkMatrix *_matrix;
   int _colorCount;
+  SkTileMode _mode;
+  const SkScalar *_positions;
+  const SkMatrix *_matrix;
 
 private:
   TransformsProps *_transformsProps;

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

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