@shopify/react-native-skia 0.1.215 → 0.1.218

package/android/build.gradle

@@ -26,6 +26,14 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 apply plugin: 'com.android.library'
 
 def reactNativeArchitectures() {
@@ -54,6 +62,10 @@ logger.warn("react-native-skia: node_modules/ found at: ${nodeModules}")
 def sourceBuild = false
 def defaultDir
 
+if (isNewArchitectureEnabled()) {
+    apply plugin: "com.facebook.react"
+}
+
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
 } else if (findProject(':ReactAndroid') != null) {
@@ -148,6 +160,16 @@ android {
         }
     }
 
+    sourceSets.main {
+        java {
+            if (!isNewArchitectureEnabled()) {
+                srcDirs += [
+                    "src/paper/java",
+                ]
+            }
+        }
+    }
+
     externalNativeBuild {
         cmake {
             path file('CMakeLists.txt')

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

@@ -12,9 +12,9 @@ import com.facebook.react.module.annotations.ReactModule;
 
 import java.lang.ref.WeakReference;
 
-@ReactModule(name="RNSkia")
-public class RNSkiaModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
-    public static final String NAME = "RNSkia";
+@ReactModule(name="RNSkiaModule")
+public class RNSkiaModule extends NativeSkiaModuleSpec implements LifecycleEventListener {
+    public static final String NAME = "RNSkiaModule";
 
     private final WeakReference<ReactApplicationContext> weakReactContext;
     private SkiaManager skiaManager;

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

@@ -2,23 +2,77 @@
 
 package com.shopify.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.ReactPackage;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.module.annotations.ReactModuleList;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.react.uimanager.ViewManager;
 
-public class RNSkiaPackage implements ReactPackage {
+@ReactModuleList(
+        nativeModules = {
+                RNSkiaModule.class,
+        })
+public class RNSkiaPackage extends TurboReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         return Arrays.<NativeModule>asList(new RNSkiaModule(reactContext));
     }
 
+    @Nullable
+    @Override
+    public NativeModule getModule(String s, ReactApplicationContext reactApplicationContext) {
+        switch (s) {
+            case RNSkiaModule.NAME:
+                return new RNSkiaModule(reactApplicationContext);
+            default:
+                return null;
+        }
+    }
+
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Arrays.<ViewManager>asList(new SkiaDrawViewManager(),
                 new SkiaPictureViewManager(), new SkiaDomViewManager());
     }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return new ReactModuleInfoProvider() {
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
+                Class<? extends NativeModule>[] moduleList =
+                        new Class[] {
+                                RNSkiaModule.class,
+                        };
+
+                for (Class<? extends NativeModule> moduleClass : moduleList) {
+                    ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
+
+                    reactModuleInfoMap.put(
+                            reactModule.name(),
+                            new ReactModuleInfo(
+                                    reactModule.name(),
+                                    moduleClass.getName(),
+                                    reactModule.canOverrideExistingModule(),
+                                    reactModule.needsEagerInit(),
+                                    reactModule.hasConstants(),
+                                    reactModule.isCxxModule(),
+                                    TurboModule.class.isAssignableFrom(moduleClass)));
+                }
+                return reactModuleInfoMap;
+            }
+        };
+    }
 }

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

@@ -7,7 +7,7 @@ import com.facebook.react.views.view.ReactViewManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public abstract class SkiaBaseViewManager extends ReactViewManager {
+public abstract class SkiaBaseViewManager<T extends SkiaBaseView> extends ReactViewManager {
 
     @Override
     public void setNativeId(@NonNull ReactViewGroup view, @Nullable String nativeId) {
@@ -17,12 +17,12 @@ public abstract class SkiaBaseViewManager extends ReactViewManager {
     }
 
     @ReactProp(name = "mode")
-    public void setMode(ReactViewGroup view, String mode) {
+    public void setMode(T view, String mode) {
         ((SkiaBaseView)view).setMode(mode);
     }
 
     @ReactProp(name = "debug")
-    public void setDebug(ReactViewGroup view, boolean show) {
+    public void setDebug(T view, boolean show) {
         ((SkiaBaseView)view).setDebugMode(show);
     }
 

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

@@ -1,9 +1,22 @@
 package com.shopify.reactnative.skia;
 
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.viewmanagers.SkiaDomViewManagerInterface;
+import com.facebook.react.viewmanagers.SkiaDomViewManagerDelegate;
+
 import androidx.annotation.NonNull;
 
-public class SkiaDomViewManager extends SkiaBaseViewManager {
+public class SkiaDomViewManager extends SkiaBaseViewManager<SkiaDomView> implements SkiaDomViewManagerInterface<SkiaDomView> {
+
+    protected SkiaDomViewManagerDelegate mDelegate;
+
+    SkiaDomViewManager() {
+        mDelegate = new SkiaDomViewManagerDelegate(this);
+    }
+
+    protected SkiaDomViewManagerDelegate getDelegate() {
+        return mDelegate;
+    }
 
     @NonNull
     @Override

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

@@ -1,9 +1,23 @@
 package com.shopify.reactnative.skia;
 
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.viewmanagers.SkiaDrawViewManagerDelegate;
+import com.facebook.react.viewmanagers.SkiaDrawViewManagerInterface;
+
 import androidx.annotation.NonNull;
 
-public class SkiaDrawViewManager extends SkiaBaseViewManager {
+public class SkiaDrawViewManager extends SkiaBaseViewManager<SkiaDrawView> implements SkiaDrawViewManagerInterface<SkiaDrawView> {
+
+
+    protected SkiaDrawViewManagerDelegate mDelegate;
+
+    SkiaDrawViewManager() {
+        mDelegate = new SkiaDrawViewManagerDelegate(this);
+    }
+
+    protected SkiaDrawViewManagerDelegate getDelegate() {
+        return mDelegate;
+    }
 
     @NonNull
     @Override
@@ -16,4 +30,5 @@ public class SkiaDrawViewManager extends SkiaBaseViewManager {
     public SkiaDrawView createViewInstance(@NonNull ThemedReactContext reactContext) {
         return new SkiaDrawView(reactContext);
     }
+
 }

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

@@ -1,9 +1,23 @@
 package com.shopify.reactnative.skia;
 
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.viewmanagers.SkiaPictureViewManagerDelegate;
+import com.facebook.react.viewmanagers.SkiaPictureViewManagerInterface;
+
 import androidx.annotation.NonNull;
 
-public class SkiaPictureViewManager extends SkiaBaseViewManager {
+public class SkiaPictureViewManager extends SkiaBaseViewManager<SkiaPictureView> implements SkiaPictureViewManagerInterface<SkiaPictureView> {
+
+
+    protected SkiaPictureViewManagerDelegate mDelegate;
+
+    SkiaPictureViewManager() {
+        mDelegate = new SkiaPictureViewManagerDelegate(this);
+    }
+
+    protected SkiaPictureViewManagerDelegate getDelegate() {
+        return mDelegate;
+    }
 
     @NonNull
     @Override

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

@@ -174,8 +174,8 @@ public class ViewScreenshotService {
 
         // Create a new matrix for translation
         final Matrix translateMatrix = new Matrix();
-        final float dx = view.getLeft() + view.getPaddingLeft() + view.getTranslationX();
-        final float dy = view.getTop() + view.getPaddingTop() + view.getTranslationY();
+        final float dx = view.getLeft() + view.getPaddingLeft();
+        final float dy = view.getTop() + view.getPaddingTop();
         translateMatrix.setTranslate(dx, dy);
 
         // Pre-concatenate the current matrix of the canvas with the translation and transformation matrices of the view

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerDelegate.java

@@ -0,0 +1,34 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class SkiaDomViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SkiaDomViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public SkiaDomViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "mode":
+        mViewManager.setMode(view, value == null ? null : (String) value);
+        break;
+      case "debug":
+        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDomViewManagerInterface.java

@@ -0,0 +1,18 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+public interface SkiaDomViewManagerInterface<T extends View> {
+  void setMode(T view, @Nullable String value);
+  void setDebug(T view, boolean value);
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDrawViewManagerDelegate.java

@@ -0,0 +1,34 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class SkiaDrawViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SkiaDrawViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public SkiaDrawViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "mode":
+        mViewManager.setMode(view, value == null ? null : (String) value);
+        break;
+      case "debug":
+        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaDrawViewManagerInterface.java

@@ -0,0 +1,18 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+public interface SkiaDrawViewManagerInterface<T extends View> {
+  void setMode(T view, @Nullable String value);
+  void setDebug(T view, boolean value);
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerDelegate.java

@@ -0,0 +1,34 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class SkiaPictureViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & SkiaPictureViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public SkiaPictureViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "mode":
+        mViewManager.setMode(view, value == null ? null : (String) value);
+        break;
+      case "debug":
+        mViewManager.setDebug(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/paper/java/com/facebook/react/viewmanagers/SkiaPictureViewManagerInterface.java

@@ -0,0 +1,18 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+public interface SkiaPictureViewManagerInterface<T extends View> {
+  void setMode(T view, @Nullable String value);
+  void setDebug(T view, boolean value);
+}

package/android/src/paper/java/com/shopify/reactnative/skia/NativeSkiaModuleSpec.java

@@ -0,0 +1,38 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.shopify.reactnative.skia;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeSkiaModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNSkiaModule";
+
+  public NativeSkiaModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  @DoNotStrip
+  public abstract boolean install();
+}

package/cpp/rnskia/dom/nodes/JsiImageNode.h

@@ -1,6 +1,11 @@
 #pragma once
 
+#ifdef TARGET_OS_IPHONE
+#include <react-native-skia/ImageProps.h>
+#else
 #include "ImageProps.h"
+#endif
+
 #include "JsiDomDrawingNode.h"
 
 #include <memory>

package/ios/RNSkia-iOS/SkiaDomView.h

@@ -0,0 +1,7 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "SkiaUIView.h"
+
+@interface SkiaDomView : SkiaUIView
+
+@end
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDomView.mm

@@ -0,0 +1,64 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <SkiaDomView.h>
+
+#import <RNSkDomView.h>
+#import <RNSkIOSView.h>
+#import <RNSkPlatformContext.h>
+
+#import <RNSkiaModule.h>
+#import <SkiaManager.h>
+#import <SkiaUIView.h>
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnskia/ComponentDescriptors.h>
+#import <react/renderer/components/rnskia/EventEmitters.h>
+#import <react/renderer/components/rnskia/Props.h>
+#import <react/renderer/components/rnskia/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@implementation SkiaDomView
+
+- (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()
+           factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
+             return std::make_shared<RNSkiOSView<RNSkia::RNSkDomView>>(context);
+           }];
+    static const auto defaultProps = std::make_shared<const SkiaDomViewProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<SkiaDomViewComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props
+           oldProps:(const Props::Shared &)oldProps {
+  const auto &newProps =
+      *std::static_pointer_cast<const SkiaDomViewProps>(props);
+  [super updateProps:props oldProps:oldProps];
+  int nativeId =
+      [[RCTConvert NSString:RCTNSStringFromString(newProps.nativeId)] intValue];
+  [self setNativeId:nativeId];
+  [self setDrawingMode:newProps.mode];
+  [self setDebugMode:newProps.debug];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> SkiaDomViewCls(void) {
+  return SkiaDomView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDomViewManager.mm

@@ -16,7 +16,7 @@ RCT_EXPORT_MODULE(SkiaDomView)
 
 - (SkiaManager *)skiaManager {
   auto bridge = [RCTBridge currentBridge];
-  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkia"];
+  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
   return [skiaModule manager];
 }
 

package/ios/RNSkia-iOS/SkiaDrawView.h

@@ -0,0 +1,7 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "SkiaUIView.h"
+
+@interface SkiaDrawView : SkiaUIView
+
+@end
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDrawView.mm

@@ -0,0 +1,72 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <SkiaDrawView.h>
+
+#import <RNSkDomView.h>
+#import <RNSkIOSView.h>
+#import <RNSkPlatformContext.h>
+
+#import <RNSkJsView.h>
+#import <SkiaUIView.h>
+
+#import <React/RCTBridge+Private.h>
+#import <React/RCTConversions.h>
+#import <React/RCTFabricComponentsPlugins.h>
+
+#import <react/renderer/components/rnskia/ComponentDescriptors.h>
+#import <react/renderer/components/rnskia/EventEmitters.h>
+#import <react/renderer/components/rnskia/Props.h>
+#import <react/renderer/components/rnskia/RCTComponentViewHelpers.h>
+
+using namespace facebook::react;
+
+@implementation SkiaDrawView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    [self prepareView];
+    static const auto defaultProps =
+        std::make_shared<const SkiaDrawViewProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
+- (void)prepareView {
+  auto skManager = [[self skiaManager] skManager];
+  // Pass SkManager as a raw pointer to avoid circular dependenciesr
+  [self initCommon:skManager.get()
+           factory:[](std::shared_ptr<RNSkia::RNSkPlatformContext> context) {
+             return std::make_shared<RNSkiOSView<RNSkia::RNSkJsView>>(context);
+           }];
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  [self prepareView];
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<SkiaDrawViewComponentDescriptor>();
+}
+
+- (void)updateProps:(const Props::Shared &)props
+           oldProps:(const Props::Shared &)oldProps {
+  const auto &newProps =
+      *std::static_pointer_cast<const SkiaDrawViewProps>(props);
+  [super updateProps:props oldProps:oldProps];
+  int nativeId =
+      [[RCTConvert NSString:RCTNSStringFromString(newProps.nativeId)] intValue];
+  [self setNativeId:nativeId];
+  [self setDrawingMode:newProps.mode];
+  [self setDebugMode:newProps.debug];
+}
+
+@end
+
+Class<RCTComponentViewProtocol> SkiaDrawViewCls(void) {
+  return SkiaDrawView.class;
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSkia-iOS/SkiaDrawViewManager.mm

@@ -15,7 +15,7 @@ RCT_EXPORT_MODULE(SkiaDrawView)
 
 - (SkiaManager *)skiaManager {
   auto bridge = [RCTBridge currentBridge];
-  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkia"];
+  auto skiaModule = (RNSkiaModule *)[bridge moduleForName:@"RNSkiaModule"];
   return [skiaModule manager];
 }
 

package/ios/RNSkia-iOS/SkiaPictureView.h

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