@shopify/react-native-skia 0.1.162 → 0.1.164

package/cpp/rnskia/RNSkJsView.h

@@ -21,9 +21,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBBHFactory.h>
-#include <SkCanvas.h>
-#include <SkPictureRecorder.h>
+#include "SkBBHFactory.h"
+#include "SkCanvas.h"
+#include "SkPictureRecorder.h"
 
 #pragma clang diagnostic pop
 

package/cpp/rnskia/RNSkPictureView.h

@@ -21,9 +21,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBBHFactory.h>
-#include <SkCanvas.h>
-#include <SkPictureRecorder.h>
+#include "SkBBHFactory.h"
+#include "SkCanvas.h"
+#include "SkPictureRecorder.h"
 
 #pragma clang diagnostic pop
 

package/cpp/rnskia/RNSkPlatformContext.h

@@ -14,7 +14,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkStream.h>
+#include "SkStream.h"
 
 #pragma clang diagnostic pop
 
@@ -188,8 +188,10 @@ public:
     }
   }
 
-  virtual void startDrawLoop() = 0;
-  virtual void stopDrawLoop() = 0;
+  // default implementation does nothing, so it can be called from virtual
+  // destructor.
+  virtual void startDrawLoop() {}
+  virtual void stopDrawLoop() {}
 
 private:
   float _pixelDensity;

package/cpp/rnskia/RNSkView.h

@@ -17,8 +17,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkCanvas.h>
-#include <SkSurface.h>
+#include "SkCanvas.h"
+#include "SkSurface.h"
 
 #pragma clang diagnostic pop
 

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

@@ -20,13 +20,6 @@ DrawingContext::inheritContext(const char *source) {
   return result;
 }
 
-size_t DrawingContext::getLevel() {
-  if (_parent != nullptr) {
-    return _parent->getLevel() + 1;
-  }
-  return 0;
-}
-
 std::string DrawingContext::getDebugDescription() {
   std::string v = "ctx for " + std::string(_source) + ":";
 
@@ -51,9 +44,27 @@ std::string DrawingContext::getDebugDescription() {
     }
 
     v += " opacity:" + std::to_string(_opacity);
+
     if (_paint->getPathEffect() != nullptr) {
       v += " [PathEffect]";
     }
+
+    if (_paint->getShader() != nullptr) {
+      v += " [Shader]";
+    }
+
+    if (_paint->getImageFilter() != nullptr) {
+      v += " [ImageFilter]";
+    }
+
+    if (_paint->getMaskFilter() != nullptr) {
+      v += " [MaskFilter]";
+    }
+
+    if (_paint->getColorFilter() != nullptr) {
+      v += " [ColorFilter]";
+    }
+
   } else {
     v = v + "[inherited] " +
         (_parent != nullptr ? _parent->getDebugDescription() : "");
@@ -168,8 +179,12 @@ double DrawingContext::getOpacity() {
  Sets the opacity value
  */
 void DrawingContext::setOpacity(double opacity) {
-  getMutablePaint()->setAlphaf(_opacity);
-  _opacity = opacity;
+  auto currentOpacity = opacity;
+  if (_parent != nullptr) {
+    currentOpacity *= _parent->getOpacity();
+  }
+  getMutablePaint()->setAlphaf(currentOpacity);
+  _opacity = currentOpacity;
 }
 
 /**

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

@@ -34,8 +34,9 @@ public:
    */
   std::shared_ptr<DrawingContext> inheritContext(const char *source);
 
-  size_t getLevel();
-
+  /**
+   Returns the debug description for the context
+   */
   std::string getDebugDescription();
 
   /**

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

@@ -36,7 +36,7 @@ public:
    */
   virtual void decorateContext(DrawingContext *context) {
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "Begin Materialize");
+    printDebugInfo("Begin Materialize " + std::string(getType()));
 #endif
     // Materialize children first so that any inner nodes get the opportunity
     // to calculate their state before this node continues.
@@ -51,11 +51,21 @@ public:
     decorate(context);
 
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "End Materialize");
+    printDebugInfo("End / Commit Materialize " + std::string(getType()));
 #endif
   }
 
 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();
+    }
+  }
+
   /**
    Override to implement materialization
    */

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

@@ -16,7 +16,7 @@ public:
 protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomRenderNode::defineProperties(container);
-    container->defineProperty(std::make_shared<PaintProp>());
+    container->defineProperty<PaintProp>();
   }
 
   /**
@@ -26,11 +26,11 @@ protected:
 
   void renderNode(DrawingContext *context) override {
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "Begin Draw", 1);
+    printDebugInfo("Begin Draw", 1);
 #endif
 
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, context->getDebugDescription(), 2);
+    printDebugInfo(context->getDebugDescription(), 2);
 #endif
     draw(context);
 
@@ -42,7 +42,7 @@ protected:
       }
     }
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "End Draw", 1);
+    printDebugInfo("End Draw", 1);
 #endif
   }
 };

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

@@ -168,6 +168,12 @@ public:
     _disposeCallback = disposeCallback;
   }
 
+  /**
+   Invalidates and marks then context as changed. The default behaviour is an
+   empty implementation
+   */
+  virtual void invalidateContext() = 0;
+
   /**
    Updates any pending property changes in all nodes and child nodes. This
    function will swap any pending property changes in this and children with any
@@ -188,6 +194,11 @@ public:
         op();
       }
 
+      // If there are any ops here we should invalidate the cached context
+      if (_queuedNodeOps.size() > 0) {
+        invalidateContext();
+      }
+
       _queuedNodeOps.clear();
     }
 
@@ -209,7 +220,11 @@ public:
     }
 
     // Now let's dispose if needed
-    if (_isDisposed) {
+    if (_isDisposing && !_isDisposed) {
+      _isDisposed = true;
+
+      this->setParent(nullptr);
+
       // Callback signaling that we're done
       if (_disposeCallback != nullptr) {
         _disposeCallback();
@@ -266,6 +281,9 @@ protected:
    always call the onPropsSet method as a signal that things have changed.
    */
   void setProps(jsi::Runtime &runtime, jsi::Object &&props) {
+#if SKIA_DOM_DEBUG
+    printDebugInfo("JS:setProps(nodeId: " + std::to_string(_nodeId) + ")");
+#endif
     if (_propsContainer == nullptr) {
 
       // Initialize properties container
@@ -276,12 +294,18 @@ protected:
     }
     // Update properties container
     _propsContainer->setProps(runtime, std::move(props));
+
+    // Invalidate context
+    invalidateContext();
   }
 
   /**
    Called for components that has no properties
    */
   void setEmptyProps() {
+#if SKIA_DOM_DEBUG
+    printDebugInfo("JS:setEmptyProps(nodeId: " + std::to_string(_nodeId) + ")");
+#endif
     if (_propsContainer == nullptr) {
 
       // Initialize properties container
@@ -304,8 +328,15 @@ protected:
    Adds a child node to the array of children for this node
    */
   virtual void addChild(std::shared_ptr<JsiDomNode> child) {
+#if SKIA_DOM_DEBUG
+    printDebugInfo("JS:addChild(childId: " + std::to_string(child->_nodeId) +
+                   ")");
+#endif
     std::lock_guard<std::mutex> lock(_childrenLock);
-    _queuedNodeOps.push_back([child, this]() { _children.push_back(child); });
+    _queuedNodeOps.push_back([child, this]() {
+      _children.push_back(child);
+      child->setParent(this);
+    });
   }
 
   /**
@@ -314,10 +345,16 @@ protected:
    */
   virtual void insertChildBefore(std::shared_ptr<JsiDomNode> child,
                                  std::shared_ptr<JsiDomNode> before) {
+#if SKIA_DOM_DEBUG
+    printDebugInfo(
+        "JS:insertChildBefore(childId: " + std::to_string(child->_nodeId) +
+        ", beforeId: " + std::to_string(before->_nodeId) + ")");
+#endif
     std::lock_guard<std::mutex> lock(_childrenLock);
     _queuedNodeOps.push_back([child, before, this]() {
       auto position = std::find(_children.begin(), _children.end(), before);
       _children.insert(position, child);
+      child->setParent(this);
     });
   }
 
@@ -326,6 +363,10 @@ protected:
    children and call dispose on the child node.
    */
   virtual void removeChild(std::shared_ptr<JsiDomNode> child) {
+#if SKIA_DOM_DEBUG
+    printDebugInfo("JS:removeChild(childId: " + std::to_string(child->_nodeId) +
+                   ")");
+#endif
     std::lock_guard<std::mutex> lock(_childrenLock);
     _queuedNodeOps.push_back([child, this]() {
       // Delete child itself
@@ -343,26 +384,40 @@ protected:
    up.
    */
   virtual void dispose() {
-    if (_isDisposed) {
+    if (_isDisposing) {
       return;
     }
 
-    _isDisposed = true;
+    _isDisposing = true;
   }
 
 #if SKIA_DOM_DEBUG
-  std::string getLevelIndentation(DrawingContext *ctx, size_t indentation = 0) {
-    return std::string((ctx->getLevel() + indentation), ' ');
+  std::string getLevelIndentation(size_t indentation = 0) {
+    JsiDomNode *curParent = _parent;
+    while (curParent != nullptr) {
+      indentation++;
+      curParent = curParent->getParent();
+    }
+    return std::string(indentation * 2, ' ');
   }
 
-  void printDebugInfo(DrawingContext *context, const std::string &message,
-                      size_t indentation = 0) {
+  void printDebugInfo(const std::string &message, size_t indentation = 0) {
     RNSkLogger::logToConsole("%s%s %lu: %s",
-                             getLevelIndentation(context, indentation).c_str(),
+                             getLevelIndentation(indentation).c_str(),
                              getType(), getNodeId(), message.c_str());
   }
 #endif
 
+  /**
+   Sets the parent node
+  */
+  void setParent(JsiDomNode *parent) { _parent = parent; }
+
+  /**
+   Returns the parent node if set.
+  */
+  JsiDomNode *getParent() { return _parent; }
+
 private:
   const char *_type;
   std::shared_ptr<RNSkPlatformContext> _context;
@@ -374,11 +429,14 @@ private:
   std::vector<std::shared_ptr<JsiDomNode>> _children;
   std::mutex _childrenLock;
 
-  std::atomic<bool> _isDisposed = {false};
+  std::atomic<bool> _isDisposing = {false};
+  bool _isDisposed = false;
 
   size_t _nodeId;
 
   std::vector<std::function<void()>> _queuedNodeOps;
+
+  JsiDomNode *_parent = nullptr;
 };
 
 } // namespace RNSkia

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

@@ -18,12 +18,6 @@
 
 namespace RNSkia {
 
-static PropId PropNameOrigin = JsiPropId::get("origin");
-static PropId PropNameOpacity = JsiPropId::get("opacity");
-static PropId PropNameClip = JsiPropId::get("clip");
-static PropId PropNameInvertClip = JsiPropId::get("invertClip");
-static PropId PropNameLayer = JsiPropId::get("layer");
-
 class JsiDomRenderNode : public JsiDomNode {
 public:
   JsiDomRenderNode(std::shared_ptr<RNSkPlatformContext> context,
@@ -32,7 +26,7 @@ public:
 
   void render(DrawingContext *context) {
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "Begin Render");
+    printDebugInfo("Begin Render");
 #endif
 
     // Ensure we have a local drawing context inheriting from the parent context
@@ -50,27 +44,27 @@ public:
       if (_layerProp->isSet()) {
         if (_layerProp->isBool()) {
 #if SKIA_DOM_DEBUG
-          printDebugInfo(context, "canvas->saveLayer()");
+          printDebugInfo("canvas->saveLayer()");
 #endif
           _localContext->getCanvas()->saveLayer(
               SkCanvas::SaveLayerRec(nullptr, nullptr, nullptr, 0));
         } else {
 #if SKIA_DOM_DEBUG
-          printDebugInfo(context, "canvas->saveLayer(paint)");
+          printDebugInfo("canvas->saveLayer(paint)");
 #endif
           _localContext->getCanvas()->saveLayer(SkCanvas::SaveLayerRec(
               nullptr, _layerProp->getDerivedValue().get(), nullptr, 0));
         }
       } else {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->save()");
+        printDebugInfo("canvas->save()");
 #endif
         _localContext->getCanvas()->save();
       }
 
       if (_originProp->isSet()) {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->translate(origin)");
+        printDebugInfo("canvas->translate(origin)");
 #endif
         // Handle origin
         _localContext->getCanvas()->translate(
@@ -81,10 +75,9 @@ public:
       if (shouldTransform) {
 #if SKIA_DOM_DEBUG
         printDebugInfo(
-            context,
             "canvas->concat(" +
-                std::string(_matrixProp->isSet() ? "matrix" : "transform") +
-                std::string(")"));
+            std::string(_matrixProp->isSet() ? "matrix" : "transform") +
+            std::string(")"));
 #endif
         auto matrix = _matrixProp->isSet() ? _matrixProp->getDerivedValue()
                                            : _transformProp->getDerivedValue();
@@ -101,7 +94,7 @@ public:
 
       if (_originProp->isSet()) {
 #if SKIA_DOM_DEBUG
-        printDebugInfo(context, "canvas->translate(-origin)");
+        printDebugInfo("canvas->translate(-origin)");
 #endif
         // Handle origin
         _localContext->getCanvas()->translate(
@@ -124,13 +117,13 @@ public:
     // Restore if needed
     if (shouldSave) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->restore()");
+      printDebugInfo("canvas->restore()");
 #endif
       _localContext->getCanvas()->restore();
     }
 
 #if SKIA_DOM_DEBUG
-    printDebugInfo(context, "End Render");
+    printDebugInfo("End Render");
 #endif
   }
 
@@ -158,41 +151,19 @@ public:
 
 protected:
   /**
-   Override to implement rendering where the current state of the drawing
-   context is correctly set.
-   */
-  virtual void renderNode(DrawingContext *context) = 0;
-
-  /**
-   Removes a child
-   */
-  void removeChild(std::shared_ptr<JsiDomNode> child) override {
-    JsiDomNode::removeChild(child);
-    if (_localContext != nullptr) {
-      _localContext->markAsChanged();
-    }
-  }
-
-  /**
-   Validates that only declaration nodes can be children
+   Invalidates and marks then context as changed.
    */
-  void addChild(std::shared_ptr<JsiDomNode> child) override {
-    JsiDomNode::addChild(child);
+  void invalidateContext() override {
     if (_localContext != nullptr) {
       _localContext->markAsChanged();
     }
   }
 
   /**
-   Validates that only declaration nodes can be children
+   Override to implement rendering where the current state of the drawing
+   context is correctly set.
    */
-  void insertChildBefore(std::shared_ptr<JsiDomNode> child,
-                         std::shared_ptr<JsiDomNode> before) override {
-    JsiDomNode::insertChildBefore(child, before);
-    if (_localContext != nullptr) {
-      _localContext->markAsChanged();
-    }
-  }
+  virtual void renderNode(DrawingContext *context) = 0;
 
   /**
    Define common properties for all render nodes
@@ -200,20 +171,14 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiDomNode::defineProperties(container);
 
-    _paintProps = container->defineProperty(std::make_shared<PaintProps>());
-
-    _matrixProp =
-        container->defineProperty(std::make_shared<MatrixProp>(PropNameMatrix));
-    _transformProp = container->defineProperty(
-        std::make_shared<TransformProp>(PropNameTransform));
-    _originProp =
-        container->defineProperty(std::make_shared<PointProp>(PropNameOrigin));
-    _clipProp =
-        container->defineProperty(std::make_shared<ClipProp>(PropNameClip));
-    _invertClip = container->defineProperty(
-        std::make_shared<NodeProp>(PropNameInvertClip));
-    _layerProp =
-        container->defineProperty(std::make_shared<LayerProp>(PropNameLayer));
+    _paintProps = container->defineProperty<PaintProps>();
+
+    _matrixProp = container->defineProperty<MatrixProp>("matrix");
+    _transformProp = container->defineProperty<TransformProp>("transform");
+    _originProp = container->defineProperty<PointProp>("origin");
+    _clipProp = container->defineProperty<ClipProp>("clip");
+    _invertClip = container->defineProperty<NodeProp>("invertClip");
+    _layerProp = container->defineProperty<LayerProp>("layer");
   }
 
 private:
@@ -224,17 +189,17 @@ private:
     auto op = invert ? SkClipOp::kDifference : SkClipOp::kIntersect;
     if (_clipProp->getRect() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipRect()");
+      printDebugInfo("canvas->clipRect()");
 #endif
       canvas->clipRect(*_clipProp->getRect(), op, true);
     } else if (_clipProp->getRRect() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipRRect()");
+      printDebugInfo("canvas->clipRRect()");
 #endif
       canvas->clipRRect(*_clipProp->getRRect(), op, true);
     } else if (_clipProp->getPath() != nullptr) {
 #if SKIA_DOM_DEBUG
-      printDebugInfo(context, "canvas->clipPath()");
+      printDebugInfo("canvas->clipPath()");
 #endif
       canvas->clipPath(*_clipProp->getPath(), op, true);
     }

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

@@ -19,7 +19,8 @@ public:
   /**
    Constructs a new optional dom node properrty
    */
-  explicit NodeProp(PropId name) : _name(name), BaseNodeProp() {}
+  explicit NodeProp(const std::string &name)
+      : _name(JsiPropId::get(name)), BaseNodeProp() {}
 
   /**
    Reads JS value and swaps out with a new value

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

@@ -110,6 +110,16 @@ public:
     return prop.get();
   }
 
+  /**
+   Defines a property that will be updated with the container changes.
+   */
+  template <class _Tp, class... _Args,
+            class = std::_EnableIf<!std::is_array<_Tp>::value>>
+  _Tp *defineProperty(_Args &&...__args) {
+    return defineProperty(
+        std::make_shared<_Tp>(std::forward<_Args>(__args)...));
+  }
+
 private:
   std::vector<std::shared_ptr<BaseNodeProp>> _properties;
   std::map<PropId, std::vector<NodeProp *>> _mappedProperties;

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

@@ -41,19 +41,18 @@ protected:
         auto maybeImageFilter =
             std::dynamic_pointer_cast<JsiBaseImageFilterNode>(child);
 
-        if (asShader) {
+        if (maybeShader) {
           sk_sp<SkShader> outer = maybeShader->getCurrent();
           if (innerShader != nullptr) {
-            innerShader = SkShaders::Blend(blendMode, innerShader, outer);
+            innerShader = SkShaders::Blend(blendMode, outer, innerShader);
           } else {
             innerShader = outer;
           }
-
-        } else {
+        } else if (maybeImageFilter) {
           sk_sp<SkImageFilter> outer = maybeImageFilter->getCurrent();
-          if (innerImageFilter != nullptr) {
-            innerImageFilter = SkImageFilters::Blend(
-                blendMode, innerImageFilter, outer, nullptr);
+          if (outer != nullptr) {
+            innerImageFilter = SkImageFilters::Blend(blendMode, outer,
+                                                     innerImageFilter, nullptr);
           } else {
             innerImageFilter = outer;
           }
@@ -71,8 +70,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _blendProp = container->defineProperty(
-        std::make_shared<BlendModeProp>(JsiPropId::get("mode")));
+    _blendProp = container->defineProperty<BlendModeProp>("mode");
     _blendProp->require();
   }
 

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

@@ -44,12 +44,9 @@ protected:
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
 
-    _style = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("style")));
-    _respectCTM = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("respectCTM")));
-    _blur = container->defineProperty(
-        std::make_shared<NodeProp>(JsiPropId::get("blur")));
+    _style = container->defineProperty<NodeProp>("style");
+    _respectCTM = container->defineProperty<NodeProp>("respectCTM");
+    _blur = container->defineProperty<NodeProp>("blur");
 
     _blur->require();
   }

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

@@ -76,10 +76,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomRenderNode::defineProperties(container);
-    _rrectProp = container->defineProperty(
-        std::make_shared<RRectProp>(JsiPropId::get("box")));
-    _rectProp = container->defineProperty(
-        std::make_shared<RectProp>(JsiPropId::get("box")));
+    _rrectProp = container->defineProperty<RRectProp>("box");
+    _rectProp = container->defineProperty<RectProp>("box");
   }
 
 private:

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

@@ -22,8 +22,7 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiBaseDomDeclarationNode::defineProperties(container);
-    _boxShadowProps =
-        container->defineProperty(std::make_shared<BoxShadowProps>());
+    _boxShadowProps = container->defineProperty<BoxShadowProps>();
   }
 
 private:

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

@@ -22,9 +22,8 @@ protected:
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
-    _circleProp = container->defineProperty(std::make_shared<CircleProp>());
-    _radiusProp =
-        container->defineProperty(std::make_shared<NodeProp>(PropNameR));
+    _circleProp = container->defineProperty<CircleProp>();
+    _radiusProp = container->defineProperty<NodeProp>("r");
 
     _circleProp->require();
     _radiusProp->require();