@shopify/react-native-skia 0.1.163 → 0.1.165

package/cpp/api/JsiSkPaint.h

@@ -63,6 +63,11 @@ public:
     return static_cast<double>(getObject()->getStrokeWidth());
   }
 
+  JSI_HOST_FUNCTION(getAlphaf) {
+    float alphaf = getObject()->getAlphaf();
+    return jsi::Value(SkScalarToDouble(alphaf));
+  }
+
   JSI_HOST_FUNCTION(setColor) {
     SkColor color = JsiSkColor::fromValue(runtime, arguments[0]);
     getObject()->setColor(color);
@@ -159,6 +164,7 @@ public:
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPaint, copy),
                        JSI_EXPORT_FUNC(JsiSkPaint, reset),
+                       JSI_EXPORT_FUNC(JsiSkPaint, getAlphaf),
                        JSI_EXPORT_FUNC(JsiSkPaint, getColor),
                        JSI_EXPORT_FUNC(JsiSkPaint, getStrokeCap),
                        JSI_EXPORT_FUNC(JsiSkPaint, getStrokeJoin),

package/cpp/api/JsiSkRuntimeEffect.h

@@ -117,6 +117,10 @@ public:
     return result;
   }
 
+  JSI_HOST_FUNCTION(source) {
+    return jsi::String::createFromAscii(runtime, getObject()->source());
+  }
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
                                        makeShaderWithChildren),
@@ -124,7 +128,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
                                        getUniformFloatCount),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform))
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, source))
 
   JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
                      sk_sp<SkRuntimeEffect> rt)
@@ -206,7 +211,7 @@ private:
         const std::size_t offset = reu.slot + j;
         float fValue = jsiUniforms.getValueAtIndex(runtime, offset).asNumber();
         int iValue = static_cast<int>(fValue);
-        auto value = reu.isInteger ? iValue : fValue;
+        auto value = reu.isInteger ? SkBits2Float(iValue) : fValue;
         memcpy(SkTAddOffset<void>(uniforms->writable_data(),
                                   offset * sizeof(value)),
                &value, sizeof(value));

package/cpp/jsi/JsiHostObject.h

@@ -132,31 +132,6 @@ public:
   JsiHostObject();
   ~JsiHostObject();
 
-protected:
-  /**
-   Override to return map of name/functions
-   */
-  virtual const RNJsi::JsiFunctionMap &getExportedFunctionMap() {
-    static const RNJsi::JsiFunctionMap empty;
-    return empty;
-  }
-
-  /**
-   Override to get property getters map of name/functions
-   */
-  virtual const JsiPropertyGettersMap &getExportedPropertyGettersMap() {
-    static const JsiPropertyGettersMap empty;
-    return empty;
-  }
-
-  /**
-   Override to get property setters map of name/functions
-   */
-  virtual const JsiPropertySettersMap &getExportedPropertySettersMap() {
-    static const JsiPropertySettersMap empty;
-    return empty;
-  }
-
   /**
    * Overridden jsi::HostObject set property method
    * @param rt Runtime
@@ -183,6 +158,31 @@ protected:
    */
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &runtime) override;
 
+protected:
+  /**
+   Override to return map of name/functions
+   */
+  virtual const RNJsi::JsiFunctionMap &getExportedFunctionMap() {
+    static const RNJsi::JsiFunctionMap empty;
+    return empty;
+  }
+
+  /**
+   Override to get property getters map of name/functions
+   */
+  virtual const JsiPropertyGettersMap &getExportedPropertyGettersMap() {
+    static const JsiPropertyGettersMap empty;
+    return empty;
+  }
+
+  /**
+   Override to get property setters map of name/functions
+   */
+  virtual const JsiPropertySettersMap &getExportedPropertySettersMap() {
+    static const JsiPropertySettersMap empty;
+    return empty;
+  }
+
   /**
    * Installs a function into the function map
    */

package/cpp/rnskia/RNSkDomView.cpp

@@ -86,7 +86,7 @@ void RNSkDomRenderer::renderCanvas(SkCanvas *canvas, float scaledWidth,
   if (_drawingContext == nullptr) {
     auto paint = std::make_shared<SkPaint>();
     paint->setAntiAlias(true);
-    _drawingContext = std::make_shared<DrawingContext>(paint, 1.0f);
+    _drawingContext = std::make_shared<DrawingContext>(paint);
 
     _drawingContext->setRequestRedraw([weakSelf = weak_from_this()]() {
       auto self = weakSelf.lock();

package/cpp/rnskia/RNSkPlatformContext.h

@@ -178,12 +178,8 @@ public:
     if (!_isValid) {
       return;
     }
-    std::unordered_map<size_t, std::function<void(bool)>> tmp;
-    {
-      std::lock_guard<std::mutex> lock(_drawCallbacksLock);
-      tmp.insert(_drawCallbacks.cbegin(), _drawCallbacks.cend());
-    }
-    for (auto it = tmp.begin(); it != tmp.end(); it++) {
+    std::lock_guard<std::mutex> lock(_drawCallbacksLock);
+    for (auto it = _drawCallbacks.begin(); it != _drawCallbacks.end(); it++) {
       it->second(invalidated);
     }
   }

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

@@ -2,10 +2,9 @@
 
 namespace RNSkia {
 
-DrawingContext::DrawingContext(std::shared_ptr<SkPaint> paint, double opacity)
+DrawingContext::DrawingContext(std::shared_ptr<SkPaint> paint)
     : DrawingContext("root") {
   _paint = paint;
-  _opacity = opacity;
 }
 
 DrawingContext::DrawingContext(DrawingContext *parent, const char *source)
@@ -20,13 +19,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) + ":";
 
@@ -50,10 +42,29 @@ std::string DrawingContext::getDebugDescription() {
       v += " blendMode:" + std::to_string(static_cast<size_t>(blendMode));
     }
 
-    v += " opacity:" + std::to_string(_opacity);
+    auto opacity = _paint->getAlphaf();
+    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() : "");
@@ -137,7 +148,6 @@ std::shared_ptr<SkPaint> DrawingContext::getMutablePaint() {
   if (_paint == nullptr) {
     auto parentPaint = _parent->getPaint();
     _paint = std::make_shared<SkPaint>(*parentPaint);
-    _opacity = _parent->getOpacity();
   }
   // Calling the getMutablePaint accessor implies that the paint
   // is about to be mutatet and will therefore invalidate
@@ -154,36 +164,6 @@ void DrawingContext::setMutablePaint(std::shared_ptr<SkPaint> paint) {
   _paint = paint;
 }
 
-/**
- Getd the opacity value
- */
-double DrawingContext::getOpacity() {
-  if (_paint == nullptr) {
-    return _parent->getOpacity();
-  }
-  return _opacity;
-}
-
-/**
- Sets the opacity value
- */
-void DrawingContext::setOpacity(double opacity) {
-  getMutablePaint()->setAlphaf(_opacity);
-  _opacity = opacity;
-}
-
-/**
- Clears the opacity value
- */
-void DrawingContext::clearOpacity() {
-  if (_parent != nullptr) {
-    _opacity = _parent->getOpacity();
-  } else {
-    _opacity = 1.0;
-  }
-  markChildrenAsChanged();
-}
-
 float DrawingContext::getScaledWidth() {
   if (_parent != nullptr) {
     return _parent->getScaledWidth();
@@ -198,6 +178,8 @@ float DrawingContext::getScaledHeight() {
   return _scaledHeight;
 }
 
+DrawingContext *DrawingContext::getParent() { return _parent; }
+
 void DrawingContext::setScaledWidth(float v) { _scaledWidth = v; }
 void DrawingContext::setScaledHeight(float v) { _scaledHeight = v; }
 

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

@@ -22,7 +22,7 @@ public:
   /**
    Creates a root drawing context with paint and opacity
    */
-  DrawingContext(std::shared_ptr<SkPaint> paint, double opacity);
+  explicit DrawingContext(std::shared_ptr<SkPaint> paint);
 
   /**
    Initilalizes a new draw context.
@@ -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();
 
   /**
@@ -86,21 +87,6 @@ public:
    */
   void setMutablePaint(std::shared_ptr<SkPaint> paint);
 
-  /**
-   Getd the opacity value
-   */
-  double getOpacity();
-
-  /**
-   Sets the opacity value
-   */
-  void setOpacity(double opacity);
-
-  /**
-   Clears the opacity
-   */
-  void clearOpacity();
-
   float getScaledWidth();
 
   float getScaledHeight();
@@ -111,6 +97,8 @@ public:
   void setRequestRedraw(std::function<void()> &&requestRedraw);
   const std::function<void()> &getRequestRedraw();
 
+  DrawingContext *getParent();
+
 private:
   explicit DrawingContext(const char *source);
 
@@ -119,7 +107,6 @@ private:
   bool _isChanged = true;
 
   std::shared_ptr<SkPaint> _paint;
-  double _opacity = 1.0f;
 
   SkCanvas *_canvas = nullptr;
   const char *_source;

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