@shopify/react-native-skia 2.11.1 → 2.11.2

package/cpp/api/JsiSkFont.h

@@ -135,8 +135,9 @@ public:
   bool isEmbolden() { return getObject()->isEmbolden(); }
 
   std::shared_ptr<JsiSkTypeface> getTypeface() {
-    return std::make_shared<JsiSkTypeface>(
-        getContext(), sk_sp<SkTypeface>(getObject()->getTypeface()));
+    // refTypeface(), not getTypeface(): the wrapper owns what it is handed.
+    return std::make_shared<JsiSkTypeface>(getContext(),
+                                           getObject()->refTypeface());
   }
 
   void setEdging(double edging) {

package/cpp/api/recorder/Paint.h

@@ -157,8 +157,12 @@ public:
       // Reset the paint that savePaint() just pushed instead of pushing a
       // second one: the matching RestorePaintDeclaration pops a single frame,
       // so an extra push would leave the enclosing group's opacity on the
-      // stack and leak it onto every sibling drawn afterwards.
-      ctx->getPaint() = SkPaint();
+      // stack and leak it onto every sibling drawn afterwards. The fresh
+      // paint is anti-aliased to match the TS player, which resets with
+      // Skia.Paint().
+      SkPaint freshPaint;
+      freshPaint.setAntiAlias(true);
+      ctx->getPaint() = freshPaint;
     }
     auto &paint = ctx->getPaint();
     if (props.opacity.has_value()) {

package/cpp/jsi/NativeObject.h

@@ -51,26 +51,32 @@ struct PrototypeCacheEntry {
  *
  * When used with static storage (like prototype caches), the cache persists
  * across hot reloads. But the JSI objects inside become invalid when the
- * runtime is destroyed. This wrapper tracks which runtime the cache was
- * created for and allocates a new cache when the runtime changes.
+ * runtime is destroyed. This wrapper tracks which main-runtime generation the
+ * cache was created for and allocates a new cache when the native module is
+ * reinstalled (RNSkManager construction bumps the generation).
+ *
+ * The generation is used instead of the runtime pointer on purpose: on an
+ * in-process runtime recreate (expo-updates reloadAsync, DevSettings.reload)
+ * Hermes frequently allocates the new runtime at the address of the freed
+ * one. A pointer comparison then sees "same runtime", keeps the stale cache,
+ * and create()/installConstructor() end up passing a jsi::Object owned by the
+ * dead runtime to the new one (use-after-free).
  *
  * The old cache is intentionally leaked - we cannot safely destroy JSI
  * objects after their runtime is gone.
  */
 template <typename T> struct StaticRuntimeAwareCache {
   RNJsi::RuntimeAwareCache<T> *cache = nullptr;
-  jsi::Runtime *cacheRuntime = nullptr;
-
-  RNJsi::RuntimeAwareCache<T> &get(jsi::Runtime &rt) {
-    auto mainRuntime = RNJsi::BaseRuntimeAwareCache::getMainJsRuntime();
-    if (&rt == mainRuntime && cacheRuntime != mainRuntime) {
-      // Main runtime changed (hot reload) - allocate new cache, leak old one
-      cache = new RNJsi::RuntimeAwareCache<T>();
-      cacheRuntime = mainRuntime;
-    }
-    if (cache == nullptr) {
+  uint64_t cacheGeneration = 0;
+
+  RNJsi::RuntimeAwareCache<T> &get(jsi::Runtime & /*rt*/) {
+    auto generation =
+        RNJsi::BaseRuntimeAwareCache::getMainJsRuntimeGeneration();
+    if (cache == nullptr || cacheGeneration != generation) {
+      // First use, or the main runtime was reinstalled (hot reload / OTA):
+      // allocate a fresh cache and leak the old one.
       cache = new RNJsi::RuntimeAwareCache<T>();
-      cacheRuntime = mainRuntime;
+      cacheGeneration = generation;
     }
     return *cache;
   }
@@ -143,9 +149,29 @@ public:
    */
   static void installPrototype(jsi::Runtime &runtime) {
     std::lock_guard<std::mutex> lock(getPrototypeCacheMutex());
+    ensurePrototypeLocked(runtime);
+  }
+
+  /**
+   * Look up (and install on first use) the prototype entry for this runtime.
+   *
+   * Callers must hold getPrototypeCacheMutex() and must consume the returned
+   * entry while still holding it: the lookup and the use of the prototype
+   * have to share one lock scope, because a reinstall of the native module
+   * (generation bump, see StaticRuntimeAwareCache) can swap the cache from
+   * any thread. A caller that released the lock in between would re-resolve
+   * a fresh cache with an empty entry and hand out an object without a
+   * prototype.
+   *
+   * The returned reference stays valid for the runtime's lifetime: the
+   * RuntimeAwareCache is heap-allocated and never freed, and
+   * std::unordered_map keeps references to its elements stable across
+   * rehashes.
+   */
+  static PrototypeCacheEntry &ensurePrototypeLocked(jsi::Runtime &runtime) {
     auto &entry = getPrototypeCache(runtime).get(runtime);
     if (entry.prototype.has_value()) {
-      return; // Already installed
+      return entry; // Already installed
     }
 
     // Create prototype object
@@ -264,6 +290,7 @@ public:
 
     // Cache the prototype
     entry.prototype = std::move(prototype);
+    return entry;
   }
 
   /**
@@ -274,13 +301,8 @@ public:
    * created internally by the native code).
    */
   static void installConstructor(jsi::Runtime &runtime) {
-    installPrototype(runtime);
-
     std::lock_guard<std::mutex> lock(getPrototypeCacheMutex());
-    auto &entry = getPrototypeCache(runtime).get(runtime);
-    if (!entry.prototype.has_value()) {
-      return;
-    }
+    auto &entry = ensurePrototypeLocked(runtime);
 
     // Create a constructor function that throws when called directly
     auto ctor = jsi::Function::createFromHostFunction(
@@ -308,8 +330,6 @@ public:
    */
   static jsi::Value create(jsi::Runtime &runtime,
                            std::shared_ptr<Derived> instance) {
-    installPrototype(runtime);
-
     // Store creation runtime for logging etc.
     instance->setCreationRuntime(&runtime);
 
@@ -319,18 +339,16 @@ public:
     // Attach native state
     obj.setNativeState(runtime, instance);
 
-    // Set prototype
+    // Install (on first use) and apply the prototype in a single lock scope
+    // so a concurrent cache swap cannot slip in between the two steps.
     {
       std::lock_guard<std::mutex> lock(getPrototypeCacheMutex());
-      auto &entry = getPrototypeCache(runtime).get(runtime);
-      if (entry.prototype.has_value()) {
-        // Use Object.setPrototypeOf to set the prototype
-        auto objectCtor =
-            runtime.global().getPropertyAsObject(runtime, "Object");
-        auto setPrototypeOf =
-            objectCtor.getPropertyAsFunction(runtime, "setPrototypeOf");
-        setPrototypeOf.call(runtime, obj, *entry.prototype);
-      }
+      auto &entry = ensurePrototypeLocked(runtime);
+      // Use Object.setPrototypeOf to set the prototype
+      auto objectCtor = runtime.global().getPropertyAsObject(runtime, "Object");
+      auto setPrototypeOf =
+          objectCtor.getPropertyAsFunction(runtime, "setPrototypeOf");
+      setPrototypeOf.call(runtime, obj, *entry.prototype);
     }
 
     // Set memory pressure hint for GC

package/cpp/jsi/RuntimeAwareCache.cpp

@@ -3,5 +3,6 @@
 namespace RNJsi {
 
 std::atomic<jsi::Runtime *> BaseRuntimeAwareCache::_mainRuntime{nullptr};
+std::atomic<uint64_t> BaseRuntimeAwareCache::_mainRuntimeGeneration{0};
 
 } // namespace RNJsi

package/cpp/jsi/RuntimeAwareCache.h

@@ -3,6 +3,7 @@
 #include <jsi/jsi.h>
 
 #include <atomic>
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <unordered_map>
@@ -20,6 +21,33 @@ public:
     // Atomic: hot reload rewrites this from the JS thread while worklet
     // runtime threads read it concurrently.
     _mainRuntime.store(rt, std::memory_order_release);
+    // Every (re)installation of the native module starts a new generation.
+    // Callers that hold process-wide state derived from the main runtime
+    // (see StaticRuntimeAwareCache) must key their invalidation on this
+    // counter and NOT on the runtime pointer: when the JS runtime is
+    // destroyed and recreated in-process (expo-updates OTA apply,
+    // DevSettings.reload) the new jsi::Runtime is frequently allocated at
+    // the exact address of the freed one, so a pointer comparison cannot
+    // tell a reload from the steady state.
+    _mainRuntimeGeneration.fetch_add(1, std::memory_order_acq_rel);
+  }
+  static uint64_t getMainJsRuntimeGeneration() {
+    return _mainRuntimeGeneration.load(std::memory_order_acquire);
+  }
+  /**
+   * Called when the main runtime is about to go away (RNSkManager destruction).
+   * Bumps the generation so process-wide caches keyed on it
+   * (StaticRuntimeAwareCache) stop trusting their contents before the next
+   * install(). This closes the window where a runtime allocated at the dead
+   * runtime's address would otherwise be taken for the main runtime and be
+   * handed the stale jsi::Objects of the previous one.
+   *
+   * The pointer itself is intentionally left in place: worklet runtime
+   * threads may still call getMainJsRuntime() while teardown overlaps, and
+   * that accessor asserts on nullptr.
+   */
+  static void invalidateMainJsRuntime() {
+    _mainRuntimeGeneration.fetch_add(1, std::memory_order_acq_rel);
   }
   static jsi::Runtime *getMainJsRuntime() {
     auto *rt = _mainRuntime.load(std::memory_order_acquire);
@@ -31,6 +59,7 @@ public:
 
 private:
   static std::atomic<jsi::Runtime *> _mainRuntime;
+  static std::atomic<uint64_t> _mainRuntimeGeneration;
 };
 
 /**

package/cpp/rnskia/RNSkManager.cpp

@@ -30,6 +30,11 @@ RNSkManager::RNSkManager(
 }
 
 RNSkManager::~RNSkManager() {
+  // The main runtime is going away: key out the process-wide prototype
+  // caches now rather than at the next install(), so nothing allocated at
+  // this runtime's address in between can be mistaken for it.
+  RNJsi::BaseRuntimeAwareCache::invalidateMainJsRuntime();
+
   // Free up any references
   _viewApi = nullptr;
   _jsRuntime = nullptr;

package/lib/commonjs/dom/nodes/datatypes/Rect.js

@@ -10,7 +10,11 @@ var _Radius = require("./Radius");
 const isEdge = (pos, b) => {
   "worklet";
 
-  return pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height;
+  const right = b.x + b.width;
+  const bottom = b.y + b.height;
+  const withinX = pos.x >= b.x && pos.x <= right;
+  const withinY = pos.y >= b.y && pos.y <= bottom;
+  return withinY && (pos.x === b.x || pos.x === right) || withinX && (pos.y === b.y || pos.y === bottom);
 };
 
 // We have an issue to check property existence on JSI backed instances

package/lib/commonjs/dom/nodes/datatypes/Rect.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Radius","require","isEdge","pos","b","x","y","width","height","exports","isRRectCtor","def","rect","undefined","isRectCtor","processRect","Skia","_def$x","_def$y","XYWHRect","processRRect","_def$r","_def$x2","_def$y2","r","processRadius","RRectXY","inflate","box","dx","dy","tx","ty","rx","ry","deflate"],"sources":["Rect.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport type { Skia, SkRect, SkRRect, Vector } from \"../../../skia/types\";\nimport type { RectCtor, RectDef, RRectCtor, RRectDef } from \"../../types\";\n\nimport { processRadius } from \"./Radius\";\n\nexport const isEdge = (pos: Vector, b: SkRect) => {\n  \"worklet\";\n  return (\n    pos.x === b.x || pos.y === b.y || pos.x === b.width || pos.y === b.height\n  );\n};\n\n// We have an issue to check property existence on JSI backed instances\nconst isRRectCtor = (def: RRectDef): def is RRectCtor => {\n  \"worklet\";\n  return (def as any).rect === undefined;\n};\n// We have an issue to check property existence on JSI backed instances\nconst isRectCtor = (def: RectDef): def is RectCtor => {\n  \"worklet\";\n  return (def as any).rect === undefined;\n};\n\nexport const processRect = (Skia: Skia, def: RectDef) => {\n  \"worklet\";\n  if (isRectCtor(def)) {\n    return Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height);\n  } else {\n    return def.rect;\n  }\n};\n\nexport const processRRect = (Skia: Skia, def: RRectDef) => {\n  \"worklet\";\n  if (isRRectCtor(def)) {\n    const r = processRadius(Skia, def.r ?? 0);\n    return Skia.RRectXY(\n      Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height),\n      r.x,\n      r.y\n    );\n  } else {\n    return def.rect;\n  }\n};\n\nexport const inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => {\n  \"worklet\";\n  return Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n};\n\nexport const deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => {\n  \"worklet\";\n  return inflate(Skia, box, -dx, -dy, tx, ty);\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_Radius","require","isEdge","pos","b","right","x","width","bottom","y","height","withinX","withinY","exports","isRRectCtor","def","rect","undefined","isRectCtor","processRect","Skia","_def$x","_def$y","XYWHRect","processRRect","_def$r","_def$x2","_def$y2","r","processRadius","RRectXY","inflate","box","dx","dy","tx","ty","rx","ry","deflate"],"sources":["Rect.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport type { Skia, SkRect, SkRRect, Vector } from \"../../../skia/types\";\nimport type { RectCtor, RectDef, RRectCtor, RRectDef } from \"../../types\";\n\nimport { processRadius } from \"./Radius\";\n\nexport const isEdge = (pos: Vector, b: SkRect) => {\n  \"worklet\";\n  const right = b.x + b.width;\n  const bottom = b.y + b.height;\n  const withinX = pos.x >= b.x && pos.x <= right;\n  const withinY = pos.y >= b.y && pos.y <= bottom;\n  return (\n    (withinY && (pos.x === b.x || pos.x === right)) ||\n    (withinX && (pos.y === b.y || pos.y === bottom))\n  );\n};\n\n// We have an issue to check property existence on JSI backed instances\nconst isRRectCtor = (def: RRectDef): def is RRectCtor => {\n  \"worklet\";\n  return (def as any).rect === undefined;\n};\n// We have an issue to check property existence on JSI backed instances\nconst isRectCtor = (def: RectDef): def is RectCtor => {\n  \"worklet\";\n  return (def as any).rect === undefined;\n};\n\nexport const processRect = (Skia: Skia, def: RectDef) => {\n  \"worklet\";\n  if (isRectCtor(def)) {\n    return Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height);\n  } else {\n    return def.rect;\n  }\n};\n\nexport const processRRect = (Skia: Skia, def: RRectDef) => {\n  \"worklet\";\n  if (isRRectCtor(def)) {\n    const r = processRadius(Skia, def.r ?? 0);\n    return Skia.RRectXY(\n      Skia.XYWHRect(def.x ?? 0, def.y ?? 0, def.width, def.height),\n      r.x,\n      r.y\n    );\n  } else {\n    return def.rect;\n  }\n};\n\nexport const inflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => {\n  \"worklet\";\n  return Skia.RRectXY(\n    Skia.XYWHRect(\n      box.rect.x - dx + tx,\n      box.rect.y - dy + ty,\n      box.rect.width + 2 * dx,\n      box.rect.height + 2 * dy\n    ),\n    box.rx + dx,\n    box.ry + dy\n  );\n};\n\nexport const deflate = (\n  Skia: Skia,\n  box: SkRRect,\n  dx: number,\n  dy: number,\n  tx = 0,\n  ty = 0\n) => {\n  \"worklet\";\n  return inflate(Skia, box, -dx, -dy, tx, ty);\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/external/reanimated/useVideo.js

@@ -16,8 +16,12 @@ const copyFrameOnAndroid = currentFrame => {
   if (_Platform.Platform.OS === "android") {
     const tex = currentFrame.value;
     if (tex) {
-      currentFrame.value = tex; //.makeNonTextureImage();
-      tex.dispose();
+      const copy = tex.makeNonTextureImage();
+      if (copy) {
+        currentFrame.value = copy;
+        tex.dispose();
+      }
+      // If copy fails, keep the original frame rather than showing black
     }
   }
 };
@@ -26,6 +30,8 @@ const setFrame = (video, currentFrame) => {
 
   const img = video.nextImage();
   if (img) {
+    var _currentFrame$value;
+    (_currentFrame$value = currentFrame.value) === null || _currentFrame$value === void 0 || _currentFrame$value.dispose();
     currentFrame.value = img;
     copyFrameOnAndroid(currentFrame);
   }

package/lib/commonjs/external/reanimated/useVideo.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_Platform","_ReanimatedProxy","_interopRequireDefault","_useVideoLoading","e","__esModule","default","copyFrameOnAndroid","currentFrame","Platform","OS","tex","value","dispose","setFrame","video","img","nextImage","defaultOptions","looping","paused","seek","volume","useOption","defaultValue","Rea","useSharedValue","isSharedValue","disposeVideo","useVideo","source","userOptions","_userOptions$paused","_userOptions$looping","_userOptions$seek","_userOptions$volume","useVideoLoading","isPaused","currentTime","duration","useMemo","_video$duration","framerate","_video$framerate","size","_video$size","width","height","rotation","_video$rotation","useAnimatedReaction","pause","play","setVolume","setLooping","useFrameCallback","_frameInfo","useEffect","runOnUI","exports"],"sources":["useVideo.ts"],"sourcesContent":["import type { SharedValue, FrameInfo } from \"react-native-reanimated\";\nimport { useEffect, useMemo } from \"react\";\n\nimport type { SkImage, Video } from \"../../skia/types\";\nimport { Platform } from \"../../Platform\";\n\nimport Rea from \"./ReanimatedProxy\";\nimport { useVideoLoading } from \"./useVideoLoading\";\n\ntype MaybeAnimated<T> = SharedValue<T> | T;\n\ninterface PlaybackOptions {\n  looping: MaybeAnimated<boolean>;\n  paused: MaybeAnimated<boolean>;\n  seek: MaybeAnimated<number | null>;\n  volume: MaybeAnimated<number>;\n}\n\nconst copyFrameOnAndroid = (currentFrame: SharedValue<SkImage | null>) => {\n  \"worklet\";\n  // on android we need to copy the texture before it's invalidated\n  if (Platform.OS === \"android\") {\n    const tex = currentFrame.value;\n    if (tex) {\n      currentFrame.value = tex; //.makeNonTextureImage();\n      tex.dispose();\n    }\n  }\n};\n\nconst setFrame = (video: Video, currentFrame: SharedValue<SkImage | null>) => {\n  \"worklet\";\n  const img = video.nextImage();\n  if (img) {\n    currentFrame.value = img;\n    copyFrameOnAndroid(currentFrame);\n  }\n};\n\nconst defaultOptions = {\n  looping: true,\n  paused: false,\n  seek: null,\n  volume: 0,\n};\n\nconst useOption = <T>(value: MaybeAnimated<T>) => {\n  \"worklet\";\n  const defaultValue = Rea.useSharedValue(\n    Rea.isSharedValue(value) ? value.value : value\n  );\n  return Rea.isSharedValue(value)\n    ? (value as SharedValue<T>)\n    : (defaultValue as SharedValue<T>);\n};\n\nconst disposeVideo = (video: Video | null) => {\n  \"worklet\";\n  video?.dispose();\n};\n\nexport const useVideo = (\n  source: string | null,\n  userOptions?: Partial<PlaybackOptions>\n) => {\n  const video = useVideoLoading(source);\n  const isPaused = useOption(userOptions?.paused ?? defaultOptions.paused);\n  const looping = useOption(userOptions?.looping ?? defaultOptions.looping);\n  const seek = useOption(userOptions?.seek ?? defaultOptions.seek);\n  const volume = useOption(userOptions?.volume ?? defaultOptions.volume);\n  const currentFrame = Rea.useSharedValue<null | SkImage>(null);\n  const currentTime = Rea.useSharedValue(0);\n  const duration = useMemo(() => video?.duration() ?? 0, [video]);\n  const framerate = useMemo(\n    () => (Platform.OS === \"web\" ? -1 : (video?.framerate() ?? 0)),\n    [video]\n  );\n  const size = useMemo(() => video?.size() ?? { width: 0, height: 0 }, [video]);\n  const rotation = useMemo(() => video?.rotation() ?? 0, [video]);\n\n  // Handle pause/play state changes\n  Rea.useAnimatedReaction(\n    () => isPaused.value,\n    (paused) => {\n      if (paused) {\n        video?.pause();\n      } else {\n        video?.play();\n      }\n    }\n  );\n\n  // Handle seek\n  Rea.useAnimatedReaction(\n    () => seek.value,\n    (value) => {\n      if (value !== null) {\n        video?.seek(value);\n        seek.value = null;\n      }\n    }\n  );\n\n  // Handle volume changes\n  Rea.useAnimatedReaction(\n    () => volume.value,\n    (value) => {\n      video?.setVolume(value);\n    }\n  );\n\n  // Handle looping changes\n  Rea.useAnimatedReaction(\n    () => looping.value,\n    (value) => {\n      video?.setLooping(value);\n    }\n  );\n\n  // Frame callback - simplified since native handles frame timing\n  Rea.useFrameCallback((_frameInfo: FrameInfo) => {\n    \"worklet\";\n    if (!video) {\n      return;\n    }\n    // Update current time from native player\n    currentTime.value = video.currentTime();\n    // Get the latest frame (native handles timing via CADisplayLink/etc)\n    setFrame(video, currentFrame);\n  });\n\n  // Apply initial state when video becomes available\n  useEffect(() => {\n    if (video) {\n      video.setLooping(looping.value);\n      video.setVolume(volume.value);\n      if (isPaused.value) {\n        video.pause();\n      } else {\n        video.play();\n      }\n    }\n    return () => {\n      Rea.runOnUI(disposeVideo)(video);\n    };\n  }, [video, isPaused, looping, volume]);\n\n  return {\n    currentFrame,\n    currentTime,\n    duration,\n    framerate,\n    rotation,\n    size,\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_Platform","_ReanimatedProxy","_interopRequireDefault","_useVideoLoading","e","__esModule","default","copyFrameOnAndroid","currentFrame","Platform","OS","tex","value","copy","makeNonTextureImage","dispose","setFrame","video","img","nextImage","_currentFrame$value","defaultOptions","looping","paused","seek","volume","useOption","defaultValue","Rea","useSharedValue","isSharedValue","disposeVideo","useVideo","source","userOptions","_userOptions$paused","_userOptions$looping","_userOptions$seek","_userOptions$volume","useVideoLoading","isPaused","currentTime","duration","useMemo","_video$duration","framerate","_video$framerate","size","_video$size","width","height","rotation","_video$rotation","useAnimatedReaction","pause","play","setVolume","setLooping","useFrameCallback","_frameInfo","useEffect","runOnUI","exports"],"sources":["useVideo.ts"],"sourcesContent":["import type { SharedValue, FrameInfo } from \"react-native-reanimated\";\nimport { useEffect, useMemo } from \"react\";\n\nimport type { SkImage, Video } from \"../../skia/types\";\nimport { Platform } from \"../../Platform\";\n\nimport Rea from \"./ReanimatedProxy\";\nimport { useVideoLoading } from \"./useVideoLoading\";\n\ntype MaybeAnimated<T> = SharedValue<T> | T;\n\ninterface PlaybackOptions {\n  looping: MaybeAnimated<boolean>;\n  paused: MaybeAnimated<boolean>;\n  seek: MaybeAnimated<number | null>;\n  volume: MaybeAnimated<number>;\n}\n\nconst copyFrameOnAndroid = (currentFrame: SharedValue<SkImage | null>) => {\n  \"worklet\";\n  // on android we need to copy the texture before it's invalidated\n  if (Platform.OS === \"android\") {\n    const tex = currentFrame.value;\n    if (tex) {\n      const copy = tex.makeNonTextureImage();\n      if (copy) {\n        currentFrame.value = copy;\n        tex.dispose();\n      }\n      // If copy fails, keep the original frame rather than showing black\n    }\n  }\n};\n\nconst setFrame = (video: Video, currentFrame: SharedValue<SkImage | null>) => {\n  \"worklet\";\n  const img = video.nextImage();\n  if (img) {\n    currentFrame.value?.dispose();\n    currentFrame.value = img;\n    copyFrameOnAndroid(currentFrame);\n  }\n};\n\nconst defaultOptions = {\n  looping: true,\n  paused: false,\n  seek: null,\n  volume: 0,\n};\n\nconst useOption = <T>(value: MaybeAnimated<T>) => {\n  \"worklet\";\n  const defaultValue = Rea.useSharedValue(\n    Rea.isSharedValue(value) ? value.value : value\n  );\n  return Rea.isSharedValue(value)\n    ? (value as SharedValue<T>)\n    : (defaultValue as SharedValue<T>);\n};\n\nconst disposeVideo = (video: Video | null) => {\n  \"worklet\";\n  video?.dispose();\n};\n\nexport const useVideo = (\n  source: string | null,\n  userOptions?: Partial<PlaybackOptions>\n) => {\n  const video = useVideoLoading(source);\n  const isPaused = useOption(userOptions?.paused ?? defaultOptions.paused);\n  const looping = useOption(userOptions?.looping ?? defaultOptions.looping);\n  const seek = useOption(userOptions?.seek ?? defaultOptions.seek);\n  const volume = useOption(userOptions?.volume ?? defaultOptions.volume);\n  const currentFrame = Rea.useSharedValue<null | SkImage>(null);\n  const currentTime = Rea.useSharedValue(0);\n  const duration = useMemo(() => video?.duration() ?? 0, [video]);\n  const framerate = useMemo(\n    () => (Platform.OS === \"web\" ? -1 : (video?.framerate() ?? 0)),\n    [video]\n  );\n  const size = useMemo(() => video?.size() ?? { width: 0, height: 0 }, [video]);\n  const rotation = useMemo(() => video?.rotation() ?? 0, [video]);\n\n  // Handle pause/play state changes\n  Rea.useAnimatedReaction(\n    () => isPaused.value,\n    (paused) => {\n      if (paused) {\n        video?.pause();\n      } else {\n        video?.play();\n      }\n    }\n  );\n\n  // Handle seek\n  Rea.useAnimatedReaction(\n    () => seek.value,\n    (value) => {\n      if (value !== null) {\n        video?.seek(value);\n        seek.value = null;\n      }\n    }\n  );\n\n  // Handle volume changes\n  Rea.useAnimatedReaction(\n    () => volume.value,\n    (value) => {\n      video?.setVolume(value);\n    }\n  );\n\n  // Handle looping changes\n  Rea.useAnimatedReaction(\n    () => looping.value,\n    (value) => {\n      video?.setLooping(value);\n    }\n  );\n\n  // Frame callback - simplified since native handles frame timing\n  Rea.useFrameCallback((_frameInfo: FrameInfo) => {\n    \"worklet\";\n    if (!video) {\n      return;\n    }\n    // Update current time from native player\n    currentTime.value = video.currentTime();\n    // Get the latest frame (native handles timing via CADisplayLink/etc)\n    setFrame(video, currentFrame);\n  });\n\n  // Apply initial state when video becomes available\n  useEffect(() => {\n    if (video) {\n      video.setLooping(looping.value);\n      video.setVolume(volume.value);\n      if (isPaused.value) {\n        video.pause();\n      } else {\n        video.play();\n      }\n    }\n    return () => {\n      Rea.runOnUI(disposeVideo)(video);\n    };\n  }, [video, isPaused, looping, volume]);\n\n  return {\n    currentFrame,\n    currentTime,\n    duration,\n    framerate,\n    rotation,\n    size,\n  };\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.disposable" preserve="true" />
 export interface SkJSIInstance<T extends string> extends Disposable {
     __typename__: T;
     dispose(): void;

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["JsiInstance.ts"],"sourcesContent":["export interface SkJSIInstance<T extends string> extends Disposable {\n  __typename__: T;\n  dispose(): void;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["JsiInstance.ts"],"sourcesContent":["/// <reference lib=\"esnext.disposable\" preserve=\"true\" />\n\nexport interface SkJSIInstance<T extends string> extends Disposable {\n  __typename__: T;\n  dispose(): void;\n}\n"],"mappings":"","ignoreList":[]}

package/lib/commonjs/sksg/Recorder/DrawingContext.js

@@ -31,7 +31,10 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
   if (paintPool.length === 0) {
     paintPool.push(Skia.Paint());
   } else {
+    // reset() produces an anti-alias false paint, unlike the Skia.Paint()
+    // factory: restore the default so reused pools render like the first frame.
     paintPool[0].reset();
+    paintPool[0].setAntiAlias(true);
   }
   paints.push(paintPool[0]);
   opacities.push(1);
@@ -49,12 +52,14 @@ const createDrawingContext = (Skia, paintPool, canvas) => {
     nextPaintIndex++;
   };
 
-  // Pushes an externally owned paint (the `paint` prop) onto the stack. It must
-  // push an opacity alongside it: restorePaint() pops both, so pushing only the
-  // paint would underflow the opacity stack and leak the enclosing group's
-  // opacity onto everything drawn afterwards.
+  // Pushes an externally owned paint (the `paint` prop) onto the stack. It
+  // pushes a frame-scoped copy, like the C++ DrawingCtx: materializePaint()
+  // mutates the top of the stack, and those mutations must not leak into the
+  // user-owned paint. It must also push an opacity alongside it: restorePaint()
+  // pops both, so pushing only the paint would underflow the opacity stack and
+  // leak the enclosing group's opacity onto everything drawn afterwards.
   const pushPaint = paint => {
-    paints.push(paint);
+    paints.push(track(paint.copy()));
     opacities.push(opacities[opacities.length - 1]);
   };
   const getOpacity = () => {

package/lib/commonjs/sksg/Recorder/DrawingContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["_FrameScope","require","createDrawingContext","Skia","paintPool","canvas","frameSkia","track","dispose","createFrameScope","paints","colorFilters","shaders","imageFilters","pathEffects","paintDeclarations","opacities","nextPaintIndex","length","push","Paint","reset","savePaint","nextPaint","assign","getCurrentPaint","pushPaint","paint","getOpacity","setOpacity","newOpacity","Math","max","min","saveBackdropFilter","imageFilter","imgf","pop","cf","ImageFilter","MakeColorFilter","saveLayer","undefined","restore","restorePaint","materializePaint","setColorFilter","reduceRight","inner","outer","ColorFilter","MakeCompose","setShader","setImageFilter","setPathEffect","PathEffect","exports"],"sources":["DrawingContext.ts"],"sourcesContent":["import type {\n  Skia,\n  SkCanvas,\n  SkColorFilter,\n  SkPaint,\n  SkShader,\n  SkImageFilter,\n  SkPathEffect,\n} from \"../../skia/types\";\n\nimport { createFrameScope } from \"./FrameScope\";\n\nexport const createDrawingContext = (\n  Skia: Skia,\n  paintPool: SkPaint[],\n  canvas: SkCanvas\n) => {\n  \"worklet\";\n\n  // Everything the renderer creates through frameSkia is frame-scoped and\n  // deleted by dispose() once the frame has been recorded. The paint pool is\n  // recording-scoped and deliberately allocated with the raw Skia instance.\n  const { Skia: frameSkia, track, dispose } = createFrameScope(Skia);\n\n  // State (formerly class fields)\n  const paints: SkPaint[] = [];\n  const colorFilters: SkColorFilter[] = [];\n  const shaders: SkShader[] = [];\n  const imageFilters: SkImageFilter[] = [];\n  const pathEffects: SkPathEffect[] = [];\n  const paintDeclarations: SkPaint[] = [];\n  const opacities: number[] = [];\n\n  let nextPaintIndex = 1;\n\n  // Initialize first paint and opacity\n  if (paintPool.length === 0) {\n    paintPool.push(Skia.Paint());\n  } else {\n    paintPool[0].reset();\n  }\n  paints.push(paintPool[0]);\n  opacities.push(1);\n\n  // Methods (formerly class methods)\n  const savePaint = () => {\n    // Get next available paint from pool or create new one if needed\n    if (nextPaintIndex >= paintPool.length) {\n      paintPool.push(Skia.Paint());\n    }\n\n    const nextPaint = paintPool[nextPaintIndex];\n    nextPaint.assign(getCurrentPaint()); // Reuse allocation by copying properties\n    paints.push(nextPaint);\n    opacities.push(opacities[opacities.length - 1]);\n    nextPaintIndex++;\n  };\n\n  // Pushes an externally owned paint (the `paint` prop) onto the stack. It must\n  // push an opacity alongside it: restorePaint() pops both, so pushing only the\n  // paint would underflow the opacity stack and leak the enclosing group's\n  // opacity onto everything drawn afterwards.\n  const pushPaint = (paint: SkPaint) => {\n    paints.push(paint);\n    opacities.push(opacities[opacities.length - 1]);\n  };\n\n  const getOpacity = () => {\n    return opacities[opacities.length - 1];\n  };\n\n  const setOpacity = (newOpacity: number) => {\n    opacities[opacities.length - 1] = Math.max(0, Math.min(1, newOpacity));\n  };\n\n  const saveBackdropFilter = () => {\n    let imageFilter: SkImageFilter | null = null;\n    const imgf = imageFilters.pop();\n    if (imgf) {\n      imageFilter = imgf;\n    } else {\n      const cf = colorFilters.pop();\n      if (cf) {\n        imageFilter = frameSkia.ImageFilter.MakeColorFilter(cf, null);\n      }\n    }\n    canvas.saveLayer(undefined, null, imageFilter);\n    canvas.restore();\n  };\n\n  // Equivalent to the `get paint()` getter in the original class\n  const getCurrentPaint = () => {\n    return paints[paints.length - 1];\n  };\n\n  const restorePaint = () => {\n    opacities.pop();\n    return paints.pop();\n  };\n\n  const materializePaint = () => {\n    // Color Filters\n    if (colorFilters.length > 0) {\n      getCurrentPaint().setColorFilter(\n        colorFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ColorFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n    // Shaders\n    if (shaders.length > 0) {\n      getCurrentPaint().setShader(shaders[shaders.length - 1]);\n    }\n    // Image Filters\n    if (imageFilters.length > 0) {\n      getCurrentPaint().setImageFilter(\n        imageFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ImageFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Path Effects\n    if (pathEffects.length > 0) {\n      getCurrentPaint().setPathEffect(\n        pathEffects.reduceRight((inner, outer) =>\n          inner ? frameSkia.PathEffect.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Clear arrays\n    colorFilters.length = 0;\n    shaders.length = 0;\n    imageFilters.length = 0;\n    pathEffects.length = 0;\n  };\n\n  // Return an object containing the Skia reference, the canvas, and the methods\n  return {\n    // Public fields\n    Skia: frameSkia,\n    canvas,\n    track,\n    dispose,\n    paints,\n    colorFilters,\n    shaders,\n    imageFilters,\n    pathEffects,\n    paintDeclarations,\n    paintPool,\n\n    // Public methods\n    savePaint,\n    pushPaint,\n    saveBackdropFilter,\n    get paint() {\n      return paints[paints.length - 1];\n    }, // the \"getter\" for the current paint\n    restorePaint,\n    materializePaint,\n    getOpacity,\n    setOpacity,\n  };\n};\n\nexport type DrawingContext = ReturnType<typeof createDrawingContext>;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_FrameScope","require","createDrawingContext","Skia","paintPool","canvas","frameSkia","track","dispose","createFrameScope","paints","colorFilters","shaders","imageFilters","pathEffects","paintDeclarations","opacities","nextPaintIndex","length","push","Paint","reset","setAntiAlias","savePaint","nextPaint","assign","getCurrentPaint","pushPaint","paint","copy","getOpacity","setOpacity","newOpacity","Math","max","min","saveBackdropFilter","imageFilter","imgf","pop","cf","ImageFilter","MakeColorFilter","saveLayer","undefined","restore","restorePaint","materializePaint","setColorFilter","reduceRight","inner","outer","ColorFilter","MakeCompose","setShader","setImageFilter","setPathEffect","PathEffect","exports"],"sources":["DrawingContext.ts"],"sourcesContent":["import type {\n  Skia,\n  SkCanvas,\n  SkColorFilter,\n  SkPaint,\n  SkShader,\n  SkImageFilter,\n  SkPathEffect,\n} from \"../../skia/types\";\n\nimport { createFrameScope } from \"./FrameScope\";\n\nexport const createDrawingContext = (\n  Skia: Skia,\n  paintPool: SkPaint[],\n  canvas: SkCanvas\n) => {\n  \"worklet\";\n\n  // Everything the renderer creates through frameSkia is frame-scoped and\n  // deleted by dispose() once the frame has been recorded. The paint pool is\n  // recording-scoped and deliberately allocated with the raw Skia instance.\n  const { Skia: frameSkia, track, dispose } = createFrameScope(Skia);\n\n  // State (formerly class fields)\n  const paints: SkPaint[] = [];\n  const colorFilters: SkColorFilter[] = [];\n  const shaders: SkShader[] = [];\n  const imageFilters: SkImageFilter[] = [];\n  const pathEffects: SkPathEffect[] = [];\n  const paintDeclarations: SkPaint[] = [];\n  const opacities: number[] = [];\n\n  let nextPaintIndex = 1;\n\n  // Initialize first paint and opacity\n  if (paintPool.length === 0) {\n    paintPool.push(Skia.Paint());\n  } else {\n    // reset() produces an anti-alias false paint, unlike the Skia.Paint()\n    // factory: restore the default so reused pools render like the first frame.\n    paintPool[0].reset();\n    paintPool[0].setAntiAlias(true);\n  }\n  paints.push(paintPool[0]);\n  opacities.push(1);\n\n  // Methods (formerly class methods)\n  const savePaint = () => {\n    // Get next available paint from pool or create new one if needed\n    if (nextPaintIndex >= paintPool.length) {\n      paintPool.push(Skia.Paint());\n    }\n\n    const nextPaint = paintPool[nextPaintIndex];\n    nextPaint.assign(getCurrentPaint()); // Reuse allocation by copying properties\n    paints.push(nextPaint);\n    opacities.push(opacities[opacities.length - 1]);\n    nextPaintIndex++;\n  };\n\n  // Pushes an externally owned paint (the `paint` prop) onto the stack. It\n  // pushes a frame-scoped copy, like the C++ DrawingCtx: materializePaint()\n  // mutates the top of the stack, and those mutations must not leak into the\n  // user-owned paint. It must also push an opacity alongside it: restorePaint()\n  // pops both, so pushing only the paint would underflow the opacity stack and\n  // leak the enclosing group's opacity onto everything drawn afterwards.\n  const pushPaint = (paint: SkPaint) => {\n    paints.push(track(paint.copy()));\n    opacities.push(opacities[opacities.length - 1]);\n  };\n\n  const getOpacity = () => {\n    return opacities[opacities.length - 1];\n  };\n\n  const setOpacity = (newOpacity: number) => {\n    opacities[opacities.length - 1] = Math.max(0, Math.min(1, newOpacity));\n  };\n\n  const saveBackdropFilter = () => {\n    let imageFilter: SkImageFilter | null = null;\n    const imgf = imageFilters.pop();\n    if (imgf) {\n      imageFilter = imgf;\n    } else {\n      const cf = colorFilters.pop();\n      if (cf) {\n        imageFilter = frameSkia.ImageFilter.MakeColorFilter(cf, null);\n      }\n    }\n    canvas.saveLayer(undefined, null, imageFilter);\n    canvas.restore();\n  };\n\n  // Equivalent to the `get paint()` getter in the original class\n  const getCurrentPaint = () => {\n    return paints[paints.length - 1];\n  };\n\n  const restorePaint = () => {\n    opacities.pop();\n    return paints.pop();\n  };\n\n  const materializePaint = () => {\n    // Color Filters\n    if (colorFilters.length > 0) {\n      getCurrentPaint().setColorFilter(\n        colorFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ColorFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n    // Shaders\n    if (shaders.length > 0) {\n      getCurrentPaint().setShader(shaders[shaders.length - 1]);\n    }\n    // Image Filters\n    if (imageFilters.length > 0) {\n      getCurrentPaint().setImageFilter(\n        imageFilters.reduceRight((inner, outer) =>\n          inner ? frameSkia.ImageFilter.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Path Effects\n    if (pathEffects.length > 0) {\n      getCurrentPaint().setPathEffect(\n        pathEffects.reduceRight((inner, outer) =>\n          inner ? frameSkia.PathEffect.MakeCompose(outer, inner) : outer\n        )\n      );\n    }\n\n    // Clear arrays\n    colorFilters.length = 0;\n    shaders.length = 0;\n    imageFilters.length = 0;\n    pathEffects.length = 0;\n  };\n\n  // Return an object containing the Skia reference, the canvas, and the methods\n  return {\n    // Public fields\n    Skia: frameSkia,\n    canvas,\n    track,\n    dispose,\n    paints,\n    colorFilters,\n    shaders,\n    imageFilters,\n    pathEffects,\n    paintDeclarations,\n    paintPool,\n\n    // Public methods\n    savePaint,\n    pushPaint,\n    saveBackdropFilter,\n    get paint() {\n      return paints[paints.length - 1];\n    }, // the \"getter\" for the current paint\n    restorePaint,\n    materializePaint,\n    getOpacity,\n    setOpacity,\n  };\n};\n\nexport type DrawingContext = ReturnType<typeof createDrawingContext>;\n"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/views/SkiaPictureView.web.js

@@ -289,21 +289,26 @@ const SkiaPictureView = props => {
   // - The renderer is created synchronously on mount (the canvas element is
   //   guaranteed to exist in useLayoutEffect; a zero size at that point is
   //   fine, the surface is created once the canvas is measurable).
-  // - Redraw requests coalesce into a single animation frame. A picture
-  //   dispatched before the canvas has a size stays in pictureRef (drawing
-  //   while unmeasured is a no-op) and is painted by the resize path below
-  //   once the canvas becomes measurable, so it is never lost.
+  // - Redraw requests coalesce into a single microtask. A microtask (not an
+  //   animation frame) so that a picture produced inside a rAF callback (the
+  //   Reanimated mapper) is drawn before the current frame paints: deferring
+  //   to the next rAF alternates between "flush pending in this frame" and
+  //   "flush scheduled for the next frame", drawing on every other frame
+  //   only and halving the effective frame rate. A picture dispatched before
+  //   the canvas has a size stays in pictureRef (drawing while unmeasured is
+  //   a no-op) and is painted by the resize path below once the canvas
+  //   becomes measurable, so it is never lost.
   // - A ResizeObserver on the canvas itself recreates the surface and repaints
   //   synchronously (its callbacks run after layout, before paint), and is
   //   also the source of the user-facing onLayout event.
   const redrawPendingRef = (0, _react.useRef)(false);
-  const frameRef = (0, _react.useRef)(0);
+  const flushScheduledRef = (0, _react.useRef)(false);
   const onLayoutRef = (0, _react.useRef)(onLayout);
   (0, _react.useLayoutEffect)(() => {
     onLayoutRef.current = onLayout;
   }, [onLayout]);
   const flushRedraw = (0, _react.useCallback)(() => {
-    frameRef.current = 0;
+    flushScheduledRef.current = false;
     if (redrawPendingRef.current && rendererRef.current && pictureRef.current) {
       redrawPendingRef.current = false;
       rendererRef.current.draw(pictureRef.current);
@@ -313,8 +318,9 @@ const SkiaPictureView = props => {
   }, []);
   const redraw = (0, _react.useCallback)(() => {
     redrawPendingRef.current = true;
-    if (frameRef.current === 0) {
-      frameRef.current = requestAnimationFrame(flushRedraw);
+    if (!flushScheduledRef.current) {
+      flushScheduledRef.current = true;
+      queueMicrotask(flushRedraw);
     }
   }, [flushRedraw]);
   const getSize = (0, _react.useCallback)(() => {
@@ -449,12 +455,11 @@ const SkiaPictureView = props => {
       renderer.dispose();
     };
   }, [isStatic]);
-  (0, _react.useEffect)(() => {
-    return () => {
-      cancelAnimationFrame(frameRef.current);
-      frameRef.current = 0;
-    };
-  }, []);
+
+  // No flush cancellation is needed on unmount: a microtask queued before
+  // unmount runs within the same task, and flushRedraw no-ops once the
+  // layout-effect cleanup has nulled rendererRef.
+
   (0, _react.useImperativeHandle)(ref, () => ({
     setPicture,
     getSize,