@shopify/react-native-skia 2.13.1 → 2.14.0

package/android/CMakeLists.txt

@@ -81,8 +81,10 @@ add_library(
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JSICache.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiPromises.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/Promise.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/jsi/ViewProperty.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkManager.cpp"
+        "${PROJECT_SOURCE_DIR}/../cpp/rnskia/RNSkPictureView.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/CSSColorParser.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/api/third_party/base64.cpp"

package/android/cpp/jni/include/JniSkiaPictureView.h

@@ -69,8 +69,8 @@ protected:
                                       highBitDepth);
   }
 
-  void surfaceSizeChanged(jobject surface, int width, int height, bool isSurface,
-                          bool highBitDepth) override {
+  void surfaceSizeChanged(jobject surface, int width, int height,
+                          bool isSurface, bool highBitDepth) override {
     JniSkiaBaseView::surfaceSizeChanged(surface, width, height, isSurface,
                                         highBitDepth);
   }
@@ -83,7 +83,18 @@ protected:
     JniSkiaBaseView::registerView(nativeId);
   }
 
-  void unregisterView() override { JniSkiaBaseView::unregisterView(); }
+  void unregisterView() override {
+    JniSkiaBaseView::unregisterView();
+    // React drops the Java view here, but the native view behind it (and the
+    // recording it owns) is only destroyed when the Java object is finalized.
+    // Release the content now so it does not wait for the Java garbage
+    // collector.
+    if (_skiaAndroidView != nullptr) {
+      auto renderer = std::static_pointer_cast<RNSkia::RNSkPictureRenderer>(
+          _skiaAndroidView->getSkiaView()->getRenderer());
+      renderer->clear();
+    }
+  }
 
   jni::local_ref<jni::JArrayInt> getBitmap(int width, int height) override {
     // Get the RNSkPictureView from the android view
@@ -101,9 +112,6 @@ protected:
       return jni::JArrayInt::newArray(0);
     }
 
-    // Get the SkPicture from the renderer
-    sk_sp<SkPicture> picture = renderer->getPicture();
-
     const size_t pixelCount =
         static_cast<size_t>(width) * static_cast<size_t>(height);
     if (pixelCount == 0) {
@@ -126,15 +134,8 @@ protected:
       return jni::JArrayInt::newArray(0);
     }
 
-    canvas->clear(SK_ColorTRANSPARENT);
-
-    if (picture) {
-      auto pd = pictureView->getPixelDensity();
-      canvas->save();
-      canvas->scale(pd, pd);
-      canvas->drawPicture(picture);
-      canvas->restore();
-    }
+    // Draws whatever the view currently shows: a picture or a recorder.
+    renderer->drawInto(canvas, pictureView->getPixelDensity());
 
     sk_sp<SkImage> snapshot = surface->makeImageSnapshot();
     if (!snapshot) {

package/apple/RNSkApplePlatformContext.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#import <React/RCTBridge+Private.h>
-#import <React/RCTBridge.h>
+#import <React/RCTBridgeModule.h>
 
 #include <functional>
 #include <memory>
@@ -21,7 +20,7 @@ namespace RNSkia {
 class RNSkApplePlatformContext : public RNSkPlatformContext {
 public:
   RNSkApplePlatformContext(
-      RCTBridge *bridge,
+      RCTViewRegistry *viewRegistry,
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
 #if !TARGET_OS_OSX
       : RNSkPlatformContext(jsCallInvoker, [[UIScreen mainScreen] scale]) {
@@ -32,7 +31,7 @@ public:
 
     // Create screenshot manager
     _screenshotService =
-        [[ViewScreenshotService alloc] initWithUiManager:bridge.uiManager];
+        [[ViewScreenshotService alloc] initWithViewRegistry:viewRegistry];
   }
 
   ~RNSkApplePlatformContext() = default;

package/apple/RNSkiaModule.h

@@ -1,11 +1,19 @@
 #pragma once
 
+#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 #import <rnskia/rnskia.h>
 
-#include "SkiaManager.h"
+#include <memory>
 
-@interface RNSkiaModule : NSObject <NativeSkiaModuleSpec>
+#include "RNSkManager.h"
 
-- (SkiaManager *)manager;
+@interface RNSkiaModule
+    : NSObject <NativeSkiaModuleSpec, RCTTurboModuleWithJSIBindings>
+
+- (std::shared_ptr<RNSkia::RNSkManager>)skManager;
+
+// Fabric components do not have a better way to interact with TurboModules.
+// Workaround to get the SkManager instance from singleton.
++ (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager;
 
 @end

package/apple/RNSkiaModule.mm

@@ -1,52 +1,79 @@
-
 #import "RNSkiaModule.h"
+
 #import <ReactCommon/RCTTurboModule.h>
 
+#import "RNSkApplePlatformContext.h"
+
+static __weak RNSkiaModule *sharedInstance = nil;
+
 @implementation RNSkiaModule {
-  SkiaManager *skiaManager;
-  std::shared_ptr<facebook::react::CallInvoker> jsInvoker;
+  // Handed to us by React Native when JS first requires the module (see
+  // installJSIBindingsWithRuntime:callInvoker:), which always happens before
+  // JS calls install(). Valid until invalidate.
+  facebook::jsi::Runtime *_runtime;
+  std::shared_ptr<facebook::react::CallInvoker> _jsInvoker;
+  std::shared_ptr<RNSkia::RNSkManager> _skManager;
 }
 
 RCT_EXPORT_MODULE()
-@synthesize bridge = _bridge;
+// Injected by React Native (bridgeless included). It is how a module looks up
+// a native view by react tag without touching RCTBridge or RCTUIManager.
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+
+#pragma mark Accessors
 
-#pragma Accessors
+- (std::shared_ptr<RNSkia::RNSkManager>)skManager {
+  return _skManager;
+}
 
-- (SkiaManager *)manager {
-  return skiaManager;
++ (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager {
+  if (sharedInstance != nil) {
+    return [sharedInstance skManager];
+  }
+  return nullptr;
 }
 
-#pragma Setup and invalidation
+#pragma mark Setup and invalidation
 
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }
 
+- (void)
+    installJSIBindingsWithRuntime:(facebook::jsi::Runtime &)runtime
+                      callInvoker:
+                          (const std::shared_ptr<facebook::react::CallInvoker>
+                               &)callInvoker {
+  _runtime = &runtime;
+  _jsInvoker = callInvoker;
+}
+
 - (void)invalidate {
-  if (skiaManager != nil) {
-    [skiaManager invalidate];
-  }
-  skiaManager = nil;
+  _skManager = nullptr;
+  _runtime = nullptr;
+  _jsInvoker = nullptr;
 }
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
-  if (skiaManager != nil) {
+  if (_skManager != nullptr) {
     // Already initialized, ignore call.
     return @true;
   }
-  if (!jsInvoker) {
-    NSLog(@"[RNSkiaModule] Failed to install SkiaManager: jsInvoker is not "
-          @"initialized.");
+  if (_runtime == nullptr || _jsInvoker == nullptr) {
+    NSLog(@"[RNSkiaModule] Failed to install: the JS runtime has not been "
+          @"provided to the module yet.");
     return @false;
   }
-  skiaManager = [[SkiaManager alloc] initWithBridge:self.bridge
-                                          jsInvoker:jsInvoker];
+  sharedInstance = self;
+  _skManager = std::make_shared<RNSkia::RNSkManager>(
+      _runtime, _jsInvoker,
+      std::make_shared<RNSkia::RNSkApplePlatformContext>(
+          self.viewRegistry_DEPRECATED, _jsInvoker));
   return @true;
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
-  jsInvoker = params.jsInvoker;
   return std::make_shared<facebook::react::NativeSkiaModuleSpecJSI>(params);
 }
 

package/apple/SkiaPictureView.mm

@@ -5,10 +5,10 @@
 #import "RNSkPlatformContext.h"
 
 #import "RNSkiaModule.h"
-#import "SkiaManager.h"
 #import "SkiaUIView.h"
 
 #import <React/RCTConversions.h>
+#import <React/RCTConvert.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
 #import <react/renderer/components/rnskia/ComponentDescriptors.h>
@@ -23,7 +23,7 @@ using namespace facebook::react;
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     // Pass SkManager as a raw pointer to avoid circular dependencies
-    auto skManager = [SkiaManager latestActiveSkManager].get();
+    auto skManager = [RNSkiaModule latestActiveSkManager].get();
     [self initCommon:skManager
              factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
                return std::make_shared<RNSkAppleView<RNSkia::RNSkPictureView>>(

package/apple/SkiaUIView.h

@@ -14,7 +14,6 @@
 
 #import "RNSkAppleView.h"
 #import "RNSkManager.h"
-#import "SkiaManager.h"
 
 @interface SkiaUIView : RCTViewComponentView
 

package/apple/SkiaUIView.mm

@@ -88,7 +88,7 @@
     // this flag is only set when the view is inserted and we want to set the
     // manager here since the view could be recycled or the app could be
     // refreshed and we would have a stale manager then
-    _manager = [SkiaManager latestActiveSkManager].get();
+    _manager = [RNSkiaModule latestActiveSkManager].get();
   }
 }
 

package/apple/ViewScreenshotService.h

@@ -7,7 +7,7 @@
 #import <Appkit/Appkit.h>
 #endif // !TARGET_OS_OSX
 
-#import <React/RCTUIManager.h>
+#import <React/RCTBridgeModule.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -19,7 +19,7 @@
 @interface ViewScreenshotService : NSObject {
 }
 
-- (instancetype)initWithUiManager:(RCTUIManager *)uiManager;
+- (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry;
 - (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag;
 
 @end

package/apple/ViewScreenshotService.mm

@@ -1,5 +1,6 @@
 #import "ViewScreenshotService.h"
 #import <QuartzCore/QuartzCore.h>
+#import <React/RCTUtils.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -9,12 +10,12 @@
 #pragma clang diagnostic pop
 
 @implementation ViewScreenshotService {
-  RCTUIManager *_uiManager;
+  __weak RCTViewRegistry *_viewRegistry;
 }
 
-- (instancetype)initWithUiManager:(RCTUIManager *)uiManager {
+- (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry {
   if (self = [super init]) {
-    _uiManager = uiManager;
+    _viewRegistry = viewRegistry;
   }
   return self;
 }
@@ -22,7 +23,7 @@
 - (sk_sp<SkImage>)screenshotOfViewWithTag:(NSNumber *)viewTag {
 #if !TARGET_OS_OSX
   // Find view corresponding to the tag
-  auto view = [_uiManager viewForReactTag:viewTag];
+  auto view = [_viewRegistry viewForReactTag:viewTag];
   if (view == NULL) {
     RCTFatal(RCTErrorWithMessage(@"Could not find view with tag"));
     return nullptr;