@shopify/react-native-skia 0.1.185 → 0.1.187

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

@@ -8,7 +8,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/SvgProp.h

@@ -17,19 +17,25 @@ public:
   }
 
   void updateDerivedValue() override {
-    if (_imageSvgProp->value().getType() != PropType::HostObject) {
-      throw std::runtime_error(
-          "Expected SkSvgDom object for the svg property.");
+    if (_imageSvgProp->isSet()) {
+
+      if (_imageSvgProp->value().getType() == PropType::HostObject) {
+
+        auto ptr = std::dynamic_pointer_cast<JsiSkSVG>(
+            _imageSvgProp->value().getAsHostObject());
+        if (ptr == nullptr) {
+          throw std::runtime_error(
+              "Expected SkSvgDom object for the svg property.");
+        }
+        setDerivedValue(ptr->getObject());
+      } else {
+        throw std::runtime_error(
+            "Expected SkSvgDom object or null/undefined for the svg property.");
+      }
+
+    } else {
+      setDerivedValue(nullptr);
     }
-
-    auto ptr = std::dynamic_pointer_cast<JsiSkSVG>(
-        _imageSvgProp->value().getAsHostObject());
-    if (ptr == nullptr) {
-      throw std::runtime_error(
-          "Expected SkSvgDom object for the svg property.");
-    }
-
-    setDerivedValue(ptr->getObject());
   }
 
 private:

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

@@ -46,7 +46,6 @@ public:
     _pathProp = defineProperty<PathProp>("path");
     _offsetProp = defineProperty<NodeProp>("initialOffset");
 
-    _fontProp->require();
     _textProp->require();
     _pathProp->require();
     _offsetProp->require();
@@ -58,66 +57,70 @@ public:
     auto path = _pathProp->getDerivedValue();
     auto offset = _offsetProp->value().getAsNumber();
 
-    // Get glyphs
-    auto numGlyphIds =
-        font->countText(text.c_str(), text.length(), SkTextEncoding::kUTF8);
-
-    std::vector<SkGlyphID> glyphIds;
-    glyphIds.reserve(numGlyphIds);
-    auto ids = font->textToGlyphs(
-        text.c_str(), text.length(), SkTextEncoding::kUTF8,
-        static_cast<SkGlyphID *>(glyphIds.data()), numGlyphIds);
-
-    // Get glyph widths
-    int glyphsSize = static_cast<int>(ids);
-    std::vector<SkScalar> widthPtrs;
-    widthPtrs.resize(glyphsSize);
-    font->getWidthsBounds(glyphIds.data(), numGlyphIds,
-                          static_cast<SkScalar *>(widthPtrs.data()), nullptr,
-                          nullptr); // TODO: Should we use paint somehow here?
-
-    std::vector<SkRSXform> rsx;
-    SkContourMeasureIter meas(*path, false, 1);
-
-    auto cont = meas.next();
-    auto dist = offset;
-
-    for (size_t i = 0; i < text.length() && cont != nullptr; ++i) {
-      auto width = widthPtrs[i];
-      dist += width / 2;
-      if (dist > cont->length()) {
-        // jump to next contour
-        cont = meas.next();
-        if (cont == nullptr) {
-          // We have come to the end of the path - terminate the string
-          // right here.
-          text = text.substr(0, i);
-          break;
+    if (font != nullptr) {
+      // Get glyphs
+      auto numGlyphIds =
+          font->countText(text.c_str(), text.length(), SkTextEncoding::kUTF8);
+
+      std::vector<SkGlyphID> glyphIds;
+      glyphIds.reserve(numGlyphIds);
+      auto ids = font->textToGlyphs(
+          text.c_str(), text.length(), SkTextEncoding::kUTF8,
+          static_cast<SkGlyphID *>(glyphIds.data()), numGlyphIds);
+
+      // Get glyph widths
+      int glyphsSize = static_cast<int>(ids);
+      std::vector<SkScalar> widthPtrs;
+      widthPtrs.resize(glyphsSize);
+      font->getWidthsBounds(glyphIds.data(), numGlyphIds,
+                            static_cast<SkScalar *>(widthPtrs.data()), nullptr,
+                            nullptr); // TODO: Should we use paint somehow here?
+
+      std::vector<SkRSXform> rsx;
+      SkContourMeasureIter meas(*path, false, 1);
+
+      auto cont = meas.next();
+      auto dist = offset;
+
+      for (size_t i = 0; i < text.length() && cont != nullptr; ++i) {
+        auto width = widthPtrs[i];
+        dist += width / 2;
+        if (dist > cont->length()) {
+          // jump to next contour
+          cont = meas.next();
+          if (cont == nullptr) {
+            // We have come to the end of the path - terminate the string
+            // right here.
+            text = text.substr(0, i);
+            break;
+          }
+          dist = width / 2;
         }
-        dist = width / 2;
-      }
-      // Gives us the (x, y) coordinates as well as the cos/sin of the tangent
-      // line at that position.
-      SkPoint pos;
-      SkVector tan;
-      if (!cont->getPosTan(dist, &pos, &tan)) {
-        throw std::runtime_error(
-            "Could not calculate distance when resolving text path");
-      }
-      auto px = pos.x();
-      auto py = pos.y();
-      auto tx = tan.x();
-      auto ty = tan.y();
+        // Gives us the (x, y) coordinates as well as the cos/sin of the tangent
+        // line at that position.
+        SkPoint pos;
+        SkVector tan;
+        if (!cont->getPosTan(dist, &pos, &tan)) {
+          throw std::runtime_error(
+              "Could not calculate distance when resolving text path");
+        }
+        auto px = pos.x();
+        auto py = pos.y();
+        auto tx = tan.x();
+        auto ty = tan.y();
 
-      auto adjustedX = px - (width / 2) * tx;
-      auto adjustedY = py - (width / 2) * ty;
+        auto adjustedX = px - (width / 2) * tx;
+        auto adjustedY = py - (width / 2) * ty;
 
-      rsx.push_back(SkRSXform::Make(tx, ty, adjustedX, adjustedY));
-      dist += width / 2;
-    }
+        rsx.push_back(SkRSXform::Make(tx, ty, adjustedX, adjustedY));
+        dist += width / 2;
+      }
 
-    setDerivedValue(SkTextBlob::MakeFromRSXform(text.c_str(), text.length(),
-                                                rsx.data(), *font));
+      setDerivedValue(SkTextBlob::MakeFromRSXform(text.c_str(), text.length(),
+                                                  rsx.data(), *font));
+    } else {
+      setDerivedValue(nullptr);
+    }
   }
 
 private:

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

@@ -5,7 +5,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkTileMode.h>
+#include "SkTileMode.h"
 
 #include <memory>
 #include <string>

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

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

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

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

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

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

package/cpp/rnskia/values/RNSkClockValue.h

@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include <RNSkPlatformContext.h>
-#include <RNSkReadonlyValue.h>
+#include "RNSkPlatformContext.h"
+#include "RNSkReadonlyValue.h"
 #include <jsi/jsi.h>
 
 #include <algorithm>

package/cpp/rnskia/values/RNSkComputedValue.h

@@ -1,8 +1,8 @@
 
 #pragma once
 
+#include "RNSkPlatformContext.h"
 #include "RNSkReadonlyValue.h"
-#include <RNSkPlatformContext.h>
 #include <jsi/jsi.h>
 
 #include <algorithm>

package/cpp/rnskia/values/RNSkReadonlyValue.h

@@ -10,9 +10,9 @@
 
 #include <jsi/jsi.h>
 
-#include <JsiSkHostObjects.h>
-#include <JsiValueWrapper.h>
-#include <RNSkPlatformContext.h>
+#include "JsiSkHostObjects.h"
+#include "JsiValueWrapper.h"
+#include "RNSkPlatformContext.h"
 
 namespace RNSkia {
 namespace jsi = facebook::jsi;

package/cpp/rnskia/values/RNSkValue.h

@@ -3,10 +3,10 @@
 #include <functional>
 #include <memory>
 
-#include <JsiHostObject.h>
-#include <RNSkAnimation.h>
-#include <RNSkPlatformContext.h>
-#include <RNSkReadonlyValue.h>
+#include "JsiHostObject.h"
+#include "RNSkAnimation.h"
+#include "RNSkPlatformContext.h"
+#include "RNSkReadonlyValue.h"
 #include <jsi/jsi.h>
 
 namespace RNSkia {

package/cpp/utils/RNSkMeasureTime.h

@@ -7,7 +7,7 @@
 #include <chrono>
 #include <string>
 
-#include <RNSkLog.h>
+#include "RNSkLog.h"
 
 namespace RNSkia {
 

package/cpp/utils/RNSkTimingInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <RNSkLog.h>
+#include "RNSkLog.h"
 #include <chrono>
 #include <string>
 #include <utility>

package/globalJestSetup.js

@@ -0,0 +1,6 @@
+module.exports = async () => {
+  const {
+    LoadSkiaWeb,
+  } = require("@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb");
+  await LoadSkiaWeb();
+};

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -6,16 +6,8 @@
 #include <memory>
 #include <string>
 
-#include <DisplayLink.h>
-#include <RNSkPlatformContext.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdocumentation"
-
-#include "SkStream.h"
-#include "SkSurface.h"
-
-#pragma clang diagnostic pop
+#include "DisplayLink.h"
+#include "RNSkPlatformContext.h"
 
 #include <jsi/jsi.h>
 
@@ -35,10 +27,15 @@ static void handleNotification(CFNotificationCenterRef center, void *observer,
 
 class RNSkiOSPlatformContext : public RNSkPlatformContext {
 public:
-  RNSkiOSPlatformContext(jsi::Runtime *runtime,
-                         std::shared_ptr<react::CallInvoker> callInvoker)
-      : RNSkPlatformContext(runtime, callInvoker,
+  RNSkiOSPlatformContext(
+      jsi::Runtime *runtime, std::shared_ptr<react::CallInvoker> callInvoker,
+      std::function<void(std::function<void()>)> dispatchMainThread,
+      std::function<sk_sp<SkImage>(size_t viewTag)> takeViewScreenshot)
+      : _dispatchMainThread(dispatchMainThread),
+        _takeViewScreenshot(takeViewScreenshot),
+        RNSkPlatformContext(runtime, callInvoker,
                             [[UIScreen mainScreen] scale]) {
+
     // We need to make sure we invalidate when modules are freed
     CFNotificationCenterAddObserver(
         CFNotificationCenterGetLocalCenter(), this, &handleNotification,
@@ -55,6 +52,10 @@ public:
   void startDrawLoop() override;
   void stopDrawLoop() override;
 
+  void runOnMainThread(std::function<void()>) override;
+
+  sk_sp<SkImage> takeScreenshotFromViewTag(size_t tag) override;
+
   virtual void performStreamOperation(
       const std::string &sourceUri,
       const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override;
@@ -69,6 +70,8 @@ public:
 
 private:
   DisplayLink *_displayLink;
+  std::function<void(std::function<void()>)> _dispatchMainThread;
+  std::function<sk_sp<SkImage>(size_t viewTag)> _takeViewScreenshot;
 };
 
 static void handleNotification(CFNotificationCenterRef center, void *observer,

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.mm

@@ -62,6 +62,14 @@ sk_sp<SkSurface> RNSkiOSPlatformContext::makeOffscreenSurface(int width,
   return MakeOffscreenMetalSurface(width, height);
 }
 
+void RNSkiOSPlatformContext::runOnMainThread(std::function<void()> func) {
+  _dispatchMainThread(func);
+}
+
+sk_sp<SkImage> RNSkiOSPlatformContext::takeScreenshotFromViewTag(size_t tag) {
+  return _takeViewScreenshot(tag);
+}
+
 void RNSkiOSPlatformContext::startDrawLoop() {
   if (_displayLink == nullptr) {
     _displayLink = [[DisplayLink alloc] init];

package/ios/RNSkia-iOS/SkiaManager.mm

@@ -4,14 +4,17 @@
 
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
 
 #import <ReactCommon/RCTTurboModule.h>
 
 #import "RNSkiOSPlatformContext.h"
+#import "ViewScreenshotService.h"
 
 @implementation SkiaManager {
   std::shared_ptr<RNSkia::RNSkManager> _skManager;
   std::shared_ptr<RNSkia::RNSkiOSPlatformContext> _platformContext;
+  ViewScreenshotService *_screenshot;
   __weak RCTBridge *weakBridge;
 }
 
@@ -37,9 +40,25 @@
       facebook::jsi::Runtime *jsRuntime =
           (facebook::jsi::Runtime *)cxxBridge.runtime;
 
+      // Create screenshot manager
+      _screenshot =
+          [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
+
+      auto takeScreenshot = [self](size_t viewTag) {
+        return [_screenshot
+            screenshotOfViewWithTag:[NSNumber numberWithLong:viewTag]];
+      };
+
+      auto dispatchOnMainThread = [self](std::function<void()> fp) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+          fp();
+        });
+      };
+
       // Create platform context
       _platformContext = std::make_shared<RNSkia::RNSkiOSPlatformContext>(
-          jsRuntime, callInvoker);
+          jsRuntime, callInvoker, std::move(dispatchOnMainThread),
+          std::move(takeScreenshot));
 
       // Create the RNSkiaManager (cross platform)
       _skManager = std::make_shared<RNSkia::RNSkManager>(jsRuntime, callInvoker,

package/ios/RNSkia-iOS/ViewScreenshotService.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#import <CoreFoundation/CoreFoundation.h>
+#import <UIKit/UIKit.h>
+
+#import <React/RCTUIManager.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkImage.h"
+
+#pragma clang diagnostic pop
+
+@interface ViewScreenshotService : NSObject {
+}
+
+- (instancetype)initWithUiManager:(RCTUIManager *)uiManager;
+- (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag;
+
+@end

package/ios/RNSkia-iOS/ViewScreenshotService.mm

@@ -0,0 +1,79 @@
+#import "ViewScreenshotService.h"
+#import <QuartzCore/QuartzCore.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkData.h"
+
+#pragma clang diagnostic pop
+
+@implementation ViewScreenshotService {
+  RCTUIManager *_uiManager;
+}
+
+- (instancetype)initWithUiManager:(RCTUIManager *)uiManager {
+  if (self = [super init]) {
+    _uiManager = uiManager;
+  }
+  return self;
+}
+
+- (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag {
+  // Find view corresponding to the tag
+  auto view = [_uiManager viewForReactTag:viewTag];
+  if (view == NULL) {
+    RCTFatal(RCTErrorWithMessage(@"Could not find view with tag"));
+  }
+
+  // Get size
+  CGSize size = view.frame.size;
+
+  // Setup context
+  UIGraphicsImageRendererFormat *format =
+      [UIGraphicsImageRendererFormat defaultFormat];
+  format.opaque = NO;
+  UIGraphicsImageRenderer *renderer =
+      [[UIGraphicsImageRenderer alloc] initWithSize:size format:format];
+
+  // Render to context - this is now the only part of this function that shows
+  // up in the profiler!
+  UIImage *image = [renderer
+      imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
+        [view drawViewHierarchyInRect:(CGRect){CGPointZero, size}
+                   afterScreenUpdates:YES];
+      }];
+
+  // Convert from UIImage -> CGImage -> SkImage
+  CGImageRef cgImage = image.CGImage;
+
+  // Get some info about the image
+  auto width = CGImageGetWidth(cgImage);
+  auto height = CGImageGetHeight(cgImage);
+  auto bytesPerRow = CGImageGetBytesPerRow(cgImage);
+
+  // Convert from UIImage -> SkImage, start by getting the pixels directly from
+  // the CGImage:
+  auto dataRef = CGDataProviderCopyData(CGImageGetDataProvider(cgImage));
+  auto length = CFDataGetLength(dataRef);
+  void *data = CFDataGetMutableBytePtr((CFMutableDataRef)dataRef);
+
+  // Now we'll capture the data in an SkData object and control releasing it:
+  auto skData = SkData::MakeWithProc(
+      data, length,
+      [](const void *ptr, void *context) {
+        CFDataRef dataRef = (CFDataRef)context;
+        CFRelease(dataRef);
+      },
+      (void *)dataRef);
+
+  // Make SkImageInfo
+  SkImageInfo info =
+      SkImageInfo::Make(static_cast<int>(width), static_cast<int>(height),
+                        kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+
+  // ... and then create the SkImage itself!
+  return SkImage::MakeRasterData(info, skData, bytesPerRow);
+}
+
+@end

package/jestSetup.js

@@ -1,5 +1,4 @@
 /* globals jest */
-jest.mock(
-  "@shopify/react-native-skia",
-  () => require("@shopify/react-native-skia/lib/commonjs/mock").Mock
+jest.mock("@shopify/react-native-skia", () =>
+  require("@shopify/react-native-skia/lib/commonjs/mock").Mock(global.CanvasKit)
 );

package/lib/commonjs/dom/nodes/drawings/ImageNode.js

@@ -20,6 +20,24 @@ class ImageNode extends _DrawingNode.JsiDrawingNode {
     const {
       image
     } = this.props;
+
+    if (!image) {
+      return {
+        src: {
+          x: 0,
+          y: 0,
+          width: 0,
+          height: 0
+        },
+        dst: {
+          x: 0,
+          y: 0,
+          width: 0,
+          height: 0
+        }
+      };
+    }
+
     const fit = this.props.fit ?? "contain";
     const rect = (0, _datatypes.processRect)(this.Skia, this.props);
     const {
@@ -54,7 +72,10 @@ class ImageNode extends _DrawingNode.JsiDrawingNode {
       src,
       dst
     } = this.derived;
-    canvas.drawImageRect(image, src, dst, paint);
+
+    if (image) {
+      canvas.drawImageRect(image, src, dst, paint);
+    }
   }
 
 }

package/lib/commonjs/dom/nodes/drawings/ImageNode.js.map

@@ -1 +1 @@
-{"version":3,"names":["ImageNode","JsiDrawingNode","constructor","ctx","props","NodeType","Image","deriveProps","image","fit","rect","processRect","Skia","src","dst","fitRects","x","y","width","height","draw","canvas","paint","derived","Error","drawImageRect"],"sources":["ImageNode.ts"],"sourcesContent":["import type { SkRect } from \"../../../skia/types\";\nimport type { DrawingContext, ImageProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { fitRects, processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageNode extends JsiDrawingNode<\n  ImageProps,\n  { src: SkRect; dst: SkRect }\n> {\n  constructor(ctx: NodeContext, props: ImageProps) {\n    super(ctx, NodeType.Image, props);\n  }\n\n  deriveProps() {\n    const { image } = this.props;\n    const fit = this.props.fit ?? \"contain\";\n    const rect = processRect(this.Skia, this.props);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    return { src, dst };\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { image } = this.props;\n    if (!this.derived) {\n      throw new Error(\"ImageNode: src and dst are undefined\");\n    }\n    const { src, dst } = this.derived;\n    canvas.drawImageRect(image, src, dst, paint);\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAGL;EACAC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,WAAW,GAAG;IACZ,MAAM;MAAEC;IAAF,IAAY,KAAKJ,KAAvB;IACA,MAAMK,GAAG,GAAG,KAAKL,KAAL,CAAWK,GAAX,IAAkB,SAA9B;IACA,MAAMC,IAAI,GAAG,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKR,KAA5B,CAAb;IACA,MAAM;MAAES,GAAF;MAAOC;IAAP,IAAe,IAAAC,mBAAA,EACnBN,GADmB,EAEnB;MACEO,CAAC,EAAE,CADL;MAEEC,CAAC,EAAE,CAFL;MAGEC,KAAK,EAAEV,KAAK,CAACU,KAAN,EAHT;MAIEC,MAAM,EAAEX,KAAK,CAACW,MAAN;IAJV,CAFmB,EAQnBT,IARmB,CAArB;IAUA,OAAO;MAAEG,GAAF;MAAOC;IAAP,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEd;IAAF,IAAY,KAAKJ,KAAvB;;IACA,IAAI,CAAC,KAAKmB,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;IACD;;IACD,MAAM;MAAEX,GAAF;MAAOC;IAAP,IAAe,KAAKS,OAA1B;IACAF,MAAM,CAACI,aAAP,CAAqBjB,KAArB,EAA4BK,GAA5B,EAAiCC,GAAjC,EAAsCQ,KAAtC;EACD;;AA7BD"}
+{"version":3,"names":["ImageNode","JsiDrawingNode","constructor","ctx","props","NodeType","Image","deriveProps","image","src","x","y","width","height","dst","fit","rect","processRect","Skia","fitRects","draw","canvas","paint","derived","Error","drawImageRect"],"sources":["ImageNode.ts"],"sourcesContent":["import type { SkRect } from \"../../../skia/types\";\nimport type { DrawingContext, ImageProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { fitRects, processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageNode extends JsiDrawingNode<\n  ImageProps,\n  { src: SkRect; dst: SkRect }\n> {\n  constructor(ctx: NodeContext, props: ImageProps) {\n    super(ctx, NodeType.Image, props);\n  }\n\n  deriveProps() {\n    const { image } = this.props;\n    if (!image) {\n      return {\n        src: { x: 0, y: 0, width: 0, height: 0 },\n        dst: { x: 0, y: 0, width: 0, height: 0 },\n      };\n    }\n    const fit = this.props.fit ?? \"contain\";\n    const rect = processRect(this.Skia, this.props);\n    const { src, dst } = fitRects(\n      fit,\n      {\n        x: 0,\n        y: 0,\n        width: image.width(),\n        height: image.height(),\n      },\n      rect\n    );\n    return { src, dst };\n  }\n\n  draw({ canvas, paint }: DrawingContext) {\n    const { image } = this.props;\n    if (!this.derived) {\n      throw new Error(\"ImageNode: src and dst are undefined\");\n    }\n    const { src, dst } = this.derived;\n    if (image) {\n      canvas.drawImageRect(image, src, dst, paint);\n    }\n  }\n}\n"],"mappings":";;;;;;;AAEA;;AACA;;AACA;;AAGO,MAAMA,SAAN,SAAwBC,2BAAxB,CAGL;EACAC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAsC;IAC/C,MAAMD,GAAN,EAAWE,eAAA,CAASC,KAApB,EAA2BF,KAA3B;EACD;;EAEDG,WAAW,GAAG;IACZ,MAAM;MAAEC;IAAF,IAAY,KAAKJ,KAAvB;;IACA,IAAI,CAACI,KAAL,EAAY;MACV,OAAO;QACLC,GAAG,EAAE;UAAEC,CAAC,EAAE,CAAL;UAAQC,CAAC,EAAE,CAAX;UAAcC,KAAK,EAAE,CAArB;UAAwBC,MAAM,EAAE;QAAhC,CADA;QAELC,GAAG,EAAE;UAAEJ,CAAC,EAAE,CAAL;UAAQC,CAAC,EAAE,CAAX;UAAcC,KAAK,EAAE,CAArB;UAAwBC,MAAM,EAAE;QAAhC;MAFA,CAAP;IAID;;IACD,MAAME,GAAG,GAAG,KAAKX,KAAL,CAAWW,GAAX,IAAkB,SAA9B;IACA,MAAMC,IAAI,GAAG,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKd,KAA5B,CAAb;IACA,MAAM;MAAEK,GAAF;MAAOK;IAAP,IAAe,IAAAK,mBAAA,EACnBJ,GADmB,EAEnB;MACEL,CAAC,EAAE,CADL;MAEEC,CAAC,EAAE,CAFL;MAGEC,KAAK,EAAEJ,KAAK,CAACI,KAAN,EAHT;MAIEC,MAAM,EAAEL,KAAK,CAACK,MAAN;IAJV,CAFmB,EAQnBG,IARmB,CAArB;IAUA,OAAO;MAAEP,GAAF;MAAOK;IAAP,CAAP;EACD;;EAEDM,IAAI,OAAoC;IAAA,IAAnC;MAAEC,MAAF;MAAUC;IAAV,CAAmC;IACtC,MAAM;MAAEd;IAAF,IAAY,KAAKJ,KAAvB;;IACA,IAAI,CAAC,KAAKmB,OAAV,EAAmB;MACjB,MAAM,IAAIC,KAAJ,CAAU,sCAAV,CAAN;IACD;;IACD,MAAM;MAAEf,GAAF;MAAOK;IAAP,IAAe,KAAKS,OAA1B;;IACA,IAAIf,KAAJ,EAAW;MACTa,MAAM,CAACI,aAAP,CAAqBjB,KAArB,EAA4BC,GAA5B,EAAiCK,GAAjC,EAAsCQ,KAAtC;IACD;EACF;;AArCD"}

package/lib/commonjs/dom/nodes/drawings/ImageSVG.js

@@ -27,6 +27,11 @@ class ImageSVGNode extends _DrawingNode.JsiDrawingNode {
     const {
       svg
     } = this.props;
+
+    if (!svg) {
+      return;
+    }
+
     const {
       x,
       y,

package/lib/commonjs/dom/nodes/drawings/ImageSVG.js.map

@@ -1 +1 @@
-{"version":3,"names":["ImageSVGNode","JsiDrawingNode","constructor","ctx","props","NodeType","ImageSVG","deriveProps","draw","canvas","svg","x","y","width","height","processRect","Skia","save","translate","drawSvg","restore"],"sources":["ImageSVG.ts"],"sourcesContent":["import type { DrawingContext, ImageSVGProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageSVGNode extends JsiDrawingNode<ImageSVGProps, null> {\n  constructor(ctx: NodeContext, props: ImageSVGProps) {\n    super(ctx, NodeType.ImageSVG, props);\n  }\n\n  deriveProps() {\n    return null;\n  }\n\n  draw({ canvas }: DrawingContext) {\n    const { svg } = this.props;\n    const { x, y, width, height } = processRect(this.Skia, this.props);\n    canvas.save();\n    canvas.translate(x, y);\n    canvas.drawSvg(svg, width, height);\n    canvas.restore();\n  }\n}\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAGO,MAAMA,YAAN,SAA2BC,2BAA3B,CAA+D;EACpEC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWE,eAAA,CAASC,QAApB,EAA8BF,KAA9B;EACD;;EAEDG,WAAW,GAAG;IACZ,OAAO,IAAP;EACD;;EAEDC,IAAI,OAA6B;IAAA,IAA5B;MAAEC;IAAF,CAA4B;IAC/B,MAAM;MAAEC;IAAF,IAAU,KAAKN,KAArB;IACA,MAAM;MAAEO,CAAF;MAAKC,CAAL;MAAQC,KAAR;MAAeC;IAAf,IAA0B,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKZ,KAA5B,CAAhC;IACAK,MAAM,CAACQ,IAAP;IACAR,MAAM,CAACS,SAAP,CAAiBP,CAAjB,EAAoBC,CAApB;IACAH,MAAM,CAACU,OAAP,CAAeT,GAAf,EAAoBG,KAApB,EAA2BC,MAA3B;IACAL,MAAM,CAACW,OAAP;EACD;;AAhBmE"}
+{"version":3,"names":["ImageSVGNode","JsiDrawingNode","constructor","ctx","props","NodeType","ImageSVG","deriveProps","draw","canvas","svg","x","y","width","height","processRect","Skia","save","translate","drawSvg","restore"],"sources":["ImageSVG.ts"],"sourcesContent":["import type { DrawingContext, ImageSVGProps } from \"../../types\";\nimport { NodeType } from \"../../types\";\nimport { processRect } from \"../datatypes\";\nimport { JsiDrawingNode } from \"../DrawingNode\";\nimport type { NodeContext } from \"../Node\";\n\nexport class ImageSVGNode extends JsiDrawingNode<ImageSVGProps, null> {\n  constructor(ctx: NodeContext, props: ImageSVGProps) {\n    super(ctx, NodeType.ImageSVG, props);\n  }\n\n  deriveProps() {\n    return null;\n  }\n\n  draw({ canvas }: DrawingContext) {\n    const { svg } = this.props;\n    if (!svg) {\n      return;\n    }\n    const { x, y, width, height } = processRect(this.Skia, this.props);\n    canvas.save();\n    canvas.translate(x, y);\n    canvas.drawSvg(svg, width, height);\n    canvas.restore();\n  }\n}\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AAGO,MAAMA,YAAN,SAA2BC,2BAA3B,CAA+D;EACpEC,WAAW,CAACC,GAAD,EAAmBC,KAAnB,EAAyC;IAClD,MAAMD,GAAN,EAAWE,eAAA,CAASC,QAApB,EAA8BF,KAA9B;EACD;;EAEDG,WAAW,GAAG;IACZ,OAAO,IAAP;EACD;;EAEDC,IAAI,OAA6B;IAAA,IAA5B;MAAEC;IAAF,CAA4B;IAC/B,MAAM;MAAEC;IAAF,IAAU,KAAKN,KAArB;;IACA,IAAI,CAACM,GAAL,EAAU;MACR;IACD;;IACD,MAAM;MAAEC,CAAF;MAAKC,CAAL;MAAQC,KAAR;MAAeC;IAAf,IAA0B,IAAAC,sBAAA,EAAY,KAAKC,IAAjB,EAAuB,KAAKZ,KAA5B,CAAhC;IACAK,MAAM,CAACQ,IAAP;IACAR,MAAM,CAACS,SAAP,CAAiBP,CAAjB,EAAoBC,CAApB;IACAH,MAAM,CAACU,OAAP,CAAeT,GAAf,EAAoBG,KAApB,EAA2BC,MAA3B;IACAL,MAAM,CAACW,OAAP;EACD;;AAnBmE"}

package/lib/commonjs/dom/nodes/drawings/Text.d.ts

@@ -8,9 +8,9 @@ export declare class TextNode extends JsiDrawingNode<TextProps, null> {
     protected deriveProps(): null;
     draw({ canvas, paint }: DrawingContext): void;
 }
-export declare class TextPathNode extends JsiDrawingNode<TextPathProps, SkTextBlob> {
+export declare class TextPathNode extends JsiDrawingNode<TextPathProps, SkTextBlob | null> {
     constructor(ctx: NodeContext, props: TextPathProps);
-    deriveProps(): SkTextBlob;
+    deriveProps(): SkTextBlob | null;
     draw({ canvas, paint }: DrawingContext): void;
 }
 export declare class TextBlobNode extends JsiDrawingNode<TextBlobProps, null> {