@shopify/react-native-skia 1.7.0 → 1.7.2

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

@@ -20,9 +20,9 @@ class JniSkiaBaseView {
 public:
   JniSkiaBaseView(jni::alias_ref<JniSkiaManager::javaobject> skiaManager,
                   std::shared_ptr<RNSkBaseAndroidView> skiaView)
-      : _manager(skiaManager->cthis()), _skiaAndroidView(skiaView) {}
+      : _manager(skiaManager->cthis()), _skiaAndroidView(std::move(skiaView)) {}
 
-  ~JniSkiaBaseView() {}
+  ~JniSkiaBaseView() = default;
 
   std::shared_ptr<RNSkManager> getSkiaManager() {
     return _manager->getSkiaManager();

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.cpp

@@ -41,7 +41,7 @@ GrBackendFormat GetGLBackendFormat(GrDirectContext *dContext,
                                    bool requireKnownFormat) {
   GrBackendApi backend = dContext->backend();
   if (backend != GrBackendApi::kOpenGL) {
-    return GrBackendFormat();
+    return {};
   }
   switch (bufferFormat) {
   // TODO: find out if we can detect, which graphic buffers support
@@ -63,7 +63,7 @@ GrBackendFormat GetGLBackendFormat(GrDirectContext *dContext,
 #endif
   default:
     if (requireKnownFormat) {
-      return GrBackendFormat();
+      return {};
     } else {
       return GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
     }
@@ -110,12 +110,12 @@ void GLTextureHelper::rebind(GrDirectContext *dContext) {
 }
 
 void delete_gl_texture(void *context) {
-  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  auto cleanupHelper = static_cast<GLTextureHelper *>(context);
   delete cleanupHelper;
 }
 
 void update_gl_texture(void *context, GrDirectContext *dContext) {
-  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  auto cleanupHelper = static_cast<GLTextureHelper *>(context);
   cleanupHelper->rebind(dContext);
 }
 
@@ -127,13 +127,13 @@ static GrBackendTexture make_gl_backend_texture(
   while (GL_NO_ERROR != glGetError()) {
   } // clear GL errors
 
-  EGLGetNativeClientBufferANDROIDProc eglGetNativeClientBufferANDROID =
+  auto eglGetNativeClientBufferANDROID =
       (EGLGetNativeClientBufferANDROIDProc)eglGetProcAddress(
           "eglGetNativeClientBufferANDROID");
   if (!eglGetNativeClientBufferANDROID) {
     RNSkLogger::logToConsole(
         "Failed to get the eglGetNativeClientBufferAndroid proc");
-    return GrBackendTexture();
+    return {};
   }
 
   EGLClientBuffer clientBuffer =
@@ -149,14 +149,14 @@ static GrBackendTexture make_gl_backend_texture(
   if (EGL_NO_IMAGE_KHR == image) {
     SkDebugf("Could not create EGL image, err = (%#x)",
              static_cast<int>(eglGetError()));
-    return GrBackendTexture();
+    return {};
   }
 
   GrGLuint texID;
   glGenTextures(1, &texID);
   if (!texID) {
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
 
   GrGLuint target = isRenderable ? GR_GL_TEXTURE_2D : GR_GL_TEXTURE_EXTERNAL;
@@ -167,7 +167,7 @@ static GrBackendTexture make_gl_backend_texture(
     SkDebugf("glBindTexture failed (%#x)", static_cast<int>(status));
     glDeleteTextures(1, &texID);
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
   glEGLImageTargetTexture2DOES(target, image);
   if ((status = glGetError()) != GL_NO_ERROR) {
@@ -175,7 +175,7 @@ static GrBackendTexture make_gl_backend_texture(
              static_cast<int>(status));
     glDeleteTextures(1, &texID);
     eglDestroyImageKHR(display, image);
-    return GrBackendTexture();
+    return {};
   }
   dContext->resetContext(kTextureBinding_GrGLBackendState);
 
@@ -223,16 +223,16 @@ MakeGLBackendTexture(GrDirectContext *dContext, AHardwareBuffer *hardwareBuffer,
                      bool isProtectedContent,
                      const GrBackendFormat &backendFormat, bool isRenderable) {
   SkASSERT(dContext);
-  if (!dContext || dContext->abandoned()) {
-    return GrBackendTexture();
+  if (dContext->abandoned()) {
+    return {};
   }
 
   if (GrBackendApi::kOpenGL != dContext->backend()) {
-    return GrBackendTexture();
+    return {};
   }
 
   if (isProtectedContent && !can_import_protected_content(dContext)) {
-    return GrBackendTexture();
+    return {};
   }
 
   return make_gl_backend_texture(

package/android/cpp/rnskia-android/MainThreadDispatcher.h

@@ -6,8 +6,8 @@
 
 class MainThreadDispatcher {
 private:
-  ALooper *mainLooper;
-  int messagePipe[2];
+  ALooper *mainLooper = nullptr;
+  int messagePipe[2] = { -1, -1 };
   std::queue<std::function<void()>> taskQueue;
   std::mutex queueMutex;
 

package/android/cpp/rnskia-android/OpenGLContext.h

@@ -117,17 +117,23 @@ public:
     // GR_GL_TEXTURE_2D
     case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
       format = GrBackendFormats::MakeGL(GR_GL_RGBA16F, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
-      format = GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+        GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+        break;
     case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_EXTERNAL);
+      break;
     case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_RGB8, GR_GL_TEXTURE_EXTERNAL);
+      break;
 #if __ANDROID_API__ >= 33
     case AHARDWAREBUFFER_FORMAT_R8_UNORM:
       format = GrBackendFormats::MakeGL(GR_GL_R8, GR_GL_TEXTURE_EXTERNAL);
+      break;
 #endif
     default:
       if (requireKnownFormat) {
@@ -136,10 +142,11 @@ public:
         format = GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
       }
     }
-
+    auto width = static_cast<int>(description.width);
+    auto height = static_cast<int>(description.height);
     auto backendTex = MakeGLBackendTexture(
         _directContext.get(), const_cast<AHardwareBuffer *>(hardwareBuffer),
-        description.width, description.height, &deleteImageProc,
+        width, height, &deleteImageProc,
         &updateImageProc, &deleteImageCtx, false, format, false);
     if (!backendTex.isValid()) {
       RNSkLogger::logToConsole(
@@ -159,8 +166,7 @@ public:
   }
 
   // TODO: remove width, height
-  std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window, int width,
-                                            int height) {
+  std::unique_ptr<WindowContext> MakeWindow(ANativeWindow *window) {
     auto display = OpenGLSharedContext::getInstance().getDisplay();
     return std::make_unique<OpenGLWindowContext>(
         _directContext.get(), display, _glContext.get(), window,

package/android/cpp/rnskia-android/OpenGLWindowContext.h

@@ -42,7 +42,7 @@ public:
     _glSurface = display->makeWindowSurface(config, _window);
   }
 
-  ~OpenGLWindowContext() {
+  ~OpenGLWindowContext() override {
     _skSurface = nullptr;
     _glSurface = nullptr;
     ANativeWindow_release(_window);

package/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -1,6 +1,5 @@
 #pragma once
 
-// TODO: Add android flags
 #if __ANDROID_API__ >= 26
 #include <android/hardware_buffer.h>
 #endif
@@ -28,18 +27,17 @@
 #pragma clang diagnostic pop
 
 namespace RNSkia {
-namespace jsi = facebook::jsi;
 
 class RNSkAndroidPlatformContext : public RNSkPlatformContext {
 public:
   RNSkAndroidPlatformContext(
       JniPlatformContext *jniPlatformContext,
       std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker)
-      : RNSkPlatformContext(jsCallInvoker,
+      : RNSkPlatformContext(std::move(jsCallInvoker),
                             jniPlatformContext->getPixelDensity()),
         _jniPlatformContext(jniPlatformContext) {}
 
-  ~RNSkAndroidPlatformContext() {}
+  ~RNSkAndroidPlatformContext() override = default;
 
   void performStreamOperation(
       const std::string &sourceUri,
@@ -65,7 +63,7 @@ public:
     return DawnContext::getInstance().MakeWindow(surface, width, height);
 #else
     auto aWindow = reinterpret_cast<ANativeWindow *>(surface);
-    return OpenGLContext::getInstance().MakeWindow(aWindow, width, height);
+    return OpenGLContext::getInstance().MakeWindow(aWindow);
 #endif
   }
 
@@ -89,7 +87,7 @@ public:
 
     OpenGLContext::getInstance().makeCurrent();
     if (glIsTexture(textureInfo.fID) == GL_FALSE) {
-      throw new std::runtime_error("Invalid textureInfo");
+      throw std::runtime_error("Invalid textureInfo");
     }
 
     GrBackendTexture backendTexture = GrBackendTextures::MakeGL(
@@ -109,7 +107,7 @@ public:
 
   void releaseNativeBuffer(uint64_t pointer) override {
 #if __ANDROID_API__ >= 26
-    AHardwareBuffer *buffer = reinterpret_cast<AHardwareBuffer *>(pointer);
+    auto *buffer = reinterpret_cast<AHardwareBuffer *>(pointer);
     AHardwareBuffer_release(buffer);
 #endif
   }
@@ -178,16 +176,16 @@ public:
     if (!SkImages::GetBackendTextureFromImage(image, &texture, true)) {
       throw std::runtime_error("Couldn't get backend texture from image.");
     }
-    return getJSITextureInfo(texture);
+    return getTextureInfo(texture);
   }
 
   const TextureInfo getTexture(sk_sp<SkSurface> surface) override {
     GrBackendTexture texture = SkSurfaces::GetBackendTexture(
         surface.get(), SkSurface::BackendHandleAccess::kFlushRead);
-    return getJSITextureInfo(texture);
+    return getTextureInfo(texture);
   }
 
-  static const TextureInfo getJSITextureInfo(const GrBackendTexture &texture) {
+  static TextureInfo getTextureInfo(const GrBackendTexture &texture) {
     if (!texture.isValid()) {
       throw std::runtime_error("invalid backend texture");
     }

package/android/cpp/rnskia-android/RNSkAndroidVideo.cpp

@@ -35,7 +35,7 @@ RNSkAndroidVideo::RNSkAndroidVideo(jni::global_ref<jobject> jniVideo)
 #endif
 }
 
-RNSkAndroidVideo::~RNSkAndroidVideo() {}
+RNSkAndroidVideo::~RNSkAndroidVideo() = default;
 
 sk_sp<SkImage> RNSkAndroidVideo::nextImage(double *timeStamp) {
 #if __ANDROID_API__ >= 26

package/android/cpp/rnskia-android/RNSkAndroidVideo.h

@@ -26,7 +26,7 @@ private:
 
 public:
   explicit RNSkAndroidVideo(jni::global_ref<jobject> jniVideo);
-  ~RNSkAndroidVideo();
+  ~RNSkAndroidVideo() override;
   sk_sp<SkImage> nextImage(double *timeStamp = nullptr) override;
   double duration() override;
   double framerate() override;

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -26,9 +26,9 @@ namespace RNSkia {
 RNSkOpenGLCanvasProvider::RNSkOpenGLCanvasProvider(
     std::function<void()> requestRedraw,
     std::shared_ptr<RNSkia::RNSkPlatformContext> platformContext)
-    : RNSkCanvasProvider(requestRedraw), _platformContext(platformContext) {}
+    : RNSkCanvasProvider(std::move(requestRedraw)), _platformContext(std::move(platformContext)) {}
 
-RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() {}
+RNSkOpenGLCanvasProvider::~RNSkOpenGLCanvasProvider() = default;
 
 float RNSkOpenGLCanvasProvider::getScaledWidth() {
   if (_surfaceHolder) {
@@ -110,7 +110,7 @@ void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject jSurfaceTexture,
   _surfaceHolder = DawnContext::getInstance().MakeWindow(window, width, height);
 #else
   _surfaceHolder =
-      OpenGLContext::getInstance().MakeWindow(window, width, height);
+      OpenGLContext::getInstance().MakeWindow(window);
 #endif
 
   // Post redraw request to ensure we paint in the next draw cycle.

package/android/src/main/java/com/shopify/reactnative/skia/SkiaBaseView.java

@@ -32,20 +32,7 @@ public abstract class SkiaBaseView extends ReactViewGroup implements SkiaViewAPI
         }
     }
 
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        if (getMeasuredWidth() == 0) {
-            if (mView instanceof SkiaTextureView) {
-                ((SkiaTextureView) mView).createSurfaceTexture();
-            }
-        }
-    }
-
     void dropInstance() {
-        if (mView instanceof SkiaTextureView) {
-            ((SkiaTextureView)mView).isDropped = true;
-        }
         unregisterView();
     }
 

package/android/src/main/java/com/shopify/reactnative/skia/SkiaTextureView.java

@@ -15,9 +15,6 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
 
     SkiaViewAPI mApi;
     boolean mDebug;
-    boolean pristine = true;
-
-    public boolean isDropped = false;
 
     public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
         super(context);
@@ -27,22 +24,6 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
         setSurfaceTextureListener(this);
     }
 
-    public void createSurfaceTexture() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            Log.i(tag, "Create SurfaceTexture");
-            SurfaceTexture surfaceTexture = new SurfaceTexture(false);
-            setSurfaceTexture(surfaceTexture);
-            onSurfaceTextureAvailable(surfaceTexture, getWidth(), getHeight());
-        }
-    }
-
-    private void reCreateSurfaceTexture() {
-        boolean surfaceIsAlreadyAvailable = getSurfaceTexture() != null;
-        if (surfaceIsAlreadyAvailable) {
-            createSurfaceTexture();
-        }
-    }
-
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
@@ -57,23 +38,13 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
     @Override
     public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surfaceTexture, int width, int height) {
         Log.i(tag, "onSurfaceTextureSizeChanged:  " + width + "x" + height);
-        if (isDropped) {
-            return;
-        }
-        mApi.onSurfaceTextureCreated(surfaceTexture, width, height);
+        mApi.onSurfaceTextureChanged(surfaceTexture, width, height);
     }
 
     @Override
     public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surfaceTexture) {
         mApi.onSurfaceDestroyed();
-        // Because of React Native Screens (which dettach the view), we always keep the surface alive.
-        // If not, Texture view will recreate the texture surface by itself and
-        // we will lose the fast first time to frame.
-        // We only delete the surface when the view is dropped (destroySurface invoked by SkiaBaseViewManager);
-        if (!isDropped) {
-            reCreateSurfaceTexture();
-        }
-        return false;
+        return true;
     }
 
     private long _prevTimestamp = 0;

package/cpp/api/JsiSkApi.h

@@ -64,7 +64,7 @@ public:
    * and provide functions for accessing and creating the Skia wrapper objects
    * @param context Platform context
    */
-  JsiSkApi(jsi::Runtime &runtime, std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkApi(const std::shared_ptr<RNSkPlatformContext> &context)
       : JsiSkHostObject(context) {
     // We create the system font manager eagerly since it has proven to be too
     // slow to do it on demand

package/cpp/api/JsiSkCanvas.h

@@ -83,7 +83,7 @@ public:
     auto src = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     auto paint = JsiSkPaint::fromValue(runtime, arguments[3]);
-    auto fastSample = count < 5 ? false : arguments[4].getBool();
+    auto fastSample = count >= 5 && arguments[4].getBool();
     _canvas->drawImageRect(image, *src, *dest, SkSamplingOptions(), paint.get(),
                            fastSample ? SkCanvas::kFast_SrcRectConstraint
                                       : SkCanvas::kStrict_SrcRectConstraint);

package/cpp/api/JsiSkColor.h

@@ -24,7 +24,7 @@ class JsiSkColor : public RNJsi::JsiHostObject {
 public:
   JsiSkColor() : JsiHostObject() {}
 
-  ~JsiSkColor() {}
+  ~JsiSkColor() override = default;
 
   static jsi::Object toValue(jsi::Runtime &runtime, SkColor color) {
     auto result = runtime.global()
@@ -63,7 +63,7 @@ public:
    * @return A function for creating a new host object wrapper for the SkColor
    * class
    */
-  static const jsi::HostFunctionType createCtor() {
+  static jsi::HostFunctionType createCtor() {
     return JSI_HOST_FUNCTION_LAMBDA {
       if (arguments[0].isNumber()) {
         return JsiSkColor::toValue(runtime, arguments[0].getNumber());

package/cpp/api/third_party/CSSColorParser.h

@@ -34,7 +34,7 @@
 namespace CSSColorParser {
 
 struct Color {
-  inline Color() {}
+  inline Color() = default;
   inline Color(unsigned char r_, unsigned char g_, unsigned char b_, float a_)
       : r(r_), g(g_), b(b_), a(a_ > 1   ? 1
                                : a_ < 0 ? 0

package/cpp/api/third_party/base64.cpp

@@ -26,8 +26,8 @@ namespace RNSkia {
 
 Base64::Error Base64::Decode(const void *srcv, size_t srcLength, void *dstv,
                              size_t *dstLength) {
-  const unsigned char *src = static_cast<const unsigned char *>(srcv);
-  unsigned char *dst = static_cast<unsigned char *>(dstv);
+  auto *src = static_cast<const unsigned char *>(srcv);
+  auto *dst = static_cast<unsigned char *>(dstv);
 
   int i = 0;
   bool padTwo = false;
@@ -112,8 +112,8 @@ Base64::Error Base64::Decode(const void *srcv, size_t srcLength, void *dstv,
 }
 
 size_t Base64::Encode(const void *srcv, size_t length, void *dstv) {
-  const unsigned char *src = static_cast<const unsigned char *>(srcv);
-  unsigned char *dst = static_cast<unsigned char *>(dstv);
+  auto *src = static_cast<const unsigned char *>(srcv);
+  auto *dst = static_cast<unsigned char *>(dstv);
 
   const char *encode = kDefaultEncode;
   if (dst) {

package/cpp/rnskia/RNSkManager.cpp

@@ -69,7 +69,7 @@ void RNSkManager::installBindings() {
   // Create the API objects and install it on the global object in the
   // provided runtime.
 
-  auto skiaApi = std::make_shared<JsiSkApi>(*_jsRuntime, _platformContext);
+  auto skiaApi = std::make_shared<JsiSkApi>(_platformContext);
   _jsRuntime->global().setProperty(
       *_jsRuntime, "SkiaApi",
       jsi::Object::createFromHostObject(*_jsRuntime, std::move(skiaApi)));

package/cpp/rnskia/RNSkPlatformContext.h

@@ -27,7 +27,6 @@
 
 namespace RNSkia {
 
-namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 struct TextureInfo {

package/ios/RNSkia-iOS/RNSkiOSPlatformContext.h

@@ -10,8 +10,6 @@
 #include "RNSkPlatformContext.h"
 #include "ViewScreenshotService.h"
 
-#include <jsi/jsi.h>
-
 namespace facebook {
 namespace react {
 class CallInvoker;
@@ -20,8 +18,6 @@ class CallInvoker;
 
 namespace RNSkia {
 
-namespace jsi = facebook::jsi;
-
 class RNSkiOSPlatformContext : public RNSkPlatformContext {
 public:
   RNSkiOSPlatformContext(

package/ios/RNSkia-iOS/SkiaDomView.mm

@@ -24,10 +24,10 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    auto skManager = [[self skiaManager] skManager];
-    // Pass SkManager as a raw pointer to avoid circular dependenciesr
+    // Pass SkManager as a raw pointer to avoid circular dependencies
+    auto skManager = [SkiaManager latestActiveSkManager].get();
     [self
-        initCommon:skManager.get()
+        initCommon:skManager
            factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
              return std::make_shared<RNSkiOSView<RNSkia::RNSkDomView>>(context);
            }];

package/ios/RNSkia-iOS/SkiaDomViewManager.mm

@@ -15,7 +15,8 @@
 RCT_EXPORT_MODULE(SkiaDomView)
 
 - (SkiaManager *)skiaManager {
-  auto bridge = [RCTBridge currentBridge];
+  auto bridge = self.bridge;
+  RCTAssert(bridge, @"Bridge must not be nil.");
   auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
   return [skiaModule manager];
 }

package/ios/RNSkia-iOS/SkiaManager.h

@@ -16,4 +16,10 @@
                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)
                                    jsInvoker;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+// 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;
+#endif // RCT_NEW_ARCH_ENABLED
+
 @end

package/ios/RNSkia-iOS/SkiaManager.mm

@@ -8,6 +8,8 @@
 
 #import "RNSkiOSPlatformContext.h"
 
+static __weak SkiaManager *sharedInstance = nil;
+
 @implementation SkiaManager {
   std::shared_ptr<RNSkia::RNSkManager> _skManager;
   __weak RCTBridge *weakBridge;
@@ -29,6 +31,7 @@
                                    jsInvoker {
   self = [super init];
   if (self) {
+    sharedInstance = self;
     RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
     if (cxxBridge.runtime) {
 
@@ -44,4 +47,18 @@
   return self;
 }
 
+- (void)dealloc
+{
+  sharedInstance = nil;
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
++ (std::shared_ptr<RNSkia::RNSkManager>)latestActiveSkManager
+{
+  if (sharedInstance != nil) {
+    return [sharedInstance skManager];
+  }
+  return nullptr;
+}
+#endif // RCT_NEW_ARCH_ENABLED
 @end

package/ios/RNSkia-iOS/SkiaPictureView.mm

@@ -24,9 +24,9 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    auto skManager = [[self skiaManager] skManager];
-    // Pass SkManager as a raw pointer to avoid circular dependenciesr
-    [self initCommon:skManager.get()
+    // Pass SkManager as a raw pointer to avoid circular dependencies
+    auto skManager = [SkiaManager latestActiveSkManager].get();
+    [self initCommon:skManager
              factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
                return std::make_shared<RNSkiOSView<RNSkia::RNSkPictureView>>(
                    context);

package/ios/RNSkia-iOS/SkiaPictureViewManager.mm

@@ -15,7 +15,8 @@
 RCT_EXPORT_MODULE(SkiaPictureView)
 
 - (SkiaManager *)skiaManager {
-  auto bridge = [RCTBridge currentBridge];
+  auto bridge = self.bridge;
+  RCTAssert(bridge, @"Bridge must not be nil.");
   auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
   return [skiaModule manager];
 }

package/ios/RNSkia-iOS/SkiaUIView.h

@@ -29,7 +29,6 @@
            factory:(std::function<std::shared_ptr<RNSkBaseiOSView>(
                         std::shared_ptr<RNSkia::RNSkPlatformContext>)>)factory;
 - (std::shared_ptr<RNSkBaseiOSView>)impl;
-- (SkiaManager *)skiaManager;
 
 - (void)setDebugMode:(bool)debugMode;
 - (void)setOpaque:(bool)opaque;

package/ios/RNSkia-iOS/SkiaUIView.mm

@@ -48,12 +48,6 @@
   _factory = factory;
 }
 
-- (SkiaManager *)skiaManager {
-  auto bridge = [RCTBridge currentBridge];
-  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
-  return [skiaModule manager];
-}
-
 - (void)willInvalidateModules {
   _impl = nullptr;
   _manager = nullptr;
@@ -114,7 +108,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 = [[self skiaManager] skManager].get();
+    _manager = [SkiaManager latestActiveSkManager].get();
   }
 }
 #endif // RCT_NEW_ARCH_ENABLED

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",