@shopify/react-native-skia 2.12.0-next.1 → 2.13.0

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/RNSkiaModule.java

@@ -1,6 +1,6 @@
 // RnskiaModule.java
 
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.util.Log;
 
@@ -17,11 +17,6 @@ public class RNSkiaModule extends NativeSkiaModuleSpec {
 
     private final WeakReference<ReactApplicationContext> weakReactContext;
     private SkiaManager skiaManager;
-    private static volatile boolean sIsValid = false;
-
-    public static boolean isModuleValid() {
-        return sIsValid;
-    }
 
     public RNSkiaModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -31,7 +26,6 @@ public class RNSkiaModule extends NativeSkiaModuleSpec {
     @Override
     public void invalidate() {
         super.invalidate();
-        sIsValid = false;
 
         if (this.skiaManager != null) {
             this.skiaManager.invalidate();
@@ -64,7 +58,6 @@ public class RNSkiaModule extends NativeSkiaModuleSpec {
                 return false;
             }
             skiaManager = new SkiaManager(context);
-            sIsValid = true;
             return true;
         } catch (Exception exception) {
             Log.e(NAME, "Failed to initialize Skia Manager!", exception);

package/android/src/main/java/com/reactnative/skia/RNSkiaPackage.java

@@ -0,0 +1,57 @@
+// RnskiaPackage.java
+
+package com.reactnative.skia;
+
+import androidx.annotation.Nullable;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.facebook.react.BaseReactPackage;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
+
+// `implements ReactPackage` is redundant (BaseReactPackage already implements it)
+// but required: older @react-native-community/cli versions only autolink
+// classes matching `implements ReactPackage` or `extends TurboReactPackage`.
+public class RNSkiaPackage extends BaseReactPackage implements ReactPackage {
+    @Nullable
+    @Override
+    public NativeModule getModule(String name, ReactApplicationContext reactApplicationContext) {
+        if (RNSkiaModule.NAME.equals(name)) {
+            return new RNSkiaModule(reactApplicationContext);
+        }
+        return null;
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Arrays.<ViewManager>asList(
+            new SkiaPictureViewManager()
+        );
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
+            reactModuleInfoMap.put(
+                    RNSkiaModule.NAME,
+                    new ReactModuleInfo(
+                            RNSkiaModule.NAME,
+                            RNSkiaModule.class.getName(),
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            false, // isCxxModule
+                            true   // isTurboModule
+                    ));
+            return reactModuleInfoMap;
+        };
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.reactnative.skia;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.View;
+
+import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.views.view.ReactViewGroup;
+
+public abstract class SkiaBaseView extends ReactViewGroup implements SkiaViewAPI {
+    // Backing view kinds, see updateView().
+    private static final int KIND_SURFACE_VIEW = 0;
+    private static final int KIND_TEXTURE_VIEW = 1;
+
+    private View mView;
+
+    // Props, applied together in updateView().
+    private boolean mOpaque = false;
+    private String mSurfaceType = "auto";
+    private boolean mZOrderOnTop = false;
+    private boolean mHighBitDepth = false;
+
+    // What the current backing view was created with.
+    private int mAppliedKind = -1;
+    private boolean mAppliedZOrderOnTop;
+    private boolean mAppliedHighBitDepth;
+
+    private final boolean debug = false;
+    private final String tag = "SkiaView";
+
+    public SkiaBaseView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        // When pointerEvents is "none" or "box-none", make this view completely
+        // transparent to touch dispatch so events pass through to views behind it
+        if (!PointerEvents.canBeTouchTarget(getPointerEvents())) {
+            return false;
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    public void setOpaque(boolean value) {
+        mOpaque = value;
+    }
+
+    public void setSurfaceType(String value) {
+        mSurfaceType = value == null ? "auto" : value;
+    }
+
+    public void setZOrderOnTop(boolean value) {
+        mZOrderOnTop = value;
+    }
+
+    public void setHighBitDepth(boolean value) {
+        mHighBitDepth = value;
+    }
+
+    // Resolve the backing view from the props. "auto" picks SurfaceView for an
+    // opaque canvas and TextureView for a non-opaque one.
+    private int resolveKind() {
+        if ("SurfaceView".equals(mSurfaceType)) {
+            return KIND_SURFACE_VIEW;
+        }
+        if ("TextureView".equals(mSurfaceType)) {
+            return KIND_TEXTURE_VIEW;
+        }
+        return mOpaque ? KIND_SURFACE_VIEW : KIND_TEXTURE_VIEW;
+    }
+
+    // The 10-bit buffer format only has 2 bits of alpha, which would visibly
+    // break translucency, and the extra precision would be lost in the 8-bit
+    // composition pass of a TextureView anyway. So the flag only applies to an
+    // opaque SurfaceView.
+    private boolean resolveHighBitDepth(int kind) {
+        if (!mHighBitDepth) {
+            return false;
+        }
+        if (kind != KIND_SURFACE_VIEW || !mOpaque) {
+            Log.w(tag, "highBitDepth requires an opaque SurfaceView on Android, falling back to the 8-bit format");
+            return false;
+        }
+        return true;
+    }
+
+    // Apply the complete prop transaction once, after every prop has arrived.
+    // Only a change of backing view, or of a setting the view must know before
+    // it attaches (zOrderOnTop, the buffer format), replaces the child; opacity
+    // is applied in place.
+    void updateView() {
+        int kind = resolveKind();
+        boolean zOrderOnTop = kind == KIND_SURFACE_VIEW && mZOrderOnTop;
+        boolean highBitDepth = resolveHighBitDepth(kind);
+        if (mView == null
+                || kind != mAppliedKind
+                || zOrderOnTop != mAppliedZOrderOnTop
+                || highBitDepth != mAppliedHighBitDepth) {
+            if (mView != null) {
+                removeView(mView);
+            }
+            mAppliedKind = kind;
+            mAppliedZOrderOnTop = zOrderOnTop;
+            mAppliedHighBitDepth = highBitDepth;
+            mView = kind == KIND_SURFACE_VIEW
+                    ? new SkiaSurfaceView(getContext(), this, debug, zOrderOnTop, mOpaque)
+                    : new SkiaTextureView(getContext(), this, debug, mOpaque);
+            addView(mView);
+            // React Native sizes native children explicitly through onLayout, so
+            // the requestLayout triggered by addView is ignored; size the new
+            // child ourselves or it stays 0x0 and never gets a surface.
+            if (getWidth() > 0 || getHeight() > 0) {
+                mView.layout(0, 0, getWidth(), getHeight());
+            }
+        } else if (kind == KIND_SURFACE_VIEW) {
+            ((SkiaSurfaceView) mView).setOpaque(mOpaque);
+        } else {
+            ((SkiaTextureView) mView).setOpaque(mOpaque);
+        }
+    }
+
+    void dropInstance() {
+        unregisterView();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+        if (mView != null) {
+            mView.layout(0, 0, right - left, bottom - top);
+        }
+    }
+
+    // SurfaceView callbacks: the native side receives an android.view.Surface.
+
+    @Override
+    public void onSurfaceCreated(Surface surface, int width, int height) {
+        surfaceAvailable(surface, width, height, true, mAppliedHighBitDepth);
+    }
+
+    @Override
+    public void onSurfaceChanged(Surface surface, int width, int height) {
+        Log.i(tag, "onSurfaceChanged " + width + "/" + height);
+        surfaceSizeChanged(surface, width, height, true, mAppliedHighBitDepth);
+    }
+
+    // TextureView callbacks: the native side receives a SurfaceTexture and
+    // drives updateTexImage itself. The 10-bit format is never used here.
+
+    @Override
+    public void onSurfaceTextureCreated(SurfaceTexture surface, int width, int height) {
+        surfaceAvailable(surface, width, height, false, false);
+    }
+
+    @Override
+    public void onSurfaceTextureChanged(SurfaceTexture surface, int width, int height) {
+        Log.i(tag, "onSurfaceTextureSizeChanged " + width + "/" + height);
+        surfaceSizeChanged(surface, width, height, false, false);
+    }
+
+    @Override
+    public void onSurfaceDestroyed() {
+        surfaceDestroyed();
+    }
+
+    // isSurface tells the native side whether `surface` is an
+    // android.view.Surface (SurfaceView) or a SurfaceTexture (TextureView).
+    protected abstract void surfaceAvailable(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
+
+    protected abstract void surfaceSizeChanged(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
+
+    protected abstract void surfaceDestroyed();
+
+    protected abstract void setDebugMode(boolean show);
+
+    protected abstract void registerView(int nativeId);
+
+    protected abstract void unregisterView();
+
+    protected abstract int[] getBitmap(int width, int height);
+}

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaBaseViewManager.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.ViewProps;
@@ -33,6 +33,25 @@ public abstract class SkiaBaseViewManager<T extends SkiaBaseView> extends ReactV
         ((SkiaBaseView)view).setHighBitDepth(value);
     }
 
+    @ReactProp(name = "androidSurfaceType")
+    public void setAndroidSurfaceType(T view, @Nullable String value) {
+        ((SkiaBaseView)view).setSurfaceType(value);
+    }
+
+    @ReactProp(name = "androidZOrderOnTop")
+    public void setAndroidZOrderOnTop(T view, boolean value) {
+        ((SkiaBaseView)view).setZOrderOnTop(value);
+    }
+
+    // The backing view depends on several props (opaque, androidSurfaceType,
+    // androidZOrderOnTop, highBitDepth), so it is resolved once per transaction
+    // rather than in each setter.
+    @Override
+    protected void onAfterUpdateTransaction(@NonNull ReactViewGroup view) {
+        super.onAfterUpdateTransaction(view);
+        ((SkiaBaseView)view).updateView();
+    }
+
     @ReactProp(name = ViewProps.POINTER_EVENTS)
     public void setPointerEvents(T view, @Nullable String pointerEventsStr) {
         view.setPointerEvents(PointerEvents.parsePointerEvents(pointerEventsStr));

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaManager.java

@@ -1,9 +1,10 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 
 @DoNotStrip
 public class SkiaManager {
@@ -22,11 +23,15 @@ public class SkiaManager {
         super();
         mContext = context;
 
-        RuntimeExecutor runtimeExecutor = ReactNativeCompatible.getRuntimeExecutor(context);
+        CallInvokerHolder jsCallInvokerHolder = context.getJSCallInvokerHolder();
+        if (jsCallInvokerHolder == null) {
+            throw new IllegalStateException("React instance is not ready: no JS CallInvoker available");
+        }
 
         mPlatformContext = new PlatformContext(context);
 
-        mHybridData = initHybrid(context.getJavaScriptContextHolder().get(), runtimeExecutor, mPlatformContext);
+        mHybridData = initHybrid(context.getJavaScriptContextHolder().get(),
+                (CallInvokerHolderImpl) jsCallInvokerHolder, mPlatformContext);
 
         initializeRuntime();
     }
@@ -44,10 +49,10 @@ public class SkiaManager {
     }
 
     // private C++ functions
-    private native HybridData initHybrid(long jsContext, RuntimeExecutor runtimeExecutor,
+    private native HybridData initHybrid(long jsContext, CallInvokerHolderImpl jsCallInvokerHolder,
             PlatformContext platformContext);
 
     private native void initializeRuntime();
     public native void invalidate();
 
-}
+}

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaPictureView.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -67,9 +67,9 @@ public class SkiaPictureView extends SkiaBaseView {
 
     private native HybridData initHybrid(SkiaManager skiaManager);
 
-    protected native void surfaceAvailable(Object surface, int width, int height, boolean opaque, boolean highBitDepth);
+    protected native void surfaceAvailable(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
 
-    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean opaque, boolean highBitDepth);
+    protected native void surfaceSizeChanged(Object surface, int width, int height, boolean isSurface, boolean highBitDepth);
 
     protected native void surfaceDestroyed();
 

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaPictureViewManager.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.viewmanagers.SkiaPictureViewManagerDelegate;

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaSurfaceView.java

@@ -1,7 +1,8 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.PixelFormat;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import androidx.annotation.NonNull;
@@ -12,13 +13,22 @@ public class SkiaSurfaceView extends SurfaceView implements SurfaceHolder.Callba
     SkiaViewAPI mApi;
     boolean mDebug;
 
-    public SkiaSurfaceView(Context context, SkiaViewAPI api, boolean debug) {
+    public SkiaSurfaceView(Context context, SkiaViewAPI api, boolean debug, boolean zOrderOnTop, boolean opaque) {
         super(context);
         mApi = api;
         mDebug = debug;
+        // Must be set before the surface is created.
+        setZOrderOnTop(zOrderOnTop);
+        setOpaque(opaque);
         getHolder().addCallback(this);
     }
 
+    // The format drives the compositor's opaque flag for this layer. It can
+    // change on a live surface: SurfaceView reports it through surfaceChanged.
+    public void setOpaque(boolean opaque) {
+        getHolder().setFormat(opaque ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT);
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
@@ -39,4 +49,4 @@ public class SkiaSurfaceView extends SurfaceView implements SurfaceHolder.Callba
     public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
         mApi.onSurfaceDestroyed();
     }
-}
+}

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

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -16,11 +16,13 @@ public class SkiaTextureView extends TextureView implements TextureView.SurfaceT
     SkiaViewAPI mApi;
     boolean mDebug;
 
-    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug) {
+    public SkiaTextureView(Context context, SkiaViewAPI api, boolean debug, boolean opaque) {
         super(context);
         mApi = api;
         mDebug = debug;
-        setOpaque(false);
+        // An opaque TextureView lets the UI toolkit skip blending it; it can be
+        // toggled on a live view.
+        setOpaque(opaque);
         setSurfaceTextureListener(this);
     }
 

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/SkiaViewAPI.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.graphics.SurfaceTexture;
 import android.view.Surface;

package/android/src/main/java/com/{shopify/reactnative → reactnative}/skia/ViewScreenshotService.java

@@ -1,4 +1,4 @@
-package com.shopify.reactnative.skia;
+package com.reactnative.skia;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -19,10 +19,11 @@ import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UIManager;
+import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewGroup;
 
-import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -118,17 +119,13 @@ public class ViewScreenshotService {
     }
 
     private static void drawChildren(Canvas canvas, ViewGroup group, Paint paint, float parentOpacity) {
-        // Handle clipping for ReactViewGroup
-        if (group instanceof ReactViewGroup) {
-            try {
-                Class[] cArg = new Class[1];
-                cArg[0] = Canvas.class;
-                Method method = ReactViewGroup.class.getDeclaredMethod("dispatchOverflowDraw", cArg);
-                method.setAccessible(true);
-                method.invoke(group, canvas);
-            } catch (Exception e) {
-                Log.e(TAG, "couldn't invoke dispatchOverflowDraw() on ReactViewGroup", e);
-            }
+        // ReactViewGroup applies `overflow: hidden` / `overflow: scroll` clipping from its
+        // dispatchDraw() override. We never call dispatchDraw() here because children are
+        // walked manually (TextureView / SurfaceView need special handling), so the clip has
+        // to be replicated explicitly, exactly as ReactViewGroup.dispatchDraw() does it.
+        if (group instanceof ReactViewGroup
+                && !ViewProps.VISIBLE.equals(((ReactViewGroup) group).getOverflow())) {
+            BackgroundStyleApplicator.clipToPaddingBox(group, canvas);
         }
         for (int i = 0; i < group.getChildCount(); i++) {
             View child = group.getChildAt(i);

package/apple/MetalContext.mm

@@ -31,7 +31,7 @@ MetalContext::MetalContext() {
   GrContextOptions grContextOptions; // set different options here.
 
   // Create the Skia Direct Context
-  _directContext = GrDirectContexts::MakeMetal(backendContext);
+  _directContext = GrDirectContexts::MakeMetal(backendContext, grContextOptions);
   if (_directContext == nullptr) {
     RNSkia::RNSkLogger::logToConsole("Couldn't create a Skia Metal Context");
   }

package/apple/RNSkApplePlatformContext.h

@@ -63,9 +63,6 @@ public:
 
   std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override;
 
-  std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) override;
-
   virtual void performStreamOperation(
       const std::string &sourceUri,
       const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override;

package/apple/RNSkApplePlatformContext.mm

@@ -307,17 +307,6 @@ RNSkApplePlatformContext::createVideo(const std::string &url) {
   return std::make_shared<RNSkAppleVideo>(url, this);
 }
 
-std::shared_ptr<WindowContext>
-RNSkApplePlatformContext::makeContextFromNativeSurface(void *surface, int width,
-                                                       int height) {
-#if defined(SK_GRAPHITE)
-  return DawnContext::getInstance().MakeWindow(surface, width, height);
-#else
-  return MetalContext::getInstance().MakeWindow((__bridge CALayer *)surface,
-                                                width, height);
-#endif
-}
-
 void RNSkApplePlatformContext::raiseError(const std::exception &err) {
   RCTFatal(RCTErrorWithMessage([NSString stringWithUTF8String:err.what()]));
 }

package/apple/RNSkiaModule.h

@@ -1,19 +1,10 @@
 #pragma once
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <rnskia/rnskia.h>
-#else
-#import <React/RCTBridgeModule.h>
-#endif
 
 #include "SkiaManager.h"
 
-@interface RNSkiaModule : NSObject
-#ifdef RCT_NEW_ARCH_ENABLED
-                          <NativeSkiaModuleSpec>
-#else
-                          <RCTBridgeModule>
-#endif
+@interface RNSkiaModule : NSObject <NativeSkiaModuleSpec>
 
 - (SkiaManager *)manager;
 

package/apple/RNSkiaModule.mm

@@ -1,6 +1,5 @@
 
 #import "RNSkiaModule.h"
-#import <React/RCTBridge+Private.h>
 #import <ReactCommon/RCTTurboModule.h>
 
 @implementation RNSkiaModule {
@@ -35,14 +34,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
     // Already initialized, ignore call.
     return @true;
   }
-#ifndef RCT_REMOVE_LEGACY_ARCH
   if (!jsInvoker) {
-    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-    jsInvoker = cxxBridge.jsCallInvoker;
-  }
-#endif
-  if (!jsInvoker) {
-    NSLog(@"[RNSkiaModule] Failed to install SkiaManager: jsInvoker is not initialized.");
+    NSLog(@"[RNSkiaModule] Failed to install SkiaManager: jsInvoker is not "
+          @"initialized.");
     return @false;
   }
   skiaManager = [[SkiaManager alloc] initWithBridge:self.bridge
@@ -50,12 +44,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
   return @true;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   jsInvoker = params.jsInvoker;
   return std::make_shared<facebook::react::NativeSkiaModuleSpecJSI>(params);
 }
-#endif
 
 @end

package/apple/SkiaManager.h

@@ -16,10 +16,8 @@
                      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/apple/SkiaManager.mm

@@ -7,10 +7,9 @@
 
 #import "RNSkApplePlatformContext.h"
 
-// Forward-declared runtime accessor that is satisfied by RCTCxxBridge
-// (legacy/transitional) and RCTBridgeProxy (bridgeless). Avoids referencing
-// RCTCxxBridge directly, which is compiled out when RCT_REMOVE_LEGACY_ARCH
-// is set (React Native 0.82+).
+// Forward-declared runtime accessor satisfied by RCTBridgeProxy (bridgeless).
+// Avoids referencing RCTCxxBridge, which is compiled out when
+// RCT_REMOVE_LEGACY_ARCH is set (React Native 0.82+).
 @interface RCTBridge (RNSkiaRuntime)
 - (void *)runtime;
 @end
@@ -54,12 +53,11 @@ static __weak SkiaManager *sharedInstance = nil;
   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/apple/SkiaPictureView.h

@@ -1,7 +1,7 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#pragma once
+
 #import "SkiaUIView.h"
 
 @interface SkiaPictureView : SkiaUIView
 
 @end
-#endif // RCT_NEW_ARCH_ENABLED

package/apple/SkiaPictureView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import "SkiaPictureView.h"
 
 #import "RNSkAppleView.h"
@@ -9,7 +8,6 @@
 #import "SkiaManager.h"
 #import "SkiaUIView.h"
 
-#import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 
@@ -70,5 +68,3 @@ using namespace facebook::react;
 Class<RCTComponentViewProtocol> SkiaPictureViewCls(void) {
   return SkiaPictureView.class;
 }
-
-#endif // RCT_NEW_ARCH_ENABLED