@ua/react-native-airship 21.1.0 → 22.0.0

package/android/generated/jni/react/renderer/components/RNAirshipSpec/ShadowNodes.cpp

@@ -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: GenerateShadowNodeCpp.js
+ */
+
+#include "ShadowNodes.h"
+
+namespace facebook::react {
+
+extern const char RNAirshipEmbeddedViewComponentName[] = "RNAirshipEmbeddedView";
+extern const char RNAirshipMessageViewComponentName[] = "RNAirshipMessageView";
+
+} // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNAirshipSpec/ShadowNodes.h

@@ -0,0 +1,43 @@
+
+/**
+ * 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: GenerateShadowNodeH.js
+ */
+
+#pragma once
+
+#include "EventEmitters.h"
+#include "Props.h"
+#include "States.h"
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+JSI_EXPORT extern const char RNAirshipEmbeddedViewComponentName[];
+
+/*
+ * `ShadowNode` for <RNAirshipEmbeddedView> component.
+ */
+using RNAirshipEmbeddedViewShadowNode = ConcreteViewShadowNode<
+    RNAirshipEmbeddedViewComponentName,
+    RNAirshipEmbeddedViewProps,
+    RNAirshipEmbeddedViewEventEmitter,
+    RNAirshipEmbeddedViewState>;
+
+JSI_EXPORT extern const char RNAirshipMessageViewComponentName[];
+
+/*
+ * `ShadowNode` for <RNAirshipMessageView> component.
+ */
+using RNAirshipMessageViewShadowNode = ConcreteViewShadowNode<
+    RNAirshipMessageViewComponentName,
+    RNAirshipMessageViewProps,
+    RNAirshipMessageViewEventEmitter,
+    RNAirshipMessageViewState>;
+
+} // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNAirshipSpec/States.cpp

@@ -0,0 +1,16 @@
+
+/**
+ * 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: GenerateStateCpp.js
+ */
+#include "States.h"
+
+namespace facebook::react {
+
+
+
+} // namespace facebook::react

package/android/generated/jni/react/renderer/components/RNAirshipSpec/States.h

@@ -0,0 +1,41 @@
+/**
+ * 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: GenerateStateH.js
+ */
+#pragma once
+
+#ifdef ANDROID
+#include <folly/dynamic.h>
+#endif
+
+namespace facebook::react {
+
+class RNAirshipEmbeddedViewState {
+public:
+  RNAirshipEmbeddedViewState() = default;
+
+#ifdef ANDROID
+  RNAirshipEmbeddedViewState(RNAirshipEmbeddedViewState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
+class RNAirshipMessageViewState {
+public:
+  RNAirshipMessageViewState() = default;
+
+#ifdef ANDROID
+  RNAirshipMessageViewState(RNAirshipMessageViewState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
+};
+
+} // namespace facebook::react

package/android/gradle.properties

@@ -3,4 +3,4 @@ Airship_minSdkVersion=23
 Airship_targetSdkVersion=35
 Airship_compileSdkVersion=35
 Airship_ndkversion=26.1.10909125
-Airship_airshipProxyVersion=13.0.1
+Airship_airshipProxyVersion=13.2.0

package/android/src/main/java/com/urbanairship/reactnative/AirshipModule.kt

@@ -825,7 +825,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
     }
 
     companion object {
-        const val NAME = "RTNAirship"
+        const val NAME = "RNAirship"
     }
 
 }

package/android/src/main/java/com/urbanairship/reactnative/ReactEmbeddedViewManager.kt

@@ -6,21 +6,31 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.RTNAirshipEmbeddedViewManagerDelegate
-import com.facebook.react.viewmanagers.RTNAirshipEmbeddedViewManagerInterface
-
+import com.facebook.react.viewmanagers.RNAirshipEmbeddedViewManagerInterface
 
 class ReactEmbeddedViewManager : SimpleViewManager<ReactEmbeddedView>(),
-    RTNAirshipEmbeddedViewManagerInterface<ReactEmbeddedView> {
+    RNAirshipEmbeddedViewManagerInterface<ReactEmbeddedView> {
+
+    private val manualDelegate = object : ViewManagerDelegate<ReactEmbeddedView> {
 
-    private val delegate = RTNAirshipEmbeddedViewManagerDelegate(this)
+        override fun setProperty(view: ReactEmbeddedView, propName: String?, value: Any?) {
+            when (propName) {
+                "embeddedId" -> setEmbeddedId(view, value as? String)
+                else -> {}
+            }
+        }
+
+        override fun receiveCommand(view: ReactEmbeddedView, commandName: String?, args: com.facebook.react.bridge.ReadableArray?) {
+            // No commands supported — add if you need any
+        }
+    }
 
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun getDelegate(): ViewManagerDelegate<ReactEmbeddedView?> {
-        return delegate
+    override fun getDelegate(): ViewManagerDelegate<ReactEmbeddedView> {
+        return manualDelegate
     }
 
     override fun createViewInstance(reactContext: ThemedReactContext): ReactEmbeddedView {
@@ -34,8 +44,7 @@ class ReactEmbeddedViewManager : SimpleViewManager<ReactEmbeddedView>(),
         }
     }
 
-
     companion object {
-        const val REACT_CLASS = "RTNAirshipEmbeddedView"
+        const val REACT_CLASS = "RNAirshipEmbeddedView"
     }
-}
+}

package/android/src/main/java/com/urbanairship/reactnative/ReactMessageViewManager.kt

@@ -7,19 +7,31 @@ import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNAirshipMessageViewManagerInterface
+import com.facebook.react.bridge.ReadableArray
 
-import com.facebook.react.viewmanagers.RTNAirshipMessageViewManagerDelegate
-import com.facebook.react.viewmanagers.RTNAirshipMessageViewManagerInterface
+class ReactMessageViewManager : SimpleViewManager<ReactMessageView>(),
+    RNAirshipMessageViewManagerInterface<ReactMessageView> {
 
-class ReactMessageViewManager : SimpleViewManager<ReactMessageView>(), RTNAirshipMessageViewManagerInterface<ReactMessageView> {
+    private val delegate = object : ViewManagerDelegate<ReactMessageView> {
 
-    private val delegate = RTNAirshipMessageViewManagerDelegate(this)
+        override fun setProperty(view: ReactMessageView, propName: String?, value: Any?) {
+            when (propName) {
+                "messageId" -> setMessageId(view, value as? String)
+                else -> {}
+            }
+        }
+
+        override fun receiveCommand(view: ReactMessageView, commandName: String?, args: ReadableArray?) {
+            // No commands implemented, add if Airship adds some in future
+        }
+    }
 
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun getDelegate(): ViewManagerDelegate<ReactMessageView?> {
+    override fun getDelegate(): ViewManagerDelegate<ReactMessageView> {
         return delegate
     }
 
@@ -75,6 +87,6 @@ class ReactMessageViewManager : SimpleViewManager<ReactMessageView>(), RTNAirshi
     }
 
     companion object {
-        const val REACT_CLASS = "RTNAirshipMessageView"
+        const val REACT_CLASS = "RNAirshipMessageView"
     }
-}
+}

package/android/src/newarch/java/com/urbanairship/reactnative/AirshipSpec.kt

@@ -3,5 +3,5 @@ package com.urbanairship.reactnative
 import com.facebook.react.bridge.ReactApplicationContext
 
 abstract class AirshipSpec internal constructor(context: ReactApplicationContext) :
-  NativeRTNAirshipSpec(context) {
+  NativeRNAirshipSpec(context) {
 }

package/android/src/oldarch/java/com/facebook/react/viewmanagers/{RTNAirshipEmbeddedViewManagerInterface.java → RNAirshipEmbeddedViewManagerInterface.java}

@@ -12,6 +12,6 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 
-public interface RTNAirshipEmbeddedViewManagerInterface<T extends View> {
+public interface RNAirshipEmbeddedViewManagerInterface<T extends View> {
   void setEmbeddedId(T view, @Nullable String value);
 }

package/android/src/oldarch/java/com/facebook/react/viewmanagers/{RTNAirshipMessageViewManagerInterface.java → RNAirshipMessageViewManagerInterface.java}

@@ -12,6 +12,6 @@ package com.facebook.react.viewmanagers;
 import android.view.View;
 import androidx.annotation.Nullable;
 
-public interface RTNAirshipMessageViewManagerInterface<T extends View> {
+public interface RNAirshipMessageViewManagerInterface<T extends View> {
   void setMessageId(T view, @Nullable String value);
 }

package/ios/AirshipEmbeddedViewWrapper.swift

@@ -5,7 +5,7 @@ import AirshipKit
 import AirshipFrameworkProxy
 import SwiftUI
 
-@objc(RTNAirshipEmbeddedViewWrapper)
+@objc(RNAirshipEmbeddedViewWrapper)
 public final class AirshipEmbeddedViewWrapper: UIView {
     private let viewModel = ReactAirshipEmbeddedView.ViewModel()
     @objc

package/ios/AirshipReactNative.swift

@@ -39,7 +39,7 @@ public class AirshipReactNative: NSObject {
         AirshipProxy.shared
     }
 
-    public static let version: String = "21.1.0"
+    public static let version: String = "21.2.0"
 
     private let eventNotifier = EventNotifier()
 

package/ios/MessageWebViewWrapper.swift

@@ -4,7 +4,7 @@ import Foundation
 import AirshipKit
 import AirshipFrameworkProxy
 
-@objc(RTNAirshipMessageWebViewWrapperDelegate)
+@objc(RNAirshipMessageWebViewWrapperDelegate)
 public protocol MessageWebViewWrapperDelegate {
     func onMessageBodyLoadFailed(messageID: String)
     func onMessageGone(messageID: String)
@@ -14,7 +14,7 @@ public protocol MessageWebViewWrapperDelegate {
     func onClose(messageID: String)
 }
 
-@objc(RTNAirshipMessageWebViewWrapper)
+@objc(RNAirshipMessageWebViewWrapper)
 public class MessageWebViewWrapper: NSObject {
     private let innerWrapper: _MessageWebViewWrapper
 

package/ios/{RTNAirship.h → RNAirship.h}

@@ -4,13 +4,13 @@
 #import <React/RCTEventEmitter.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
-#import "RTNAirshipSpec.h"
+#import "generated/RNAirshipSpec/RNAirshipSpec.h"
 
-@interface RTNAirship : RCTEventEmitter <NativeRTNAirshipSpec>
+@interface RNAirship : RCTEventEmitter <NativeRNAirshipSpec>
 #else
 #import <React/RCTBridgeModule.h>
 
-@interface RTNAirship : RCTEventEmitter <RCTBridgeModule>
+@interface RNAirship : RCTEventEmitter <RCTBridgeModule>
 #endif
 
 @property(nonatomic, strong) RCTBridge *reactBridge;

package/ios/{RTNAirship.mm → RNAirship.mm}

@@ -1,6 +1,6 @@
 /* Copyright Airship and Contributors */
 
-#import "RTNAirship.h"
+#import "RNAirship.h"
 
 #if __has_include(<react_native_airship/react_native_airship-Swift.h>)
 #import <react_native_airship/react_native_airship-Swift.h>
@@ -8,7 +8,7 @@
 #import "react_native_airship-Swift.h"
 #endif
 
-@implementation RTNAirship
+@implementation RNAirship
 RCT_EXPORT_MODULE()
 
 - (NSArray<NSString *> *)supportedEvents {
@@ -20,7 +20,7 @@ RCT_EXPORT_MODULE()
 }
 
 -(void)startObserving {
-    __weak RTNAirship *weakSelf = self;
+    __weak RNAirship *weakSelf = self;
     
     [AirshipReactNative.shared setNotifier:^(NSString *name, NSDictionary<NSString *,id> *body) {
         [weakSelf sendEventWithName:name body:body];
@@ -45,7 +45,7 @@ RCT_EXPORT_MODULE()
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
 (const facebook::react::ObjCTurboModule::InitParams &)params
 {
-    return std::make_shared<facebook::react::NativeRTNAirshipSpecJSI>(params);
+    return std::make_shared<facebook::react::NativeRNAirshipSpecJSI>(params);
 }
 #endif
 
@@ -784,7 +784,7 @@ RCT_REMAP_METHOD(featureFlagManagerTrackInteraction,
 RCT_REMAP_METHOD(featureFlagManagerFlag,
                  featureFlagManagerFlag:(NSString *)flagName
                  useResultCache:(BOOL)useResultCache
-                 featureFlagManagerFlag:(RCTPromiseResolveBlock)resolve
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared featureFlagManagerFlagWithFlagName:flagName
@@ -796,7 +796,7 @@ RCT_REMAP_METHOD(featureFlagManagerFlag,
 
 RCT_REMAP_METHOD(featureFlagManagerResultCacheGetFlag,
                  featureFlagManagerResultCacheGetFlag:(NSString *)flagName
-                 featureFlagManagerResultCacheGetFlag:(RCTPromiseResolveBlock)resolve
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared featureFlagManagerResultCacheGetFlagWithName:flagName
@@ -807,12 +807,12 @@ RCT_REMAP_METHOD(featureFlagManagerResultCacheGetFlag,
 
 RCT_REMAP_METHOD(featureFlagManagerResultCacheSetFlag,
                  featureFlagManagerResultCacheSetFlag:(NSDictionary *)flag
-                 ttl:(nonnull NSNumber *)ttl
-                 featureFlagManagerResultCacheGetFlag:(RCTPromiseResolveBlock)resolve
+                 ttl:(double)ttl
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared featureFlagManagerResultCacheSetFlagWithFlag:flag
-                                                                ttl:ttl
+                                                                ttl:@(ttl)
                                                           completionHandler:^(NSError * _Nullable error) {
                   [self handleResult:nil error:error resolve:resolve reject:reject];
               }];
@@ -820,7 +820,7 @@ RCT_REMAP_METHOD(featureFlagManagerResultCacheSetFlag,
 
 RCT_REMAP_METHOD(featureFlagManagerResultCacheRemoveFlag,
                  featureFlagManagerResultCacheRemoveFlag:(NSString *)flagName
-                 featureFlagManagerResultCacheRemoveFlag:(RCTPromiseResolveBlock)resolve
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared featureFlagManagerResultCacheRemoveFlagWithName:flagName
@@ -841,7 +841,7 @@ RCT_REMAP_METHOD(liveActivityListAll,
 
 RCT_REMAP_METHOD(liveActivityList,
                  liveActivityListRequest:(NSDictionary *)request
-                 liveActivityList:(RCTPromiseResolveBlock)resolve
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared liveActivityListWithOptions:request
@@ -851,8 +851,8 @@ RCT_REMAP_METHOD(liveActivityList,
 }
 
 RCT_REMAP_METHOD(liveActivityStart,
-                 liveActivityStartRequest:(NSDictionary *)request
-                 liveActivityStart:(RCTPromiseResolveBlock)resolve
+                 liveActivityStart:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared liveActivityStartWithOptions:request
@@ -862,8 +862,8 @@ RCT_REMAP_METHOD(liveActivityStart,
 }
 
 RCT_REMAP_METHOD(liveActivityUpdate,
-                 liveActivityUpdateRequest:(NSDictionary *)request
-                 liveActivityUpdate:(RCTPromiseResolveBlock)resolve
+                 liveActivityUpdate:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared liveActivityUpdateWithOptions:request
@@ -873,8 +873,8 @@ RCT_REMAP_METHOD(liveActivityUpdate,
 }
 
 RCT_REMAP_METHOD(liveActivityEnd,
-                 liveActivityEndRequest:(NSDictionary *)request
-                 liveActivityEnd:(RCTPromiseResolveBlock)resolve
+                 liveActivityEnd:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     [AirshipReactNative.shared liveActivityEndWithOptions:request
@@ -884,38 +884,39 @@ RCT_REMAP_METHOD(liveActivityEnd,
 }
 
 RCT_REMAP_METHOD(liveUpdateListAll,
-                 liveUpdateListAll:(RCTPromiseResolveBlock)resolve
+                 liveUpdateListAll:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
     reject(@"AIRSHIP_ERROR", @"Not supported on iOS", nil);
 }
 
 RCT_REMAP_METHOD(liveUpdateList,
-                 liveUpdateListRequest:(NSDictionary *)request
-                 liveUpdateList:(RCTPromiseResolveBlock)resolve
+                 liveUpdateList:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     reject(@"AIRSHIP_ERROR", @"Not supported on iOS", nil);
 }
 
 RCT_REMAP_METHOD(liveUpdateStart,
-                 liveUpdateStartRequest:(NSDictionary *)request
-                 liveUpdateCreate:(RCTPromiseResolveBlock)resolve
+                 liveUpdateStart:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     reject(@"AIRSHIP_ERROR", @"Not supported on iOS", nil);
 }
 
 RCT_REMAP_METHOD(liveUpdateUpdate,
-                 liveUpdateUpdateRequest:(NSDictionary *)request
-                 liveUpdateUpdate:(RCTPromiseResolveBlock)resolve
+                 liveUpdateUpdate:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     reject(@"AIRSHIP_ERROR", @"Not supported on iOS", nil);
 }
 
 RCT_REMAP_METHOD(liveUpdateEnd,
-                 liveUpdateEndRequest:(NSDictionary *)request
-                 liveUpdateEnd:(RCTPromiseResolveBlock)resolve
+                 liveUpdateEnd:(NSDictionary *)request
+                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject) {
 
     reject(@"AIRSHIP_ERROR", @"Not supported on iOS", nil);

package/ios/{RTNAirshipBootloader.h → RNAirshipBootloader.h}

@@ -6,7 +6,7 @@
 /**
  * Handles takeOff for the Urban Airship SDK.
  */
-@interface RTNAirshipBootloader: NSObject
+@interface RNAirshipBootloader: NSObject
 
 /**
  * Disables automatic takeOff.

package/ios/{RTNAirshipBootloader.m → RNAirshipBootloader.m}

@@ -1,6 +1,6 @@
 /* Copyright Airship and Contributors */
 
-#import "RTNAirshipBootloader.h"
+#import "RNAirshipBootloader.h"
 
 #if __has_include(<react_native_airship/react_native_airship-Swift.h>)
 #import <react_native_airship/react_native_airship-Swift.h>
@@ -8,7 +8,7 @@
 #import "react_native_airship-Swift.h"
 #endif
 
-@implementation RTNAirshipBootloader
+@implementation RNAirshipBootloader
 
 
 + (void)disable {

package/ios/{RTNAirshipEmbeddedView.h → RNAirshipEmbeddedView.h}

@@ -3,6 +3,9 @@
 #import <WebKit/WebKit.h>
 #import <React/RCTView.h>
 
+#ifndef RNAirshipEmbeddedViewNativeComponent_h
+#define RNAirshipEmbeddedViewNativeComponent_h
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #endif
@@ -10,9 +13,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RTNAirshipEmbeddedView : RCTViewComponentView
+@interface RNAirshipEmbeddedView : RCTViewComponentView
 #else
-@interface RTNAirshipEmbeddedView : RCTView
+@interface RNAirshipEmbeddedView : RCTView
 #endif
 
 @property (nonatomic, copy) NSString *embeddedID;
@@ -20,3 +23,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif

package/ios/{RTNAirshipEmbeddedView.mm → RNAirshipEmbeddedView.mm}

@@ -1,6 +1,6 @@
 /* Copyright Airship and Contributors */
 
-#import "RTNAirshipEmbeddedView.h"
+#import "RNAirshipEmbeddedView.h"
 
 #if __has_include(<react_native_airship/react_native_airship-Swift.h>)
 #import <react_native_airship/react_native_airship-Swift.h>
@@ -8,52 +8,42 @@
 #import "react_native_airship-Swift.h"
 #endif
 
+#import "generated/RNAirshipSpec/ComponentDescriptors.h"
+#import "generated/RNAirshipSpec/EventEmitters.h"
+#import "generated/RNAirshipSpec/Props.h"
+#import "generated/RNAirshipSpec/RCTComponentViewHelpers.h"
+
+
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTConversions.h>
-#import <React/RCTFabricComponentsPlugins.h>
-#import <react/renderer/components/RTNAirshipComponents/ComponentDescriptors.h>
-#import <react/renderer/components/RTNAirshipComponents/Props.h>
+#import "RCTFabricComponentsPlugins.h"
+
 using namespace facebook::react;
 #endif
 
-@interface RTNAirshipEmbeddedView()
-@property (nonatomic, strong) RTNAirshipEmbeddedViewWrapper *wrapper;
+@interface RNAirshipEmbeddedView() <RCTRNAirshipEmbeddedViewViewProtocol>
+@property (nonatomic, strong)RNAirshipEmbeddedViewWrapper *wrapper;
 @end
 
-@implementation RTNAirshipEmbeddedView
+@implementation RNAirshipEmbeddedView
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
-        static const auto defaultProps = std::make_shared<const RTNAirshipMessageViewProps>();
+      static const auto defaultProps = std::make_shared<const RNAirshipEmbeddedViewProps>();
         _props = defaultProps;
     }
     return self;
 }
-#endif
-
-
-
-- (instancetype) init {
-    self = [self initWithFrame:CGRectZero];
-    if (self) {
-        self.wrapper = [[RTNAirshipEmbeddedViewWrapper alloc] initWithFrame:self.bounds];
-        [self addSubview:self.wrapper];
-    }
-    return self;
-}
-
 
-#ifdef RCT_NEW_ARCH_ENABLED
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<RTNAirshipMessageViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<RNAirshipEmbeddedViewComponentDescriptor>();
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-    const auto &newProps = *std::static_pointer_cast<const RTNAirshipEmbeddedViewProps>(props);
+    const auto &newProps = *std::static_pointer_cast<const RNAirshipEmbeddedViewProps>(props);
     self.embeddedID = [NSString stringWithUTF8String:newProps.embeddedId.c_str()];
 
     [super updateProps:props oldProps:oldProps];
@@ -64,7 +54,16 @@ using namespace facebook::react;
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
 }
-#else
+#endif
+
+- (instancetype) init {
+    self = [self initWithFrame:CGRectZero];
+    if (self) {
+        self.wrapper = [[RNAirshipEmbeddedViewWrapper alloc] initWithFrame:self.bounds];
+        [self addSubview:self.wrapper];
+    }
+    return self;
+}
 
 - (void)didMoveToSuperview {
     [super didMoveToSuperview];
@@ -74,13 +73,9 @@ using namespace facebook::react;
     [super didMoveToWindow];
 }
 
-#endif
-
-
-
 - (void)setEmbeddedID:(NSString *)embeddedID {
     _embeddedID = embeddedID;
-    __weak RTNAirshipEmbeddedView *weakSelf = self;
+    __weak RNAirshipEmbeddedView *weakSelf = self;
     [weakSelf.wrapper setEmbeddedID:embeddedID];
 }
 
@@ -92,8 +87,8 @@ using namespace facebook::react;
 @end
 
 #ifdef RCT_NEW_ARCH_ENABLED
-Class<RCTComponentViewProtocol> RTNAirshipEmbeddedViewCls(void)
+Class<RCTComponentViewProtocol>RNAirshipEmbeddedViewCls(void)
 {
-    return RTNAirshipEmbeddedView.class;
+    return RNAirshipEmbeddedView.class;
 }
 #endif

package/ios/{RTNAirshipMessageViewManager.h → RNAirshipEmbeddedViewManager.h}

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RTNAirshipMessageViewManager : RCTViewManager
+@interface RNAirshipEmbeddedViewManager : RCTViewManager
 @end
 
 NS_ASSUME_NONNULL_END