@shopify/react-native-skia 0.1.164 → 0.1.165

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

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

@@ -9,6 +9,11 @@
 
 namespace RNSkia {
 
+static PropId PropName0 = JsiPropId::get("0");
+static PropId PropName1 = JsiPropId::get("1");
+static PropId PropName2 = JsiPropId::get("2");
+static PropId PropName3 = JsiPropId::get("3");
+
 class ColorProp : public DerivedProp<SkColor> {
 public:
   explicit ColorProp(PropId name) : DerivedProp<SkColor>() {
@@ -28,10 +33,10 @@ public:
   static SkColor parseColorValue(const JsiValue &color) {
     if (color.getType() == PropType::Object) {
       // Float array
-      auto r = color.getValue(JsiPropId::get("0"));
-      auto g = color.getValue(JsiPropId::get("1"));
-      auto b = color.getValue(JsiPropId::get("2"));
-      auto a = color.getValue(JsiPropId::get("3"));
+      auto r = color.getValue(PropName0);
+      auto g = color.getValue(PropName1);
+      auto b = color.getValue(PropName2);
+      auto a = color.getValue(PropName3);
       return SkColorSetARGB(a.getAsNumber() * 255.0f, r.getAsNumber() * 255.0f,
                             g.getAsNumber() * 255.0f, b.getAsNumber() * 255.0f);
 

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

@@ -30,7 +30,8 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_imageProp->value().getType() != PropType::HostObject) {
+    if (!_imageProp->isSet() ||
+        _imageProp->value().getType() != PropType::HostObject) {
       throw std::runtime_error("Expected SkImage object for the " +
                                std::string(getName()) + " property.");
     }
@@ -67,7 +68,7 @@ public:
 
     auto rect = _rectProp->getDerivedValue() ? *_rectProp->getDerivedValue()
                                              : imageRect;
-    auto fit = _fitProp->isSet() ? _fitProp->value().getAsString() : "none";
+    auto fit = _fitProp->isSet() ? _fitProp->value().getAsString() : "contain";
 
     setDerivedValue(fitRects(fit, imageRect, rect));
   }

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

@@ -92,22 +92,31 @@ public:
 
     // Opacity
     if (_opacity->isChanged() || context->isChanged()) {
+      auto parent = context->getParent();
+      auto paint = context->getMutablePaint();
       if (_opacity->isSet()) {
-        context->setOpacity(_opacity->value().getAsNumber());
+        auto currentOpacity = _opacity->value().getAsNumber();
+        auto parent = context->getParent();
+        if (parent != nullptr) {
+          currentOpacity *= parent->getPaint()->getAlphaf();
+        }
+        paint->setAlphaf(currentOpacity);
       } else {
-        context->clearOpacity();
+        if (parent != nullptr) {
+          paint->setAlphaf(parent->getPaint()->getAlphaf());
+        } else {
+          paint->setAlphaf(1.0);
+        }
       }
     }
 
     // COLOR
     if (_color->isSet() && (_color->isChanged() || context->isChanged())) {
       auto paint = context->getMutablePaint();
+      auto opacity = paint->getAlphaf();
       paint->setShader(nullptr);
       paint->setColor(*_color->getDerivedValue());
-      paint->setAlphaf(context->getOpacity() * paint->getColor4f().fA);
-    } else if (context->isChanged()) {
-      auto paint = context->getMutablePaint();
-      paint->setAlphaf(context->getOpacity());
+      paint->setAlphaf(opacity * paint->getColor4f().fA);
     }
 
     // Style

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

@@ -76,10 +76,17 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_x->isSet() && _y->isSet() && _width->isSet() && _height->isSet()) {
-      setDerivedValue(SkRect::MakeXYWH(
-          _x->value().getAsNumber(), _y->value().getAsNumber(),
-          _width->value().getAsNumber(), _height->value().getAsNumber()));
+    if (_width->isSet() && _height->isSet()) {
+      auto x = 0.0;
+      auto y = 0.0;
+      if (_x->isSet()) {
+        x = _x->value().getAsNumber();
+      }
+      if (_y->isSet()) {
+        y = _y->value().getAsNumber();
+      }
+      setDerivedValue(SkRect::MakeXYWH(x, y, _width->value().getAsNumber(),
+                                       _height->value().getAsNumber()));
     }
   }
 

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

@@ -16,6 +16,68 @@
 
 namespace RNSkia {
 
+bool isJSPoint(const JsiValue &value) {
+  return value.getType() == PropType::Object && value.hasValue(PropNameX) &&
+         value.hasValue(PropNameY);
+}
+
+bool isSkPoint(const JsiValue &value) {
+  return value.getType() == PropType::HostObject &&
+         std::dynamic_pointer_cast<JsiSkPoint>(value.getAsHostObject()) !=
+             nullptr;
+}
+
+bool isIndexable(const JsiValue &value) {
+  return value.getType() == PropType::Object && value.hasValue(PropName0);
+}
+
+void processValue(std::vector<SkScalar> &values, const JsiValue &value) {
+  if (value.getType() == PropType::Number) {
+    auto n = value.getAsNumber();
+    values.push_back(n);
+  } else if (value.getType() == PropType::Array) {
+    auto arrayValue = value.getAsArray();
+    for (size_t i = 0; i < arrayValue.size(); ++i) {
+      auto a = arrayValue[i];
+      processValue(values, a);
+    }
+  } else if (isJSPoint(value) || isSkPoint(value)) {
+    auto pointValue = PointProp::processValue(value);
+    values.push_back(pointValue.x());
+    values.push_back(pointValue.y());
+  } else if (isIndexable(value)) {
+    auto length = value.getKeys().size();
+    for (size_t i = 0; i < length; ++i) {
+      values.push_back(
+          value.getValue(JsiPropId::get(std::to_string(i))).getAsNumber());
+    }
+  }
+}
+
+void processUniform(std::vector<SkScalar> &values, SkRuntimeEffect *source,
+                    const JsiValue &uniforms, SkRuntimeShaderBuilder *rtb) {
+  auto uniformsCount = source->uniforms().size();
+  for (size_t i = 0; i < uniformsCount; ++i) {
+    auto it = source->uniforms().begin() + i;
+    auto name = JsiPropId::get(std::string(it->name));
+    if (!uniforms.hasValue(name)) {
+      throw std::runtime_error("The runtime effect has the uniform value \"" +
+                               std::string(name) +
+                               "\" declared, but it is missing from the "
+                               "uniforms property of the Runtime effect.");
+    }
+    auto value = uniforms.getValue(name);
+    if (rtb == nullptr) {
+      processValue(values, value);
+    } else {
+      std::vector<SkScalar> uniformValue;
+      processValue(uniformValue, value);
+      rtb->uniform(name).set(uniformValue.data(),
+                             static_cast<int>(uniformValue.size()));
+    }
+  }
+}
+
 class UniformsProp : public DerivedSkProp<SkData> {
 public:
   UniformsProp(PropId name, NodeProp *sourceProp) : DerivedSkProp<SkData>() {
@@ -32,7 +94,9 @@ public:
     auto source = _sourceProp->value().getAs<JsiSkRuntimeEffect>()->getObject();
 
     // Flatten uniforms from property
-    auto uniformValues = flattenUniforms(source.get(), _uniformsProp->value());
+    std::vector<SkScalar> uniformValues;
+    processUniform(uniformValues, source.get(), _uniformsProp->value(),
+                   nullptr);
 
     // Cast uniforms according to the declaration in the shader
     auto uniformsData = castUniforms(source.get(), uniformValues);
@@ -41,11 +105,30 @@ public:
     setDerivedValue(uniformsData);
   }
 
+  void processUniforms(SkRuntimeShaderBuilder &rtb) {
+    if (!_uniformsProp->isSet()) {
+      return;
+    }
+
+    // Get the effect
+    auto source = _sourceProp->value().getAs<JsiSkRuntimeEffect>()->getObject();
+    // Flatten uniforms from property
+    std::vector<SkScalar> uniformValues;
+    processUniform(uniformValues, source.get(), _uniformsProp->value(), &rtb);
+  }
+
 private:
   sk_sp<SkData> castUniforms(SkRuntimeEffect *source,
                              const std::vector<SkScalar> &values) {
     // Create memory for uniforms
-    auto uniformsData = SkData::MakeUninitialized(source->uniformSize());
+    auto uniformSize = source->uniformSize();
+    if (values.size() * sizeof(float) != uniformSize) {
+      throw std::runtime_error(
+          "Uniforms size differs from effect's uniform size. Received " +
+          std::to_string(values.size()) + " expected " +
+          std::to_string(uniformSize / sizeof(float)));
+    }
+    auto uniformsData = SkData::MakeUninitialized(uniformSize);
 
     // Loop through all uniforms in the effect and load data from the flattened
     // array of values
@@ -57,7 +140,7 @@ private:
         const std::size_t offset = reu.slot + j;
         float fValue = values.at(offset);
         int iValue = static_cast<int>(fValue);
-        auto value = reu.isInteger ? iValue : fValue;
+        auto value = reu.isInteger ? SkBits2Float(iValue) : fValue;
         memcpy(SkTAddOffset<void>(uniformsData->writable_data(),
                                   offset * sizeof(value)),
                &value, sizeof(value));
@@ -67,126 +150,6 @@ private:
     return uniformsData;
   }
 
-  std::vector<SkScalar> flattenUniforms(SkRuntimeEffect *source,
-                                        const JsiValue &propObject) {
-    auto uniformsCount = source->uniforms().size();
-    std::vector<SkScalar> uniformValues;
-
-    for (size_t i = 0; i < uniformsCount; ++i) {
-      auto it = source->uniforms().begin() + i;
-      auto name = JsiPropId::get(std::string(it->name));
-
-      if (!propObject.hasValue(name)) {
-        throw std::runtime_error("The runtime effect has the uniform value \"" +
-                                 std::string(name) +
-                                 "\" declared, but it is missing from the "
-                                 "uniforms property of the Runtime effect.");
-      }
-
-      auto value = propObject.getValue(name);
-
-      // A uniform value can be a single number, a vector or an array of numbers
-      // Or an array of the above
-      if (value.getType() == PropType::Number) {
-        // Set numeric uniform
-        uniformValues.push_back(value.getAsNumber());
-      } else if (value.getType() == PropType::Array) {
-        // Array
-        auto arrayValue = value.getAsArray();
-        for (size_t n = 0; n < arrayValue.size(); ++n) {
-          auto a = arrayValue[n];
-          if (a.getType() == PropType::Number) {
-            uniformValues.push_back(a.getAsNumber());
-          } else {
-            for (size_t j = 0; j < a.getAsArray().size(); ++j) {
-              uniformValues.push_back(a.getAsArray()[j].getAsNumber());
-            }
-          }
-        }
-      } else if (value.getType() == PropType::HostObject ||
-                 value.getType() == PropType::Object) {
-        // Vector (JsiSkPoint / JsiSkRect)
-        auto pointValue = PointProp::processValue(value);
-        uniformValues.push_back(pointValue.x());
-        uniformValues.push_back(pointValue.y());
-      }
-    }
-    return uniformValues;
-  }
-
-  NodeProp *_uniformsProp;
-  NodeProp *_sourceProp;
-};
-
-class SimpleUniformsProp : public BaseDerivedProp {
-public:
-  SimpleUniformsProp(PropId name, NodeProp *sourceProp) : BaseDerivedProp() {
-    _uniformsProp = addProperty(std::make_shared<NodeProp>(name));
-    _sourceProp = sourceProp;
-  }
-
-  void processUniforms(SkRuntimeShaderBuilder &rtb) {
-    if (!_uniformsProp->isSet()) {
-      return;
-    }
-
-    auto propObject = _uniformsProp->value();
-    auto source = _sourceProp->value().getAs<JsiSkRuntimeEffect>()->getObject();
-
-    auto uniformsCount = source->uniforms().size();
-
-    for (size_t i = 0; i < uniformsCount; ++i) {
-      auto it = source->uniforms().begin() + i;
-      auto name = JsiPropId::get(std::string(it->name));
-
-      if (!propObject.hasValue(name)) {
-        throw std::runtime_error("The runtime effect has the uniform value \"" +
-                                 std::string(name) +
-                                 "\" declared, but it is missing from the "
-                                 "uniforms property of the Runtime effect.");
-      }
-
-      auto value = propObject.getValue(name);
-
-      // A uniform value can be a single number, a vector or an array of numbers
-      // Or an array of the above
-      if (value.getType() == PropType::Number) {
-        // Set numeric uniform
-        rtb.uniform(name) = value.getAsNumber();
-      } else if (value.getType() == PropType::Array) {
-        // Array
-        auto arrayValue = value.getAsArray();
-        std::vector<SkScalar> set;
-        for (size_t n = 0; n < arrayValue.size(); ++n) {
-          auto a = arrayValue[n];
-          if (a.getType() == PropType::Number) {
-            set.push_back(a.getAsNumber());
-          } else {
-            for (size_t j = 0; j < a.getAsArray().size(); ++j) {
-              set.push_back(a.getAsArray()[j].getAsNumber());
-            }
-          }
-        }
-        rtb.uniform(name).set(set.data(), static_cast<int>(set.size()));
-
-      } else if (value.getType() == PropType::HostObject ||
-                 value.getType() == PropType::Object) {
-        // Vector (JsiSkPoint / JsiSkRect)
-        auto pointValue = PointProp::processValue(value);
-        std::vector<SkScalar> set = {pointValue.x(), pointValue.y()};
-
-        rtb.uniform(name).set(set.data(), static_cast<int>(set.size()));
-      } else {
-        throw std::runtime_error("Unexpected type for uniform prop \"" +
-                                 std::string(name) + "\". Got " +
-                                 value.getTypeAsString(value.getType()));
-      }
-    }
-  }
-
-  void updateDerivedValue() override {}
-
-private:
   NodeProp *_uniformsProp;
   NodeProp *_sourceProp;
 };

package/cpp/rnskia/values/RNSkReadonlyValue.h

@@ -142,12 +142,8 @@ protected:
    @param runtime Current JS Runtime
    */
   void notifyListeners(jsi::Runtime &runtime) {
-    std::unordered_map<long, std::function<void(jsi::Runtime &)>> tmp;
-    {
-      std::lock_guard<std::mutex> lock(_mutex);
-      tmp.insert(_listeners.cbegin(), _listeners.cend());
-    }
-    for (const auto &listener : tmp) {
+    std::lock_guard<std::mutex> lock(_mutex);
+    for (const auto &listener : _listeners) {
       listener.second(runtime);
     }
   }

package/lib/commonjs/dom/nodes/datatypes/Circle.js

@@ -19,7 +19,12 @@ const processCircle = (Skia, def) => {
     };
   }
 
-  return def;
+  return { ...def,
+    c: def.c ?? {
+      x: 0,
+      y: 0
+    }
+  };
 };
 
 exports.processCircle = processCircle;

package/lib/commonjs/dom/nodes/datatypes/Circle.js.map

@@ -1 +1 @@
-{"version":3,"names":["isCircleScalarDef","def","cx","undefined","processCircle","Skia","c","Point","cy","r"],"sources":["Circle.ts"],"sourcesContent":["import type { Skia } from \"../../../skia/types\";\nimport type { CircleDef, ScalarCircleDef } from \"../../types\";\n\nexport const isCircleScalarDef = (def: CircleDef): def is ScalarCircleDef =>\n  // We have an issue to check property existence on JSI backed instances\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  (def as any).cx !== undefined;\n\nexport const processCircle = (Skia: Skia, def: CircleDef) => {\n  if (isCircleScalarDef(def)) {\n    return { c: Skia.Point(def.cx, def.cy), r: def.r };\n  }\n  return def;\n};\n"],"mappings":";;;;;;;AAGO,MAAMA,iBAAiB,GAAIC,GAAD,IAC/B;AACA;AACCA,GAAD,CAAaC,EAAb,KAAoBC,SAHf;;;;AAKA,MAAMC,aAAa,GAAG,CAACC,IAAD,EAAaJ,GAAb,KAAgC;EAC3D,IAAID,iBAAiB,CAACC,GAAD,CAArB,EAA4B;IAC1B,OAAO;MAAEK,CAAC,EAAED,IAAI,CAACE,KAAL,CAAWN,GAAG,CAACC,EAAf,EAAmBD,GAAG,CAACO,EAAvB,CAAL;MAAiCC,CAAC,EAAER,GAAG,CAACQ;IAAxC,CAAP;EACD;;EACD,OAAOR,GAAP;AACD,CALM"}
+{"version":3,"names":["isCircleScalarDef","def","cx","undefined","processCircle","Skia","c","Point","cy","r","x","y"],"sources":["Circle.ts"],"sourcesContent":["import type { Skia } from \"../../../skia/types\";\nimport type { CircleDef, ScalarCircleDef } from \"../../types\";\n\nexport const isCircleScalarDef = (def: CircleDef): def is ScalarCircleDef =>\n  // We have an issue to check property existence on JSI backed instances\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  (def as any).cx !== undefined;\n\nexport const processCircle = (Skia: Skia, def: CircleDef) => {\n  if (isCircleScalarDef(def)) {\n    return { c: Skia.Point(def.cx, def.cy), r: def.r };\n  }\n  return { ...def, c: def.c ?? { x: 0, y: 0 } };\n};\n"],"mappings":";;;;;;;AAGO,MAAMA,iBAAiB,GAAIC,GAAD,IAC/B;AACA;AACCA,GAAD,CAAaC,EAAb,KAAoBC,SAHf;;;;AAKA,MAAMC,aAAa,GAAG,CAACC,IAAD,EAAaJ,GAAb,KAAgC;EAC3D,IAAID,iBAAiB,CAACC,GAAD,CAArB,EAA4B;IAC1B,OAAO;MAAEK,CAAC,EAAED,IAAI,CAACE,KAAL,CAAWN,GAAG,CAACC,EAAf,EAAmBD,GAAG,CAACO,EAAvB,CAAL;MAAiCC,CAAC,EAAER,GAAG,CAACQ;IAAxC,CAAP;EACD;;EACD,OAAO,EAAE,GAAGR,GAAL;IAAUK,CAAC,EAAEL,GAAG,CAACK,CAAJ,IAAS;MAAEI,CAAC,EAAE,CAAL;MAAQC,CAAC,EAAE;IAAX;EAAtB,CAAP;AACD,CALM"}

package/lib/commonjs/dom/nodes/datatypes/Rect.js

@@ -20,7 +20,7 @@ const isRectCtor = def => def.rect === undefined;
 
 const processRect = (Skia, def) => {
   if (isRectCtor(def)) {
-    return Skia.XYWHRect(def.x, def.y, def.width, def.height);
+    return Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height);
   } else {
     return def.rect;
   }
@@ -30,8 +30,8 @@ exports.processRect = processRect;
 
 const processRRect = (Skia, def) => {
   if (isRRectCtor(def)) {
-    const r = (0, _Radius.processRadius)(Skia, def.r);
-    return Skia.RRectXY(Skia.XYWHRect(def.x, def.y, def.width, def.height), r.x, r.y);
+    const r = (0, _Radius.processRadius)(Skia, def.r ?? 0);
+    return Skia.RRectXY(Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height), r.x, r.y);
   } else {
     return def.rect;
   }