@shopify/react-native-skia 1.11.1 → 1.11.2

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

@@ -1,222 +0,0 @@
-#pragma once
-
-#include "JsiSkRRect.h"
-#include "NodeProp.h"
-#include "RectProp.h"
-
-#include <memory>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkRRect.h"
-#include "include/core/SkRect.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-static PropId PropNameRx = JsiPropId::get("rx");
-static PropId PropNameRy = JsiPropId::get("ry");
-static PropId PropNameR = JsiPropId::get("r");
-static PropId PropNameTopLeft = JsiPropId::get("topLeft");
-static PropId PropNameTopRight = JsiPropId::get("topRight");
-static PropId PropNameBottomRight = JsiPropId::get("bottomRight");
-static PropId PropNameBottomLeft = JsiPropId::get("bottomLeft");
-
-/**
- Reads a rect from a given propety in the node. The name of the property is
- provided on the constructor. The property can either be a Javascript property
- or a host object representing an SkRect.
- */
-class RRectProp : public DerivedProp<SkRRect> {
-public:
-  explicit RRectProp(PropId name,
-                     const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp(onChange) {
-    _prop = defineProperty<NodeProp>(name);
-  }
-
-  static std::shared_ptr<SkRRect> processRRect(const JsiValue &value) {
-    if (value.getType() == PropType::HostObject) {
-      // Try reading as rect
-      auto rectPtr =
-          std::dynamic_pointer_cast<JsiSkRRect>(value.getAsHostObject());
-      if (rectPtr != nullptr) {
-        auto rrect = rectPtr->getObject();
-        return std::make_shared<SkRRect>(
-            SkRRect::MakeRectXY(rrect->rect(), rrect->getSimpleRadii().x(),
-                                rrect->getSimpleRadii().y()));
-      }
-    } else {
-      if (value.getType() == PropType::Object) {
-        if (value.hasValue(PropNameRect) && value.hasValue(PropNameRx) &&
-            value.hasValue(PropNameRy)) {
-          auto rect = value.getValue(PropNameRect);
-          if (rect.hasValue(PropNameX) && rect.hasValue(PropNameY) &&
-              rect.hasValue(PropNameWidth) && rect.hasValue(PropNameHeight)) {
-            auto x = rect.getValue(PropNameX);
-            auto y = rect.getValue(PropNameY);
-            auto width = rect.getValue(PropNameWidth);
-            auto height = rect.getValue(PropNameHeight);
-            auto rx = value.getValue(PropNameRx);
-            auto ry = value.getValue(PropNameRy);
-
-            // Update cache from js object value
-            return std::make_shared<SkRRect>(SkRRect::MakeRectXY(
-                SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
-                                 width.getAsNumber(), height.getAsNumber()),
-                rx.getAsNumber(), ry.getAsNumber()));
-          }
-        } else if (value.hasValue(PropNameRect) &&
-                   value.hasValue(PropNameTopLeft) &&
-                   value.hasValue(PropNameTopRight) &&
-                   value.hasValue(PropNameBottomRight) &&
-                   value.hasValue(PropNameBottomLeft)) {
-          auto rect = value.getValue(PropNameRect);
-          if (rect.hasValue(PropNameX) && rect.hasValue(PropNameY) &&
-              rect.hasValue(PropNameWidth) && rect.hasValue(PropNameHeight)) {
-            auto x = rect.getValue(PropNameX);
-            auto y = rect.getValue(PropNameY);
-            auto width = rect.getValue(PropNameWidth);
-            auto height = rect.getValue(PropNameHeight);
-            std::vector<SkPoint> points;
-            points.reserve(4);
-            auto topLeft = value.getValue(PropNameTopLeft);
-            auto topLeftX = topLeft.getValue(PropNameX);
-            auto topLeftY = topLeft.getValue(PropNameY);
-            points.push_back(
-                SkPoint::Make(topLeftX.getAsNumber(), topLeftY.getAsNumber()));
-
-            auto topRight = value.getValue(PropNameTopRight);
-            auto topRightX = topRight.getValue(PropNameX);
-            auto topRightY = topRight.getValue(PropNameY);
-            points.push_back(SkPoint::Make(topRightX.getAsNumber(),
-                                           topRightY.getAsNumber()));
-
-            auto bottomRight = value.getValue(PropNameBottomRight);
-            auto bottomRightX = bottomRight.getValue(PropNameX);
-            auto bottomRightY = bottomRight.getValue(PropNameY);
-            points.push_back(SkPoint::Make(bottomRightX.getAsNumber(),
-                                           bottomRightY.getAsNumber()));
-
-            auto bottomLeft = value.getValue(PropNameBottomLeft);
-            auto bottomLeftX = bottomLeft.getValue(PropNameX);
-            auto bottomLeftY = bottomLeft.getValue(PropNameY);
-            points.push_back(SkPoint::Make(bottomLeftX.getAsNumber(),
-                                           bottomLeftY.getAsNumber()));
-
-            auto rrect = std::make_shared<SkRRect>(SkRRect::MakeEmpty());
-            rrect->setRectRadii(
-                SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
-                                 width.getAsNumber(), height.getAsNumber()),
-                points.data());
-            return rrect;
-          }
-        }
-      }
-    }
-    return nullptr;
-  }
-
-  void updateDerivedValue() override {
-    if (_prop->isSet()) {
-      auto value = _prop->value();
-      setDerivedValue(RRectProp::processRRect(value));
-    }
-  }
-
-private:
-  NodeProp *_prop;
-};
-
-/**
- Reads rect properties from a node's properties
- */
-class RRectPropFromProps : public DerivedProp<SkRRect> {
-public:
-  explicit RRectPropFromProps(
-      const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkRRect>(onChange) {
-    _x = defineProperty<NodeProp>(PropNameX);
-    _y = defineProperty<NodeProp>(PropNameY);
-    _width = defineProperty<NodeProp>(PropNameWidth);
-    _height = defineProperty<NodeProp>(PropNameHeight);
-    _r = defineProperty<NodeProp>(PropNameR);
-  }
-
-  void updateDerivedValue() override {
-    if (_x->isSet() && _y->isSet() && _width->isSet() && _height->isSet() &&
-        _r->isSet()) {
-      setDerivedValue(SkRRect::MakeRectXY(
-          SkRect::MakeXYWH(_x->value().getAsNumber(), _y->value().getAsNumber(),
-                           _width->value().getAsNumber(),
-                           _height->value().getAsNumber()),
-          _r->value().getAsNumber(), _r->value().getAsNumber()));
-    }
-  }
-
-private:
-  NodeProp *_x;
-  NodeProp *_y;
-  NodeProp *_width;
-  NodeProp *_height;
-  NodeProp *_r;
-};
-
-/**
- Reads rect props from either a given property or from the property object
- itself.
- */
-class RRectProps : public DerivedProp<SkRRect> {
-public:
-  explicit RRectProps(PropId name,
-                      const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkRRect>(onChange) {
-    _rectProp = defineProperty<RRectProp>(name);
-    _rectPropFromProps = defineProperty<RRectPropFromProps>();
-  }
-
-  void updateDerivedValue() override {
-    if (_rectProp->isSet()) {
-      setDerivedValue(_rectProp->getUnsafeDerivedValue());
-    } else if (_rectPropFromProps->isSet()) {
-      setDerivedValue(_rectPropFromProps->getUnsafeDerivedValue());
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  RRectProp *_rectProp;
-  RRectPropFromProps *_rectPropFromProps;
-};
-
-/**
- Reads rect props from either a given property or from the property object
- itself.
- */
-class BoxProps : public DerivedProp<SkRRect> {
-public:
-  explicit BoxProps(PropId name,
-                    const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkRRect>(onChange) {
-    _boxProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    auto value = _boxProp->value();
-    auto rect = RectProp::processRect(value);
-    if (rect) {
-      setDerivedValue(SkRRect::MakeRect(*rect));
-    } else {
-      setDerivedValue(RRectProp::processRRect(value));
-    }
-  }
-
-private:
-  NodeProp *_boxProp;
-};
-
-} // namespace RNSkia

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

@@ -1,52 +0,0 @@
-#pragma once
-
-#include "JsiSkRSXform.h"
-#include "NodeProp.h"
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkRSXform.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-// TODO: Factorize these array classes
-class RSXFormsProp : public DerivedProp<std::vector<SkRSXform>> {
-public:
-  explicit RSXFormsProp(PropId name,
-                        const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<std::vector<SkRSXform>>(onChange) {
-    _rsxFormsProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_rsxFormsProp->isSet()) {
-      auto rsxforms = _rsxFormsProp->value().getAsArray();
-      std::vector<SkRSXform> derivedRSXForms;
-      derivedRSXForms.reserve(rsxforms.size());
-
-      for (size_t i = 0; i < rsxforms.size(); ++i) {
-        auto val = rsxforms[i];
-        if (val.getType() == PropType::HostObject) {
-          auto rsx =
-              std::dynamic_pointer_cast<JsiSkRSXform>(val.getAsHostObject())
-                  ->getObject();
-          derivedRSXForms.push_back(*rsx);
-        }
-      }
-      setDerivedValue(std::move(derivedRSXForms));
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  NodeProp *_rsxFormsProp;
-};
-} // namespace RNSkia

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

@@ -1,43 +0,0 @@
-#pragma once
-
-#include "NodeProp.h"
-#include "PointProp.h"
-
-#include <memory>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkPoint.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class RadiusProp : public DerivedProp<SkPoint> {
-public:
-  explicit RadiusProp(PropId name,
-                      const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkPoint>(onChange) {
-    _radiusProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_radiusProp->isSet()) {
-      // Check for simple number:
-      if (_radiusProp->value().getType() == PropType::Number) {
-        setDerivedValue(SkPoint::Make(_radiusProp->value().getAsNumber(),
-                                      _radiusProp->value().getAsNumber()));
-      } else {
-        setDerivedValue(PointProp::processValue(_radiusProp->value()));
-      }
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  NodeProp *_radiusProp;
-};
-
-} // namespace RNSkia

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

@@ -1,164 +0,0 @@
-#pragma once
-
-#include "JsiSkRSXform.h"
-#include "NodeProp.h"
-#include "PointProp.h"
-
-#include <memory>
-#include <utility>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkRect.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-static PropId PropNameRect = JsiPropId::get("rect");
-static PropId PropNameWidth = JsiPropId::get("width");
-static PropId PropNameHeight = JsiPropId::get("height");
-
-/**
- Reads a rect from a given propety in the node. The name of the property is
- provided on the constructor. The property can either be a Javascript property
- or a host object representing an SkRect.
- */
-class RectProp : public DerivedProp<SkRect> {
-public:
-  explicit RectProp(PropId name,
-                    const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp(onChange) {
-    _prop = defineProperty<NodeProp>(name);
-  }
-
-  static std::shared_ptr<SkRect> processRect(const JsiValue &value) {
-    if (value.getType() == PropType::HostObject) {
-      auto rectPtr =
-          std::dynamic_pointer_cast<JsiSkRect>(value.getAsHostObject());
-      if (rectPtr != nullptr) {
-        return std::make_shared<SkRect>(SkRect::MakeXYWH(
-            rectPtr->getObject()->x(), rectPtr->getObject()->y(),
-            rectPtr->getObject()->width(), rectPtr->getObject()->height()));
-      }
-    } else if (value.getType() == PropType::Object &&
-               value.hasValue(PropNameX) && value.hasValue(PropNameY) &&
-               value.hasValue(PropNameWidth) &&
-               value.hasValue(PropNameHeight)) {
-      // Save props for fast access
-      auto x = value.getValue(PropNameX);
-      auto y = value.getValue(PropNameY);
-      auto width = value.getValue(PropNameWidth);
-      auto height = value.getValue(PropNameHeight);
-      // Update cache from js object value
-      return std::make_shared<SkRect>(
-          SkRect::MakeXYWH(x.getAsNumber(), y.getAsNumber(),
-                           width.getAsNumber(), height.getAsNumber()));
-    }
-    return nullptr;
-  }
-
-  void updateDerivedValue() override {
-    if (_prop->isSet()) {
-      setDerivedValue(RectProp::processRect(_prop->value()));
-    }
-  }
-
-private:
-  NodeProp *_prop;
-};
-
-/**
- Reads rect properties from a node's properties
- */
-class RectPropFromProps : public DerivedProp<SkRect> {
-public:
-  explicit RectPropFromProps(
-      const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkRect>(onChange) {
-    _x = defineProperty<NodeProp>(PropNameX);
-    _y = defineProperty<NodeProp>(PropNameY);
-    _width = defineProperty<NodeProp>(PropNameWidth);
-    _height = defineProperty<NodeProp>(PropNameHeight);
-  }
-
-  void updateDerivedValue() override {
-    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()));
-    }
-  }
-
-private:
-  NodeProp *_x;
-  NodeProp *_y;
-  NodeProp *_width;
-  NodeProp *_height;
-};
-
-/**
- Reads rect props from either a given property or from the property object
- itself.
- */
-class RectProps : public DerivedProp<SkRect> {
-public:
-  explicit RectProps(PropId name,
-                     const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<SkRect>(onChange) {
-    _rectProp = defineProperty<RectProp>(name);
-    _rectPropFromProps = defineProperty<RectPropFromProps>();
-  }
-
-  void updateDerivedValue() override {
-    if (_rectProp->isSet()) {
-      setDerivedValue(_rectProp->getUnsafeDerivedValue());
-    } else if (_rectPropFromProps->isSet()) {
-      setDerivedValue(_rectPropFromProps->getUnsafeDerivedValue());
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  RectProp *_rectProp;
-  RectPropFromProps *_rectPropFromProps;
-};
-
-class RectsProp : public DerivedProp<std::vector<SkRect>> {
-public:
-  explicit RectsProp(PropId name,
-                     const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp<std::vector<SkRect>>(onChange) {
-    _rectsProp = defineProperty<NodeProp>(name);
-  }
-
-  void updateDerivedValue() override {
-    if (_rectsProp->isSet()) {
-      auto rects = _rectsProp->value().getAsArray();
-      std::vector<SkRect> derivedRects;
-      derivedRects.reserve(rects.size());
-
-      for (size_t i = 0; i < rects.size(); ++i) {
-        derivedRects.push_back(*RectProp::processRect(rects[i]));
-      }
-      setDerivedValue(std::move(derivedRects));
-    } else {
-      setDerivedValue(nullptr);
-    }
-  }
-
-private:
-  NodeProp *_rectsProp;
-};
-
-} // namespace RNSkia

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

@@ -1,54 +0,0 @@
-#pragma once
-
-#include "include/core/SkSamplingOptions.h"
-
-namespace RNSkia {
-
-static PropId PropNameCubicB = JsiPropId::get("B");
-static PropId PropNameCubicC = JsiPropId::get("C");
-static PropId PropNameFilter = JsiPropId::get("filter");
-static PropId PropNameMipmap = JsiPropId::get("mipmap");
-
-class SamplingProp : public DerivedProp<SkSamplingOptions> {
-public:
-  explicit SamplingProp(PropId name,
-                        const std::function<void(BaseNodeProp *)> &onChange)
-      : DerivedProp(onChange) {
-    _prop = defineProperty<NodeProp>(name);
-  }
-
-  static SkSamplingOptions processSamplingOptions(const JsiValue &value) {
-    SkSamplingOptions samplingOptions(SkFilterMode::kLinear);
-    if (value.getType() == PropType::Object) {
-      if (value.hasValue(PropNameCubicB) && value.hasValue(PropNameCubicC)) {
-        auto B =
-            static_cast<float>(value.getValue(PropNameCubicB).getAsNumber());
-        auto C =
-            static_cast<float>(value.getValue(PropNameCubicC).getAsNumber());
-        samplingOptions = SkSamplingOptions({B, C});
-      } else if (value.hasValue(PropNameFilter)) {
-        auto filter = static_cast<SkFilterMode>(
-            value.getValue(PropNameFilter).getAsNumber());
-        if (value.hasValue(PropNameMipmap)) {
-          auto mipmap = static_cast<SkMipmapMode>(
-              value.getValue(PropNameMipmap).getAsNumber());
-          samplingOptions = SkSamplingOptions(filter, mipmap);
-        } else {
-          samplingOptions = SkSamplingOptions(filter);
-        }
-      }
-    }
-
-    return samplingOptions;
-  }
-
-  void updateDerivedValue() override {
-    if (_prop->isSet()) {
-      setDerivedValue(SamplingProp::processSamplingOptions(_prop->value()));
-    }
-  }
-
-private:
-  NodeProp *_prop;
-};
-} // namespace RNSkia