fix(🍏): rename WebGPU view to not clash with standalone WebGPU module (#3795)

Author: wcandillon

packages/skia/android/src/main/java/com/shopify/reactnative/skia/WebGPUViewManager.java

@@ -5,24 +5,24 @@
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.viewmanagers.WebGPUViewManagerDelegate;
-import com.facebook.react.viewmanagers.WebGPUViewManagerInterface;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerDelegate;
+import com.facebook.react.viewmanagers.SkiaWebGPUViewManagerInterface;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 @ReactModule(name = WebGPUViewManager.NAME)
-public class WebGPUViewManager extends ReactViewManager implements WebGPUViewManagerInterface<WebGPUView> {
+public class WebGPUViewManager extends ReactViewManager implements SkiaWebGPUViewManagerInterface<WebGPUView> {
 
-  public static final String NAME = "WebGPUView";
+  public static final String NAME = "SkiaWebGPUView";
 
-  protected WebGPUViewManagerDelegate mDelegate;
+  protected SkiaWebGPUViewManagerDelegate mDelegate;
 
   public WebGPUViewManager() {
-    mDelegate = new WebGPUViewManagerDelegate(this);
+    mDelegate = new SkiaWebGPUViewManagerDelegate(this);
   }
 
-  protected WebGPUViewManagerDelegate getDelegate() {
+  protected SkiaWebGPUViewManagerDelegate getDelegate() {
     return mDelegate;
   }
 

packages/skia/apple/WebGPUView.h packages/skia/apple/SkiaWebGPUView.hpackages/skia/apple/WebGPUView.h renamed to packages/skia/apple/SkiaWebGPUView.h

@@ -12,7 +12,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface WebGPUView : RCTViewComponentView
+@interface SkiaWebGPUView : RCTViewComponentView
 @end
 
 NS_ASSUME_NONNULL_END

packages/skia/apple/WebGPUView.mm packages/skia/apple/SkiaWebGPUView.mmpackages/skia/apple/WebGPUView.mm renamed to packages/skia/apple/SkiaWebGPUView.mm

@@ -1,6 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import "WebGPUView.h"
+#import "SkiaWebGPUView.h"
 
 #import <react/renderer/components/rnskia/ComponentDescriptors.h>
 #import <react/renderer/components/rnskia/EventEmitters.h>
@@ -12,18 +12,18 @@
 
 using namespace facebook::react;
 
-@implementation WebGPUView
+@implementation SkiaWebGPUView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const WebGPUViewProps>();
+    static const auto defaultProps = std::make_shared<const SkiaWebGPUViewProps>();
     _props = defaultProps;
   }
   return self;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
-  return concreteComponentDescriptorProvider<WebGPUViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<SkiaWebGPUViewComponentDescriptor>();
 }
 
 - (void)prepareForRecycle {
@@ -46,9 +46,9 @@ - (WebGPUMetalView *)getContentView {
 - (void)updateProps:(const Props::Shared &)props
            oldProps:(const Props::Shared &)oldProps {
   const auto &oldViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(_props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(_props);
   const auto &newViewProps =
-      *std::static_pointer_cast<const WebGPUViewProps>(props);
+      *std::static_pointer_cast<const SkiaWebGPUViewProps>(props);
 
   if (newViewProps.contextId != oldViewProps.contextId) {
     /*
@@ -72,6 +72,6 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
 
 @end
 
-Class<RCTComponentViewProtocol> WebGPUViewCls(void) { return WebGPUView.class; }
+Class<RCTComponentViewProtocol> SkiaWebGPUViewCls(void) { return SkiaWebGPUView.class; }
 
 #endif // RCT_NEW_ARCH_ENABLED

packages/skia/package.json

@@ -148,7 +148,7 @@
     "ios": {
       "componentProvider": {
         "SkiaPictureView": "SkiaPictureView",
-        "WebGPUView": "WebGPUView"
+        "SkiaWebGPUView": "SkiaWebGPUView"
       }
     }
   },

packages/skia/src/specs/WebGPUViewNativeComponent.ts

@@ -8,4 +8,4 @@ export interface NativeProps extends ViewProps {
 }
 
 // eslint-disable-next-line import/no-default-export
-export default codegenNativeComponent<NativeProps>("WebGPUView");
+export default codegenNativeComponent<NativeProps>("SkiaWebGPUView");