@shopify/react-native-skia 1.11.1 → 1.11.2

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

@@ -1,119 +0,0 @@
-#pragma once
-
-#include "JsiDomDeclarationNode.h"
-#include "PaintProps.h"
-
-#include <memory>
-
-namespace RNSkia {
-
-class JsiPaintNode : public JsiDomDeclarationNode,
-                     public JsiDomNodeCtor<JsiPaintNode> {
-public:
-  explicit JsiPaintNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiDomDeclarationNode(context, "skPaint", DeclarationType::Paint) {}
-
-  void decorate(DeclarationContext *context) override {
-    auto paint = std::make_shared<SkPaint>();
-    paint->setAntiAlias(true);
-
-    if (_paintProps->getOpacity()->isSet()) {
-      paint->setAlphaf(paint->getAlphaf() *
-                       _paintProps->getOpacity()->value().getAsNumber());
-    }
-
-    if (_paintProps->getColor()->isSet()) {
-      auto currentOpacity = paint->getAlphaf();
-      paint->setShader(nullptr);
-      paint->setColor(*_paintProps->getColor()->getDerivedValue());
-      paint->setAlphaf(paint->getAlphaf() * currentOpacity);
-    }
-
-    if (_paintProps->getStrokeWidth()->isSet()) {
-      paint->setStrokeWidth(
-          _paintProps->getStrokeWidth()->value().getAsNumber());
-    }
-
-    if (_paintProps->getBlendMode()->isSet()) {
-      paint->setBlendMode(*_paintProps->getBlendMode()->getDerivedValue());
-    }
-
-    if (_paintProps->getStyle()->isSet()) {
-      auto styleValue = _paintProps->getStyle()->value().getAsString();
-      if (styleValue == "stroke") {
-        paint->setStyle(SkPaint::Style::kStroke_Style);
-      } else if (styleValue == "fill") {
-        paint->setStyle(SkPaint::Style::kFill_Style);
-      } else {
-        throw std::runtime_error(
-            styleValue + " is not a valud value for the style property.");
-      }
-    }
-
-    if (_paintProps->getStrokeJoin()->isSet()) {
-      paint->setStrokeJoin(*_paintProps->getStrokeJoin()->getDerivedValue());
-    }
-
-    if (_paintProps->getStrokeCap()->isSet()) {
-      paint->setStrokeCap(*_paintProps->getStrokeCap()->getDerivedValue());
-    }
-
-    if (_paintProps->getStrokeMiter()->isSet()) {
-      paint->setStrokeMiter(
-          _paintProps->getStrokeMiter()->value().getAsNumber());
-    }
-
-    if (_paintProps->getAntiAlias()->isSet()) {
-      paint->setAntiAlias(_paintProps->getAntiAlias()->value().getAsBool());
-    }
-
-    if (_paintProps->getDither()->isSet()) {
-      paint->setDither(_paintProps->getDither()->value().getAsBool());
-    }
-
-    context->save();
-    decorateChildren(context);
-
-    auto imageFilter = context->getImageFilters()->popAsOne();
-    auto colorFilter = context->getColorFilters()->popAsOne();
-    auto shader = context->getShaders()->pop();
-    auto maskFilter = context->getMaskFilters()->pop();
-    auto pathEffect = context->getPathEffects()->popAsOne();
-
-    context->restore();
-
-    if (imageFilter) {
-      paint->setImageFilter(imageFilter);
-    }
-
-    if (colorFilter) {
-      paint->setColorFilter(colorFilter);
-    }
-
-    if (shader) {
-      paint->setShader(shader);
-    }
-
-    if (maskFilter) {
-      paint->setMaskFilter(maskFilter);
-    }
-
-    if (pathEffect) {
-      paint->setPathEffect(pathEffect);
-    }
-
-    context->getPaints()->push(paint);
-  }
-
-protected:
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _paintProps = container->defineProperty<PaintProps>();
-  }
-
-private:
-  PaintProps *_paintProps;
-};
-
-} // namespace RNSkia

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

@@ -1,62 +0,0 @@
-#pragma once
-
-#include "JsiDomDrawingNode.h"
-#include "ParagraphProp.h"
-
-#include <memory>
-
-namespace RNSkia {
-
-class JsiParagraphNode : public JsiDomDrawingNode,
-                         public JsiDomNodeCtor<JsiParagraphNode> {
-public:
-  explicit JsiParagraphNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiDomDrawingNode(context, "skParagraph") {}
-
-protected:
-  void draw(DrawingContext *context) override {
-    auto x = _xProp->value().getAsNumber();
-    auto y = _yProp->value().getAsNumber();
-    auto width = static_cast<SkScalar>(_widthProp->value().getAsNumber());
-
-    auto p = *_paragraphProp->getDerivedValue();
-    if (p != nullptr) {
-
-      // Let's ensure that we don't perform unnecessary layouts on the
-      // paragraph. We should only layout if we have a new paragraph or if the
-      // layout width has changed.
-      if (_lastLayoutWidth != width || _lastLayoutParagraph != p) {
-        // perform layout!
-        p->layout(width);
-        _lastLayoutWidth = width;
-        _lastLayoutParagraph = p;
-      }
-      // Paint the layout to the canvas
-      p->paint(context->getCanvas(), x, y);
-    }
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDrawingNode::defineProperties(container);
-    _paragraphProp = container->defineProperty<ParagraphProp>("paragraph");
-
-    _xProp = container->defineProperty<NodeProp>("x");
-    _xProp->require();
-
-    _yProp = container->defineProperty<NodeProp>("y");
-    _yProp->require();
-
-    _widthProp = container->defineProperty<NodeProp>("width");
-    _widthProp->require();
-  }
-
-private:
-  ParagraphProp *_paragraphProp;
-  NodeProp *_xProp;
-  NodeProp *_yProp;
-  NodeProp *_widthProp;
-  SkScalar _lastLayoutWidth;
-  para::Paragraph *_lastLayoutParagraph = nullptr;
-};
-
-} // namespace RNSkia

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

@@ -1,50 +0,0 @@
-#pragma once
-
-#include "BezierProps.h"
-#include "BlendModeProp.h"
-#include "ColorProp.h"
-#include "JsiDomDrawingNode.h"
-#include "PointsProp.h"
-
-#include <memory>
-
-namespace RNSkia {
-
-class JsiPatchNode : public JsiDomDrawingNode,
-                     public JsiDomNodeCtor<JsiPatchNode> {
-public:
-  explicit JsiPatchNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiDomDrawingNode(context, "skPatch") {}
-
-protected:
-  void draw(DrawingContext *context) override {
-    SkBlendMode defaultBlendMode =
-        _colorsProp->isSet() ? SkBlendMode::kDstOver : SkBlendMode::kSrcOver;
-    context->getCanvas()->drawPatch(
-        _patchProp->getDerivedValue()->data(),
-        _colorsProp->isSet() ? _colorsProp->getDerivedValue()->data() : nullptr,
-        _textureProp->isSet() ? _textureProp->getDerivedValue()->data()
-                              : nullptr,
-        _blendModeProp->isSet() ? *_blendModeProp->getDerivedValue()
-                                : defaultBlendMode,
-        *context->getPaint());
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDrawingNode::defineProperties(container);
-    _colorsProp = container->defineProperty<ColorsProp>("colors");
-    _textureProp = container->defineProperty<PointsProp>("texture");
-    _blendModeProp = container->defineProperty<BlendModeProp>("blendMode");
-    _patchProp = container->defineProperty<BezierProp>("patch");
-
-    _patchProp->require();
-  }
-
-private:
-  ColorsProp *_colorsProp;
-  PointsProp *_textureProp;
-  BlendModeProp *_blendModeProp;
-  BezierProp *_patchProp;
-};
-
-} // namespace RNSkia

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

@@ -1,268 +0,0 @@
-#pragma once
-
-#include "JsiDomDeclarationNode.h"
-
-#include "NodeProp.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkPathEffect.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class JsiBasePathEffectNode : public JsiDomDeclarationNode {
-public:
-  JsiBasePathEffectNode(std::shared_ptr<RNSkPlatformContext> context,
-                        const char *type)
-      : JsiDomDeclarationNode(context, type, DeclarationType::PathEffect) {}
-
-protected:
-  void composeAndPush(DeclarationContext *context, sk_sp<SkPathEffect> pe1) {
-    context->save();
-    decorateChildren(context);
-    auto pe2 = context->getPathEffects()->popAsOne();
-    context->restore();
-    auto pe = pe2 ? SkPathEffect::MakeCompose(pe1, pe2) : pe1;
-    context->getPathEffects()->push(pe);
-  }
-};
-
-class JsiDashPathEffectNode : public JsiBasePathEffectNode,
-                              public JsiDomNodeCtor<JsiDashPathEffectNode> {
-public:
-  explicit JsiDashPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skDashPathEffect") {}
-
-  void decorate(DeclarationContext *context) override {
-
-    // Phase
-    auto phase = _phase->isSet() ? _phase->value().getAsNumber() : 0;
-
-    // Copy intervals
-    std::vector<SkScalar> intervals;
-    auto intervalsArray = _intervals->value().getAsArray();
-    for (size_t i = 0; i < intervalsArray.size(); ++i) {
-      intervals.push_back(intervalsArray[i].getAsNumber());
-    }
-
-    // Create effect
-    auto pathEffect = SkDashPathEffect::Make(
-        intervals.data(), static_cast<int>(intervals.size()), phase);
-
-    composeAndPush(context, pathEffect);
-  }
-
-protected:
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _intervals = container->defineProperty<NodeProp>("intervals");
-    _phase = container->defineProperty<NodeProp>("phase");
-
-    _intervals->require();
-  }
-
-private:
-  NodeProp *_intervals;
-  NodeProp *_phase;
-};
-
-class JsiDiscretePathEffectNode
-    : public JsiBasePathEffectNode,
-      public JsiDomNodeCtor<JsiDiscretePathEffectNode> {
-public:
-  explicit JsiDiscretePathEffectNode(
-      std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skDiscretePathEffect") {}
-
-  void decorate(DeclarationContext *context) override {
-    // Create effect
-    auto pathEffect =
-        SkDiscretePathEffect::Make(_lengthProp->value().getAsNumber(),
-                                   _deviationProp->value().getAsNumber(),
-                                   _seedProp->value().getAsNumber());
-
-    composeAndPush(context, pathEffect);
-  }
-
-protected:
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _lengthProp = container->defineProperty<NodeProp>("length");
-    _deviationProp = container->defineProperty<NodeProp>("deviation");
-    _seedProp = container->defineProperty<NodeProp>("seed");
-
-    _lengthProp->require();
-    _deviationProp->require();
-    _seedProp->require();
-  }
-
-private:
-  NodeProp *_lengthProp;
-  NodeProp *_deviationProp;
-  NodeProp *_seedProp;
-};
-
-class JsiCornerPathEffectNode : public JsiBasePathEffectNode,
-                                public JsiDomNodeCtor<JsiCornerPathEffectNode> {
-public:
-  explicit JsiCornerPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skCornerPathEffect") {}
-
-  void decorate(DeclarationContext *context) override {
-    // Create effect
-    auto pathEffect = SkCornerPathEffect::Make(_rProp->value().getAsNumber());
-
-    composeAndPush(context, pathEffect);
-  }
-
-protected:
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _rProp = container->defineProperty<NodeProp>("r");
-    _rProp->require();
-  }
-
-private:
-  NodeProp *_rProp;
-};
-
-class JsiPath1DPathEffectNode : public JsiBasePathEffectNode,
-                                public JsiDomNodeCtor<JsiPath1DPathEffectNode> {
-public:
-  explicit JsiPath1DPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skPath1DPathEffect") {}
-
-  void decorate(DeclarationContext *context) override {
-    // Create effect
-    auto pathEffect = SkPath1DPathEffect::Make(
-        *_pathProp->getDerivedValue(), _advanceProp->value().getAsNumber(),
-        _phaseProp->value().getAsNumber(),
-        getStyleFromStringValue(_styleProp->value().getAsString()));
-
-    composeAndPush(context, pathEffect);
-  }
-
-protected:
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _phaseProp = container->defineProperty<NodeProp>("phase");
-    _advanceProp = container->defineProperty<NodeProp>("advance");
-    _pathProp = container->defineProperty<PathProp>("path");
-    _styleProp = container->defineProperty<NodeProp>("style");
-
-    _phaseProp->require();
-    _advanceProp->require();
-    _pathProp->require();
-    _styleProp->require();
-  }
-
-private:
-  SkPath1DPathEffect::Style getStyleFromStringValue(const std::string &value) {
-    if (value == "translate") {
-      return SkPath1DPathEffect::kTranslate_Style;
-    } else if (value == "rotate") {
-      return SkPath1DPathEffect::kRotate_Style;
-    } else if (value == "morph") {
-      return SkPath1DPathEffect::kMorph_Style;
-    }
-    throw std::runtime_error("Value \"" + value +
-                             "\" is not a valid Path1D effect style.");
-  }
-
-  NodeProp *_phaseProp;
-  NodeProp *_advanceProp;
-  NodeProp *_styleProp;
-  PathProp *_pathProp;
-};
-
-class JsiPath2DPathEffectNode : public JsiBasePathEffectNode,
-                                public JsiDomNodeCtor<JsiPath2DPathEffectNode> {
-public:
-  explicit JsiPath2DPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skPath2DPathEffect") {}
-
-protected:
-  void decorate(DeclarationContext *context) override {
-
-    // Create effect
-    auto pathEffect = SkPath2DPathEffect::Make(*_matrixProp->getDerivedValue(),
-                                               *_pathProp->getDerivedValue());
-
-    composeAndPush(context, pathEffect);
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _matrixProp = container->defineProperty<MatrixProp>("matrix");
-    _pathProp = container->defineProperty<PathProp>("path");
-
-    _matrixProp->require();
-    _pathProp->require();
-  }
-
-private:
-  MatrixProp *_matrixProp;
-  PathProp *_pathProp;
-};
-
-class JsiLine2DPathEffectNode : public JsiBasePathEffectNode,
-                                public JsiDomNodeCtor<JsiLine2DPathEffectNode> {
-public:
-  explicit JsiLine2DPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skLine2DPathEffect") {}
-
-protected:
-  void decorate(DeclarationContext *context) override {
-
-    // Create effect
-    auto pathEffect = SkLine2DPathEffect::Make(
-        _widthProp->value().getAsNumber(), *_matrixProp->getDerivedValue());
-
-    composeAndPush(context, pathEffect);
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDeclarationNode::defineProperties(container);
-
-    _matrixProp = container->defineProperty<MatrixProp>("matrix");
-    _widthProp = container->defineProperty<NodeProp>("width");
-
-    _matrixProp->require();
-    _widthProp->require();
-  }
-
-private:
-  MatrixProp *_matrixProp;
-  NodeProp *_widthProp;
-};
-
-class JsiSumPathEffectNode : public JsiBasePathEffectNode,
-                             public JsiDomNodeCtor<JsiSumPathEffectNode> {
-public:
-  explicit JsiSumPathEffectNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiBasePathEffectNode(context, "skSumPathEffect") {}
-
-protected:
-  void decorate(DeclarationContext *context) override {
-    decorateChildren(context);
-    auto pe =
-        context->getPathEffects()->Declaration<sk_sp<SkPathEffect>>::popAsOne(
-            [=](sk_sp<SkPathEffect> inner, sk_sp<SkPathEffect> outer) {
-              return SkPathEffect::MakeSum(inner, outer);
-            });
-    context->getPathEffects()->push(pe);
-  }
-};
-} // namespace RNSkia

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

@@ -1,181 +0,0 @@
-#pragma once
-
-#include "JsiDomDrawingNode.h"
-#include "PathProp.h"
-
-#include <algorithm>
-#include <memory>
-#include <string>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/effects/SkTrimPathEffect.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-static PropId PropNameMiterLimit = JsiPropId::get("miter_limit");
-static PropId PropNamePrecision = JsiPropId::get("precision");
-
-class JsiPathNode : public JsiDomDrawingNode,
-                    public JsiDomNodeCtor<JsiPathNode> {
-public:
-  explicit JsiPathNode(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiDomDrawingNode(context, "skPath") {}
-
-protected:
-  void draw(DrawingContext *context) override {
-    if (getPropsContainer()->isChanged()) {
-      auto start = saturate(
-          _startProp->isSet() ? _startProp->value().getAsNumber() : 0.0);
-      auto end =
-          saturate(_endProp->isSet() ? _endProp->value().getAsNumber() : 1.0);
-      // Can we use the path directly, or do we need to copy to
-      // mutate / modify the path?
-      auto hasStartOffset = start != 0.0;
-      auto hasEndOffset = end != 1.0;
-      auto hasFillStyle = _fillTypeProp->isSet();
-      auto hasStrokeOptions =
-          _strokeOptsProp->isSet() &&
-          _strokeOptsProp->value().getType() == PropType::Object;
-
-      auto willMutatePath = hasStartOffset == true || hasEndOffset == true ||
-                            hasFillStyle == true || hasStrokeOptions == true;
-
-      if (willMutatePath) {
-        // We'll trim the path
-        SkPath filteredPath(*_pathProp->getDerivedValue());
-        auto pe =
-            SkTrimPathEffect::Make(start, end, SkTrimPathEffect::Mode::kNormal);
-
-        if (pe != nullptr) {
-          SkStrokeRec rec(SkStrokeRec::InitStyle::kHairline_InitStyle);
-          if (!pe->filterPath(&filteredPath, filteredPath, &rec, nullptr)) {
-            throw std::runtime_error(
-                "Failed trimming path with parameters start: " +
-                std::to_string(start) + ", end: " + std::to_string(end));
-          }
-          filteredPath.swap(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(start) + ", end: " + std::to_string(end));
-        } else {
-          _path = std::make_shared<const SkPath>(filteredPath);
-        }
-
-        // Set fill style
-        if (_fillTypeProp->isSet()) {
-          auto fillType = _fillTypeProp->value().getAsString();
-          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?
-        if (_strokeOptsProp->isSet()) {
-          auto opts = _strokeOptsProp->value();
-          SkPaint strokePaint;
-
-          if (opts.hasValue(JsiPropId::get("strokeCap"))) {
-            strokePaint.setStrokeCap(StrokeCapProp::getCapFromString(
-                opts.getValue(JsiPropId::get("strokeCap")).getAsString()));
-          }
-
-          if (opts.hasValue(JsiPropId::get("strokeJoin"))) {
-            strokePaint.setStrokeJoin(StrokeJoinProp::getJoinFromString(
-                opts.getValue(JsiPropId::get("strokeJoin")).getAsString()));
-          }
-
-          if (opts.hasValue(PropNameWidth)) {
-            strokePaint.setStrokeWidth(
-                opts.getValue(PropNameWidth).getAsNumber());
-          }
-
-          if (opts.hasValue(PropNameMiterLimit)) {
-            strokePaint.setStrokeMiter(
-                opts.getValue(PropNameMiterLimit).getAsNumber());
-          }
-
-          double precision = 1.0;
-          if (opts.hasValue(PropNamePrecision)) {
-            precision = opts.getValue(PropNamePrecision).getAsNumber();
-          }
-
-          // _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 (!skpathutils::FillPathWithPaint(*_path.get(), strokePaint,
-                                              p.get(), nullptr, precision)) {
-            _path = nullptr;
-          } else {
-            _path = std::const_pointer_cast<const SkPath>(p);
-          }
-        }
-
-      } else {
-        // We'll just draw the pure path
-        _path = _pathProp->getDerivedValue();
-      }
-    }
-
-    if (_path == nullptr) {
-      throw std::runtime_error(
-          "Path node could not resolve path props correctly.");
-    }
-
-    context->getCanvas()->drawPath(*_path, *context->getPaint());
-  }
-
-  void defineProperties(NodePropsContainer *container) override {
-    JsiDomDrawingNode::defineProperties(container);
-    _pathProp = container->defineProperty<PathProp>("path");
-    _startProp = container->defineProperty<NodeProp>("start");
-    _endProp = container->defineProperty<NodeProp>("end");
-    _fillTypeProp = container->defineProperty<NodeProp>("fillType");
-    _strokeOptsProp = container->defineProperty<NodeProp>("stroke");
-
-    _pathProp->require();
-  }
-
-private:
-  float saturate(float x) { return std::max(0.0f, std::min(1.0f, x)); }
-
-  SkPathFillType getFillTypeFromStringValue(const std::string &value) {
-    if (value == "winding") {
-      return SkPathFillType::kWinding;
-    } else if (value == "evenOdd") {
-      return SkPathFillType::kEvenOdd;
-    } else if (value == "inverseWinding") {
-      return SkPathFillType::kInverseWinding;
-    } else if (value == "inverseEvenOdd") {
-      return SkPathFillType::kInverseEvenOdd;
-    }
-    throw std::runtime_error("Could not convert value \"" + value +
-                             "\" to path fill type.");
-  }
-
-  PathProp *_pathProp;
-  NodeProp *_startProp;
-  NodeProp *_endProp;
-  NodeProp *_fillTypeProp;
-  NodeProp *_strokeOptsProp;
-
-  std::shared_ptr<const SkPath> _path;
-};
-
-class StrokeOptsProps : public BaseDerivedProp {
-public:
-  explicit StrokeOptsProps(const std::function<void(BaseNodeProp *)> &onChange)
-      : BaseDerivedProp(onChange) {
-    _strokeProp = defineProperty<NodeProp>("stroke");
-  }
-
-private:
-  NodeProp *_strokeProp;
-};
-
-} // namespace RNSkia