@shopify/react-native-skia 2.4.19 → 2.4.21

package/apple/MetalContext.h

@@ -65,7 +65,6 @@ public:
   }
 
   sk_sp<SkImage> MakeImageFromBuffer(void *buffer) {
-
     CVPixelBufferRef sampleBuffer = (CVPixelBufferRef)buffer;
     SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat format =
         SkiaCVPixelBufferUtils::getCVPixelBufferBaseFormat(sampleBuffer);
@@ -73,12 +72,12 @@ public:
     case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::rgb: {
       // CVPixelBuffer is in any RGB format, single-plane
       return SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
+          _device, _directContext.get(), sampleBuffer);
     }
     case SkiaCVPixelBufferUtils::CVPixelBufferBaseFormat::yuv: {
       // CVPixelBuffer is in any YUV format, multi-plane
       return SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-          _directContext.get(), sampleBuffer);
+          _device, _directContext.get(), sampleBuffer);
     }
     default:
       [[unlikely]] {

package/apple/SkiaCVPixelBufferUtils.h

@@ -84,7 +84,7 @@ public:
      CVPixelBuffer.
      */
     static sk_sp<SkImage>
-    makeSkImageFromCVPixelBuffer(GrDirectContext *context,
+    makeSkImageFromCVPixelBuffer(id<MTLDevice> device, GrDirectContext *context,
                                  CVPixelBufferRef pixelBuffer);
 
   private:
@@ -98,7 +98,7 @@ public:
      CVPixelBuffer.
      */
     static sk_sp<SkImage>
-    makeSkImageFromCVPixelBuffer(GrDirectContext *context,
+    makeSkImageFromCVPixelBuffer(id<MTLDevice> device, GrDirectContext *context,
                                  CVPixelBufferRef pixelBuffer);
 
   private:
@@ -109,10 +109,9 @@ public:
   };
 
 private:
-  static CVMetalTextureCacheRef getTextureCache();
-  static TextureHolder *
-  getSkiaTextureForCVPixelBufferPlane(CVPixelBufferRef pixelBuffer,
-                                      size_t planeIndex);
+  static CVMetalTextureCacheRef getTextureCache(id<MTLDevice> device);
+  static TextureHolder *getSkiaTextureForCVPixelBufferPlane(
+      id<MTLDevice> device, CVPixelBufferRef pixelBuffer, size_t planeIndex);
   static MTLPixelFormat
   getMTLPixelFormatForCVPixelBufferPlane(CVPixelBufferRef pixelBuffer,
                                          size_t planeIndex);

package/apple/SkiaCVPixelBufferUtils.mm

@@ -134,13 +134,14 @@ SkColorType SkiaCVPixelBufferUtils::RGB::getCVPixelBufferColorType(
 }
 
 sk_sp<SkImage> SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
-    GrDirectContext *context, CVPixelBufferRef pixelBuffer) {
+    id<MTLDevice> device, GrDirectContext *context,
+    CVPixelBufferRef pixelBuffer) {
   // 1. Get Skia color type for RGB buffer
   SkColorType colorType = getCVPixelBufferColorType(pixelBuffer);
 
   // 2. Get texture, RGB buffers only have one plane
-  TextureHolder *texture =
-      getSkiaTextureForCVPixelBufferPlane(pixelBuffer, /* planeIndex */ 0);
+  TextureHolder *texture = getSkiaTextureForCVPixelBufferPlane(
+      device, pixelBuffer, /* planeIndex */ 0);
 
   // 3. Convert to image with manual memory cleanup
   return SkImages::BorrowTextureFrom(
@@ -152,15 +153,22 @@ sk_sp<SkImage> SkiaCVPixelBufferUtils::RGB::makeSkImageFromCVPixelBuffer(
 // pragma MARK: YUV
 
 sk_sp<SkImage> SkiaCVPixelBufferUtils::YUV::makeSkImageFromCVPixelBuffer(
-    GrDirectContext *context, CVPixelBufferRef pixelBuffer) {
+    id<MTLDevice> device, GrDirectContext *context,
+    CVPixelBufferRef pixelBuffer) {
   // 1. Get all planes (YUV, Y_UV, Y_U_V or Y_U_V_A)
-  size_t planesCount = CVPixelBufferGetPlaneCount(pixelBuffer);
+  const size_t planesCount = CVPixelBufferGetPlaneCount(pixelBuffer);
+  if (planesCount > SkYUVAInfo::kMaxPlanes) [[unlikely]] {
+    throw std::runtime_error(
+        "CVPixelBuffer has " + std::to_string(planesCount) +
+        " textures, but the platform only supports a maximum of " +
+        std::to_string(SkYUVAInfo::kMaxPlanes) + " textures!");
+  }
   MultiTexturesHolder *texturesHolder = new MultiTexturesHolder();
-  GrBackendTexture textures[planesCount];
+  GrBackendTexture textures[SkYUVAInfo::kMaxPlanes];
 
   for (size_t planeIndex = 0; planeIndex < planesCount; planeIndex++) {
     TextureHolder *textureHolder =
-        getSkiaTextureForCVPixelBufferPlane(pixelBuffer, planeIndex);
+        getSkiaTextureForCVPixelBufferPlane(device, pixelBuffer, planeIndex);
     textures[planeIndex] = textureHolder->toGrBackendTexture();
     texturesHolder->addTexture(textureHolder);
   }
@@ -282,9 +290,9 @@ SkYUVColorSpace SkiaCVPixelBufferUtils::YUV::getColorspace(OSType pixelFormat) {
 // pragma MARK: CVPixelBuffer -> Skia Texture
 
 TextureHolder *SkiaCVPixelBufferUtils::getSkiaTextureForCVPixelBufferPlane(
-    CVPixelBufferRef pixelBuffer, size_t planeIndex) {
+    id<MTLDevice> device, CVPixelBufferRef pixelBuffer, size_t planeIndex) {
   // 1. Get cache
-  CVMetalTextureCacheRef textureCache = getTextureCache();
+  CVMetalTextureCacheRef textureCache = getTextureCache(device);
 
   // 2. Get MetalTexture from CMSampleBuffer
   size_t width = CVPixelBufferGetWidthOfPlane(pixelBuffer, planeIndex);
@@ -308,13 +316,13 @@ TextureHolder *SkiaCVPixelBufferUtils::getSkiaTextureForCVPixelBufferPlane(
 
 // pragma MARK: getTextureCache()
 
-CVMetalTextureCacheRef SkiaCVPixelBufferUtils::getTextureCache() {
+CVMetalTextureCacheRef
+SkiaCVPixelBufferUtils::getTextureCache(id<MTLDevice> device) {
   static CVMetalTextureCacheRef textureCache = nil;
   if (textureCache == nil) {
     // Create a new Texture Cache
-    auto result = CVMetalTextureCacheCreate(kCFAllocatorDefault, nil,
-                                            MTLCreateSystemDefaultDevice(), nil,
-                                            &textureCache);
+    auto result = CVMetalTextureCacheCreate(kCFAllocatorDefault, nil, device,
+                                            nil, &textureCache);
     if (result != kCVReturnSuccess || textureCache == nil) {
       throw std::runtime_error("Failed to create Metal Texture Cache!");
     }

package/cpp/api/JsiSkContourMeasureIter.h

@@ -47,7 +47,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkContourMeasureIter, dispose))
 
   size_t getMemoryPressure() const override {
-    return sizeof(SkContourMeasureIter);
+    return std::max(sizeof(SkContourMeasureIter), kMinMemoryPressure);
   }
 
   std::string getObjectType() const override {

package/cpp/api/JsiSkFont.h

@@ -279,7 +279,9 @@ public:
       : JsiSkWrappingSharedPtrHostObject(std::move(context),
                                          std::make_shared<SkFont>(font)) {}
 
-  size_t getMemoryPressure() const override { return sizeof(SkFont); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkFont), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkFont"; }
 

package/cpp/api/JsiSkFontStyle.h

@@ -56,7 +56,9 @@ public:
     }
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkFontStyle); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkFontStyle), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkFontStyle"; }
 

package/cpp/api/JsiSkHostObjects.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ -12,6 +13,11 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
+// Minimum memory pressure reported for any host object.
+// This accounts for C++ wrapper overhead and ensures dispose() never
+// increases reported memory pressure (which would defeat its purpose).
+static constexpr size_t kMinMemoryPressure = 256;
+
 /**
  * Base class for jsi host objects - these are all implemented as JsiHostObjects
  * and has a pointer to the platform context.
@@ -139,6 +145,10 @@ public:
    * macro.
    */
   JSI_HOST_FUNCTION(dispose) {
+    if (!isDisposed()) {
+      thisValue.asObject(runtime).setExternalMemoryPressure(runtime,
+                                                            kMinMemoryPressure);
+    }
     safeDispose();
     return jsi::Value::undefined();
   }
@@ -153,7 +163,9 @@ protected:
   /**
    * Returns true if the object has been disposed.
    */
-  bool isDisposed() const { return _isDisposed.load(std::memory_order_acquire); }
+  bool isDisposed() const {
+    return _isDisposed.load(std::memory_order_acquire);
+  }
 
   /**
    * Returns the underlying object without checking if disposed.

package/cpp/api/JsiSkImage.h

@@ -249,6 +249,9 @@ public:
     }
     auto rasterImage = image->makeRasterImage(grContext);
 #endif
+    if (!rasterImage) {
+      return jsi::Value::null();
+    }
     auto hostObjectInstance =
         std::make_shared<JsiSkImage>(getContext(), std::move(rasterImage));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
@@ -289,31 +292,26 @@ public:
                                               std::move(image)) {
     // Get the dispatcher for the current thread
     _dispatcher = Dispatcher::getDispatcher();
-    // Process any pending operations
+    // Process any pending operations (e.g. deletions of previous resources)
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto image = getObjectUnchecked();
-    if (image && _dispatcher) {
-      _dispatcher->run([image]() {
-        // Image will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkImage>::releaseResources();
-  }
-
 public:
   ~JsiSkImage() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkImage) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto image = getObjectUnchecked();
+      if (image && _dispatcher) {
+        _dispatcher->run([image]() {
+          // Image will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   size_t getMemoryPressure() const override {

package/cpp/api/JsiSkImageInfo.h

@@ -69,7 +69,9 @@ public:
     return static_cast<double>(getObject()->alphaType());
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkImageInfo); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkImageInfo), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkImageInfo"; }
 

package/cpp/api/JsiSkMatrix.h

@@ -166,7 +166,9 @@ public:
     }
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkMatrix); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkMatrix), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkMatrix"; }
 

package/cpp/api/JsiSkPaint.h

@@ -209,7 +209,9 @@ public:
     setObject(std::make_shared<SkPaint>(std::move(paint)));
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkPaint); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkPaint), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkPaint"; }
 

package/cpp/api/JsiSkPicture.h

@@ -34,27 +34,22 @@ public:
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto picture = getObjectUnchecked();
-    if (picture && _dispatcher) {
-      _dispatcher->run([picture]() {
-        // Picture will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkPicture>::releaseResources();
-  }
-
 public:
   ~JsiSkPicture() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkPicture) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto picture = getObjectUnchecked();
+      if (picture && _dispatcher) {
+        _dispatcher->run([picture]() {
+          // Picture will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   JSI_HOST_FUNCTION(makeShader) {

package/cpp/api/JsiSkPoint.h

@@ -62,7 +62,9 @@ public:
                                                        context);
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkPoint); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkPoint), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkPoint"; }
 

package/cpp/api/JsiSkRRect.h

@@ -106,7 +106,9 @@ public:
                                                        context);
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkRRect); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkRRect), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkRRect"; }
 

package/cpp/api/JsiSkRSXform.h

@@ -111,7 +111,9 @@ public:
                                                          context);
     };
   }
-  size_t getMemoryPressure() const override { return sizeof(SkRSXform); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkRSXform), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkRSXform"; }
 

package/cpp/api/JsiSkRect.h

@@ -100,7 +100,9 @@ public:
                                                        context);
   }
 
-  size_t getMemoryPressure() const override { return sizeof(SkRect); }
+  size_t getMemoryPressure() const override {
+    return std::max(sizeof(SkRect), kMinMemoryPressure);
+  }
 
   std::string getObjectType() const override { return "JsiSkRect"; }
 

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -63,7 +63,7 @@ public:
   }
 
   size_t getMemoryPressure() const override {
-    return sizeof(SkRuntimeShaderBuilder);
+    return std::max(sizeof(SkRuntimeShaderBuilder), kMinMemoryPressure);
   }
 
   std::string getObjectType() const override {

package/cpp/api/JsiSkSVGFactory.h

@@ -160,7 +160,7 @@ public:
                              std::move(assets));
   }
 
-  size_t getMemoryPressure() const override { return 512; }
+  size_t getMemoryPressure() const override { return kMinMemoryPressure; }
 
   std::string getObjectType() const override { return "JsiSkSVGFactory"; }
 

package/cpp/api/JsiSkSurface.h

@@ -45,27 +45,22 @@ public:
     _dispatcher->processQueue();
   }
 
-protected:
-  void releaseResources() override {
-    // Queue deletion on the creation thread if needed
-    auto surface = getObjectUnchecked();
-    if (surface && _dispatcher) {
-      _dispatcher->run([surface]() {
-        // Surface will be deleted when this lambda is destroyed
-      });
-    }
-    // Clear the object
-    JsiSkWrappingSkPtrHostObject<SkSurface>::releaseResources();
-  }
-
 public:
   ~JsiSkSurface() override {
-    // If already disposed, resources were already cleaned up
-    if (isDisposed()) {
-      return;
+    if (!isDisposed()) {
+      // This JSI Object is being deleted from a GC, which might happen
+      // on a separate Thread. GPU resources (like SkSurface) must be deleted
+      // on the same Thread they were created on, so in this case we schedule
+      // deletion to run on the Thread this Object was created on.
+      auto surface = getObjectUnchecked();
+      if (surface && _dispatcher) {
+        _dispatcher->run([surface]() {
+          // Surface will be deleted when this lambda is destroyed, on the
+          // original Thread.
+        });
+      }
+      releaseResources();
     }
-    // Use the same cleanup path as dispose()
-    releaseResources();
   }
 
   EXPORT_JSI_API_TYPENAME(JsiSkSurface, Surface)

package/cpp/jsi2/NativeObject.h

@@ -28,6 +28,11 @@ namespace rnwgpu {
 
 namespace jsi = facebook::jsi;
 
+// Minimum memory pressure reported for any native object.
+// This accounts for C++ wrapper overhead and ensures dispose() never
+// increases reported memory pressure (which would defeat its purpose).
+static constexpr size_t kMinMemoryPressure = 256;
+
 // Forward declaration
 template <typename Derived> class NativeObject;
 
@@ -384,7 +389,7 @@ public:
   /**
    * Memory pressure for GC hints. Override in derived classes.
    */
-  virtual size_t getMemoryPressure() { return 1024; }
+  virtual size_t getMemoryPressure() { return kMinMemoryPressure; }
 
   /**
    * Set the creation runtime. Called during create().

package/lib/commonjs/renderer/Offscreen.d.ts

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 export declare const isOnMainThread: () => boolean;
 export declare const drawAsPicture: (element: ReactElement, bounds?: SkRect) => Promise<SkPicture>;
-export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<import("../skia").SkImage>;
-export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => import("../skia").SkImage;
+export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<SkImage | null>;
+export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => SkImage | null;

package/lib/commonjs/renderer/Offscreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["_skia","require","_Platform","_Reconciler","isOnMainThread","_WORKLET","Platform","OS","exports","drawAsPicture","element","bounds","recorder","Skia","PictureRecorder","canvas","beginRecording","root","SkiaSGRoot","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (element: ReactElement, size: SkSize) => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (picture: SkPicture, size: SkSize) => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":";;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEO,MAAMG,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDC,kBAAQ,CAACC,EAAE,KAAK,KAAK;AAEzB,CAAC;AAACC,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAEK,MAAMK,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGC,UAAI,CAACC,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGH,QAAQ,CAACI,cAAc,CAACL,MAAM,CAAC;EAC9C,MAAMM,IAAI,GAAG,IAAIC,sBAAU,CAACL,UAAI,CAAC;EACjC,MAAMI,IAAI,CAACE,MAAM,CAACT,OAAO,CAAC;EAC1BO,IAAI,CAACG,YAAY,CAACL,MAAM,CAAC;EACzB,MAAMM,OAAO,GAAGT,QAAQ,CAACU,wBAAwB,CAAC,CAAC;EACnDV,QAAQ,CAACW,OAAO,CAAC,CAAC;EAClBN,IAAI,CAACO,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAACb,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAEK,MAAMgB,WAAW,GAAG,MAAAA,CAAOf,OAAqB,EAAEgB,IAAY,KAAK;EACxE,OAAOC,sBAAsB,CAAC,MAAMlB,aAAa,CAACC,OAAO,CAAC,EAAEgB,IAAI,CAAC;AACnE,CAAC;AAAClB,OAAA,CAAAiB,WAAA,GAAAA,WAAA;AAEK,MAAME,sBAAsB,GAAGA,CAACN,OAAkB,EAAEK,IAAY,KAAK;EAC1E,SAAS;;EACT,MAAME,OAAO,GAAGf,UAAI,CAACgB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMjB,MAAM,GAAGa,OAAO,CAACK,SAAS,CAAC,CAAC;EAClClB,MAAM,CAACmB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC;AAAC9B,OAAA,CAAAmB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_skia","require","_Platform","_Reconciler","isOnMainThread","_WORKLET","Platform","OS","exports","drawAsPicture","element","bounds","recorder","Skia","PictureRecorder","canvas","beginRecording","root","SkiaSGRoot","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkImage, SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (\n  element: ReactElement,\n  size: SkSize\n): Promise<SkImage | null> => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (\n  picture: SkPicture,\n  size: SkSize\n): SkImage | null => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":";;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEO,MAAMG,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDC,kBAAQ,CAACC,EAAE,KAAK,KAAK;AAEzB,CAAC;AAACC,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAEK,MAAMK,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGC,UAAI,CAACC,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGH,QAAQ,CAACI,cAAc,CAACL,MAAM,CAAC;EAC9C,MAAMM,IAAI,GAAG,IAAIC,sBAAU,CAACL,UAAI,CAAC;EACjC,MAAMI,IAAI,CAACE,MAAM,CAACT,OAAO,CAAC;EAC1BO,IAAI,CAACG,YAAY,CAACL,MAAM,CAAC;EACzB,MAAMM,OAAO,GAAGT,QAAQ,CAACU,wBAAwB,CAAC,CAAC;EACnDV,QAAQ,CAACW,OAAO,CAAC,CAAC;EAClBN,IAAI,CAACO,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAACb,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAEK,MAAMgB,WAAW,GAAG,MAAAA,CACzBf,OAAqB,EACrBgB,IAAY,KACgB;EAC5B,OAAOC,sBAAsB,CAAC,MAAMlB,aAAa,CAACC,OAAO,CAAC,EAAEgB,IAAI,CAAC;AACnE,CAAC;AAAClB,OAAA,CAAAiB,WAAA,GAAAA,WAAA;AAEK,MAAME,sBAAsB,GAAGA,CACpCN,OAAkB,EAClBK,IAAY,KACO;EACnB,SAAS;;EACT,MAAME,OAAO,GAAGf,UAAI,CAACgB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMjB,MAAM,GAAGa,OAAO,CAACK,SAAS,CAAC,CAAC;EAClClB,MAAM,CAACmB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC;AAAC9B,OAAA,CAAAmB,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/skia/types/Image/Image.d.ts

@@ -125,6 +125,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
      * Returns raster image or lazy image. Copies SkImage backed by GPU texture
      * into CPU memory if needed. Returns original SkImage if decoded in raster
      * bitmap, or if encoded in a stream.
+     * Returns null if the conversion fails.
      */
-    makeNonTextureImage(): SkImage;
+    makeNonTextureImage(): SkImage | null;
 }

package/lib/commonjs/skia/types/Image/Image.js.map

@@ -1 +1 @@
-{"version":3,"names":["FilterMode","exports","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   */\n  makeNonTextureImage(): SkImage;\n}\n"],"mappings":";;;;;;IAiBYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAKVE,UAAU,GAAAD,OAAA,CAAAC,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAMVC,WAAW,GAAAF,OAAA,CAAAE,WAAA,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQhB,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAACJ,OAAA,CAAAG,eAAA,GAAAA,eAAA;AAEK,MAAME,qBAAqB,GAAAL,OAAA,CAAAK,qBAAA,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AACxD,MAAMC,uBAAuB,GAAAR,OAAA,CAAAQ,uBAAA,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AACpD,MAAME,aAAa,GAAAT,OAAA,CAAAS,aAAA,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AACpC,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC;AAACP,OAAA,CAAAU,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"names":["FilterMode","exports","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   * Returns null if the conversion fails.\n   */\n  makeNonTextureImage(): SkImage | null;\n}\n"],"mappings":";;;;;;IAiBYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAKVE,UAAU,GAAAD,OAAA,CAAAC,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAAA,IAMVC,WAAW,GAAAF,OAAA,CAAAE,WAAA,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQhB,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAACJ,OAAA,CAAAG,eAAA,GAAAA,eAAA;AAEK,MAAME,qBAAqB,GAAAL,OAAA,CAAAK,qBAAA,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AACxD,MAAMC,uBAAuB,GAAAR,OAAA,CAAAQ,uBAAA,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AACpD,MAAME,aAAa,GAAAT,OAAA,CAAAS,aAAA,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AACpC,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC;AAACP,OAAA,CAAAU,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/module/renderer/Offscreen.d.ts

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 export declare const isOnMainThread: () => boolean;
 export declare const drawAsPicture: (element: ReactElement, bounds?: SkRect) => Promise<SkPicture>;
-export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<import("../skia").SkImage>;
-export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => import("../skia").SkImage;
+export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<SkImage | null>;
+export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => SkImage | null;

package/lib/module/renderer/Offscreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["Skia","Platform","SkiaSGRoot","isOnMainThread","_WORKLET","OS","drawAsPicture","element","bounds","recorder","PictureRecorder","canvas","beginRecording","root","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (element: ReactElement, size: SkSize) => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (picture: SkPicture, size: SkSize) => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":"AAGA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,QAAQ,QAAQ,aAAa;AACtC,SAASC,UAAU,QAAQ,oBAAoB;AAE/C,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDH,QAAQ,CAACI,EAAE,KAAK,KAAK;AAEzB,CAAC;AAED,OAAO,MAAMC,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGT,IAAI,CAACU,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGF,QAAQ,CAACG,cAAc,CAACJ,MAAM,CAAC;EAC9C,MAAMK,IAAI,GAAG,IAAIX,UAAU,CAACF,IAAI,CAAC;EACjC,MAAMa,IAAI,CAACC,MAAM,CAACP,OAAO,CAAC;EAC1BM,IAAI,CAACE,YAAY,CAACJ,MAAM,CAAC;EACzB,MAAMK,OAAO,GAAGP,QAAQ,CAACQ,wBAAwB,CAAC,CAAC;EACnDR,QAAQ,CAACS,OAAO,CAAC,CAAC;EAClBL,IAAI,CAACM,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAED,OAAO,MAAMI,WAAW,GAAG,MAAAA,CAAOb,OAAqB,EAAEc,IAAY,KAAK;EACxE,OAAOC,sBAAsB,CAAC,MAAMhB,aAAa,CAACC,OAAO,CAAC,EAAEc,IAAI,CAAC;AACnE,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAGA,CAACN,OAAkB,EAAEK,IAAY,KAAK;EAC1E,SAAS;;EACT,MAAME,OAAO,GAAGvB,IAAI,CAACwB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMhB,MAAM,GAAGY,OAAO,CAACK,SAAS,CAAC,CAAC;EAClCjB,MAAM,CAACkB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC","ignoreList":[]}
+{"version":3,"names":["Skia","Platform","SkiaSGRoot","isOnMainThread","_WORKLET","OS","drawAsPicture","element","bounds","recorder","PictureRecorder","canvas","beginRecording","root","render","drawOnCanvas","picture","finishRecordingAsPicture","dispose","unmount","drawAsImage","size","drawAsImageFromPicture","surface","Surface","MakeOffscreen","width","height","getCanvas","drawPicture","flush","image","makeImageSnapshot","makeNonTextureImage"],"sources":["Offscreen.tsx"],"sourcesContent":["import type { ReactElement } from \"react\";\n\nimport type { SkImage, SkPicture, SkRect, SkSize } from \"../skia/types\";\nimport { Skia } from \"../skia\";\nimport { Platform } from \"../Platform\";\nimport { SkiaSGRoot } from \"../sksg/Reconciler\";\n\nexport const isOnMainThread = () => {\n  \"worklet\";\n  return (\n    (typeof _WORKLET !== \"undefined\" && _WORKLET === true) ||\n    Platform.OS === \"web\"\n  );\n};\n\nexport const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {\n  const recorder = Skia.PictureRecorder();\n  const canvas = recorder.beginRecording(bounds);\n  const root = new SkiaSGRoot(Skia);\n  await root.render(element);\n  root.drawOnCanvas(canvas);\n  const picture = recorder.finishRecordingAsPicture();\n  recorder.dispose();\n  root.unmount();\n  return picture;\n};\n\nexport const drawAsImage = async (\n  element: ReactElement,\n  size: SkSize\n): Promise<SkImage | null> => {\n  return drawAsImageFromPicture(await drawAsPicture(element), size);\n};\n\nexport const drawAsImageFromPicture = (\n  picture: SkPicture,\n  size: SkSize\n): SkImage | null => {\n  \"worklet\";\n  const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;\n  const canvas = surface.getCanvas();\n  canvas.drawPicture(picture);\n  surface.flush();\n  const image = surface.makeImageSnapshot();\n  return image.makeNonTextureImage();\n};\n"],"mappings":"AAGA,SAASA,IAAI,QAAQ,SAAS;AAC9B,SAASC,QAAQ,QAAQ,aAAa;AACtC,SAASC,UAAU,QAAQ,oBAAoB;AAE/C,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAClC,SAAS;;EACT,OACG,OAAOC,QAAQ,KAAK,WAAW,IAAIA,QAAQ,KAAK,IAAI,IACrDH,QAAQ,CAACI,EAAE,KAAK,KAAK;AAEzB,CAAC;AAED,OAAO,MAAMC,aAAa,GAAG,MAAAA,CAAOC,OAAqB,EAAEC,MAAe,KAAK;EAC7E,MAAMC,QAAQ,GAAGT,IAAI,CAACU,eAAe,CAAC,CAAC;EACvC,MAAMC,MAAM,GAAGF,QAAQ,CAACG,cAAc,CAACJ,MAAM,CAAC;EAC9C,MAAMK,IAAI,GAAG,IAAIX,UAAU,CAACF,IAAI,CAAC;EACjC,MAAMa,IAAI,CAACC,MAAM,CAACP,OAAO,CAAC;EAC1BM,IAAI,CAACE,YAAY,CAACJ,MAAM,CAAC;EACzB,MAAMK,OAAO,GAAGP,QAAQ,CAACQ,wBAAwB,CAAC,CAAC;EACnDR,QAAQ,CAACS,OAAO,CAAC,CAAC;EAClBL,IAAI,CAACM,OAAO,CAAC,CAAC;EACd,OAAOH,OAAO;AAChB,CAAC;AAED,OAAO,MAAMI,WAAW,GAAG,MAAAA,CACzBb,OAAqB,EACrBc,IAAY,KACgB;EAC5B,OAAOC,sBAAsB,CAAC,MAAMhB,aAAa,CAACC,OAAO,CAAC,EAAEc,IAAI,CAAC;AACnE,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAGA,CACpCN,OAAkB,EAClBK,IAAY,KACO;EACnB,SAAS;;EACT,MAAME,OAAO,GAAGvB,IAAI,CAACwB,OAAO,CAACC,aAAa,CAACJ,IAAI,CAACK,KAAK,EAAEL,IAAI,CAACM,MAAM,CAAE;EACpE,MAAMhB,MAAM,GAAGY,OAAO,CAACK,SAAS,CAAC,CAAC;EAClCjB,MAAM,CAACkB,WAAW,CAACb,OAAO,CAAC;EAC3BO,OAAO,CAACO,KAAK,CAAC,CAAC;EACf,MAAMC,KAAK,GAAGR,OAAO,CAACS,iBAAiB,CAAC,CAAC;EACzC,OAAOD,KAAK,CAACE,mBAAmB,CAAC,CAAC;AACpC,CAAC","ignoreList":[]}

package/lib/module/skia/types/Image/Image.d.ts

@@ -125,6 +125,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
      * Returns raster image or lazy image. Copies SkImage backed by GPU texture
      * into CPU memory if needed. Returns original SkImage if decoded in raster
      * bitmap, or if encoded in a stream.
+     * Returns null if the conversion fails.
      */
-    makeNonTextureImage(): SkImage;
+    makeNonTextureImage(): SkImage | null;
 }

package/lib/module/skia/types/Image/Image.js.map

@@ -1 +1 @@
-{"version":3,"names":["FilterMode","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   */\n  makeNonTextureImage(): SkImage;\n}\n"],"mappings":"AAiBA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAMtB,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQvB,OAAO,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC/D,OAAO,MAAMC,uBAAuB,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC3D,OAAO,MAAME,aAAa,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AAC3C,OAAO,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["FilterMode","MipmapMode","ImageFormat","isCubicSampling","sampling","MitchellCubicSampling","B","C","CatmullRomCubicSampling","CubicSampling","MakeCubic"],"sources":["Image.ts"],"sourcesContent":["import type { SkMatrix } from \"../Matrix\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { TileMode } from \"../ImageFilter\";\nimport type { SkShader } from \"../Shader\";\n\nimport type { ImageInfo } from \"./ImageFactory\";\n\nexport interface CubicResampler {\n  B: number;\n  C: number;\n}\n\nexport interface FilterOptions {\n  filter: FilterMode;\n  mipmap?: MipmapMode;\n}\n\nexport enum FilterMode {\n  Nearest,\n  Linear,\n}\n\nexport enum MipmapMode {\n  None,\n  Nearest,\n  Linear,\n}\n\nexport enum ImageFormat {\n  JPEG = 3,\n  PNG = 4,\n  WEBP = 6,\n}\n\nexport type SamplingOptions = CubicResampler | FilterOptions;\n\nexport const isCubicSampling = (\n  sampling: SamplingOptions\n): sampling is CubicResampler => {\n  \"worklet\";\n  return \"B\" in sampling && \"C\" in sampling;\n};\n\nexport const MitchellCubicSampling = { B: 1 / 3.0, C: 1 / 3.0 };\nexport const CatmullRomCubicSampling = { B: 0, C: 1 / 2.0 };\nexport const CubicSampling = { B: 0, C: 0 };\nexport const MakeCubic = (B: number, C: number) => ({ B, C });\n\nexport interface SkImage extends SkJSIInstance<\"Image\"> {\n  /**\n   * Returns the possibly scaled height of the image.\n   */\n  height(): number;\n\n  /**\n   * Returns the possibly scaled width of the image.\n   */\n  width(): number;\n\n  /**\n   * Returns the ImageInfo describing the image.\n   */\n  getImageInfo(): ImageInfo;\n\n  /**\n   * Returns the backend texture of the image.\n   * The returned object can be used to create a Skia Image object.\n   * The returned object is backend specific and should be used with caution.\n   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.\n   * The returned object may be null if the image does not have a backend texture.\n   *\n   * @return backend texture of the image or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param fm - The filter mode. (default nearest)\n   * @param mm - The mipmap mode. Note: for settings other than None, the image must have mipmaps (default none)\n   *             calculated with makeCopyWithDefaultMipmaps;\n   * @param localMatrix\n   */\n  makeShaderOptions(\n    tx: TileMode,\n    ty: TileMode,\n    fm: FilterMode,\n    mm: MipmapMode,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /**\n   * Returns this image as a shader with the specified tiling. It will use cubic sampling.\n   * @param tx - tile mode in the x direction.\n   * @param ty - tile mode in the y direction.\n   * @param B - See CubicResampler in SkSamplingOptions.h for more information\n   * @param C - See CubicResampler in SkSamplingOptions.h for more information\n   * @param localMatrix\n   */\n  makeShaderCubic(\n    tx: TileMode,\n    ty: TileMode,\n    B: number,\n    C: number,\n    localMatrix?: SkMatrix\n  ): SkShader;\n\n  /** Encodes Image pixels, returning result as UInt8Array. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  Uint8Array with data\n  */\n  encodeToBytes(fmt?: ImageFormat, quality?: number): Uint8Array;\n\n  /** Encodes Image pixels, returning result as a base64 encoded string. Returns existing\n     encoded data if present; otherwise, SkImage is encoded with\n     SkEncodedImageFormat::kPNG. Skia must be built with SK_ENCODE_PNG to encode\n     SkImage.\n\n    Returns nullptr if existing encoded data is missing or invalid, and\n    encoding fails.\n\n    @param fmt - PNG is the default value.\n    @param quality - a value from 0 to 100; 100 is the least lossy. May be ignored.\n\n    @return  base64 encoded string of data\n  */\n  encodeToBase64(fmt?: ImageFormat, quality?: number): string;\n\n  /** Read Image pixels\n   *\n   * @param srcX - optional x-axis upper left corner of the rectangle to read from\n   * @param srcY - optional y-axis upper left corner of the rectangle to read from\n   * @param imageInfo - optional describes the pixel format and dimensions of the data to read into\n   * @return Float32Array or Uint8Array with data or null if the read failed.\n   */\n  readPixels(\n    srcX?: number,\n    srcY?: number,\n    imageInfo?: ImageInfo\n  ): Float32Array | Uint8Array | null;\n\n  /**\n   * Returns raster image or lazy image. Copies SkImage backed by GPU texture\n   * into CPU memory if needed. Returns original SkImage if decoded in raster\n   * bitmap, or if encoded in a stream.\n   * Returns null if the conversion fails.\n   */\n  makeNonTextureImage(): SkImage | null;\n}\n"],"mappings":"AAiBA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAKtB,WAAYC,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA;AAMtB,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAXA,WAAW,CAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAQvB,OAAO,MAAMC,eAAe,GAC1BC,QAAyB,IACM;EAC/B,SAAS;;EACT,OAAO,GAAG,IAAIA,QAAQ,IAAI,GAAG,IAAIA,QAAQ;AAC3C,CAAC;AAED,OAAO,MAAMC,qBAAqB,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG,GAAG;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC/D,OAAO,MAAMC,uBAAuB,GAAG;EAAEF,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE,CAAC,GAAG;AAAI,CAAC;AAC3D,OAAO,MAAME,aAAa,GAAG;EAAEH,CAAC,EAAE,CAAC;EAAEC,CAAC,EAAE;AAAE,CAAC;AAC3C,OAAO,MAAMG,SAAS,GAAGA,CAACJ,CAAS,EAAEC,CAAS,MAAM;EAAED,CAAC;EAAEC;AAAE,CAAC,CAAC","ignoreList":[]}

package/lib/typescript/lib/commonjs/renderer/Offscreen.d.ts

@@ -1,5 +1,5 @@
 export const __esModule: boolean;
 export function isOnMainThread(): boolean;
 export function drawAsPicture(element: any, bounds: any): Promise<import("../../..").SkPicture>;
-export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage>;
-export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage;
+export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage | null>;
+export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage | null;

package/lib/typescript/lib/module/renderer/Offscreen.d.ts

@@ -1,4 +1,4 @@
 export function isOnMainThread(): boolean;
 export function drawAsPicture(element: any, bounds: any): Promise<import("../../..").SkPicture>;
-export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage>;
-export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage;
+export function drawAsImage(element: any, size: any): Promise<import("../../..").SkImage | null>;
+export function drawAsImageFromPicture(picture: any, size: any): import("../../..").SkImage | null;

package/lib/typescript/src/renderer/Offscreen.d.ts

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 export declare const isOnMainThread: () => boolean;
 export declare const drawAsPicture: (element: ReactElement, bounds?: SkRect) => Promise<SkPicture>;
-export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<import("../skia").SkImage>;
-export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => import("../skia").SkImage;
+export declare const drawAsImage: (element: ReactElement, size: SkSize) => Promise<SkImage | null>;
+export declare const drawAsImageFromPicture: (picture: SkPicture, size: SkSize) => SkImage | null;

package/lib/typescript/src/skia/types/Image/Image.d.ts

@@ -125,6 +125,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
      * Returns raster image or lazy image. Copies SkImage backed by GPU texture
      * into CPU memory if needed. Returns original SkImage if decoded in raster
      * bitmap, or if encoded in a stream.
+     * Returns null if the conversion fails.
      */
-    makeNonTextureImage(): SkImage;
+    makeNonTextureImage(): SkImage | null;
 }

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "2.4.19",
+  "version": "2.4.21",
   "skia": {
     "version": "m144c",
     "checksums": {

package/src/renderer/Offscreen.tsx

@@ -1,6 +1,6 @@
 import type { ReactElement } from "react";
 
-import type { SkPicture, SkRect, SkSize } from "../skia/types";
+import type { SkImage, SkPicture, SkRect, SkSize } from "../skia/types";
 import { Skia } from "../skia";
 import { Platform } from "../Platform";
 import { SkiaSGRoot } from "../sksg/Reconciler";
@@ -25,11 +25,17 @@ export const drawAsPicture = async (element: ReactElement, bounds?: SkRect) => {
   return picture;
 };
 
-export const drawAsImage = async (element: ReactElement, size: SkSize) => {
+export const drawAsImage = async (
+  element: ReactElement,
+  size: SkSize
+): Promise<SkImage | null> => {
   return drawAsImageFromPicture(await drawAsPicture(element), size);
 };
 
-export const drawAsImageFromPicture = (picture: SkPicture, size: SkSize) => {
+export const drawAsImageFromPicture = (
+  picture: SkPicture,
+  size: SkSize
+): SkImage | null => {
   "worklet";
   const surface = Skia.Surface.MakeOffscreen(size.width, size.height)!;
   const canvas = surface.getCanvas();

package/src/skia/types/Image/Image.ts

@@ -153,6 +153,7 @@ export interface SkImage extends SkJSIInstance<"Image"> {
    * Returns raster image or lazy image. Copies SkImage backed by GPU texture
    * into CPU memory if needed. Returns original SkImage if decoded in raster
    * bitmap, or if encoded in a stream.
+   * Returns null if the conversion fails.
    */
-  makeNonTextureImage(): SkImage;
+  makeNonTextureImage(): SkImage | null;
 }