@shopify/react-native-skia 1.11.1 → 1.11.2

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

@@ -1,196 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include "JsiSkImage.h"
-
-#include <algorithm>
-#include <memory>
-#include <string>
-
-namespace RNSkia {
-
-struct FitSizes {
-  SkSize src;
-  SkSize dst;
-};
-
-struct FitRects {
-  SkRect src;
-  SkRect dst;
-};
-
-static PropId PropNameImage = JsiPropId::get("image");
-static PropId PropNameFit = JsiPropId::get("fit");
-
-class ImageProp : public DerivedSkProp<SkImage> {
-public:
-  explicit ImageProp(PropId name,
-                     const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkImage>(onChange) {
-    _imageProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_imageProp->isSet()) {
-      // Check for host object
-      if (_imageProp->value().getType() == PropType::HostObject) {
-        // This should be an SkImage wrapper:
-        auto ptr = std::dynamic_pointer_cast<JsiSkImage>(
-            _imageProp->value().getAsHostObject());
-        if (ptr == nullptr) {
-          // If not - throw an exception
-          throw std::runtime_error("Expected SkImage object for the " +
-                                   std::string(getName()) +
-                                   " property. Got a " +
-                                   _imageProp->value().getTypeAsString(
-                                       _imageProp->value().getType()) +
-                                   ".");
-        }
-        setDerivedValue(ptr->getObject());
-      } else {
-        // Should be a host object if set
-        throw std::runtime_error(
-            "Expected SkImage object or null/undefined for the " +
-            std::string(getName()) + " property.");
-      }
-    } else {
-      // Set to null
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  NodeProp *_imageProp;
-};
-
-class ImageProps : public DerivedProp<FitRects> {
-public:
-  explicit ImageProps(const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<FitRects>(onChange) {
-    _fitProp = defineProperty<NodeProp>(PropNameFit);
-    _imageProp = defineProperty<ImageProp>(PropNameImage);
-    _rectProp = defineProperty<RectProps>(PropNameRect);
-  }
-
-  void updateDerivedValue() override {
-    auto image = _imageProp->getDerivedValue();
-    if (image == nullptr) {
-      setDerivedValue(nullptr);
-      return;
-    }
-
-    auto imageRect = SkRect::MakeXYWH(0, 0, image->width(), image->height());
-
-    auto rect = _rectProp->getDerivedValue() ? *_rectProp->getDerivedValue()
-                                             : imageRect;
-    auto fit = _fitProp->isSet() ? _fitProp->value().getAsString() : "contain";
-
-    setDerivedValue(fitRects(fit, imageRect, rect));
-  }
-
-  sk_sp<SkImage> getImage() { return _imageProp->getDerivedValue(); }
-
-  std::shared_ptr<const SkRect> getRect() {
-    return _rectProp->getDerivedValue();
-  }
-
-  SkMatrix rect2rect(SkRect src, SkRect dst) {
-    auto sx = dst.width() / src.width();
-    auto sy = dst.height() / src.height();
-    auto tx = dst.x() - src.x() * sx;
-    auto ty = dst.y() - src.y() * sy;
-    SkMatrix m3;
-    m3.preTranslate(tx, ty);
-    m3.preScale(sx, sy);
-    return m3;
-  }
-
-private:
-  SkSize size(double width, double height) {
-    return SkSize::Make(width, height);
-  }
-
-  FitRects fitRects(const std::string &fit, SkRect rect, SkRect rect2) {
-    auto sizes = applyBoxFit(fit, size(rect.width(), rect.height()),
-                             size(rect2.width(), rect2.height()));
-
-    auto src = inscribe(sizes.src, rect);
-    auto dst = inscribe(sizes.dst, rect2);
-
-    return {.src = src, .dst = dst};
-  }
-
-  SkRect inscribe(SkSize size, SkRect rect) {
-    auto halfWidthDelta = (rect.width() - size.width()) / 2.0;
-    auto halfHeightDelta = (rect.height() - size.height()) / 2.0;
-    return SkRect::MakeXYWH(rect.x() + halfWidthDelta,
-                            rect.y() + halfHeightDelta, size.width(),
-                            size.height());
-  }
-
-  FitSizes applyBoxFit(const std::string fit, SkSize input, SkSize output) {
-    SkSize src = size(0, 0);
-    SkSize dst = size(0, 0);
-
-    if (input.height() <= 0.0 || input.width() <= 0.0 ||
-        output.height() <= 0.0 || output.width() <= 0.0) {
-      return {.src = src, .dst = dst};
-    }
-
-    if (fit == "fill") {
-      src = input;
-      dst = output;
-    } else if (fit == "contain") {
-      src = input;
-      if (output.width() / output.height() > src.width() / src.height()) {
-        dst = size((src.width() * output.height()) / src.height(),
-                   output.height());
-      } else {
-        dst =
-            size(output.width(), (src.height() * output.width()) / src.width());
-      }
-    } else if (fit == "cover") {
-      if (output.width() / output.height() > input.width() / input.height()) {
-        src = size(input.width(),
-                   (input.width() * output.height()) / output.width());
-      } else {
-        src = size((input.height() * output.width()) / output.height(),
-                   input.height());
-      }
-      dst = output;
-    } else if (fit == "fitWidth") {
-      src = size(input.width(),
-                 (input.width() * output.height()) / output.width());
-      dst = size(output.width(), (src.height() * output.width()) / src.width());
-    } else if (fit == "fitHeight") {
-      src = size((input.height() * output.width()) / output.height(),
-                 input.height());
-      dst =
-          size((src.width() * output.height()) / src.height(), output.height());
-    } else if (fit == "none") {
-      src = size(std::min(input.width(), output.width()),
-                 std::min(input.height(), output.height()));
-      dst = src;
-    } else if (fit == "scaleDown") {
-      src = input;
-      dst = input;
-      auto aspectRatio = input.width() / input.height();
-      if (dst.height() > output.height()) {
-        dst = size(output.height() * aspectRatio, output.height());
-      }
-      if (dst.width() > output.width()) {
-        dst = size(output.width(), output.width() / aspectRatio);
-      }
-    } else {
-      throw std::runtime_error("The value \"" + fit +
-                               "\" is not a valid fit value.");
-    }
-    return {.src = src, .dst = dst};
-  }
-
-  NodeProp *_fitProp;
-  ImageProp *_imageProp;
-  RectProps *_rectProp;
-};
-} // namespace RNSkia

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

@@ -1,79 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include <memory>
-#include <string>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkPaint.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class StrokeCapProp : public DerivedProp<SkPaint::Cap> {
-public:
-  explicit StrokeCapProp(PropId name,
-                         const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkPaint::Cap>(onChange) {
-    _strokeCap = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_strokeCap->isSet() && (_strokeCap->isChanged())) {
-      auto capValue = _strokeCap->value().getAsString();
-      setDerivedValue(getCapFromString(capValue));
-    }
-  }
-
-  static SkPaint::Cap getCapFromString(const std::string &value) {
-    if (value == "round") {
-      return SkPaint::Cap::kRound_Cap;
-    } else if (value == "butt") {
-      return SkPaint::Cap::kButt_Cap;
-    } else if (value == "square") {
-      return SkPaint::Cap::kSquare_Cap;
-    }
-    throw std::runtime_error("Property value \"" + value +
-                             "\" is not a legal stroke cap.");
-  }
-
-private:
-  NodeProp *_strokeCap;
-};
-
-class StrokeJoinProp : public DerivedProp<SkPaint::Join> {
-public:
-  explicit StrokeJoinProp(PropId name,
-                          const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkPaint::Join>(onChange) {
-    _strokeJoin = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_strokeJoin->isSet() && (_strokeJoin->isChanged())) {
-      auto joinValue = _strokeJoin->value().getAsString();
-      setDerivedValue(getJoinFromString(joinValue));
-    }
-  }
-
-  static SkPaint::Join getJoinFromString(const std::string &value) {
-    if (value == "miter") {
-      return SkPaint::Join::kMiter_Join;
-    } else if (value == "round") {
-      return SkPaint::Join::kRound_Join;
-    } else if (value == "bevel") {
-      return SkPaint::Join::kBevel_Join;
-    }
-    throw std::runtime_error("Property value \"" + value +
-                             "\" is not a legal stroke join.");
-  }
-
-private:
-  NodeProp *_strokeJoin;
-};
-
-} // namespace RNSkia

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

@@ -1,45 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include "JsiSkSVG.h"
-
-#include <memory>
-
-namespace RNSkia {
-
-class SvgProp : public DerivedSkProp<SkSVGDOM> {
-public:
-  explicit SvgProp(PropId name,
-                   const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkSVGDOM>(onChange) {
-    _imageSvgProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_imageSvgProp->isSet()) {
-
-      if (_imageSvgProp->value().getType() == PropType::HostObject) {
-
-        auto ptr = std::dynamic_pointer_cast<JsiSkSVG>(
-            _imageSvgProp->value().getAsHostObject());
-        if (ptr == nullptr) {
-          throw std::runtime_error(
-              "Expected SkSvgDom object for the svg property.");
-        }
-        setDerivedValue(ptr->getObject());
-      } else {
-        throw std::runtime_error(
-            "Expected SkSvgDom object or null/undefined for the svg property.");
-      }
-
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  NodeProp *_imageSvgProp;
-};
-
-} // namespace RNSkia

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

@@ -1,133 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#include "JsiSkTextBlob.h"
-
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace RNSkia {
-
-class TextBlobProp : public DerivedSkProp<SkTextBlob> {
-public:
-  explicit TextBlobProp(PropId name,
-                        const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkTextBlob>(onChange) {
-    _textBlobProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_textBlobProp->value().getType() != PropType::HostObject) {
-      throw std::runtime_error("Expected SkTextBlob object for the " +
-                               std::string(getName()) + " property.");
-    }
-
-    auto ptr = _textBlobProp->value().getAs<JsiSkTextBlob>();
-    if (ptr == nullptr) {
-      throw std::runtime_error("Expected SkTextBlob object for the " +
-                               std::string(getName()) + " property.");
-    }
-
-    setDerivedValue(ptr->getObject());
-  }
-
-private:
-  NodeProp *_textBlobProp;
-};
-
-class TextPathBlobProp : public DerivedSkProp<SkTextBlob> {
-public:
-  explicit TextPathBlobProp(const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedSkProp<SkTextBlob>(onChange) {
-    _fontProp = defineProperty<FontProp>("font");
-    _textProp = defineProperty<NodeProp>("text");
-    _pathProp = defineProperty<PathProp>("path");
-    _offsetProp = defineProperty<NodeProp>("initialOffset");
-
-    _textProp->require();
-    _pathProp->require();
-    _offsetProp->require();
-  }
-
-  void updateDerivedValue() override {
-    auto font = _fontProp->getDerivedValue();
-    auto text = _textProp->value().getAsString();
-    auto path = _pathProp->getDerivedValue();
-    auto offset = _offsetProp->value().getAsNumber();
-
-    if (font != nullptr) {
-      // Get glyphs
-      auto numGlyphIds =
-          font->countText(text.c_str(), text.length(), SkTextEncoding::kUTF8);
-
-      std::vector<SkGlyphID> glyphIds;
-      glyphIds.reserve(numGlyphIds);
-      auto ids = font->textToGlyphs(
-          text.c_str(), text.length(), SkTextEncoding::kUTF8,
-          static_cast<SkGlyphID *>(glyphIds.data()), numGlyphIds);
-
-      // Get glyph widths
-      int glyphsSize = static_cast<int>(ids);
-      std::vector<SkScalar> widthPtrs;
-      widthPtrs.resize(glyphsSize);
-      font->getWidthsBounds(glyphIds.data(), numGlyphIds,
-                            static_cast<SkScalar *>(widthPtrs.data()), nullptr,
-                            nullptr); // TODO: Should we use paint somehow here?
-
-      std::vector<SkRSXform> rsx;
-      SkContourMeasureIter meas(*path, false, 1);
-
-      auto cont = meas.next();
-      auto dist = offset;
-
-      for (size_t i = 0; i < text.length() && cont != nullptr; ++i) {
-        auto width = widthPtrs[i];
-        dist += width / 2;
-        if (dist > cont->length()) {
-          // jump to next contour
-          cont = meas.next();
-          if (cont == nullptr) {
-            // We have come to the end of the path - terminate the string
-            // right here.
-            text = text.substr(0, i);
-            break;
-          }
-          dist = width / 2;
-        }
-        // Gives us the (x, y) coordinates as well as the cos/sin of the tangent
-        // line at that position.
-        SkPoint pos;
-        SkVector tan;
-        if (!cont->getPosTan(dist, &pos, &tan)) {
-          throw std::runtime_error(
-              "Could not calculate distance when resolving text path");
-        }
-        auto px = pos.x();
-        auto py = pos.y();
-        auto tx = tan.x();
-        auto ty = tan.y();
-
-        auto adjustedX = px - (width / 2) * tx;
-        auto adjustedY = py - (width / 2) * ty;
-
-        rsx.push_back(SkRSXform::Make(tx, ty, adjustedX, adjustedY));
-        dist += width / 2;
-      }
-
-      setDerivedValue(SkTextBlob::MakeFromRSXform(text.c_str(), text.length(),
-                                                  rsx.data(), *font));
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  FontProp *_fontProp;
-  NodeProp *_textProp;
-  PathProp *_pathProp;
-  NodeProp *_offsetProp;
-};
-
-} // namespace RNSkia

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

@@ -1,52 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkTileMode.h"
-
-#include <memory>
-#include <string>
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class TileModeProp : public DerivedProp<SkTileMode> {
-public:
-  explicit TileModeProp(PropId name,
-                        const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkTileMode>(onChange) {
-    _tileModeProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_tileModeProp->isSet()) {
-      setDerivedValue(
-          getTileModeFromStringValue(_tileModeProp->value().getAsString()));
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  SkTileMode getTileModeFromStringValue(const std::string &value) {
-    if (value == "clamp") {
-      return SkTileMode::kClamp;
-    } else if (value == "repeat") {
-      return SkTileMode::kRepeat;
-    } else if (value == "mirror") {
-      return SkTileMode::kMirror;
-    } else if (value == "decal") {
-      return SkTileMode::kDecal;
-    }
-    throw std::runtime_error("Value \"" + value +
-                             "\" is not a valid tile mode.");
-  }
-
-  NodeProp *_tileModeProp;
-};
-
-} // namespace RNSkia

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

@@ -1,147 +0,0 @@
-#pragma once
-
-#include "DerivedNodeProp.h"
-#include "JsiSkMatrix.h"
-
-#include <memory>
-#include <string>
-
-namespace RNSkia {
-
-static PropId PropNameTranslateX = JsiPropId::get("translateX");
-static PropId PropNameTranslateY = JsiPropId::get("translateY");
-static PropId PropNameTranslateZ = JsiPropId::get("translateZ");
-static PropId PropNameTranslate = JsiPropId::get("translate");
-static PropId PropNameScale = JsiPropId::get("scale");
-static PropId PropNameScaleX = JsiPropId::get("scaleX");
-static PropId PropNameScaleY = JsiPropId::get("scaleY");
-static PropId PropNameSkewX = JsiPropId::get("skewX");
-static PropId PropNameSkewY = JsiPropId::get("skewY");
-static PropId PropNameRotate = JsiPropId::get("rotate");
-static PropId PropNameRotateZ = JsiPropId::get("rotateZ");
-static PropId PropNameRotateX = JsiPropId::get("rotateX");
-static PropId PropNameRotateY = JsiPropId::get("rotateY");
-static PropId PropNamePerspective = JsiPropId::get("perspective");
-static PropId PropNameMatrix4 = JsiPropId::get("matrix");
-
-class TransformProp : public DerivedProp<SkMatrix> {
-public:
-  explicit TransformProp(PropId name,
-                         const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkMatrix>(onChange) {
-    _transformProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (!_transformProp->isSet()) {
-      setDerivedValue(nullptr);
-    } else if (_transformProp->value().getType() != PropType::Array) {
-      throw std::runtime_error(
-          "Expected array for transform property, got " +
-          JsiValue::getTypeAsString(_transformProp->value().getType()));
-    } else {
-      SkM44 m4;
-      auto m = std::make_shared<SkMatrix>(SkMatrix());
-      for (auto &el : _transformProp->value().getAsArray()) {
-        auto keys = el.getKeys();
-        if (keys.size() == 0) {
-          throw std::runtime_error(
-              "Empty value in transform. Expected translateX, translateY, "
-              "scale, "
-              "scaleX, scaleY, skewX, skewY, rotate or rotateZ.");
-        }
-        auto key = el.getKeys().at(0);
-        if (key == PropNameTranslateX) {
-          auto x = el.getValue(key).getAsNumber();
-          SkM44 trX(1, 0, 0, x, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-          m4.preConcat(trX);
-        } else if (key == PropNameTranslateY) {
-          auto y = el.getValue(key).getAsNumber();
-          SkM44 trY(1, 0, 0, 0, 0, 1, 0, y, 0, 0, 1, 0, 0, 0, 0, 1);
-          m4.preConcat(trY);
-        } else if (key == PropNameTranslateZ) {
-          auto z = el.getValue(key).getAsNumber();
-          SkM44 trZ(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, z, 0, 0, 0, 1);
-          m4.preConcat(trZ);
-        } else if (key == PropNameTranslate) {
-          auto arr = el.getValue(key).getAsArray();
-          double x = 0, y = 0, z = 0;
-          for (size_t i = 0; i < arr.size(); ++i) {
-            if (i == 0) {
-              x = arr[i].getAsNumber();
-            } else if (i == 1) {
-              y = arr[i].getAsNumber();
-            } else if (i == 2) {
-              z = arr[i].getAsNumber();
-            }
-          }
-          SkM44 tr(1, 0, 0, x, 0, 1, 0, y, 0, 0, 1, z, 0, 0, 0, 1);
-          m4.preConcat(tr);
-        } else if (key == PropNameScale) {
-          auto s = el.getValue(key).getAsNumber();
-          SkM44 scale(s, 0, 0, 0, 0, s, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-          m4.preConcat(scale);
-        } else if (key == PropNameScaleX) {
-          auto s = el.getValue(key).getAsNumber();
-          SkM44 scale(s, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-          m4.preConcat(scale);
-        } else if (key == PropNameScaleY) {
-          auto s = el.getValue(key).getAsNumber();
-          SkM44 scale(1, 0, 0, 0, 0, s, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
-          m4.preConcat(scale);
-        } else if (key == PropNameSkewX) {
-          auto angle = el.getValue(key).getAsNumber();
-          SkM44 skewX(1, 0, 0, 0, std::tan(angle), 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-                      1);
-          m4.preConcat(skewX);
-        } else if (key == PropNameSkewY) {
-          auto angle = el.getValue(key).getAsNumber();
-          SkM44 skewY(1, std::tan(angle), 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-                      1);
-          m4.preConcat(skewY);
-        } else if (key == PropNameRotate || key == PropNameRotateZ) {
-          auto angle = el.getValue(key).getAsNumber();
-          SkM44 rotate;
-          rotate.setRotateUnit({0, 0, 1}, angle);
-          m4.preConcat(rotate);
-        } else if (key == PropNameRotateY) {
-          auto angle = el.getValue(key).getAsNumber();
-          SkM44 rotate;
-          rotate.setRotateUnit({0, 1, 0}, angle);
-          m4.preConcat(rotate);
-        } else if (key == PropNameRotateX) {
-          auto angle = el.getValue(key).getAsNumber();
-          SkM44 rotate;
-          rotate.setRotateUnit({1, 0, 0}, angle);
-          m4.preConcat(rotate);
-        } else if (key == PropNamePerspective) {
-          auto p = el.getValue(key).getAsNumber();
-          SkM44 perspective(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, -1 / p,
-                            1);
-          m4.preConcat(perspective);
-        } else if (key == PropNameMatrix4) {
-          auto arr = el.getValue(key).getAsArray();
-          SkM44 m44;
-          for (size_t i = 0; i < arr.size(); ++i) {
-            auto obj = arr[i];
-            m44.setRC(i / 4, i % 4, obj.getAsNumber());
-          }
-          m4.preConcat(m44);
-        } else {
-          throw std::runtime_error(
-              "Unknown key in transform. Expected translateX, translateY, "
-              "scale, "
-              "scaleX, scaleY, skewX, skewY, rotate or rotateZ - got " +
-              std::string(key) + ".");
-        }
-      }
-      m->preConcat(m4.asM33());
-      setDerivedValue(m);
-    }
-  }
-
-private:
-  NodeProp *_transformProp;
-};
-
-} // namespace RNSkia