@shopify/react-native-skia 2.2.18 → 2.2.20

package/src/skia/web/JsiSkTypeface.ts

@@ -29,8 +29,4 @@ export class JsiSkTypeface
   getGlyphIDs(str: string, numCodePoints?: number) {
     return Array.from(this.ref.getGlyphIDs(str, numCodePoints));
   }
-
-  dispose = () => {
-    this.ref.delete();
-  };
 }

package/src/skia/web/JsiSkTypefaceFontProvider.ts

@@ -9,8 +9,6 @@ export class JsiSkTypefaceFontProvider
   extends HostObject<TypefaceFontProvider, "FontMgr">
   implements SkTypefaceFontProvider
 {
-  private allocatedPointers: number[] = [];
-
   constructor(CanvasKit: CanvasKit, ref: TypefaceFontProvider) {
     super(CanvasKit, ref, "FontMgr");
   }
@@ -36,16 +34,6 @@ export class JsiSkTypefaceFontProvider
     // @ts-expect-error
     this.ref._registerFont(typeface.ref, strPtr);
   }
-
-  dispose() {
-    for (const ptr of this.allocatedPointers) {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      this.CanvasKit._free(ptr);
-    }
-
-    this.ref.delete();
-  }
 }
 
 const lengthBytesUTF8 = (str: string) => {

package/src/skia/web/JsiSkVertices.ts

@@ -13,10 +13,6 @@ export class JsiSkVertices
     super(CanvasKit, ref, "Vertices");
   }
 
-  dispose = () => {
-    this.ref.delete();
-  };
-
   bounds() {
     return new JsiSkRect(this.CanvasKit, this.ref.bounds());
   }

package/src/skia/web/JsiSkottieAnimation.ts

@@ -253,7 +253,4 @@ export class JsiSkottieAnimation
   version() {
     return this.ref.version();
   }
-  dispose() {
-    this.ref.delete();
-  }
 }

package/src/skia/web/JsiVideo.ts

@@ -89,9 +89,13 @@ export class JsiVideo implements Video {
     this.videoElement.volume = volume;
   }
 
-  dispose() {
+  [Symbol.dispose]() {
     if (this.videoElement.parentNode) {
       this.videoElement.parentNode.removeChild(this.videoElement);
     }
   }
+
+  dispose() {
+    this[Symbol.dispose]();
+  }
 }

package/src/sksg/Container.native.ts

@@ -23,7 +23,10 @@ const nativeDrawOnscreen = (nativeId: number, recorder: JsiRecorder) => {
 class NativeReanimatedContainer extends Container {
   private mapperId: number | null = null;
 
-  constructor(Skia: Skia, private nativeId: number) {
+  constructor(
+    Skia: Skia,
+    private nativeId: number
+  ) {
     super(Skia);
   }
 

package/src/sksg/Container.web.ts

@@ -29,7 +29,10 @@ const drawOnscreen = (Skia: Skia, nativeId: number, recording: Recording) => {
 class ReanimatedContainer extends Container {
   private mapperId: number | null = null;
 
-  constructor(Skia: Skia, private nativeId: number) {
+  constructor(
+    Skia: Skia,
+    private nativeId: number
+  ) {
     super(Skia);
   }
 

package/src/sksg/Elements.tsx

@@ -57,7 +57,6 @@ import type {
 import type { SkiaProps } from "../renderer";
 
 declare module "react" {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace JSX {
     interface IntrinsicElements {
       skGroup: SkiaProps<GroupProps>;

package/src/sksg/Reconciler.ts

@@ -23,7 +23,10 @@ export class SkiaSGRoot {
   private root: OpaqueRoot;
   private container: Container;
 
-  constructor(public Skia: Skia, nativeId = -1) {
+  constructor(
+    public Skia: Skia,
+    nativeId = -1
+  ) {
     this.container = createContainer(Skia, nativeId);
     this.root = skiaReconciler.createContainer(
       this.container,

package/src/sksg/Recorder/ReanimatedRecorder.ts

@@ -32,6 +32,10 @@ import type {
 import type { AnimatedProps } from "../../renderer";
 import { isSharedValue } from "../utils";
 
+/**
+ * Currently the recorder only work if the GPU resources (e.g Images) are owned by the main thread.
+ * It will crash otherwise on Ganesh (iOS/Android).
+ */
 export class ReanimatedRecorder implements BaseRecorder {
   private values = new Set<SharedValue<unknown>>();
   private recorder: JsiRecorder;

package/src/sksg/Recorder/Visitor.ts

@@ -250,7 +250,7 @@ const visitNode = (recorder: BaseRecorder, node: Node<any>) => {
       const shadows = node.children
         .filter((n) => n.type === NodeType.BoxShadow)
         // eslint-disable-next-line @typescript-eslint/no-shadow
-        .map(({ props }) => ({ props } as { props: BoxShadowProps }));
+        .map(({ props }) => ({ props }) as { props: BoxShadowProps });
       recorder.drawBox(props, shadows);
       break;
     case NodeType.Fill:

package/src/sksg/StaticContainer.ts

@@ -48,7 +48,10 @@ export abstract class Container {
 }
 
 export class StaticContainer extends Container {
-  constructor(Skia: Skia, private nativeId: number) {
+  constructor(
+    Skia: Skia,
+    private nativeId: number
+  ) {
     super(Skia);
   }
 

package/src/views/SkiaPictureView.web.tsx

@@ -26,7 +26,10 @@ interface Renderer {
 class WebGLRenderer implements Renderer {
   private surface: JsiSkSurface | null = null;
 
-  constructor(private canvas: HTMLCanvasElement, private pd: number) {
+  constructor(
+    private canvas: HTMLCanvasElement,
+    private pd: number
+  ) {
     this.onResize();
   }
 
@@ -83,7 +86,10 @@ class WebGLRenderer implements Renderer {
 class StaticWebGLRenderer implements Renderer {
   private cachedImage: SkImage | null = null;
 
-  constructor(private canvas: HTMLCanvasElement, private pd: number) {}
+  constructor(
+    private canvas: HTMLCanvasElement,
+    private pd: number
+  ) {}
 
   onResize(): void {
     this.cachedImage = null;
@@ -294,10 +300,13 @@ export const SkiaPictureView = forwardRef<
       redraw,
       makeImageSnapshot,
     } as SkiaPictureViewHandle);
+  }, [setPicture, getSize, redraw, makeImageSnapshot, props.nativeID]);
+
+  useEffect(() => {
     if (props.picture) {
       setPicture(props.picture);
     }
-  }, [setPicture, getSize, redraw, makeImageSnapshot, props]);
+  }, [setPicture, props.picture]);
 
   useEffect(() => {
     tick();

package/cpp/api/JsiSkThreadSafeDeletion.h

@@ -1,105 +0,0 @@
-#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