@shopify/react-native-skia 1.11.1 → 1.11.2

package/cpp/rnskia/dom/base/ConcatablePaint.h

@@ -1,49 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkColorFilter.h"
-#include "include/core/SkImageFilter.h"
-#include "include/core/SkMaskFilter.h"
-#include "include/core/SkPaint.h"
-#include "include/core/SkPathEffect.h"
-#include "include/core/SkShader.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class JsiDomNode;
-class PaintProps;
-class DeclarationContext;
-
-/**
- Class for concatenating SkPaint objects.
- */
-class ConcatablePaint {
-public:
-  ConcatablePaint(DeclarationContext *context, PaintProps *paintProps,
-                  const std::vector<std::shared_ptr<JsiDomNode>> &children);
-
-  void concatTo(std::shared_ptr<SkPaint> paint);
-  bool isEmpty();
-
-private:
-  DeclarationContext *_declarationContext;
-  const std::vector<std::shared_ptr<JsiDomNode>> _children;
-  PaintProps *_paintProps;
-
-  bool _isEmpty{true};
-
-  sk_sp<SkImageFilter> _imageFilter;
-  sk_sp<SkColorFilter> _colorFilter;
-  sk_sp<SkPathEffect> _pathEffect;
-  sk_sp<SkMaskFilter> _maskFilter;
-  sk_sp<SkShader> _shader;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/Declaration.h

@@ -1,86 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <numeric>
-#include <stack>
-#include <utility>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkRefCnt.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-/**
- Small container for shaders, filters, masks and effects
- */
-template <typename T> class Declaration {
-public:
-  // Pushes to the stack
-  void push(T el) { _elements.push(el); }
-
-  // Clears and returns all elements
-  std::vector<T> popAll() {
-    auto size = _elements.size();
-    std::vector<T> tmp;
-    tmp.reserve(size);
-    for (size_t i = 0; i < size; ++i) {
-      tmp.push_back(_elements.top());
-      _elements.pop();
-    }
-    std::reverse(std::begin(tmp), std::end(tmp));
-    return tmp;
-  }
-
-  T pop() {
-    if (_elements.size() == 0) {
-      return nullptr;
-    }
-    auto tmp = _elements.top();
-    _elements.pop();
-    return tmp;
-  }
-
-  // Clears and returns through reducer function in reversed order
-  T popAsOne(std::function<T(T inner, T outer)> composer) {
-    auto tmp = popAll();
-    std::reverse(std::begin(tmp), std::end(tmp));
-    return std::accumulate(std::begin(tmp), std::end(tmp),
-                           static_cast<T>(nullptr), [=](T inner, T outer) {
-                             if (inner == nullptr) {
-                               return outer;
-                             }
-                             return composer(inner, outer);
-                           });
-  }
-
-  // Returns the size of the elements
-  size_t size() { return _elements.size(); }
-
-private:
-  std::stack<T> _elements;
-};
-
-/**
- Small container for shaders, filters, masks and effects
- */
-template <typename T> class ComposableDeclaration : public Declaration<T> {
-public:
-  /**
-   Constructor
-   */
-  explicit ComposableDeclaration(std::function<T(T inner, T outer)> composer)
-      : Declaration<T>(), _composer(composer) {}
-
-  // Clears and returns through reducer function in reversed order
-  T popAsOne() { return Declaration<T>::popAsOne(_composer); }
-
-private:
-  std::function<T(T inner, T outer)> _composer;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/DeclarationContext.h

@@ -1,79 +0,0 @@
-#pragma once
-
-#include "Declaration.h"
-
-#include <memory>
-#include <stack>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkColorFilter.h"
-#include "include/core/SkImageFilter.h"
-#include "include/core/SkMaskFilter.h"
-#include "include/core/SkPaint.h"
-#include "include/core/SkPathEffect.h"
-#include "include/core/SkShader.h"
-#include "include/effects/SkImageFilters.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class DeclarationContext {
-public:
-  DeclarationContext() { save(); }
-
-  Declaration<sk_sp<SkShader>> *getShaders() { return &_shaders.top(); }
-  ComposableDeclaration<sk_sp<SkImageFilter>> *getImageFilters() {
-    return &_imageFilters.top();
-  }
-  ComposableDeclaration<sk_sp<SkColorFilter>> *getColorFilters() {
-    return &_colorFilters.top();
-  }
-  ComposableDeclaration<sk_sp<SkPathEffect>> *getPathEffects() {
-    return &_pathEffects.top();
-  }
-  Declaration<sk_sp<SkMaskFilter>> *getMaskFilters() {
-    return &_maskFilters.top();
-  }
-  Declaration<std::shared_ptr<SkPaint>> *getPaints() { return &_paints.top(); }
-
-  void save() {
-    _paints.emplace();
-    _shaders.emplace();
-    _imageFilters.emplace(
-        [](sk_sp<SkImageFilter> inner, sk_sp<SkImageFilter> outer) {
-          return SkImageFilters::Compose(outer, inner);
-        });
-    _colorFilters.emplace(
-        [](sk_sp<SkColorFilter> inner, sk_sp<SkColorFilter> outer) {
-          return SkColorFilters::Compose(outer, inner);
-        });
-    _pathEffects.emplace(
-        [](sk_sp<SkPathEffect> inner, sk_sp<SkPathEffect> outer) {
-          return SkPathEffect::MakeCompose(outer, inner);
-        });
-    _maskFilters.emplace();
-  }
-
-  void restore() {
-    _shaders.pop();
-    _imageFilters.pop();
-    _colorFilters.pop();
-    _pathEffects.pop();
-    _maskFilters.pop();
-    _paints.pop();
-  }
-
-private:
-  std::stack<Declaration<sk_sp<SkShader>>> _shaders;
-  std::stack<ComposableDeclaration<sk_sp<SkImageFilter>>> _imageFilters;
-  std::stack<ComposableDeclaration<sk_sp<SkColorFilter>>> _colorFilters;
-  std::stack<ComposableDeclaration<sk_sp<SkPathEffect>>> _pathEffects;
-  std::stack<Declaration<sk_sp<SkMaskFilter>>> _maskFilters;
-  std::stack<Declaration<std::shared_ptr<SkPaint>>> _paints;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/DerivedNodeProp.h

@@ -1,203 +0,0 @@
-#pragma once
-
-#include "BaseNodeProp.h"
-#include "JsiValue.h"
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace RNSkia {
-
-/**
- Class for composing multiple properties into a derived property value
- */
-class BaseDerivedProp : public BaseNodeProp {
-public:
-  explicit BaseDerivedProp(const std::function<void(BaseNodeProp *)> &onChange)
-      : _onChange(onChange), BaseNodeProp() {}
-
-  /**
-   Starts the process of updating and reading props
-   */
-  void updatePendingChanges() override {
-    auto changed = false;
-    for (auto &prop : _properties) {
-      prop->updatePendingChanges();
-      if (prop->isChanged()) {
-        changed = true;
-      }
-    }
-
-    // We only need to update the derived value when any of the derived
-    // properties have changed.
-    if (changed) {
-      updateDerivedValue();
-    }
-  }
-
-  /*
-   Marks properties as no longer changed
-   */
-  void markAsResolved() override {
-    for (auto &prop : _properties) {
-      prop->markAsResolved();
-    }
-
-    _isChanged = false;
-  }
-
-  /**
-   Returns the changed state of the prop
-   */
-  bool isChanged() override { return _isChanged; }
-
-  /**
-   Delegate read value to child nodes
-   */
-  void readValueFromJs(jsi::Runtime &runtime,
-                       const ReadPropFunc &read) override {
-    for (auto &prop : _properties) {
-      prop->readValueFromJs(runtime, read);
-    }
-  }
-
-  /**
-   Override to calculate the derived value from child properties
-   */
-  virtual void updateDerivedValue() = 0;
-
-  /**
-   Adds a property to the derived property child props.
-   */
-  template <class _Tp, class... _Args,
-            class = std::enable_if_t<!std::is_array<_Tp>::value>>
-  _Tp *defineProperty(_Args &&...__args) {
-    auto prop =
-        std::make_shared<_Tp>(std::forward<_Args>(__args)..., _onChange);
-    _properties.push_back(prop);
-    return prop.get();
-  }
-
-  /*
-   Return name of properties in derived prop as a comma separated list
-   */
-  std::string getName() override {
-    std::string v = "";
-    for (size_t i = 0; i < _properties.size(); ++i) {
-      v += _properties[i]->getName() + (i < _properties.size() - 1 ? ", " : "");
-    }
-    return v;
-  }
-
-  /**
-   Returns true if one or more of the child props has values
-   */
-  bool isSet() override {
-    for (auto &prop : _properties) {
-      if (prop->isSet()) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-protected:
-  void setIsChanged(bool isChanged) { _isChanged = isChanged; }
-
-private:
-  std::vector<std::shared_ptr<BaseNodeProp>> _properties;
-  std::atomic<bool> _isChanged = {false};
-  std::function<void(BaseNodeProp *)> _onChange;
-};
-
-/**
- Class for composing multiple properties into a derived property value
- */
-template <typename T> class DerivedProp : public BaseDerivedProp {
-public:
-  explicit DerivedProp(const std::function<void(BaseNodeProp *)> &onChange)
-      : BaseDerivedProp(onChange) {}
-
-  /**
-  Returns the derived value
-   */
-  std::shared_ptr<const T> getDerivedValue() {
-    return std::const_pointer_cast<const T>(_derivedValue);
-  }
-
-  /**
-   Returns a mutable version of the derived value. Used by the paint props to
-   keep a drawing context
-   */
-  std::shared_ptr<T> getUnsafeDerivedValue() { return _derivedValue; }
-
-  /**
-   Returns true if is optional and one of the child props has a value, or all
-   props if optional is false.
-   */
-  bool isSet() override { return _derivedValue != nullptr; };
-
-protected:
-  /**
-   Set derived value from sub classes
-   */
-  void setDerivedValue(std::shared_ptr<T> value) {
-    setIsChanged(_derivedValue != value);
-    _derivedValue = value;
-  }
-
-  /**
-   Set derived value from sub classes
-   */
-  void setDerivedValue(T &&value) {
-    setIsChanged(true);
-    _derivedValue = std::make_shared<T>(std::move(value));
-  }
-
-private:
-  std::shared_ptr<T> _derivedValue;
-};
-
-/**
- Class for composing multiple properties into a derived property value
- */
-template <typename T> class DerivedSkProp : public BaseDerivedProp {
-public:
-  explicit DerivedSkProp(const std::function<void(BaseNodeProp *)> &onChange)
-      : BaseDerivedProp(onChange) {}
-
-  /**
-  Returns the derived value
-   */
-  sk_sp<T> getDerivedValue() { return _derivedValue; }
-
-  /**
-   Returns true if is optional and one of the child props has a value, or all
-   props if optional is false.
-   */
-  bool isSet() override { return _derivedValue != nullptr; };
-
-protected:
-  /**
-   Set derived value from sub classes
-   */
-  void setDerivedValue(sk_sp<T> value) {
-    setIsChanged(_derivedValue != value);
-    _derivedValue = value;
-  }
-
-  /**
-   Set derived value from sub classes
-   */
-  void setDerivedValue(const T &&value) {
-    setIsChanged(true);
-    _derivedValue = sk_make_sp<T>(std::move(value));
-  }
-
-private:
-  sk_sp<T> _derivedValue;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/DrawingContext.cpp

@@ -1,55 +0,0 @@
-#include "DrawingContext.h"
-
-#include "ConcatablePaint.h"
-#include "JsiDomNode.h"
-#include "PaintProps.h"
-
-#include <numeric>
-
-namespace RNSkia {
-
-DrawingContext::DrawingContext(std::shared_ptr<SkPaint> paint) {
-  _declarationContext = std::make_unique<DeclarationContext>();
-  paint->setAntiAlias(true);
-  _paints.push_back(paint);
-}
-
-DrawingContext::DrawingContext()
-    : DrawingContext(std::make_shared<SkPaint>()) {}
-
-bool DrawingContext::saveAndConcat(
-    PaintProps *paintProps,
-    const std::vector<std::shared_ptr<JsiDomNode>> &children,
-    std::shared_ptr<SkPaint> paintCache) {
-
-  if (paintCache) {
-    _paints.push_back(paintCache);
-    return true;
-  }
-
-  ConcatablePaint paint(_declarationContext.get(), paintProps, children);
-  if (!paint.isEmpty()) {
-    save();
-    paint.concatTo(getPaint());
-    return true;
-  }
-
-  return false;
-}
-
-void DrawingContext::save() {
-  // Copy paint and push
-  _paints.push_back(std::make_shared<SkPaint>(*getPaint()));
-}
-
-void DrawingContext::restore() { _paints.pop_back(); }
-
-SkCanvas *DrawingContext::getCanvas() { return _canvas; }
-
-void DrawingContext::setCanvas(SkCanvas *canvas) { _canvas = canvas; }
-
-std::shared_ptr<SkPaint> DrawingContext::getPaint() {
-  return _paints[_paints.size() - 1];
-}
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/DrawingContext.h

@@ -1,104 +0,0 @@
-#pragma once
-
-#include "JsiHostObject.h"
-
-#include "Declaration.h"
-#include "DeclarationContext.h"
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "include/core/SkCanvas.h"
-#include "include/core/SkPaint.h"
-#include "include/core/SkRefCnt.h"
-
-#pragma clang diagnostic pop
-
-namespace RNSkia {
-
-class PaintProps;
-class JsiDomNode;
-
-class DomRenderContext {
-public:
-  float getScaledWidth() { return _scaledWidth; }
-  float getScaledHeight() { return _scaledHeight; }
-
-  void setScaledWidth(float v) { _scaledWidth = v; }
-  void setScaledHeight(float v) { _scaledHeight = v; }
-
-  void setRequestRedraw(std::function<void()> &&requestRedraw) {
-    _requestRedraw = std::move(requestRedraw);
-  }
-
-  const std::function<void()> &getRequestRedraw() { return _requestRedraw; }
-
-private:
-  float _scaledWidth = -1;
-  float _scaledHeight = -1;
-  std::function<void()> _requestRedraw;
-};
-
-class DrawingContext : public DomRenderContext,
-                       public std::enable_shared_from_this<DrawingContext> {
-public:
-  /**
-   Creates a root drawing context with paint and opacity
-   */
-  DrawingContext();
-
-  /**
-   Creates a drawing context with the given paint as its starting paint object
-  */
-  explicit DrawingContext(std::shared_ptr<SkPaint> paint);
-
-  /**
-   Factory for saving/restoring the context for a node
-   */
-  bool saveAndConcat(PaintProps *paintProps,
-                     const std::vector<std::shared_ptr<JsiDomNode>> &children,
-                     std::shared_ptr<SkPaint> paintCache);
-  void restore();
-
-  /**
-   Returns true if the current cache is changed
-   */
-  bool isChanged();
-
-  /**
-   Get/Sets the canvas object
-   */
-  SkCanvas *getCanvas();
-
-  /**
-   Sets the canvas
-   */
-  void setCanvas(SkCanvas *canvas);
-
-  /**
-   Gets the paint object
-   */
-  std::shared_ptr<SkPaint> getPaint();
-
-  /*
-   Returns the root declaratiins object
-   */
-  DeclarationContext *getDeclarationContext() {
-    return _declarationContext.get();
-  }
-
-private:
-  void save();
-
-  explicit DrawingContext(const char *source);
-  SkCanvas *_canvas = nullptr;
-  std::vector<std::shared_ptr<SkPaint>> _paints;
-  std::unique_ptr<DeclarationContext> _declarationContext;
-};
-
-} // namespace RNSkia

package/cpp/rnskia/dom/base/JsiDomDeclarationNode.h

@@ -1,119 +0,0 @@
-
-#pragma once
-
-#include "DrawingContext.h"
-#include "JsiDomNode.h"
-
-#include <memory>
-#include <string>
-
-namespace RNSkia {
-
-enum DeclarationType {
-  Unknown = 0,
-  Paint = 1,
-  Shader = 2,
-  ImageFilter = 3,
-  ColorFilter = 4,
-  PathEffect = 5,
-  MaskFilter = 6,
-};
-
-class JsiDomDeclarationNode : public JsiDomNode {
-public:
-  JsiDomDeclarationNode(std::shared_ptr<RNSkPlatformContext> context,
-                        const char *type, DeclarationType declarationType)
-      : JsiDomNode(context, type, NodeClass::DeclarationNode),
-        _declarationType(declarationType) {}
-
-  JSI_PROPERTY_GET(declarationType) {
-    // FIXME: Shouldn't this be the declaration type instead? It has been
-    return jsi::String::createFromUtf8(runtime, std::string(getType()));
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiDomDeclarationNode,
-                                                  declarationType),
-                              JSI_EXPORT_PROP_GET(JsiDomNode, type))
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiDomNode, addChild),
-                       JSI_EXPORT_FUNC(JsiDomNode, removeChild),
-                       JSI_EXPORT_FUNC(JsiDomNode, insertChildBefore),
-                       JSI_EXPORT_FUNC(JsiDomNode, setProps),
-                       JSI_EXPORT_FUNC(JsiDomNode, setProp),
-                       JSI_EXPORT_FUNC(JsiDomNode, dispose),
-                       JSI_EXPORT_FUNC(JsiDomNode, children))
-
-  /**
-   Called when rendering the tree to create all derived values from all nodes.
-   */
-  void decorateContext(DeclarationContext *context) override {
-    JsiDomNode::decorateContext(context);
-
-#if SKIA_DOM_DEBUG
-    printDebugInfo("Begin decorate " + std::string(getType()));
-#endif
-
-    // decorate drawing context
-    decorate(context);
-
-#if SKIA_DOM_DEBUG
-    printDebugInfo("End / Commit decorate " + std::string(getType()));
-#endif
-  }
-
-  DeclarationType getDeclarationType() { return _declarationType; }
-
-  /**
-   Override to implement materialization
-   */
-  virtual void decorate(DeclarationContext *context) = 0;
-
-protected:
-  /**
-   Invalidates and marks then context as changed. The implementation in the
-   declaration node is to pass the call upwards to the parent node
-   */
-  void invalidateContext() override {
-    if (getParent() != nullptr) {
-      getParent()->invalidateContext();
-    }
-  }
-
-  /**
-   A property changed
-   */
-  void onPropertyChanged(BaseNodeProp *prop) override { invalidateContext(); }
-
-  /**
-   Validates that only declaration nodes can be children
-   */
-  void addChild(std::shared_ptr<JsiDomNode> child) override {
-    if (child->getNodeClass() != NodeClass::DeclarationNode) {
-      getContext()->raiseError(std::runtime_error(
-          "Cannot add a child of type \"" + std::string(child->getType()) +
-          "\" to a \"" + std::string(getType()) + "\"."));
-    }
-    JsiDomNode::addChild(child);
-  }
-
-  /**
-   Validates that only declaration nodes can be children
-   */
-  void insertChildBefore(std::shared_ptr<JsiDomNode> child,
-                         std::shared_ptr<JsiDomNode> before) override {
-    if (child->getNodeClass() != NodeClass::DeclarationNode) {
-      getContext()->raiseError(std::runtime_error(
-          "Cannot add a child of type \"" + std::string(child->getType()) +
-          "\" to a \"" + std::string(getType()) + "\"."));
-    }
-    JsiDomNode::insertChildBefore(child, before);
-  }
-
-private:
-  /**
-   Type of declaration
-   */
-  DeclarationType _declarationType;
-};
-
-} // namespace RNSkia