@shopify/react-native-skia 0.1.164 → 0.1.166

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

@@ -45,18 +45,18 @@ public:
     return _pathProp->isSet() || _rectProp->isSet() || _rrectProp->isSet();
   }
 
-  SkPath *getPath() { return _path.get(); }
-  SkRect *getRect() { return _rect.get(); }
-  SkRRect *getRRect() { return _rrect.get(); }
+  const SkPath *getPath() { return _path.get(); }
+  const SkRect *getRect() { return _rect.get(); }
+  const SkRRect *getRRect() { return _rrect.get(); }
 
 private:
   PathProp *_pathProp;
   RectProp *_rectProp;
   RRectProp *_rrectProp;
 
-  std::shared_ptr<SkPath> _path;
-  std::shared_ptr<SkRect> _rect;
-  std::shared_ptr<SkRRect> _rrect;
+  std::shared_ptr<const SkPath> _path;
+  std::shared_ptr<const SkRect> _rect;
+  std::shared_ptr<const SkRRect> _rrect;
 };
 
 } // namespace RNSkia

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,13 +68,15 @@ 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));
   }
 
   sk_sp<SkImage> getImage() { return _imageProp->getDerivedValue(); }
-  std::shared_ptr<SkRect> getRect() { return _rectProp->getDerivedValue(); }
+  std::shared_ptr<const SkRect> getRect() {
+    return _rectProp->getDerivedValue();
+  }
 
   SkRect rect2rect(SkRect src, SkRect dst) {
     auto scaleX = dst.width() / src.width();

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

@@ -19,8 +19,6 @@
 
 namespace RNSkia {
 
-static PropId PropNameCurrent = JsiPropId::get("current");
-
 class PaintProp : public DerivedProp<SkPaint> {
 public:
   explicit PaintProp(PropId name) : DerivedProp<SkPaint>() {
@@ -40,20 +38,6 @@ public:
           throw std::runtime_error("Expected SkPaint object, got unknown "
                                    "object when reading paint property.");
         }
-      } else if (_paintProp->value().getType() == PropType::Object) {
-        // We have a JS object - is it a ref?
-        auto ref = _paintProp->value().getValue(PropNameCurrent);
-        if (ref.getType() == PropType::HostObject) {
-          auto ptr = ref.getAs<JsiSkPaint>();
-          if (ptr != nullptr) {
-            // Update the local paint for the current context
-            setDerivedValue(ptr->getObject());
-          } else {
-            throw std::runtime_error(
-                "Expected reference to a SkPaint object, got unknown object "
-                "when reading paint property.");
-          }
-        }
       } else {
         setDerivedValue(nullptr);
       }
@@ -92,22 +76,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/dom/props/VerticesProps.h

@@ -40,9 +40,9 @@ public:
   bool hasColors() { return _colorsProp->isSet(); }
 
   void updateDerivedValue() override {
-    SkVertices::VertexMode *vertextMode =
+    const SkVertices::VertexMode *vertextMode =
         _vertexModeProp->getDerivedValue().get();
-    std::vector<SkColor> *colors = _colorsProp->getDerivedValue().get();
+    const std::vector<SkColor> *colors = _colorsProp->getDerivedValue().get();
     auto vertices = _verticesProp->getDerivedValue();
     auto textures = _texturesProp->getDerivedValue();
     auto indices = _indicesProp->getDerivedValue();

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

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

@@ -1 +1 @@
-{"version":3,"names":["isEdge","pos","b","x","y","width","height","isRRectCtor","def","rect","undefined","isRectCtor","processRect","Skia","XYWHRect","processRRect","r","processRadius","RRectXY"],"sources":["Rect.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport type { Skia, SkRect, Vector } from \"../../../skia/types\";\nimport type { RectCtor, RectDef, RRectCtor, RRectDef } from \"../../types\";\n\nimport { processRadius } from \"./Radius\";\n\nexport const isEdge = (pos: Vector, b: SkRect) =>\n  pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height;\n\n// We have an issue to check property existence on JSI backed instances\nconst isRRectCtor = (def: RRectDef): def is RRectCtor =>\n  (def as any).rect === undefined;\n// We have an issue to check property existence on JSI backed instances\nconst isRectCtor = (def: RectDef): def is RectCtor =>\n  (def as any).rect === undefined;\n\nexport const processRect = (Skia: Skia, def: RectDef) => {\n  if (isRectCtor(def)) {\n    return Skia.XYWHRect(def.x, def.y, def.width, def.height);\n  } else {\n    return def.rect;\n  }\n};\n\nexport const processRRect = (Skia: Skia, def: RRectDef) => {\n  if (isRRectCtor(def)) {\n    const r = processRadius(Skia, def.r);\n    return Skia.RRectXY(\n      Skia.XYWHRect(def.x, def.y, def.width, def.height),\n      r.x,\n      r.y\n    );\n  } else {\n    return def.rect;\n  }\n};\n"],"mappings":";;;;;;;AAIA;;AAJA;AAMO,MAAMA,MAAM,GAAG,CAACC,GAAD,EAAcC,CAAd,KACpBD,GAAG,CAACE,CAAJ,KAAUD,CAAC,CAACC,CAAZ,IAAiBF,GAAG,CAACG,CAAJ,KAAUF,CAAC,CAACE,CAA7B,IAAkCH,GAAG,CAACE,CAAJ,KAAUD,CAAC,CAACG,KAA9C,IAAuDJ,GAAG,CAACG,CAAJ,KAAUF,CAAC,CAACI,MAD9D,C,CAGP;;;;;AACA,MAAMC,WAAW,GAAIC,GAAD,IACjBA,GAAD,CAAaC,IAAb,KAAsBC,SADxB,C,CAEA;;;AACA,MAAMC,UAAU,GAAIH,GAAD,IAChBA,GAAD,CAAaC,IAAb,KAAsBC,SADxB;;AAGO,MAAME,WAAW,GAAG,CAACC,IAAD,EAAaL,GAAb,KAA8B;EACvD,IAAIG,UAAU,CAACH,GAAD,CAAd,EAAqB;IACnB,OAAOK,IAAI,CAACC,QAAL,CAAcN,GAAG,CAACL,CAAlB,EAAqBK,GAAG,CAACJ,CAAzB,EAA4BI,GAAG,CAACH,KAAhC,EAAuCG,GAAG,CAACF,MAA3C,CAAP;EACD,CAFD,MAEO;IACL,OAAOE,GAAG,CAACC,IAAX;EACD;AACF,CANM;;;;AAQA,MAAMM,YAAY,GAAG,CAACF,IAAD,EAAaL,GAAb,KAA+B;EACzD,IAAID,WAAW,CAACC,GAAD,CAAf,EAAsB;IACpB,MAAMQ,CAAC,GAAG,IAAAC,qBAAA,EAAcJ,IAAd,EAAoBL,GAAG,CAACQ,CAAxB,CAAV;IACA,OAAOH,IAAI,CAACK,OAAL,CACLL,IAAI,CAACC,QAAL,CAAcN,GAAG,CAACL,CAAlB,EAAqBK,GAAG,CAACJ,CAAzB,EAA4BI,GAAG,CAACH,KAAhC,EAAuCG,GAAG,CAACF,MAA3C,CADK,EAELU,CAAC,CAACb,CAFG,EAGLa,CAAC,CAACZ,CAHG,CAAP;EAKD,CAPD,MAOO;IACL,OAAOI,GAAG,CAACC,IAAX;EACD;AACF,CAXM"}
+{"version":3,"names":["isEdge","pos","b","x","y","width","height","isRRectCtor","def","rect","undefined","isRectCtor","processRect","Skia","XYWHRect","processRRect","r","processRadius","RRectXY"],"sources":["Rect.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport type { Skia, SkRect, Vector } from \"../../../skia/types\";\nimport type { RectCtor, RectDef, RRectCtor, RRectDef } from \"../../types\";\n\nimport { processRadius } from \"./Radius\";\n\nexport const isEdge = (pos: Vector, b: SkRect) =>\n  pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height;\n\n// We have an issue to check property existence on JSI backed instances\nconst isRRectCtor = (def: RRectDef): def is RRectCtor =>\n  (def as any).rect === undefined;\n// We have an issue to check property existence on JSI backed instances\nconst isRectCtor = (def: RectDef): def is RectCtor =>\n  (def as any).rect === undefined;\n\nexport const processRect = (Skia: Skia, def: RectDef) => {\n  if (isRectCtor(def)) {\n    return Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height);\n  } else {\n    return def.rect;\n  }\n};\n\nexport const processRRect = (Skia: Skia, def: RRectDef) => {\n  if (isRRectCtor(def)) {\n    const r = processRadius(Skia, def.r ?? 0);\n    return Skia.RRectXY(\n      Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height),\n      r.x,\n      r.y\n    );\n  } else {\n    return def.rect;\n  }\n};\n"],"mappings":";;;;;;;AAIA;;AAJA;AAMO,MAAMA,MAAM,GAAG,CAACC,GAAD,EAAcC,CAAd,KACpBD,GAAG,CAACE,CAAJ,KAAUD,CAAC,CAACC,CAAZ,IAAiBF,GAAG,CAACG,CAAJ,KAAUF,CAAC,CAACE,CAA7B,IAAkCH,GAAG,CAACE,CAAJ,KAAUD,CAAC,CAACG,KAA9C,IAAuDJ,GAAG,CAACG,CAAJ,KAAUF,CAAC,CAACI,MAD9D,C,CAGP;;;;;AACA,MAAMC,WAAW,GAAIC,GAAD,IACjBA,GAAD,CAAaC,IAAb,KAAsBC,SADxB,C,CAEA;;;AACA,MAAMC,UAAU,GAAIH,GAAD,IAChBA,GAAD,CAAaC,IAAb,KAAsBC,SADxB;;AAGO,MAAME,WAAW,GAAG,CAACC,IAAD,EAAaL,GAAb,KAA8B;EACvD,IAAIG,UAAU,CAACH,GAAD,CAAd,EAAqB;IACnB,OAAOK,IAAI,CAACC,QAAL,CAAcN,GAAG,CAACL,CAAJ,IAAS,CAAvB,EAA0BK,GAAG,CAACJ,CAAJ,IAAS,CAAnC,EAAsCI,GAAG,CAACH,KAA1C,EAAiDG,GAAG,CAACF,MAArD,CAAP;EACD,CAFD,MAEO;IACL,OAAOE,GAAG,CAACC,IAAX;EACD;AACF,CANM;;;;AAQA,MAAMM,YAAY,GAAG,CAACF,IAAD,EAAaL,GAAb,KAA+B;EACzD,IAAID,WAAW,CAACC,GAAD,CAAf,EAAsB;IACpB,MAAMQ,CAAC,GAAG,IAAAC,qBAAA,EAAcJ,IAAd,EAAoBL,GAAG,CAACQ,CAAJ,IAAS,CAA7B,CAAV;IACA,OAAOH,IAAI,CAACK,OAAL,CACLL,IAAI,CAACC,QAAL,CAAcN,GAAG,CAACL,CAAJ,IAAS,CAAvB,EAA0BK,GAAG,CAACJ,CAAJ,IAAS,CAAnC,EAAsCI,GAAG,CAACH,KAA1C,EAAiDG,GAAG,CAACF,MAArD,CADK,EAELU,CAAC,CAACb,CAFG,EAGLa,CAAC,CAACZ,CAHG,CAAP;EAKD,CAPD,MAOO;IACL,OAAOI,GAAG,CAACC,IAAX;EACD;AACF,CAXM"}

package/lib/commonjs/dom/nodes/drawings/Box.js

@@ -27,7 +27,7 @@ const deflate = function (Skia, box, dx, dy) {
 
 class BoxShadowNode extends _Node.JsiDeclarationNode {
   constructor(ctx, props) {
-    super(ctx, _types2.DeclarationType.Unknown, _types2.NodeType.Box, props);
+    super(ctx, _types2.DeclarationType.Unknown, _types2.NodeType.BoxShadow, props);
   }
 
   materialize() {

package/lib/commonjs/dom/nodes/drawings/Box.js.map

@@ -1 +1 @@
-{"version":3,"names":["inflate","Skia","box","dx","dy","tx","ty","RRectXY","XYWHRect","rect","x","y","width","height","rx","ry","deflate","BoxShadowNode","JsiDeclarationNode","constructor","ctx","props","DeclarationType","Unknown","NodeType","Box","materialize","BoxNode","JsiRenderNode","renderNode","canvas","paint","defaultBox","opacity","getAlphaf","isRRect","shadows","_children","map","node","filter","n","shadow","inner","color","blur","spread","lPaint","Paint","setColor","Color","setAlphaf","setMaskFilter","MaskFilter","MakeBlur","BlurStyle","Normal","drawRRect","delta","Point","Math","abs","save","clipRRect","ClipOp","Intersect","outer","drawDRRect","restore"],"sources":["Box.ts"],"sourcesContent":["import type { SkRRect, Skia } from \"../../../skia/types\";\nimport { BlurStyle, ClipOp, isRRect } from \"../../../skia/types\";\nimport type { DrawingContext } from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport type { BoxShadowProps, BoxProps } from \"../../types/Drawings\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport { JsiRenderNode } from \"../RenderNode\";\n\nconst inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) =>\n  Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => inflate(Skia, box, -dx, -dy, tx, ty);\n\nexport class BoxShadowNode extends JsiDeclarationNode<\n  BoxShadowProps,\n  BoxShadowProps\n> {\n  constructor(ctx: NodeContext, props: BoxShadowProps) {\n    super(ctx, DeclarationType.Unknown, NodeType.Box, props);\n  }\n\n  materialize() {\n    return this.props;\n  }\n}\n\nexport class BoxNode extends JsiRenderNode<BoxProps> {\n  constructor(ctx: NodeContext, props: BoxProps) {\n    super(ctx, NodeType.Box, props);\n  }\n\n  renderNode({ canvas, paint }: DrawingContext) {\n    const { box: defaultBox } = this.props;\n    const opacity = paint.getAlphaf();\n    const box = isRRect(defaultBox)\n      ? defaultBox\n      : this.Skia.RRectXY(defaultBox, 0, 0);\n    const shadows = this._children\n      .map((node) => {\n        if (node instanceof BoxShadowNode) {\n          return node.materialize();\n        }\n        return null;\n      })\n      .filter((n): n is BoxShadowProps => n !== null);\n    shadows\n      .filter((shadow) => !shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        canvas.drawRRect(\n          inflate(this.Skia, box, spread, spread, dx, dy),\n          lPaint\n        );\n      });\n\n    canvas.drawRRect(box, paint);\n\n    shadows\n      .filter((shadow) => shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const delta = this.Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));\n        canvas.save();\n        canvas.clipRRect(box, ClipOp.Intersect, false);\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        const inner = deflate(this.Skia, box, spread, spread, dx, dy);\n        const outer = inflate(this.Skia, box, delta.x, delta.y);\n        canvas.drawDRRect(outer, inner, lPaint);\n        canvas.restore();\n      });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["inflate","Skia","box","dx","dy","tx","ty","RRectXY","XYWHRect","rect","x","y","width","height","rx","ry","deflate","BoxShadowNode","JsiDeclarationNode","constructor","ctx","props","DeclarationType","Unknown","NodeType","BoxShadow","materialize","BoxNode","JsiRenderNode","Box","renderNode","canvas","paint","defaultBox","opacity","getAlphaf","isRRect","shadows","_children","map","node","filter","n","shadow","inner","color","blur","spread","lPaint","Paint","setColor","Color","setAlphaf","setMaskFilter","MaskFilter","MakeBlur","BlurStyle","Normal","drawRRect","delta","Point","Math","abs","save","clipRRect","ClipOp","Intersect","outer","drawDRRect","restore"],"sources":["Box.ts"],"sourcesContent":["import type { SkRRect, Skia } from \"../../../skia/types\";\nimport { BlurStyle, ClipOp, isRRect } from \"../../../skia/types\";\nimport type { DrawingContext } from \"../../types\";\nimport { DeclarationType, NodeType } from \"../../types\";\nimport type { BoxShadowProps, BoxProps } from \"../../types/Drawings\";\nimport type { NodeContext } from \"../Node\";\nimport { JsiDeclarationNode } from \"../Node\";\nimport { JsiRenderNode } from \"../RenderNode\";\n\nconst inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) =>\n  Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n\nconst deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => inflate(Skia, box, -dx, -dy, tx, ty);\n\nexport class BoxShadowNode extends JsiDeclarationNode<\n  BoxShadowProps,\n  BoxShadowProps\n> {\n  constructor(ctx: NodeContext, props: BoxShadowProps) {\n    super(ctx, DeclarationType.Unknown, NodeType.BoxShadow, props);\n  }\n\n  materialize() {\n    return this.props;\n  }\n}\n\nexport class BoxNode extends JsiRenderNode<BoxProps> {\n  constructor(ctx: NodeContext, props: BoxProps) {\n    super(ctx, NodeType.Box, props);\n  }\n\n  renderNode({ canvas, paint }: DrawingContext) {\n    const { box: defaultBox } = this.props;\n    const opacity = paint.getAlphaf();\n    const box = isRRect(defaultBox)\n      ? defaultBox\n      : this.Skia.RRectXY(defaultBox, 0, 0);\n    const shadows = this._children\n      .map((node) => {\n        if (node instanceof BoxShadowNode) {\n          return node.materialize();\n        }\n        return null;\n      })\n      .filter((n): n is BoxShadowProps => n !== null);\n    shadows\n      .filter((shadow) => !shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        canvas.drawRRect(\n          inflate(this.Skia, box, spread, spread, dx, dy),\n          lPaint\n        );\n      });\n\n    canvas.drawRRect(box, paint);\n\n    shadows\n      .filter((shadow) => shadow.inner)\n      .map((shadow) => {\n        const { color = \"black\", blur, spread = 0, dx = 0, dy = 0 } = shadow;\n        const delta = this.Skia.Point(10 + Math.abs(dx), 10 + Math.abs(dy));\n        canvas.save();\n        canvas.clipRRect(box, ClipOp.Intersect, false);\n        const lPaint = this.Skia.Paint();\n        lPaint.setColor(this.Skia.Color(color));\n        lPaint.setAlphaf(paint.getAlphaf() * opacity);\n\n        lPaint.setMaskFilter(\n          this.Skia.MaskFilter.MakeBlur(BlurStyle.Normal, blur, true)\n        );\n        const inner = deflate(this.Skia, box, spread, spread, dx, dy);\n        const outer = inflate(this.Skia, box, delta.x, delta.y);\n        canvas.drawDRRect(outer, inner, lPaint);\n        canvas.restore();\n      });\n  }\n}\n"],"mappings":"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"}

package/lib/commonjs/dom/nodes/drawings/ImageNode.js

@@ -18,9 +18,9 @@ class ImageNode extends _DrawingNode.JsiDrawingNode {
 
   deriveProps() {
     const {
-      image,
-      fit
+      image
     } = this.props;
+    const fit = this.props.fit ?? "contain";
     const rect = (0, _datatypes.processRect)(this.Skia, this.props);
     const {
       src,

package/lib/commonjs/dom/nodes/drawings/ImageNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["ImageNode","JsiDrawingNode","constructor","ctx","props","NodeType","Image","deriveProps","image","fit","rect","processRect","Skia","src","dst","fitRects","x","y","width","height","draw","canvas","paint","derived","Error","drawImageRect"],"sources":["ImageNode.ts"],"sourcesContent":["import type { SkRect } from \"../../../skia/types\";\nimport type { DrawingContext, ImageProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { fitRects, processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageNode extends JsiDrawingNode<\n  ImageProps,\n  { src: SkRect; dst: SkRect }\n> {\n  constructor(ctx: NodeContext, props: ImageProps) {\n    super(ctx, NodeType.Image, props);\n  }\n\n  deriveProps() {\n    const { image, fit } = this.props;\n    const rect = processRect(this.Skia, this.props);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    return { src, dst };\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { image } = this.props;\n    if (!this.derived) {\n      throw new Error(\"ImageNode: src and dst are undefined\");\n    }\n    const { src, dst } = this.derived;\n    canvas.drawImageRect(image, src, dst, paint);\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAGL;EACAC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,WAAW,GAAG;IACZ,MAAM;MAAEC,KAAF;MAASC;IAAT,IAAiB,KAAKL,KAA5B;IACA,MAAMM,IAAI,GAAG,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKR,KAA5B,CAAb;IACA,MAAM;MAAES,GAAF;MAAOC;IAAP,IAAe,IAAAC,mBAAA,EACnBN,GADmB,EAEnB;MACEO,CAAC,EAAE,CADL;MAEEC,CAAC,EAAE,CAFL;MAGEC,KAAK,EAAEV,KAAK,CAACU,KAAN,EAHT;MAIEC,MAAM,EAAEX,KAAK,CAACW,MAAN;IAJV,CAFmB,EAQnBT,IARmB,CAArB;IAUA,OAAO;MAAEG,GAAF;MAAOC;IAAP,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEd;IAAF,IAAY,KAAKJ,KAAvB;;IACA,IAAI,CAAC,KAAKmB,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;IACD;;IACD,MAAM;MAAEX,GAAF;MAAOC;IAAP,IAAe,KAAKS,OAA1B;IACAF,MAAM,CAACI,aAAP,CAAqBjB,KAArB,EAA4BK,GAA5B,EAAiCC,GAAjC,EAAsCQ,KAAtC;EACD;;AA5BD"}
+{"version":3,"names":["ImageNode","JsiDrawingNode","constructor","ctx","props","NodeType","Image","deriveProps","image","fit","rect","processRect","Skia","src","dst","fitRects","x","y","width","height","draw","canvas","paint","derived","Error","drawImageRect"],"sources":["ImageNode.ts"],"sourcesContent":["import type { SkRect } from \"../../../skia/types\";\nimport type { DrawingContext, ImageProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { fitRects, processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageNode extends JsiDrawingNode<\n  ImageProps,\n  { src: SkRect; dst: SkRect }\n> {\n  constructor(ctx: NodeContext, props: ImageProps) {\n    super(ctx, NodeType.Image, props);\n  }\n\n  deriveProps() {\n    const { image } = this.props;\n    const fit = this.props.fit ?? \"contain\";\n    const rect = processRect(this.Skia, this.props);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    return { src, dst };\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { image } = this.props;\n    if (!this.derived) {\n      throw new Error(\"ImageNode: src and dst are undefined\");\n    }\n    const { src, dst } = this.derived;\n    canvas.drawImageRect(image, src, dst, paint);\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAGL;EACAC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,WAAW,GAAG;IACZ,MAAM;MAAEC;IAAF,IAAY,KAAKJ,KAAvB;IACA,MAAMK,GAAG,GAAG,KAAKL,KAAL,CAAWK,GAAX,IAAkB,SAA9B;IACA,MAAMC,IAAI,GAAG,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKR,KAA5B,CAAb;IACA,MAAM;MAAES,GAAF;MAAOC;IAAP,IAAe,IAAAC,mBAAA,EACnBN,GADmB,EAEnB;MACEO,CAAC,EAAE,CADL;MAEEC,CAAC,EAAE,CAFL;MAGEC,KAAK,EAAEV,KAAK,CAACU,KAAN,EAHT;MAIEC,MAAM,EAAEX,KAAK,CAACW,MAAN;IAJV,CAFmB,EAQnBT,IARmB,CAArB;IAUA,OAAO;MAAEG,GAAF;MAAOC;IAAP,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEd;IAAF,IAAY,KAAKJ,KAAvB;;IACA,IAAI,CAAC,KAAKmB,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;IACD;;IACD,MAAM;MAAEX,GAAF;MAAOC;IAAP,IAAe,KAAKS,OAA1B;IACAF,MAAM,CAACI,aAAP,CAAqBjB,KAArB,EAA4BK,GAA5B,EAAiCC,GAAjC,EAAsCQ,KAAtC;EACD;;AA7BD"}

package/lib/commonjs/dom/nodes/paint/ImageFilters.js

@@ -122,7 +122,7 @@ exports.BlurImageFilterNode = BlurImageFilterNode;
 
 class DropShadowImageFilterNode extends ImageFilterDeclaration {
   constructor(ctx, props) {
-    super(ctx, _types2.NodeType.BlurImageFilter, props);
+    super(ctx, _types2.NodeType.DropShadowImageFilter, props);
   }
 
   materialize() {