@shopify/react-native-skia 2.0.1 → 2.0.3

package/cpp/rnskia/DawnWindowContext.h

@@ -27,15 +27,7 @@ public:
                     wgpu::Surface surface, int width, int height)
       : _recorder(recorder), _device(device), _surface(surface), _width(width),
         _height(height) {
-    wgpu::SurfaceConfiguration config;
-    config.device = _device;
-    config.format = DawnUtils::PreferredTextureFormat;
-    config.width = _width;
-    config.height = _height;
-#ifdef __APPLE__
-    config.alphaMode = wgpu::CompositeAlphaMode::Premultiplied;
-#endif
-    _surface.Configure(&config);
+    configureSurface();
   }
 
   sk_sp<SkSurface> getSurface() override {
@@ -58,7 +50,9 @@ public:
   void present() override;
 
   void resize(int width, int height) override {
-    throw std::runtime_error("resize not implemented yet");
+    _width = width;
+    _height = height;
+    configureSurface();
   }
 
   int getWidth() override { return _width; }
@@ -66,6 +60,19 @@ public:
   int getHeight() override { return _height; }
 
 private:
+  void configureSurface() {
+    wgpu::SurfaceConfiguration config;
+    config.device = _device;
+    config.format = DawnUtils::PreferredTextureFormat;
+    config.width = _width;
+    config.height = _height;
+    config.presentMode = wgpu::PresentMode::Fifo;
+#ifdef __APPLE__
+    config.alphaMode = wgpu::CompositeAlphaMode::Premultiplied;
+#endif
+    _surface.Configure(&config);
+  }
+
   skgpu::graphite::Recorder *_recorder;
   // TODO: keep device in DawnContext? Do we need it for resizing?
   wgpu::Device _device;
@@ -74,4 +81,4 @@ private:
   int _height;
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -3,6 +3,7 @@
 #include <functional>
 #include <memory>
 #include <mutex>
+#include <shared_mutex>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ -23,6 +24,47 @@ using RNSkViewInfo = struct RNSkViewInfo {
   std::unordered_map<std::string, RNJsi::ViewProperty> props;
 };
 
+class ViewRegistry {
+public:
+  static ViewRegistry &getInstance() {
+    static ViewRegistry instance;
+    return instance;
+  }
+
+  ViewRegistry(const ViewRegistry &) = delete;
+  ViewRegistry &operator=(const ViewRegistry &) = delete;
+
+  void removeViewInfo(size_t id) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    _registry.erase(id);
+  }
+
+  // Execute a function while holding the registry lock
+  template<typename F>
+  auto withViewInfo(size_t id, F&& func) -> decltype(func(std::shared_ptr<RNSkViewInfo>())) {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    auto it = _registry.find(id);
+    std::shared_ptr<RNSkViewInfo> info;
+    if (it != _registry.end()) {
+      info = it->second;
+    } else {
+      info = std::make_shared<RNSkViewInfo>();
+      _registry[id] = info;
+    }
+    return func(info);
+  }
+
+  void clear() {
+    std::unique_lock<std::shared_mutex> lock(_mutex);
+    _registry.clear();
+  }
+
+private:
+  ViewRegistry() = default;
+  mutable std::shared_mutex _mutex;
+  std::unordered_map<size_t, std::shared_ptr<RNSkViewInfo>> _registry;
+};
+
 class RNSkJsiViewApi : public RNJsi::JsiHostObject,
                        public std::enable_shared_from_this<RNSkJsiViewApi> {
 public:
@@ -53,19 +95,21 @@ public:
     }
 
     auto nativeId = arguments[0].asNumber();
-    std::lock_guard<std::mutex> lock(_mutex);
-    auto info = getEnsuredViewInfo(nativeId);
-
-    info->props.insert_or_assign(arguments[1].asString(runtime).utf8(runtime),
-                                 RNJsi::ViewProperty(runtime, arguments[2]));
-
-    // Now let's see if we have a view that we can update
-    if (info->view != nullptr) {
-      // Update view!
-      info->view->setNativeId(nativeId);
-      info->view->setJsiProperties(info->props);
-      info->props.clear();
-    }
+    
+    // Safely execute operations while holding the registry lock
+    ViewRegistry::getInstance().withViewInfo(nativeId, [&](std::shared_ptr<RNSkViewInfo> info) {
+      info->props.insert_or_assign(arguments[1].asString(runtime).utf8(runtime),
+                                   RNJsi::ViewProperty(runtime, arguments[2]));
+
+      // Now let's see if we have a view that we can update
+      if (info->view != nullptr) {
+        // Update view!
+        info->view->setNativeId(nativeId);
+        info->view->setJsiProperties(info->props);
+        info->props.clear();
+      }
+      return nullptr; // Return type for template deduction
+    });
 
     return jsi::Value::undefined();
   }
@@ -88,11 +132,12 @@ public:
 
     // find Skia View
     int nativeId = arguments[0].asNumber();
-    std::lock_guard<std::mutex> lock(_mutex);
-    auto info = getEnsuredViewInfo(nativeId);
-    if (info->view != nullptr) {
-      info->view->requestRedraw();
-    }
+    ViewRegistry::getInstance().withViewInfo(nativeId, [](std::shared_ptr<RNSkViewInfo> info) {
+      if (info->view != nullptr) {
+        info->view->requestRedraw();
+      }
+      return nullptr;
+    });
     return jsi::Value::undefined();
   }
 
@@ -113,12 +158,10 @@ public:
     // find Skia view
     int nativeId = arguments[0].asNumber();
     sk_sp<SkImage> image;
-    std::shared_ptr<RNSkView> view;
-    {
-      std::lock_guard<std::mutex> lock(_mutex);
-      auto info = getEnsuredViewInfo(nativeId);
-      view = info->view;
-    }
+    std::shared_ptr<RNSkView> view = ViewRegistry::getInstance().withViewInfo(nativeId, 
+      [](std::shared_ptr<RNSkViewInfo> info) {
+        return info->view;
+      });
     if (view != nullptr) {
       if (count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()) {
         auto rect = JsiSkRect::fromValue(runtime, arguments[1]);
@@ -154,12 +197,10 @@ public:
 
     // find Skia view
     int nativeId = arguments[0].asNumber();
-    std::shared_ptr<RNSkView> view;
-    {
-      std::lock_guard<std::mutex> lock(_mutex);
-      auto info = getEnsuredViewInfo(nativeId);
-      view = info->view;
-    }
+    std::shared_ptr<RNSkView> view = ViewRegistry::getInstance().withViewInfo(nativeId,
+      [](std::shared_ptr<RNSkViewInfo> info) {
+        return info->view;
+      });
     auto context = _platformContext;
     auto bounds =
         count > 1 && !arguments[1].isUndefined() && !arguments[1].isNull()
@@ -205,8 +246,7 @@ public:
    Call to remove all draw view infos
    */
   void unregisterAll() {
-    std::lock_guard<std::mutex> lock(_mutex);
-    _viewInfos.clear();
+    ViewRegistry::getInstance().clear();
   }
 
   /**
@@ -215,12 +255,13 @@ public:
    * @param view View to register
    */
   void registerSkiaView(size_t nativeId, std::shared_ptr<RNSkView> view) {
-    std::lock_guard<std::mutex> lock(_mutex);
-    auto info = getEnsuredViewInfo(nativeId);
-    info->view = view;
-    info->view->setNativeId(nativeId);
-    info->view->setJsiProperties(info->props);
-    info->props.clear();
+    ViewRegistry::getInstance().withViewInfo(nativeId, [&](std::shared_ptr<RNSkViewInfo> info) {
+      info->view = view;
+      info->view->setNativeId(nativeId);
+      info->view->setJsiProperties(info->props);
+      info->props.clear();
+      return nullptr;
+    });
   }
 
   /**
@@ -228,14 +269,7 @@ public:
    * @param nativeId View id
    */
   void unregisterSkiaView(size_t nativeId) {
-    std::lock_guard<std::mutex> lock(_mutex);
-    if (_viewInfos.count(nativeId) == 0) {
-      return;
-    }
-    auto info = getEnsuredViewInfo(nativeId);
-
-    info->view = nullptr;
-    _viewInfos.erase(nativeId);
+    ViewRegistry::getInstance().removeViewInfo(nativeId);
   }
 
   /**
@@ -245,34 +279,20 @@ public:
    or a valid view, effectively toggling the view's availability.
    */
   void setSkiaView(size_t nativeId, std::shared_ptr<RNSkView> view) {
-    std::lock_guard<std::mutex> lock(_mutex);
-    auto info = getEnsuredViewInfo(nativeId);
-    if (view != nullptr) {
-      info->view = view;
-      info->view->setNativeId(nativeId);
-      info->view->setJsiProperties(info->props);
-      info->props.clear();
-    } else if (view == nullptr) {
-      info->view = view;
-    }
+    ViewRegistry::getInstance().withViewInfo(nativeId, [&](std::shared_ptr<RNSkViewInfo> info) {
+      if (view != nullptr) {
+        info->view = view;
+        info->view->setNativeId(nativeId);
+        info->view->setJsiProperties(info->props);
+        info->props.clear();
+      } else {
+        info->view = view;  // Set to nullptr
+      }
+      return nullptr;
+    });
   }
 
 private:
-  /**
-   * Creates or returns the callback info object for the given view
-   * @param nativeId View id
-   * @return The callback info object for the requested view
-   */
-  RNSkViewInfo *getEnsuredViewInfo(size_t nativeId) {
-    if (_viewInfos.count(nativeId) == 0) {
-      RNSkViewInfo info;
-      _viewInfos.emplace(nativeId, info);
-    }
-    return &_viewInfos.at(nativeId);
-  }
-
-  std::unordered_map<size_t, RNSkViewInfo> _viewInfos;
   std::shared_ptr<RNSkPlatformContext> _platformContext;
-  std::mutex _mutex;
 };
 } // namespace RNSkia

package/cpp/rnskia/RNSkManager.cpp

@@ -30,7 +30,6 @@ RNSkManager::RNSkManager(
 }
 
 RNSkManager::~RNSkManager() {
-  invalidate();
   // Free up any references
   _viewApi = nullptr;
   _jsRuntime = nullptr;
@@ -38,36 +37,22 @@ RNSkManager::~RNSkManager() {
   _jsCallInvoker = nullptr;
 }
 
-void RNSkManager::invalidate() {
-  if (_isInvalidated) {
-    return;
-  }
-  _isInvalidated = true;
-
-  // Invalidate members
-  _viewApi->unregisterAll();
-}
-
 void RNSkManager::registerSkiaView(size_t nativeId,
                                    std::shared_ptr<RNSkView> view) {
-  if (!_isInvalidated && _viewApi != nullptr)
-    _viewApi->registerSkiaView(nativeId, std::move(view));
+  _viewApi->registerSkiaView(nativeId, std::move(view));
 }
 
 void RNSkManager::unregisterSkiaView(size_t nativeId) {
-  if (!_isInvalidated && _viewApi != nullptr)
-    _viewApi->unregisterSkiaView(nativeId);
+  _viewApi->unregisterSkiaView(nativeId);
 }
 
 void RNSkManager::setSkiaView(size_t nativeId, std::shared_ptr<RNSkView> view) {
-  if (!_isInvalidated && _viewApi != nullptr)
-    _viewApi->setSkiaView(nativeId, std::move(view));
+  _viewApi->setSkiaView(nativeId, std::move(view));
 }
 
 void RNSkManager::installBindings() {
   // Create the API objects and install it on the global object in the
   // provided runtime.
-
   auto skiaApi = std::make_shared<JsiSkApi>(_platformContext);
   _jsRuntime->global().setProperty(
       *_jsRuntime, "SkiaApi",

package/cpp/rnskia/RNSkManager.h

@@ -33,11 +33,6 @@ public:
 
   ~RNSkManager();
 
-  /**
-   Invalidates the Skia Manager
-   */
-  void invalidate();
-
   /**
    * Registers a RNSkView with the given native id
    * @param nativeId Native view id
@@ -77,7 +72,6 @@ private:
   std::shared_ptr<RNSkPlatformContext> _platformContext;
   std::shared_ptr<facebook::react::CallInvoker> _jsCallInvoker;
   std::shared_ptr<RNSkJsiViewApi> _viewApi;
-  std::atomic<bool> _isInvalidated = {false};
 };
 
 } // namespace RNSkia

package/cpp/rnskia/RNSkPlatformContext.h

@@ -105,22 +105,39 @@ public:
    */
   virtual sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) = 0;
 
+#if !defined(SK_GRAPHITE)
   virtual sk_sp<SkImage>
   makeImageFromNativeTexture(const TextureInfo &textureInfo, int width,
                              int height, bool mipMapped) = 0;
 
-#if !defined(SK_GRAPHITE)
+  virtual const TextureInfo getTexture(sk_sp<SkSurface> image) = 0;
+
+  virtual const TextureInfo getTexture(sk_sp<SkImage> image) = 0;
+
   virtual GrDirectContext *getDirectContext() = 0;
+#else
+  sk_sp<SkImage> makeImageFromNativeTexture(const TextureInfo &textureInfo,
+                                            int width, int height,
+                                            bool mipMapped) {
+    throw std::runtime_error(
+        "makeImageFromNativeTexture not implemented yet on Graphite");
+  }
+
+  const TextureInfo getTexture(sk_sp<SkSurface> image) {
+    throw std::runtime_error(
+        "getTexture(surface) not implemented yet on Graphite");
+  }
+
+  const TextureInfo getTexture(sk_sp<SkImage> image) {
+    throw std::runtime_error(
+        "getTexture(image) not implemented yet on Graphite");
+  }
 #endif
 
   virtual void releaseNativeBuffer(uint64_t pointer) = 0;
 
   virtual uint64_t makeNativeBuffer(sk_sp<SkImage> image) = 0;
 
-  virtual const TextureInfo getTexture(sk_sp<SkSurface> image) = 0;
-
-  virtual const TextureInfo getTexture(sk_sp<SkImage> image) = 0;
-
   virtual std::shared_ptr<RNSkVideo> createVideo(const std::string &url) = 0;
 
   /**

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

@@ -15,6 +15,7 @@ export interface ImageInfo {
     width: number;
 }
 export interface ImageFactory {
+    MakeNull: () => SkImage;
     /**
      * Return an Image backed by the encoded data, but attempt to defer decoding until the image
      * is actually used/drawn. This deferral allows the system to cache the result, either on the
@@ -58,7 +59,7 @@ export interface ImageFactory {
      *
      * @returns Returns a valid SkImage, if the texture is invalid, an error is thrown.
      */
-    MakeImageFromNativeTextureUnstable: (texture: unknown, width: number, height: number, mipmapped?: boolean) => SkImage;
+    MakeImageFromNativeTextureUnstable: (texture: unknown, width: number, height: number, mipmapped?: boolean, outputImage?: SkImage) => SkImage;
     /**
      * Returns an image that will be a screenshot of the view represented by
      * the view tag

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

@@ -1 +1 @@
-{"version":3,"names":["AlphaType","exports"],"sources":["ImageFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { NativeBuffer } from \"../NativeBuffer\";\n\nimport type { ColorType } from \"./ColorType\";\nimport type { SkImage } from \"./Image\";\n\nexport enum AlphaType {\n  Unknown,\n  Opaque,\n  Premul,\n  Unpremul,\n}\n\nexport interface ImageInfo {\n  alphaType: AlphaType;\n  // TODO: add support for color space\n  // colorSpace: ColorSpace;\n  colorType: ColorType;\n  height: number;\n  width: number;\n}\n\nexport interface ImageFactory {\n  /**\n   * Return an Image backed by the encoded data, but attempt to defer decoding until the image\n   * is actually used/drawn. This deferral allows the system to cache the result, either on the\n   * CPU or on the GPU, depending on where the image is drawn.\n   * This decoding uses the codecs that have been compiled into CanvasKit. If the bytes are\n   * invalid (or an unrecognized codec), null will be returned. See Image.h for more details.\n   * @param data - Data object with bytes of data\n   * @returns If the encoded format is not supported, or subset is outside of the bounds of the decoded\n   *  image, nullptr is returned.\n   */\n  MakeImageFromEncoded: (encoded: SkData) => SkImage | null;\n\n  /**\n   * Return an Image backed by a given native buffer.\n   * The native buffer must be a valid owning reference.\n   *\n   * For instance, this API is used by\n   * [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera)\n   * to render a Skia Camera preview.\n   *\n   * - On Android; This is an `AHardwareBuffer*`\n   * - On iOS, this is a `CVPixelBufferRef`\n   * @param nativeBuffer A strong `uintptr_t` pointer to the native buffer\n   * @throws Throws an error if the Image could not be created, for example when the given\n   * native buffer is invalid.\n   */\n  MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;\n\n  /**\n   *\n   * Return an Image backed by a given native texture.\n   *\n   * The native texture must be a valid owning reference.\n   *\n   * This API might be used to integrate with other libraries using gpu textures,\n   * or to transfer images between different threads.\n   *\n   * @param texture A native texture handle\n   * @param width The width of the texture\n   * @param height The height of the texture\n   * @param mipmapped Whether the texture is mipmapped\n   * @throws Throws an error if the Image could not be created, for example when the given native texture is invalid.\n   *\n   * @returns Returns a valid SkImage, if the texture is invalid, an error is thrown.\n   */\n  MakeImageFromNativeTextureUnstable: (\n    texture: unknown,\n    width: number,\n    height: number,\n    mipmapped?: boolean\n  ) => SkImage;\n\n  /**\n   * Returns an image that will be a screenshot of the view represented by\n   * the view tag\n   * @param viewTag - The tag of the view to make an image from.\n   * @returns Returns a valid SkImage, if the view tag is invalid, nullptr is returned.\n   */\n  MakeImageFromViewTag: (viewTag: number) => Promise<SkImage | null>;\n\n  /**\n   * Returns an image with the given pixel data and format.\n   * Note that we will always make a copy of the pixel data, because of inconsistencies in\n   * behavior between GPU and CPU (i.e. the pixel data will be turned into a GPU texture and\n   * not modifiable after creation).\n   *\n   * @param info\n   * @param data - bytes representing the pixel data.\n   * @param bytesPerRow\n   */\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;\n}\n"],"mappings":";;;;;;IAMYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}
+{"version":3,"names":["AlphaType","exports"],"sources":["ImageFactory.ts"],"sourcesContent":["import type { SkData } from \"../Data\";\nimport type { NativeBuffer } from \"../NativeBuffer\";\n\nimport type { ColorType } from \"./ColorType\";\nimport type { SkImage } from \"./Image\";\n\nexport enum AlphaType {\n  Unknown,\n  Opaque,\n  Premul,\n  Unpremul,\n}\n\nexport interface ImageInfo {\n  alphaType: AlphaType;\n  // TODO: add support for color space\n  // colorSpace: ColorSpace;\n  colorType: ColorType;\n  height: number;\n  width: number;\n}\n\nexport interface ImageFactory {\n  MakeNull: () => SkImage;\n  /**\n   * Return an Image backed by the encoded data, but attempt to defer decoding until the image\n   * is actually used/drawn. This deferral allows the system to cache the result, either on the\n   * CPU or on the GPU, depending on where the image is drawn.\n   * This decoding uses the codecs that have been compiled into CanvasKit. If the bytes are\n   * invalid (or an unrecognized codec), null will be returned. See Image.h for more details.\n   * @param data - Data object with bytes of data\n   * @returns If the encoded format is not supported, or subset is outside of the bounds of the decoded\n   *  image, nullptr is returned.\n   */\n  MakeImageFromEncoded: (encoded: SkData) => SkImage | null;\n\n  /**\n   * Return an Image backed by a given native buffer.\n   * The native buffer must be a valid owning reference.\n   *\n   * For instance, this API is used by\n   * [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera)\n   * to render a Skia Camera preview.\n   *\n   * - On Android; This is an `AHardwareBuffer*`\n   * - On iOS, this is a `CVPixelBufferRef`\n   * @param nativeBuffer A strong `uintptr_t` pointer to the native buffer\n   * @throws Throws an error if the Image could not be created, for example when the given\n   * native buffer is invalid.\n   */\n  MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;\n\n  /**\n   *\n   * Return an Image backed by a given native texture.\n   *\n   * The native texture must be a valid owning reference.\n   *\n   * This API might be used to integrate with other libraries using gpu textures,\n   * or to transfer images between different threads.\n   *\n   * @param texture A native texture handle\n   * @param width The width of the texture\n   * @param height The height of the texture\n   * @param mipmapped Whether the texture is mipmapped\n   * @throws Throws an error if the Image could not be created, for example when the given native texture is invalid.\n   *\n   * @returns Returns a valid SkImage, if the texture is invalid, an error is thrown.\n   */\n  MakeImageFromNativeTextureUnstable: (\n    texture: unknown,\n    width: number,\n    height: number,\n    mipmapped?: boolean,\n    outputImage?: SkImage\n  ) => SkImage;\n\n  /**\n   * Returns an image that will be a screenshot of the view represented by\n   * the view tag\n   * @param viewTag - The tag of the view to make an image from.\n   * @returns Returns a valid SkImage, if the view tag is invalid, nullptr is returned.\n   */\n  MakeImageFromViewTag: (viewTag: number) => Promise<SkImage | null>;\n\n  /**\n   * Returns an image with the given pixel data and format.\n   * Note that we will always make a copy of the pixel data, because of inconsistencies in\n   * behavior between GPU and CPU (i.e. the pixel data will be turned into a GPU texture and\n   * not modifiable after creation).\n   *\n   * @param info\n   * @param data - bytes representing the pixel data.\n   * @param bytesPerRow\n   */\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;\n}\n"],"mappings":";;;;;;IAMYA,SAAS,GAAAC,OAAA,CAAAD,SAAA,0BAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAATA,SAAS,CAATA,SAAS;EAAA,OAATA,SAAS;AAAA","ignoreList":[]}

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

@@ -32,7 +32,7 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
   
         example: https://fiddle.skia.org/c/@Surface_makeImageSnapshot
     */
-    makeImageSnapshot(bounds?: SkRect): SkImage;
+    makeImageSnapshot(bounds?: SkRect, outputImage?: SkImage): SkImage;
     /**
      * Make sure any queued draws are sent to the screen or the GPU.
      */

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["Surface.ts"],"sourcesContent":["import type { SkImage } from \"../Image\";\nimport type { SkCanvas } from \"../Canvas\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkRect } from \"../Rect\";\n\nexport interface SkSurface extends SkJSIInstance<\"Surface\"> {\n  /** Returns Canvas that draws into the surface. Subsequent calls return the\n     same Canvas. Canvas returned is managed and owned by Surface, and is\n     deleted when Surface is deleted.\n\n      @return  drawing Canvas for Surface\n\n      example: https://fiddle.skia.org/c/@Surface_getCanvas\n  */\n  getCanvas(): SkCanvas;\n\n  /**\n   * Returns the backend texture of the surface.\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 surface is deleted\n   * or draw operations are performed on the surface.\n   * The returned object may be null if the surface does not have a backend texture.\n   *\n   * @return backend texture of the surface or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /** Returns Image capturing Surface contents. Subsequent drawing to\n     Surface contents are not captured.\n\n      @param bounds A rectangle specifying the subset of the surface that\n   is of interest.\n      @return  Image initialized with Surface contents\n\n      example: https://fiddle.skia.org/c/@Surface_makeImageSnapshot\n  */\n  makeImageSnapshot(bounds?: SkRect): SkImage;\n\n  /**\n   * Make sure any queued draws are sent to the screen or the GPU.\n   */\n  flush(): void;\n\n  /**\n   * Returns the possibly scaled width of the surface.\n   */\n  width(): number;\n\n  /**\n   * Returns the possibly scaled height of the surface.\n   */\n  height(): number;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["Surface.ts"],"sourcesContent":["import type { SkImage } from \"../Image\";\nimport type { SkCanvas } from \"../Canvas\";\nimport type { SkJSIInstance } from \"../JsiInstance\";\nimport type { SkRect } from \"../Rect\";\n\nexport interface SkSurface extends SkJSIInstance<\"Surface\"> {\n  /** Returns Canvas that draws into the surface. Subsequent calls return the\n     same Canvas. Canvas returned is managed and owned by Surface, and is\n     deleted when Surface is deleted.\n\n      @return  drawing Canvas for Surface\n\n      example: https://fiddle.skia.org/c/@Surface_getCanvas\n  */\n  getCanvas(): SkCanvas;\n\n  /**\n   * Returns the backend texture of the surface.\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 surface is deleted\n   * or draw operations are performed on the surface.\n   * The returned object may be null if the surface does not have a backend texture.\n   *\n   * @return backend texture of the surface or null\n   */\n  getNativeTextureUnstable(): unknown;\n\n  /** Returns Image capturing Surface contents. Subsequent drawing to\n     Surface contents are not captured.\n\n      @param bounds A rectangle specifying the subset of the surface that\n   is of interest.\n      @return  Image initialized with Surface contents\n\n      example: https://fiddle.skia.org/c/@Surface_makeImageSnapshot\n  */\n  makeImageSnapshot(bounds?: SkRect, outputImage?: SkImage): SkImage;\n\n  /**\n   * Make sure any queued draws are sent to the screen or the GPU.\n   */\n  flush(): void;\n\n  /**\n   * Returns the possibly scaled width of the surface.\n   */\n  width(): number;\n\n  /**\n   * Returns the possibly scaled height of the surface.\n   */\n  height(): number;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkImageFactory.d.ts

@@ -5,6 +5,7 @@ import { JsiSkImage } from "./JsiSkImage";
 import type { JsiSkSurface } from "./JsiSkSurface";
 export declare class JsiSkImageFactory extends Host implements ImageFactory {
     constructor(CanvasKit: CanvasKit);
+    MakeNull(): JsiSkImage;
     MakeImageFromViewTag(viewTag: number): Promise<SkImage | null>;
     MakeImageFromNativeBuffer(buffer: NativeBuffer, surface?: JsiSkSurface, image?: JsiSkImage): JsiSkImage;
     MakeImageFromEncoded(encoded: SkData): JsiSkImage | null;

package/lib/commonjs/skia/web/JsiSkImageFactory.js

@@ -12,6 +12,9 @@ class JsiSkImageFactory extends _Host.Host {
   constructor(CanvasKit) {
     super(CanvasKit);
   }
+  MakeNull() {
+    return new _JsiSkImage.JsiSkImage(this.CanvasKit, null);
+  }
   MakeImageFromViewTag(viewTag) {
     const view = viewTag;
     // TODO: Implement screenshot from view in React JS

package/lib/commonjs/skia/web/JsiSkImageFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["_types","require","_Host","_JsiSkImage","_JsiSkData","JsiSkImageFactory","Host","constructor","CanvasKit","MakeImageFromViewTag","viewTag","view","console","log","Promise","resolve","MakeImageFromNativeBuffer","buffer","surface","image","isNativeBufferWeb","Error","img","HTMLImageElement","HTMLVideoElement","ImageBitmap","MakeLazyImageFromTextureSource","CanvasKitWebGLBuffer","toImage","MakeImageFromCanvasImageSource","JsiSkImage","makeImageFromTextureSource","updateTextureFromSource","MakeImageFromEncoded","encoded","JsiSkData","fromValue","MakeImageFromNativeTextureUnstable","throwNotImplementedOnRNWeb","MakeImage","info","data","bytesPerRow","alphaType","getEnum","colorSpace","ColorSpace","SRGB","colorType","height","width","exports"],"sources":["JsiSkImageFactory.ts"],"sourcesContent":["import type { CanvasKit, Image } from \"canvaskit-wasm\";\n\nimport { CanvasKitWebGLBuffer, isNativeBufferWeb } from \"../types\";\nimport type {\n  SkData,\n  ImageInfo,\n  SkImage,\n  NativeBuffer,\n  ImageFactory,\n} from \"../types\";\n\nimport { Host, getEnum, throwNotImplementedOnRNWeb } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkData } from \"./JsiSkData\";\nimport type { JsiSkSurface } from \"./JsiSkSurface\";\nimport type { CanvasKitWebGLBufferImpl } from \"./CanvasKitWebGLBufferImpl\";\n\nexport class JsiSkImageFactory extends Host implements ImageFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeImageFromViewTag(viewTag: number): Promise<SkImage | null> {\n    const view = viewTag as unknown as HTMLElement;\n    // TODO: Implement screenshot from view in React JS\n    console.log(view);\n    return Promise.resolve(null);\n  }\n\n  MakeImageFromNativeBuffer(\n    buffer: NativeBuffer,\n    surface?: JsiSkSurface,\n    image?: JsiSkImage\n  ) {\n    if (!isNativeBufferWeb(buffer)) {\n      throw new Error(\"Invalid NativeBuffer\");\n    }\n    if (!surface) {\n      let img: Image;\n      if (\n        buffer instanceof HTMLImageElement ||\n        buffer instanceof HTMLVideoElement ||\n        buffer instanceof ImageBitmap\n      ) {\n        img = this.CanvasKit.MakeLazyImageFromTextureSource(buffer);\n      } else if (buffer instanceof CanvasKitWebGLBuffer) {\n        img = (\n          buffer as CanvasKitWebGLBuffer as CanvasKitWebGLBufferImpl\n        ).toImage();\n      } else {\n        img = this.CanvasKit.MakeImageFromCanvasImageSource(buffer);\n      }\n      return new JsiSkImage(this.CanvasKit, img);\n    } else if (!image) {\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      const img = (surface as any).makeImageFromTextureSource(buffer) as Image;\n      return new JsiSkImage(this.CanvasKit, img);\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      const img = (surface as any).updateTextureFromSource(\n        image,\n        buffer\n      ) as Image;\n      return new JsiSkImage(this.CanvasKit, img);\n    }\n  }\n\n  MakeImageFromEncoded(encoded: SkData) {\n    const image = this.CanvasKit.MakeImageFromEncoded(\n      JsiSkData.fromValue(encoded)\n    );\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  MakeImageFromNativeTextureUnstable() {\n    return throwNotImplementedOnRNWeb<SkImage>();\n  }\n\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {\n    // see toSkImageInfo() from canvaskit\n    const image = this.CanvasKit.MakeImage(\n      {\n        alphaType: getEnum(this.CanvasKit, \"AlphaType\", info.alphaType),\n        colorSpace: this.CanvasKit.ColorSpace.SRGB,\n        colorType: getEnum(this.CanvasKit, \"ColorType\", info.colorType),\n        height: info.height,\n        width: info.width,\n      },\n      JsiSkData.fromValue(data),\n      bytesPerRow\n    );\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_types","require","_Host","_JsiSkImage","_JsiSkData","JsiSkImageFactory","Host","constructor","CanvasKit","MakeNull","JsiSkImage","MakeImageFromViewTag","viewTag","view","console","log","Promise","resolve","MakeImageFromNativeBuffer","buffer","surface","image","isNativeBufferWeb","Error","img","HTMLImageElement","HTMLVideoElement","ImageBitmap","MakeLazyImageFromTextureSource","CanvasKitWebGLBuffer","toImage","MakeImageFromCanvasImageSource","makeImageFromTextureSource","updateTextureFromSource","MakeImageFromEncoded","encoded","JsiSkData","fromValue","MakeImageFromNativeTextureUnstable","throwNotImplementedOnRNWeb","MakeImage","info","data","bytesPerRow","alphaType","getEnum","colorSpace","ColorSpace","SRGB","colorType","height","width","exports"],"sources":["JsiSkImageFactory.ts"],"sourcesContent":["import type { CanvasKit, Image } from \"canvaskit-wasm\";\n\nimport { CanvasKitWebGLBuffer, isNativeBufferWeb } from \"../types\";\nimport type {\n  SkData,\n  ImageInfo,\n  SkImage,\n  NativeBuffer,\n  ImageFactory,\n} from \"../types\";\n\nimport { Host, getEnum, throwNotImplementedOnRNWeb } from \"./Host\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkData } from \"./JsiSkData\";\nimport type { JsiSkSurface } from \"./JsiSkSurface\";\nimport type { CanvasKitWebGLBufferImpl } from \"./CanvasKitWebGLBufferImpl\";\n\nexport class JsiSkImageFactory extends Host implements ImageFactory {\n  constructor(CanvasKit: CanvasKit) {\n    super(CanvasKit);\n  }\n\n  MakeNull() {\n    return new JsiSkImage(this.CanvasKit, null as unknown as Image);\n  }\n\n  MakeImageFromViewTag(viewTag: number): Promise<SkImage | null> {\n    const view = viewTag as unknown as HTMLElement;\n    // TODO: Implement screenshot from view in React JS\n    console.log(view);\n    return Promise.resolve(null);\n  }\n\n  MakeImageFromNativeBuffer(\n    buffer: NativeBuffer,\n    surface?: JsiSkSurface,\n    image?: JsiSkImage\n  ) {\n    if (!isNativeBufferWeb(buffer)) {\n      throw new Error(\"Invalid NativeBuffer\");\n    }\n    if (!surface) {\n      let img: Image;\n      if (\n        buffer instanceof HTMLImageElement ||\n        buffer instanceof HTMLVideoElement ||\n        buffer instanceof ImageBitmap\n      ) {\n        img = this.CanvasKit.MakeLazyImageFromTextureSource(buffer);\n      } else if (buffer instanceof CanvasKitWebGLBuffer) {\n        img = (\n          buffer as CanvasKitWebGLBuffer as CanvasKitWebGLBufferImpl\n        ).toImage();\n      } else {\n        img = this.CanvasKit.MakeImageFromCanvasImageSource(buffer);\n      }\n      return new JsiSkImage(this.CanvasKit, img);\n    } else if (!image) {\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      const img = (surface as any).makeImageFromTextureSource(buffer) as Image;\n      return new JsiSkImage(this.CanvasKit, img);\n    } else {\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      const img = (surface as any).updateTextureFromSource(\n        image,\n        buffer\n      ) as Image;\n      return new JsiSkImage(this.CanvasKit, img);\n    }\n  }\n\n  MakeImageFromEncoded(encoded: SkData) {\n    const image = this.CanvasKit.MakeImageFromEncoded(\n      JsiSkData.fromValue(encoded)\n    );\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  MakeImageFromNativeTextureUnstable() {\n    return throwNotImplementedOnRNWeb<SkImage>();\n  }\n\n  MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {\n    // see toSkImageInfo() from canvaskit\n    const image = this.CanvasKit.MakeImage(\n      {\n        alphaType: getEnum(this.CanvasKit, \"AlphaType\", info.alphaType),\n        colorSpace: this.CanvasKit.ColorSpace.SRGB,\n        colorType: getEnum(this.CanvasKit, \"ColorType\", info.colorType),\n        height: info.height,\n        width: info.width,\n      },\n      JsiSkData.fromValue(data),\n      bytesPerRow\n    );\n    if (image === null) {\n      return null;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/skia/web/JsiSkSurface.d.ts

@@ -1,6 +1,7 @@
 import type { CanvasKit, Surface } from "canvaskit-wasm";
 import type { SkCanvas, SkImage, SkRect, SkSurface } from "../types";
 import { HostObject } from "./Host";
+import { JsiSkImage } from "./JsiSkImage";
 export declare class JsiSkSurface extends HostObject<Surface, "Surface"> implements SkSurface {
     constructor(CanvasKit: CanvasKit, ref: Surface);
     dispose: () => void;
@@ -8,6 +9,6 @@ export declare class JsiSkSurface extends HostObject<Surface, "Surface"> impleme
     width(): number;
     height(): number;
     getCanvas(): SkCanvas;
-    makeImageSnapshot(bounds?: SkRect): SkImage;
+    makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage;
     getNativeTextureUnstable(): unknown;
 }

package/lib/commonjs/skia/web/JsiSkSurface.js

@@ -30,8 +30,11 @@ class JsiSkSurface extends _Host.HostObject {
   getCanvas() {
     return new _JsiSkCanvas.JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());
   }
-  makeImageSnapshot(bounds) {
+  makeImageSnapshot(bounds, outputImage) {
     const image = this.ref.makeImageSnapshot(bounds ? Array.from(_JsiSkRect.JsiSkRect.fromValue(this.CanvasKit, bounds)) : undefined);
+    if (outputImage) {
+      outputImage.ref = image;
+    }
     return new _JsiSkImage.JsiSkImage(this.CanvasKit, image);
   }
   getNativeTextureUnstable() {

package/lib/commonjs/skia/web/JsiSkSurface.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","JsiSkSurface","HostObject","constructor","CanvasKit","ref","dispose","flush","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  dispose = () => {\n    this.ref.dispose();\n  };\n\n  flush() {\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAAwC,SAAAI,gBAAAC,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAD,CAAA,GAAAI,MAAA,CAAAC,cAAA,CAAAL,CAAA,EAAAC,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAT,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAG,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAb,CAAA,QAAAU,CAAA,GAAAV,CAAA,CAAAc,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAEjC,MAAMgB,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;IAACvB,eAAA,kBAGzB,MAAM;MACd,IAAI,CAACuB,GAAG,CAACC,OAAO,CAAC,CAAC;IACpB,CAAC;EAJD;EAMAC,KAAKA,CAAA,EAAG;IACN,IAAI,CAACF,GAAG,CAACE,KAAK,CAAC,CAAC;EAClB;EAEAC,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACH,GAAG,CAACG,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACJ,GAAG,CAACI,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACP,SAAS,EAAE,IAAI,CAACC,GAAG,CAACK,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAW;IAC1C,MAAMC,KAAK,GAAG,IAAI,CAACT,GAAG,CAACO,iBAAiB,CACtCC,MAAM,GACFE,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAACd,SAAS,EAAES,MAAM,CAAC,CAAC,GACvDM,SACN,CAAC;IACD,OAAO,IAAIC,sBAAU,CAAC,IAAI,CAAChB,SAAS,EAAEU,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAAvB,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"names":["_Host","require","_JsiSkCanvas","_JsiSkImage","_JsiSkRect","_defineProperty","e","r","t","_toPropertyKey","Object","defineProperty","value","enumerable","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","JsiSkSurface","HostObject","constructor","CanvasKit","ref","dispose","flush","width","height","getCanvas","JsiSkCanvas","makeImageSnapshot","bounds","outputImage","image","Array","from","JsiSkRect","fromValue","undefined","JsiSkImage","getNativeTextureUnstable","console","warn","exports"],"sources":["JsiSkSurface.ts"],"sourcesContent":["import type { CanvasKit, Surface } from \"canvaskit-wasm\";\n\nimport type { SkCanvas, SkImage, SkRect, SkSurface } from \"../types\";\n\nimport { HostObject } from \"./Host\";\nimport { JsiSkCanvas } from \"./JsiSkCanvas\";\nimport { JsiSkImage } from \"./JsiSkImage\";\nimport { JsiSkRect } from \"./JsiSkRect\";\n\nexport class JsiSkSurface\n  extends HostObject<Surface, \"Surface\">\n  implements SkSurface\n{\n  constructor(CanvasKit: CanvasKit, ref: Surface) {\n    super(CanvasKit, ref, \"Surface\");\n  }\n\n  dispose = () => {\n    this.ref.dispose();\n  };\n\n  flush() {\n    this.ref.flush();\n  }\n\n  width() {\n    return this.ref.width();\n  }\n\n  height() {\n    return this.ref.height();\n  }\n\n  getCanvas(): SkCanvas {\n    return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());\n  }\n\n  makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage {\n    const image = this.ref.makeImageSnapshot(\n      bounds\n        ? Array.from(JsiSkRect.fromValue(this.CanvasKit, bounds))\n        : undefined\n    );\n    if (outputImage) {\n      outputImage.ref = image;\n    }\n    return new JsiSkImage(this.CanvasKit, image);\n  }\n\n  getNativeTextureUnstable(): unknown {\n    console.warn(\"getBackendTexture is not implemented on Web\");\n    return null;\n  }\n}\n"],"mappings":";;;;;;AAIA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAAwC,SAAAI,gBAAAC,CAAA,EAAAC,CAAA,EAAAC,CAAA,YAAAD,CAAA,GAAAE,cAAA,CAAAF,CAAA,MAAAD,CAAA,GAAAI,MAAA,CAAAC,cAAA,CAAAL,CAAA,EAAAC,CAAA,IAAAK,KAAA,EAAAJ,CAAA,EAAAK,UAAA,MAAAC,YAAA,MAAAC,QAAA,UAAAT,CAAA,CAAAC,CAAA,IAAAC,CAAA,EAAAF,CAAA;AAAA,SAAAG,eAAAD,CAAA,QAAAQ,CAAA,GAAAC,YAAA,CAAAT,CAAA,uCAAAQ,CAAA,GAAAA,CAAA,GAAAA,CAAA;AAAA,SAAAC,aAAAT,CAAA,EAAAD,CAAA,2BAAAC,CAAA,KAAAA,CAAA,SAAAA,CAAA,MAAAF,CAAA,GAAAE,CAAA,CAAAU,MAAA,CAAAC,WAAA,kBAAAb,CAAA,QAAAU,CAAA,GAAAV,CAAA,CAAAc,IAAA,CAAAZ,CAAA,EAAAD,CAAA,uCAAAS,CAAA,SAAAA,CAAA,YAAAK,SAAA,yEAAAd,CAAA,GAAAe,MAAA,GAAAC,MAAA,EAAAf,CAAA;AAEjC,MAAMgB,YAAY,SACfC,gBAAU,CAEpB;EACEC,WAAWA,CAACC,SAAoB,EAAEC,GAAY,EAAE;IAC9C,KAAK,CAACD,SAAS,EAAEC,GAAG,EAAE,SAAS,CAAC;IAACvB,eAAA,kBAGzB,MAAM;MACd,IAAI,CAACuB,GAAG,CAACC,OAAO,CAAC,CAAC;IACpB,CAAC;EAJD;EAMAC,KAAKA,CAAA,EAAG;IACN,IAAI,CAACF,GAAG,CAACE,KAAK,CAAC,CAAC;EAClB;EAEAC,KAAKA,CAAA,EAAG;IACN,OAAO,IAAI,CAACH,GAAG,CAACG,KAAK,CAAC,CAAC;EACzB;EAEAC,MAAMA,CAAA,EAAG;IACP,OAAO,IAAI,CAACJ,GAAG,CAACI,MAAM,CAAC,CAAC;EAC1B;EAEAC,SAASA,CAAA,EAAa;IACpB,OAAO,IAAIC,wBAAW,CAAC,IAAI,CAACP,SAAS,EAAE,IAAI,CAACC,GAAG,CAACK,SAAS,CAAC,CAAC,CAAC;EAC9D;EAEAE,iBAAiBA,CAACC,MAAe,EAAEC,WAAwB,EAAW;IACpE,MAAMC,KAAK,GAAG,IAAI,CAACV,GAAG,CAACO,iBAAiB,CACtCC,MAAM,GACFG,KAAK,CAACC,IAAI,CAACC,oBAAS,CAACC,SAAS,CAAC,IAAI,CAACf,SAAS,EAAES,MAAM,CAAC,CAAC,GACvDO,SACN,CAAC;IACD,IAAIN,WAAW,EAAE;MACfA,WAAW,CAACT,GAAG,GAAGU,KAAK;IACzB;IACA,OAAO,IAAIM,sBAAU,CAAC,IAAI,CAACjB,SAAS,EAAEW,KAAK,CAAC;EAC9C;EAEAO,wBAAwBA,CAAA,EAAY;IAClCC,OAAO,CAACC,IAAI,CAAC,6CAA6C,CAAC;IAC3D,OAAO,IAAI;EACb;AACF;AAACC,OAAA,CAAAxB,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/commonjs/sksg/HostConfig.js

@@ -100,7 +100,7 @@ const sksgHostConfig = exports.sksgHostConfig = {
   preparePortalMount: () => {
     debug("preparePortalMount");
   },
-  cloneInstance(instance, _type, _oldProps, newProps, _updatePayload, _internalInstanceHandle, keepChildren, _recyclableInstance) {
+  cloneInstance(instance, _type, _oldProps, newProps, keepChildren, _newChildSet) {
     debug("cloneInstance");
     return {
       type: instance.type,