@shopify/react-native-skia 2.2.14 → 2.2.16

package/apple/MetalContext.h

@@ -14,29 +14,6 @@
 #import <include/gpu/ganesh/mtl/GrMtlDirectContext.h>
 #import <include/gpu/ganesh/mtl/SkSurfaceMetal.h>
 
-class MetalSharedContext {
-public:
-  static MetalSharedContext &getInstance() {
-    static MetalSharedContext instance;
-    return instance;
-  }
-
-  id<MTLDevice> getDevice() { return _device; }
-
-private:
-  MetalSharedContext() {
-    _device = MTLCreateSystemDefaultDevice();
-    if (!_device) {
-      throw std::runtime_error("Failed to create Metal device");
-    }
-  }
-
-  MetalSharedContext(const MetalSharedContext &) = delete;
-  MetalSharedContext &operator=(const MetalSharedContext &) = delete;
-
-  id<MTLDevice> _device;
-};
-
 struct OffscreenRenderContext {
   id<MTLTexture> texture;
 
@@ -68,7 +45,7 @@ public:
   }
 
   sk_sp<SkSurface> MakeOffscreen(int width, int height) {
-    auto device = MetalSharedContext::getInstance().getDevice();
+    auto device = _device;
     auto ctx = new OffscreenRenderContext(device, _directContext, _commandQueue,
                                           width, height);
 
@@ -115,7 +92,7 @@ public:
   std::unique_ptr<RNSkia::WindowContext>
   MakeWindow(CALayer *window, int width, int height,
              bool useP3ColorSpace = true) {
-    auto device = MetalSharedContext::getInstance().getDevice();
+    auto device = _device;
     return std::make_unique<MetalWindowContext>(_directContext.get(), device,
                                                 _commandQueue, window, width,
                                                 height, useP3ColorSpace);
@@ -124,6 +101,7 @@ public:
   GrDirectContext *getDirectContext() { return _directContext.get(); }
 
 private:
+  id<MTLDevice> _device = nullptr;
   id<MTLCommandQueue> _commandQueue = nullptr;
   sk_sp<GrDirectContext> _directContext = nullptr;
 

package/apple/MetalContext.mm

@@ -18,11 +18,15 @@
 #pragma clang diagnostic pop
 
 MetalContext::MetalContext() {
-  auto device = MetalSharedContext::getInstance().getDevice();
+  _device = MTLCreateSystemDefaultDevice();
+  if (!_device) {
+    throw std::runtime_error("Failed to create Metal device");
+  }
+
   _commandQueue =
-      id<MTLCommandQueue>(CFRetain((GrMTLHandle)[device newCommandQueue]));
+      id<MTLCommandQueue>(CFRetain((GrMTLHandle)[_device newCommandQueue]));
   GrMtlBackendContext backendContext = {};
-  backendContext.fDevice.reset((__bridge void *)device);
+  backendContext.fDevice.reset((__bridge void *)_device);
   backendContext.fQueue.reset((__bridge void *)_commandQueue);
   GrContextOptions grContextOptions; // set different options here.
 

package/apple/MetalWindowContext.mm

@@ -26,10 +26,20 @@ MetalWindowContext::MetalWindowContext(GrDirectContext *directContext,
   _layer.drawableSize = CGSizeMake(width, height);
   BOOL supportsWideColor = NO;
   if (useP3ColorSpace) {
+#if !TARGET_OS_OSX
     if (@available(iOS 10.0, *)) {
       supportsWideColor = [UIScreen mainScreen].traitCollection.displayGamut ==
                           UIDisplayGamutP3;
     }
+#else
+    if (@available(macOS 10.12, *)) {
+      NSScreen *screen = [NSScreen mainScreen];
+      NSColorSpace *displayP3 = [NSColorSpace displayP3ColorSpace];
+      if (screen.colorSpace && displayP3) {
+        supportsWideColor = [screen.colorSpace isEqual:displayP3];
+      }
+    }
+#endif // !TARGET_OS_OSX
   }
   if (supportsWideColor) {
     CGColorSpaceRef colorSpace =
@@ -75,4 +85,4 @@ void MetalWindowContext::present() {
   [commandBuffer presentDrawable:_currentDrawable];
   [commandBuffer commit];
   _skSurface = nullptr;
-}
+}

package/apple/RNSkMetalCanvasProvider.mm

@@ -77,11 +77,7 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
       // we try to render while in the background. (see above issue)
       return false;
     }
-  }
-  // Wrap in auto release pool since we want the system to clean up after
-  // rendering and not wait until later - we've seen some example of memory
-  // usage growing very fast in the simulator without this.
-  @autoreleasepool {
+
     auto surface = _ctx->getSurface();
     if (!surface) {
       return false;
@@ -89,8 +85,9 @@ bool RNSkMetalCanvasProvider::renderToCanvas(
     auto canvas = surface->getCanvas();
     cb(canvas);
     _ctx->present();
+    return true;
   }
-  return true;
+  return false;
 };
 
 void RNSkMetalCanvasProvider::setSize(int width, int height) {

package/cpp/api/JsiSkImage.h

@@ -8,6 +8,7 @@
 #include "JsiSkImageInfo.h"
 #include "JsiSkMatrix.h"
 #include "JsiSkShader.h"
+#include "JsiSkThreadSafeDeletion.h"
 #include "third_party/base64.h"
 
 #include "JsiTextureInfo.h"
@@ -61,6 +62,9 @@ inline SkSamplingOptions SamplingOptionsFromValue(jsi::Runtime &runtime,
 }
 
 class JsiSkImage : public JsiSkWrappingSkPtrHostObject<SkImage> {
+private:
+  ThreadSafeDeletion<SkImage> _deletionHandler;
+
 public:
   // TODO-API: Properties?
   JSI_HOST_FUNCTION(width) { return static_cast<double>(getObject()->width()); }
@@ -271,7 +275,18 @@ public:
   JsiSkImage(std::shared_ptr<RNSkPlatformContext> context,
              const sk_sp<SkImage> image)
       : JsiSkWrappingSkPtrHostObject<SkImage>(std::move(context),
-                                              std::move(image)) {}
+                                              std::move(image)) {
+    // Drain any pending deletions when creating new images
+    ThreadSafeDeletion<SkImage>::drainDeletionQueue();
+  }
+
+  ~JsiSkImage() override {
+    // Handle thread-safe deletion
+    _deletionHandler.handleDeletion(getObject());
+    // Always clear the object to prevent base class destructor from deleting it
+    // handleDeletion takes full responsibility for the object's lifetime
+    setObject(nullptr);
+  }
 
   size_t getMemoryPressure() const override {
     auto image = getObject();

package/cpp/api/JsiSkSurface.h

@@ -6,6 +6,7 @@
 #include <jsi/jsi.h>
 
 #include "JsiSkHostObjects.h"
+#include "JsiSkThreadSafeDeletion.h"
 #include "JsiTextureInfo.h"
 
 #include "JsiSkCanvas.h"
@@ -28,11 +29,26 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkSurface : public JsiSkWrappingSkPtrHostObject<SkSurface> {
+private:
+  ThreadSafeDeletion<SkSurface> _deletionHandler;
+
 public:
   JsiSkSurface(std::shared_ptr<RNSkPlatformContext> context,
                sk_sp<SkSurface> surface)
       : JsiSkWrappingSkPtrHostObject<SkSurface>(std::move(context),
-                                                std::move(surface)) {}
+                                                std::move(surface)),
+        _deletionHandler() {
+    // Drain any pending deletions when creating new surfaces
+    ThreadSafeDeletion<SkSurface>::drainDeletionQueue();
+  }
+
+  ~JsiSkSurface() override {
+    // Handle thread-safe deletion
+    _deletionHandler.handleDeletion(getObject());
+    // Always clear the object to prevent base class destructor from deleting it
+    // handleDeletion takes full responsibility for the object's lifetime
+    setObject(nullptr);
+  }
 
   EXPORT_JSI_API_TYPENAME(JsiSkSurface, Surface)
 

package/cpp/api/JsiSkThreadSafeDeletion.h

@@ -0,0 +1,105 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <thread>
+
+// Define this to disable thread-safe deletion (for testing purposes)
+// #define DISABLE_THREAD_SAFE_DELETION
+
+namespace RNSkia {
+
+/**
+ * Utility class for managing thread-safe deletion of Skia objects.
+ * Ensures objects are deleted on the thread that created them.
+ */
+template <typename T> class ThreadSafeDeletion {
+private:
+  struct DeletionItem {
+    sk_sp<T> object;
+    std::thread::id creationThreadId;
+  };
+
+  static inline std::mutex _queueMutex;
+  static inline std::queue<DeletionItem> _deletionQueue;
+
+  std::thread::id _creationThreadId;
+
+public:
+  ThreadSafeDeletion() : _creationThreadId(std::this_thread::get_id()) {}
+
+  /**
+   * Handles deletion of the object. If we're on the wrong thread,
+   * queues it for later deletion. Otherwise, allows immediate deletion.
+   * The object is always considered handled after this call.
+   */
+  void handleDeletion(sk_sp<T> object) {
+    if (!object) {
+      return;
+    }
+
+#ifdef DISABLE_THREAD_SAFE_DELETION
+    // When disabled, allow immediate deletion
+    // This will likely cause crashes when objects are deleted on wrong thread
+    return;
+#else
+    // Always try to drain the queue when handling deletions
+    drainDeletionQueue();
+
+    // Check if we're on the creation thread
+    if (std::this_thread::get_id() != _creationThreadId) {
+      // Queue for deletion on the correct thread
+      std::lock_guard<std::mutex> lock(_queueMutex);
+      _deletionQueue.push({object, _creationThreadId});
+      return;
+    }
+
+    // We're on the correct thread, allow immediate deletion via destructor
+    return;
+#endif
+  }
+
+  /**
+   * Drains the deletion queue for objects created on the current thread.
+   * Should be called periodically (e.g., when creating new objects).
+   */
+  static void drainDeletionQueue() {
+#ifndef DISABLE_THREAD_SAFE_DELETION
+    auto currentThreadId = std::this_thread::get_id();
+    std::queue<DeletionItem> remainingItems;
+
+    std::lock_guard<std::mutex> lock(_queueMutex);
+
+    // Process all items in the queue
+    while (!_deletionQueue.empty()) {
+      auto item = _deletionQueue.front();
+      _deletionQueue.pop();
+
+      // If this item belongs to the current thread, let it be deleted
+      if (item.creationThreadId == currentThreadId) {
+        // The sk_sp destructor will handle the cleanup
+        // Just let it go out of scope
+      } else {
+        // Keep items that belong to other threads
+        remainingItems.push(item);
+      }
+    }
+
+    // Put back items that couldn't be deleted
+    _deletionQueue = std::move(remainingItems);
+#endif
+  }
+
+  /**
+   * Returns the number of items waiting for deletion.
+   * Useful for debugging and testing.
+   */
+  static size_t getPendingDeletionCount() {
+    std::lock_guard<std::mutex> lock(_queueMutex);
+    return _deletionQueue.size();
+  }
+};
+
+} // namespace RNSkia

package/cpp/api/recorder/Drawings.h

@@ -385,17 +385,17 @@ public:
     for (size_t i = 0; i < shadowCount; i++) {
       auto shadowObj =
           shadowsArray.getValueAtIndex(runtime, i).asObject(runtime);
-      
+
       // Create shadow directly in vector to avoid copy
       shadows.emplace_back();
       BoxShadowCmdProps &shadow = shadows.back();
 
-       convertProperty(runtime, shadowObj, "dx", shadow.dx, variables);
-       convertProperty(runtime, shadowObj, "dy", shadow.dy, variables);
-       convertProperty(runtime, shadowObj, "spread", shadow.spread, variables);
-       convertProperty(runtime, shadowObj, "blur", shadow.blur, variables);
-       convertProperty(runtime, shadowObj, "color", shadow.color, variables);
-       convertProperty(runtime, shadowObj, "inner", shadow.inner, variables);
+      convertProperty(runtime, shadowObj, "dx", shadow.dx, variables);
+      convertProperty(runtime, shadowObj, "dy", shadow.dy, variables);
+      convertProperty(runtime, shadowObj, "spread", shadow.spread, variables);
+      convertProperty(runtime, shadowObj, "blur", shadow.blur, variables);
+      convertProperty(runtime, shadowObj, "color", shadow.color, variables);
+      convertProperty(runtime, shadowObj, "inner", shadow.inner, variables);
     }
   }
 

package/cpp/jsi/JsiHostObject.cpp

@@ -2,35 +2,8 @@
 #include <functional>
 #include <vector>
 
-// To be able to find objects that aren't cleaned up correctly,
-// we can set this value to 1 and debug the constructor/destructor
-#define JSI_DEBUG_ALLOCATIONS 0
-
 namespace RNJsi {
 
-#if JSI_DEBUG_ALLOCATIONS
-int objCounter = 0;
-std::vector<JsiHostObject *> objects;
-#endif
-
-JsiHostObject::JsiHostObject() {
-#if JSI_DEBUG_ALLOCATIONS
-  objects.push_back(this);
-  objCounter++;
-#endif
-}
-JsiHostObject::~JsiHostObject() {
-#if JSI_DEBUG_ALLOCATIONS
-  for (size_t i = 0; i < objects.size(); ++i) {
-    if (objects.at(i) == this) {
-      objects.erase(objects.begin() + i);
-      break;
-    }
-  }
-  objCounter--;
-#endif
-}
-
 void JsiHostObject::set(jsi::Runtime &rt, const jsi::PropNameID &name,
                         const jsi::Value &value) {
 

package/cpp/jsi/JsiHostObject.h

@@ -47,7 +47,7 @@
  * Creates a JSI export function declaration
  */
 #define JSI_EXPORT_FUNC(CLASS, FUNCTION)                                       \
-  {#FUNCTION, (jsi::Value (JsiHostObject::*)(                                  \
+  {#FUNCTION, (jsi::Value(JsiHostObject::*)(                                   \
                   jsi::Runtime & runtime, const jsi::Value &thisValue,         \
                   const jsi::Value *arguments, size_t)) &                      \
                   CLASS::FUNCTION}
@@ -65,7 +65,7 @@
  * Creates a JSI export getter declaration
  */
 #define JSI_EXPORT_PROP_GET(CLASS, FUNCTION)                                   \
-  {#FUNCTION, (jsi::Value (JsiHostObject::*)(jsi::Runtime & runtime)) &        \
+  {#FUNCTION, (jsi::Value(JsiHostObject::*)(jsi::Runtime & runtime)) &         \
                   CLASS::STR_CAT(STR_GET, FUNCTION)}
 
 /**
@@ -83,7 +83,7 @@
  */
 #define JSI_EXPORT_PROP_SET(CLASS, FUNCTION)                                   \
   {#FUNCTION,                                                                  \
-   (void (JsiHostObject::*)(jsi::Runtime & runtime, const jsi::Value &)) &     \
+   (void(JsiHostObject::*)(jsi::Runtime & runtime, const jsi::Value &)) &      \
        CLASS::STR_CAT(STR_SET, FUNCTION)}
 
 /**
@@ -125,8 +125,8 @@ using JsiPropertySettersMap =
  */
 class JsiHostObject : public jsi::HostObject {
 public:
-  JsiHostObject();
-  ~JsiHostObject();
+  JsiHostObject() = default;
+  ~JsiHostObject() = default;
 
   /**
    * Overridden jsi::HostObject set property method

package/cpp/jsi/ViewProperty.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <functional>
 #include <jsi/jsi.h>
 #include <memory>
 #include <string>
@@ -26,11 +27,42 @@ public:
     }
   }
 
-  bool isNull() { return std::holds_alternative<nullptr_t>(_value); }
+  template <typename PlatformContext>
+  ViewProperty(jsi::Runtime &runtime, const jsi::Value &value,
+               PlatformContext platformContext, size_t nativeId) {
+    // Set the onSize callback with all the necessary context
+    _value = std::function<void(int, int)>(
+        [&runtime, platformContext, nativeId](int width, int height) {
+          jsi::Object size(runtime);
+          auto pd = platformContext->getPixelDensity();
+          size.setProperty(runtime, "width", jsi::Value(width / pd));
+          size.setProperty(runtime, "height", jsi::Value(height / pd));
+
+          // Get the stored shared value from global
+          std::string globalKey =
+              "__onSize_" + std::to_string(static_cast<int>(nativeId));
+          auto globalProp =
+              runtime.global().getProperty(runtime, globalKey.c_str());
+          if (!globalProp.isUndefined()) {
+            globalProp.asObject(runtime).setProperty(runtime, "value", size);
+          }
+        });
+  }
+
+  bool isNull() { return std::holds_alternative<std::nullptr_t>(_value); }
 
   sk_sp<SkPicture> getPicture() { return std::get<sk_sp<SkPicture>>(_value); }
 
+  std::variant<std::nullptr_t, std::function<void(int, int)>>
+  getOnSize() const {
+    if (std::holds_alternative<std::function<void(int, int)>>(_value)) {
+      return std::get<std::function<void(int, int)>>(_value);
+    }
+    return nullptr;
+  }
+
 private:
-  std::variant<nullptr_t, sk_sp<SkPicture>> _value = nullptr;
+  std::variant<std::nullptr_t, sk_sp<SkPicture>, std::function<void(int, int)>>
+      _value = nullptr;
 };
 } // namespace RNJsi

package/cpp/rnskia/RNSkJsiViewApi.h

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "JsiHostObject.h"
+#include "RNSkPictureView.h"
 #include "RNSkPlatformContext.h"
 #include "RNSkView.h"
 #include "ViewProperty.h"
@@ -102,31 +103,20 @@ public:
     ViewRegistry::getInstance().withViewInfo(
         nativeId, [&](std::shared_ptr<RNSkViewInfo> info) {
           auto name = arguments[1].asString(runtime).utf8(runtime);
-          if (name == "onSize" && isSharedValue(runtime, arguments[2])) {
-            jsi::Object size(runtime);
-            auto pd = _platformContext->getPixelDensity();
-            auto w = info->view != nullptr
-                         ? std::max(info->view->getScaledWidth(), 0)
-                         : 0;
-            auto h = info->view != nullptr
-                         ? std::max(info->view->getScaledHeight(), 0)
-                         : 0;
-
-            size.setProperty(runtime, "width", w / pd);
-            size.setProperty(runtime, "height", h / pd);
-            arguments[2].asObject(runtime).setProperty(runtime, "value", size);
-          } else {
+          info->props.insert_or_assign(
+              arguments[1].asString(runtime).utf8(runtime),
+              RNJsi::ViewProperty(runtime, arguments[2]));
+          if (info->props.find("onSize") == info->props.end()) {
             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();
-            }
+                "onSize", RNJsi::ViewProperty(runtime, arguments[2],
+                                              _platformContext, nativeId));
+          }
+          // 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
         });

package/cpp/rnskia/RNSkPictureView.h

@@ -5,6 +5,7 @@
 #include <mutex>
 #include <string>
 #include <unordered_map>
+#include <variant>
 #include <vector>
 
 #include <jsi/jsi.h>
@@ -55,8 +56,25 @@ public:
     _requestRedraw();
   }
 
+  void setOnSize(
+      std::variant<std::nullptr_t, std::function<void(int, int)>> onSize) {
+    _onSize = onSize;
+  }
+
 private:
   bool performDraw(std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
+    // Call onSize callback only if the size has changed
+    int currentWidth = canvasProvider->getWidth();
+    int currentHeight = canvasProvider->getHeight();
+
+    if (std::holds_alternative<std::function<void(int, int)>>(_onSize)) {
+      if (_lastWidth != currentWidth || _lastHeight != currentHeight) {
+        _lastWidth = currentWidth;
+        _lastHeight = currentHeight;
+        std::get<std::function<void(int, int)>>(_onSize)(currentWidth,
+                                                         currentHeight);
+      }
+    }
     return canvasProvider->renderToCanvas([=, this](SkCanvas *canvas) {
       // Make sure to scale correctly
       auto pd = _platformContext->getPixelDensity();
@@ -72,6 +90,9 @@ private:
 
   std::shared_ptr<RNSkPlatformContext> _platformContext;
   sk_sp<SkPicture> _picture;
+  std::variant<std::nullptr_t, std::function<void(int, int)>> _onSize = nullptr;
+  int _lastWidth = -1;
+  int _lastHeight = -1;
 };
 
 class RNSkPictureView : public RNSkView {
@@ -88,7 +109,7 @@ public:
 
   void setJsiProperties(
       std::unordered_map<std::string, RNJsi::ViewProperty> &props) override {
-
+    // Base implementation - no onSize callback
     for (auto &prop : props) {
       if (prop.first == "picture") {
         if (prop.second.isNull()) {
@@ -97,10 +118,12 @@ public:
               ->setPicture(nullptr);
           continue;
         }
-
         // Save picture
         std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
             ->setPicture(prop.second.getPicture());
+      } else if (prop.first == "onSize") {
+        std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
+            ->setOnSize(prop.second.getOnSize());
       }
     }
   }

package/cpp/rnskia/RNSkView.h

@@ -148,6 +148,13 @@ public:
   virtual void setJsiProperties(
       std::unordered_map<std::string, RNJsi::ViewProperty> &props) = 0;
 
+  virtual void
+  setJsiProperties(std::unordered_map<std::string, RNJsi::ViewProperty> &props,
+                   std::function<jsi::Object(int, int)> onSize) {
+    // Default implementation just calls the base method, ignoring onSize
+    setJsiProperties(props);
+  }
+
   void requestRedraw() {
     if (!_redrawRequested) {
       _redrawRequested = true;

package/lib/commonjs/Platform/Platform.js

@@ -10,7 +10,8 @@ const Platform = exports.Platform = {
   OS: _reactNative.Platform.OS,
   PixelRatio: _reactNative.PixelRatio.get(),
   resolveAsset: source => {
-    return (0, _types.isRNModule)(source) ? _reactNative.Image.resolveAssetSource(source).uri : source.default;
+    // eslint-disable-next-line no-nested-ternary
+    return (0, _types.isRNModule)(source) ? _reactNative.Image.resolveAssetSource(source).uri : "uri" in source ? source.uri : source.default;
   },
   findNodeHandle: _reactNative.findNodeHandle,
   View: _reactNative.View

package/lib/commonjs/Platform/Platform.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_types","Platform","exports","OS","RNPlatform","PixelRatio","get","resolveAsset","source","isRNModule","Image","resolveAssetSource","uri","default","findNodeHandle","View"],"sources":["Platform.ts"],"sourcesContent":["import {\n  Image,\n  PixelRatio,\n  Platform as RNPlatform,\n  findNodeHandle,\n  View,\n} from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\nexport const Platform: IPlatform = {\n  OS: RNPlatform.OS,\n  PixelRatio: PixelRatio.get(),\n  resolveAsset: (source: DataModule) => {\n    return isRNModule(source)\n      ? Image.resolveAssetSource(source).uri\n      : source.default;\n  },\n  findNodeHandle,\n  View,\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASA,IAAAC,MAAA,GAAAD,OAAA;AAIO,MAAME,QAAmB,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACjCE,EAAE,EAAEC,qBAAU,CAACD,EAAE;EACjBE,UAAU,EAAEA,uBAAU,CAACC,GAAG,CAAC,CAAC;EAC5BC,YAAY,EAAGC,MAAkB,IAAK;IACpC,OAAO,IAAAC,iBAAU,EAACD,MAAM,CAAC,GACrBE,kBAAK,CAACC,kBAAkB,CAACH,MAAM,CAAC,CAACI,GAAG,GACpCJ,MAAM,CAACK,OAAO;EACpB,CAAC;EACDC,cAAc,EAAdA,2BAAc;EACdC,IAAI,EAAJA;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_types","Platform","exports","OS","RNPlatform","PixelRatio","get","resolveAsset","source","isRNModule","Image","resolveAssetSource","uri","default","findNodeHandle","View"],"sources":["Platform.ts"],"sourcesContent":["import {\n  Image,\n  PixelRatio,\n  Platform as RNPlatform,\n  findNodeHandle,\n  View,\n} from \"react-native\";\n\nimport type { DataModule } from \"../skia/types\";\nimport { isRNModule } from \"../skia/types\";\n\nimport type { IPlatform } from \"./IPlatform\";\n\nexport const Platform: IPlatform = {\n  OS: RNPlatform.OS,\n  PixelRatio: PixelRatio.get(),\n  resolveAsset: (source: DataModule) => {\n    // eslint-disable-next-line no-nested-ternary\n    return isRNModule(source)\n      ? Image.resolveAssetSource(source).uri\n      : \"uri\" in source\n      ? source.uri\n      : source.default;\n  },\n  findNodeHandle,\n  View,\n};\n"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AASA,IAAAC,MAAA,GAAAD,OAAA;AAIO,MAAME,QAAmB,GAAAC,OAAA,CAAAD,QAAA,GAAG;EACjCE,EAAE,EAAEC,qBAAU,CAACD,EAAE;EACjBE,UAAU,EAAEA,uBAAU,CAACC,GAAG,CAAC,CAAC;EAC5BC,YAAY,EAAGC,MAAkB,IAAK;IACpC;IACA,OAAO,IAAAC,iBAAU,EAACD,MAAM,CAAC,GACrBE,kBAAK,CAACC,kBAAkB,CAACH,MAAM,CAAC,CAACI,GAAG,GACpC,KAAK,IAAIJ,MAAM,GACfA,MAAM,CAACI,GAAG,GACVJ,MAAM,CAACK,OAAO;EACpB,CAAC;EACDC,cAAc,EAAdA,2BAAc;EACdC,IAAI,EAAJA;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/Platform/Platform.web.js

@@ -149,6 +149,9 @@ const Platform = exports.Platform = {
       }
       throw new Error("Asset source is a number - this is not supported on the web");
     }
+    if ("uri" in source) {
+      return source.uri;
+    }
     return source.default;
   },
   findNodeHandle: () => {