@shopify/react-native-skia 0.1.184 → 0.1.186

package/cpp/rnskia/RNSkJsView.h

@@ -9,14 +9,14 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiValueWrapper.h>
-#include <RNSkView.h>
-
-#include <JsiSkCanvas.h>
-#include <RNSkInfoParameter.h>
-#include <RNSkLog.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkTimingInfo.h>
+#include "JsiValueWrapper.h"
+#include "RNSkView.h"
+
+#include "JsiSkCanvas.h"
+#include "RNSkInfoParameter.h"
+#include "RNSkLog.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkTimingInfo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -7,11 +7,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include <JsiHostObject.h>
-#include <JsiValueWrapper.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkValue.h>
-#include <RNSkView.h>
+#include "JsiHostObject.h"
+#include "JsiValueWrapper.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkValue.h"
+#include "RNSkView.h"
 #include <jsi/jsi.h>
 
 namespace RNSkia {

package/cpp/rnskia/RNSkPictureView.h

@@ -9,14 +9,14 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiValueWrapper.h>
-#include <RNSkView.h>
-
-#include <JsiSkPicture.h>
-#include <RNSkInfoParameter.h>
-#include <RNSkLog.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkTimingInfo.h>
+#include "JsiValueWrapper.h"
+#include "RNSkView.h"
+
+#include "JsiSkPicture.h"
+#include "RNSkInfoParameter.h"
+#include "RNSkLog.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkTimingInfo.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

package/cpp/rnskia/RNSkPlatformContext.h

@@ -9,11 +9,13 @@
 #include <unordered_map>
 #include <utility>
 
-#include <RNSkDispatchQueue.h>
+#include "RNSkDispatchQueue.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkData.h"
+#include "SkImage.h"
 #include "SkStream.h"
 #include "SkSurface.h"
 
@@ -88,6 +90,18 @@ public:
     _dispatchQueue->dispatch(std::move(func));
   }
 
+  /**
+   * Runs the passed function on the main thread
+   * @param func Function to run.
+   */
+  virtual void runOnMainThread(std::function<void()> func) = 0;
+
+  /**
+   * Takes a screenshot of a given view represented by the view tag
+   * @param tag React view tag
+   */
+  virtual sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) = 0;
+
   /**
    Returns the javascript runtime
    */
@@ -112,12 +126,27 @@ public:
 
   /**
    * Creates an offscreen surface
-   * @param width width of the surface
-   * @param height height of the surface
+   * @param width Width of the offscreen surface
+   * @param height Height of the offscreen surface
    * @return sk_sp<SkSurface>
    */
   virtual sk_sp<SkSurface> makeOffscreenSurface(int width, int height) = 0;
 
+  /**
+   * Creates an skImage containing the screenshot of a native view and its
+   * children.
+   * @param viewTag React viewtag
+   * @param callback Called when image is ready or with null if something
+   * failed.
+   */
+  virtual void
+  makeViewScreenshot(int viewTag,
+                     std::function<void(sk_sp<SkImage>)> callback) {
+    runOnMainThread([this, callback, viewTag]() {
+      callback(takeScreenshotFromViewTag(viewTag));
+    });
+  }
+
   /**
    * Raises an exception on the platform. This function does not necessarily
    * throw an exception and stop execution, so it is important to stop execution

package/cpp/rnskia/RNSkValueApi.h

@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include <JsiHostObject.h>
-#include <RNSkAnimation.h>
-#include <RNSkComputedValue.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkValue.h>
+#include "JsiHostObject.h"
+#include "RNSkAnimation.h"
+#include "RNSkComputedValue.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkValue.h"
 #include <jsi/jsi.h>
 
 namespace RNSkia {

package/cpp/rnskia/RNSkView.h

@@ -6,13 +6,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include <JsiValueWrapper.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkValue.h>
+#include "JsiValueWrapper.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkValue.h"
 
-#include <JsiSkImage.h>
-#include <JsiSkPoint.h>
-#include <JsiSkRect.h>
+#include "JsiSkImage.h"
+#include "JsiSkPoint.h"
+#include "JsiSkRect.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -99,13 +99,15 @@ public:
    Returns a snapshot of the current surface/canvas
    */
   sk_sp<SkImage> makeSnapshot(std::shared_ptr<SkRect> bounds) {
+    sk_sp<SkImage> image;
     if (bounds != nullptr) {
       SkIRect b = SkIRect::MakeXYWH(bounds->x(), bounds->y(), bounds->width(),
                                     bounds->height());
-      return _surface->makeImageSnapshot(b);
+      image = _surface->makeImageSnapshot(b);
     } else {
-      return _surface->makeImageSnapshot();
+      image = _surface->makeImageSnapshot();
     }
+    return image->makeNonTextureImage();
   }
 
   /**

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

@@ -6,12 +6,12 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
-#include <SkImageFilter.h>
-#include <SkMaskFilter.h>
-#include <SkPaint.h>
-#include <SkPathEffect.h>
-#include <SkShader.h>
+#include "SkColorFilter.h"
+#include "SkImageFilter.h"
+#include "SkMaskFilter.h"
+#include "SkPaint.h"
+#include "SkPathEffect.h"
+#include "SkShader.h"
 
 #pragma clang diagnostic pop
 

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

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkRefCnt.h>
+#include "SkRefCnt.h"
 
 #pragma clang diagnostic pop
 

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

@@ -9,13 +9,13 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
-#include <SkImageFilter.h>
-#include <SkImageFilters.h>
-#include <SkMaskFilter.h>
-#include <SkPaint.h>
-#include <SkPathEffect.h>
-#include <SkShader.h>
+#include "SkColorFilter.h"
+#include "SkImageFilter.h"
+#include "SkImageFilters.h"
+#include "SkMaskFilter.h"
+#include "SkPaint.h"
+#include "SkPathEffect.h"
+#include "SkShader.h"
 
 #pragma clang diagnostic pop
 

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

@@ -13,9 +13,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkCanvas.h>
-#include <SkPaint.h>
-#include <SkRefCnt.h>
+#include "SkCanvas.h"
+#include "SkPaint.h"
+#include "SkRefCnt.h"
 
 #pragma clang diagnostic pop
 

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

@@ -54,7 +54,7 @@ public:
   void updatePendingValues() {
     for (auto &prop : _properties) {
       prop->updatePendingChanges();
-      if (!prop->isSet() && prop->isRequired()) {
+      if (prop->isRequired() && !prop->isSet()) {
         throw std::runtime_error("Missing one or more required properties " +
                                  std::string(prop->getName()) + " in the " +
                                  _type + " component.");

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

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkMaskFilter.h>
+#include "SkMaskFilter.h"
 
 #pragma clang diagnostic pop
 

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

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkColorFilter.h>
+#include "SkColorFilter.h"
 
 #pragma clang diagnostic pop
 

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

@@ -20,12 +20,14 @@ protected:
     auto x = _xProp->value().getAsNumber();
     auto y = _yProp->value().getAsNumber();
     auto font = _fontProp->getDerivedValue();
-    auto glyphInfo = _glyphsProp->getDerivedValue();
-
-    context->getCanvas()->drawGlyphs(
-        static_cast<int>(glyphInfo->glyphIds.size()),
-        glyphInfo->glyphIds.data(), glyphInfo->positions.data(),
-        SkPoint::Make(x, y), *font, *context->getPaint());
+    if (font != nullptr) {
+      auto glyphInfo = _glyphsProp->getDerivedValue();
+
+      context->getCanvas()->drawGlyphs(
+          static_cast<int>(glyphInfo->glyphIds.size()),
+          glyphInfo->glyphIds.data(), glyphInfo->positions.data(),
+          SkPoint::Make(x, y), *font, *context->getPaint());
+    }
   }
 
   void defineProperties(NodePropsContainer *container) override {
@@ -36,7 +38,6 @@ protected:
     _xProp = container->defineProperty<NodeProp>("x");
     _yProp = container->defineProperty<NodeProp>("y");
 
-    _fontProp->require();
     _glyphsProp->require();
     _xProp->require();
     _yProp->require();

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

@@ -16,7 +16,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkImageFilter.h>
+#include "SkImageFilter.h"
 
 #pragma clang diagnostic pop
 
@@ -107,11 +107,14 @@ public:
       auto f2 = SkImageFilters::Offset(dx, dy, f1);
       auto f3 = SkImageFilters::Blur(blur, blur, SkTileMode::kDecal, f2);
       auto f4 = SkImageFilters::Blend(SkBlendMode::kSrcIn, srcAlpha, f3);
-
-      composeAndPush(context, SkImageFilters::Compose(
-                                  input ? input : nullptr,
-                                  SkImageFilters::Blend(SkBlendMode::kSrcOver,
-                                                        srcGraphic, f4)));
+      if (shadowOnly) {
+        composeAndPush(context, f4);
+      } else {
+        composeAndPush(context, SkImageFilters::Compose(
+                                    input ? input : nullptr,
+                                    SkImageFilters::Blend(SkBlendMode::kSrcOver,
+                                                          srcGraphic, f4)));
+      }
 
     } else {
       composeAndPush(

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

@@ -16,16 +16,19 @@ public:
 protected:
   void draw(DrawingContext *context) override {
     auto rects = _imageProps->getDerivedValue();
+    auto image = _imageProps->getImage();
+    if (image == nullptr) {
+      return;
+    }
 
     context->getCanvas()->drawImageRect(
-        _imageProps->getImage(), rects->src, rects->dst, SkSamplingOptions(),
+        image, rects->src, rects->dst, SkSamplingOptions(),
         context->getPaint().get(), SkCanvas::kStrict_SrcRectConstraint);
   }
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
     _imageProps = container->defineProperty<ImageProps>();
-    _imageProps->require();
   }
 
 private:

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

@@ -17,21 +17,21 @@ public:
 protected:
   void draw(DrawingContext *context) override {
     auto svgDom = _svgDomProp->getDerivedValue();
-    auto rect = _rectProp->getDerivedValue();
-
-    context->getCanvas()->save();
-    context->getCanvas()->translate(rect->x(), rect->y());
-    svgDom->setContainerSize(SkSize::Make(rect->width(), rect->height()));
-    svgDom->render(context->getCanvas());
-    context->getCanvas()->restore();
+    if (svgDom != nullptr) {
+      auto rect = _rectProp->getDerivedValue();
+
+      context->getCanvas()->save();
+      context->getCanvas()->translate(rect->x(), rect->y());
+      svgDom->setContainerSize(SkSize::Make(rect->width(), rect->height()));
+      svgDom->render(context->getCanvas());
+      context->getCanvas()->restore();
+    }
   }
 
   void defineProperties(NodePropsContainer *container) override {
     JsiDomDrawingNode::defineProperties(container);
     _svgDomProp = container->defineProperty<SvgProp>("svg");
     _rectProp = container->defineProperty<RectProps>("rect");
-
-    _svgDomProp->require();
   }
 
 private:

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

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPathEffect.h>
+#include "SkPathEffect.h"
 
 #pragma clang diagnostic pop
 

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

@@ -9,7 +9,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkTrimPathEffect.h>
+#include "SkTrimPathEffect.h"
 
 #pragma clang diagnostic pop
 

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

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

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

@@ -17,7 +17,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkShader.h>
+#include "SkShader.h"
 
 #pragma clang diagnostic pop
 
@@ -91,6 +91,10 @@ public:
   void decorate(DeclarationContext *context) override {
 
     auto image = _imageProps->getImage();
+    if (image == nullptr) {
+      return;
+    }
+
     auto rect = _imageProps->getRect();
     auto lm =
         _transformProp->isSet() ? _transformProp->getDerivedValue() : nullptr;
@@ -98,7 +102,7 @@ public:
     if (rect != nullptr && lm != nullptr) {
       auto rc = _imageProps->getDerivedValue();
       auto m3 = _imageProps->rect2rect(rc->src, rc->dst);
-      if (_transformProp->isChanged()) {
+      if (_transformProp->isChanged() || _imageProps->isChanged()) {
         // To modify the matrix we need to copy it since we're not allowed to
         // modify values contained in properties - this would have caused the
         // matrix to be translated and scaled more and more for each render
@@ -144,7 +148,7 @@ protected:
     _transformProp->require();
 
     // Add and require the image
-    container->defineProperty<NodeProp>("image")->require();
+    container->defineProperty<NodeProp>("image");
   }
 
 private:

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

@@ -21,9 +21,11 @@ protected:
     auto y = _yProp->value().getAsNumber();
     auto font = _fontProp->getDerivedValue();
 
-    context->getCanvas()->drawSimpleText(text, strlen(text),
-                                         SkTextEncoding::kUTF8, x, y, *font,
-                                         *context->getPaint());
+    if (font != nullptr) {
+      context->getCanvas()->drawSimpleText(text, strlen(text),
+                                           SkTextEncoding::kUTF8, x, y, *font,
+                                           *context->getPaint());
+    }
   }
 
   void defineProperties(NodePropsContainer *container) override {
@@ -34,7 +36,6 @@ protected:
     _xProp = container->defineProperty<NodeProp>("x");
     _yProp = container->defineProperty<NodeProp>("y");
 
-    _fontProp->require();
     _textProp->require();
     _xProp->require();
     _yProp->require();

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

@@ -16,7 +16,9 @@ public:
 protected:
   void draw(DrawingContext *context) override {
     auto blob = _textBlobProp->getDerivedValue();
-    context->getCanvas()->drawTextBlob(blob, 0, 0, *context->getPaint());
+    if (blob != nullptr) {
+      context->getCanvas()->drawTextBlob(blob, 0, 0, *context->getPaint());
+    }
   }
 
   void defineProperties(NodePropsContainer *container) override {

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

@@ -10,7 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkBlendMode.h>
+#include "SkBlendMode.h"
 
 #pragma clang diagnostic pop
 

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

@@ -8,7 +8,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPoint.h>
+#include "SkPoint.h"
 
 #pragma clang diagnostic pop
 

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

@@ -11,7 +11,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPath.h>
+#include "SkPath.h"
 
 #pragma clang diagnostic pop
 

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

@@ -17,17 +17,22 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (!_fontProp->isSet() ||
-        _fontProp->value().getType() != PropType::HostObject) {
-      throw std::runtime_error("Expected SkFont object for the Font property.");
+    if (_fontProp->isSet()) {
+      if (_fontProp->value().getType() == PropType::HostObject) {
+        auto ptr = _fontProp->value().getAs<JsiSkFont>();
+        if (ptr == nullptr) {
+          throw std::runtime_error(
+              "Expected SkFont object for the Font property.");
+        }
+        setDerivedValue(ptr->getObject());
+
+      } else {
+        throw std::runtime_error(
+            "Expected SkFont object or null/undefined for the Font property.");
+      }
+    } else {
+      setDerivedValue(nullptr);
     }
-
-    auto ptr = _fontProp->value().getAs<JsiSkFont>();
-    if (ptr == nullptr) {
-      throw std::runtime_error("Expected SkFont object for the Font property.");
-    }
-
-    setDerivedValue(ptr->getObject());
   }
 
 private:

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

@@ -32,20 +32,32 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (!_imageProp->isSet() ||
-        _imageProp->value().getType() != PropType::HostObject) {
-      throw std::runtime_error("Expected SkImage object for the " +
-                               std::string(getName()) + " property.");
-    }
-
-    auto ptr = std::dynamic_pointer_cast<JsiSkImage>(
-        _imageProp->value().getAsHostObject());
-    if (ptr == nullptr) {
-      throw std::runtime_error("Expected SkImage object for the " +
-                               std::string(getName()) + " property.");
+    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);
     }
-
-    setDerivedValue(ptr->getObject());
   }
 
 private:
@@ -62,11 +74,12 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (!_imageProp->isSet()) {
-      throw std::runtime_error("Image property is not set on the Image node.");
+    auto image = _imageProp->getDerivedValue();
+    if (image == nullptr) {
+      setDerivedValue(nullptr);
+      return;
     }
 
-    auto image = _imageProp->getDerivedValue();
     auto imageRect = SkRect::MakeXYWH(0, 0, image->width(), image->height());
 
     auto rect = _rectProp->getDerivedValue() ? *_rectProp->getDerivedValue()
@@ -77,6 +90,7 @@ public:
   }
 
   sk_sp<SkImage> getImage() { return _imageProp->getDerivedValue(); }
+
   std::shared_ptr<const SkRect> getRect() {
     return _rectProp->getDerivedValue();
   }

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

@@ -13,7 +13,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPaint.h>
+#include "SkPaint.h"
 
 #pragma clang diagnostic pop
 

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

@@ -8,7 +8,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPath.h>
+#include "SkPath.h"
 
 #pragma clang diagnostic pop