@ua/react-native-airship 21.1.0 → 22.0.0

package/ios/RNAirshipEmbeddedViewViewManager.mm

@@ -0,0 +1,17 @@
+/* Copyright Airship and Contributors */
+
+#import "RNAirshipEmbeddedViewManager.h"
+#import "RNAirshipEmbeddedView.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RNAirshipEmbeddedViewManager
+RCT_REMAP_VIEW_PROPERTY(embeddedId, embeddedID, NSString)
+RCT_EXPORT_MODULE(RNAirshipEmbeddedView)
+
+- (UIView *)view {
+    return [[RNAirshipEmbeddedView alloc] init];
+}
+
+@end

package/ios/{RTNAirshipMessageView.h → RNAirshipMessageView.h}

@@ -3,6 +3,12 @@
 #import <WebKit/WebKit.h>
 #import <React/RCTView.h>
 
+
+
+#ifndef RNAirshipMessageViewNativeComponent_h
+#define RNAirshipMessageViewNativeComponent_h
+
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 #endif
@@ -10,9 +16,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RTNAirshipMessageView : RCTViewComponentView
+@interface RNAirshipMessageView : RCTViewComponentView
 #else
-@interface RTNAirshipMessageView : RCTView
+@interface RNAirshipMessageView : RCTView
 #endif
 
 @property (nonatomic, copy) RCTDirectEventBlock onLoadStarted;
@@ -24,3 +30,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+#endif

package/ios/{RTNAirshipMessageView.mm → RNAirshipMessageView.mm}

@@ -1,6 +1,6 @@
 /* Copyright Airship and Contributors */
 
-#import "RTNAirshipMessageView.h"
+#import "RNAirshipMessageView.h"
 
 #if __has_include(<react_native_airship/react_native_airship-Swift.h>)
 #import <react_native_airship/react_native_airship-Swift.h>
@@ -8,27 +8,29 @@
 #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 RTNAirshipMessageView()<RTNAirshipMessageWebViewWrapperDelegate>
-@property (nonatomic, strong) RTNAirshipMessageWebViewWrapper *wrapper;
+@interface RNAirshipMessageView() <RNAirshipMessageWebViewWrapperDelegate, RCTRNAirshipMessageViewViewProtocol>
+@property (nonatomic, strong)RNAirshipMessageWebViewWrapper *wrapper;
 @end
 
-NSString *const RTNAirshipMessageViewErrorMessageNotAvailable = @"MESSAGE_NOT_AVAILABLE";
-NSString *const RTNAirshipMessageViewErrorFailedToFetchMessage = @"FAILED_TO_FETCH_MESSAGE";
-NSString *const RTNAirshipMessageViewErrorMessageLoadFailed = @"MESSAGE_LOAD_FAILED";
+NSString *const RNAirshipMessageViewErrorMessageNotAvailable = @"MESSAGE_NOT_AVAILABLE";
+NSString *const RNAirshipMessageViewErrorFailedToFetchMessage = @"FAILED_TO_FETCH_MESSAGE";
+NSString *const RNAirshipMessageViewErrorMessageLoadFailed = @"MESSAGE_LOAD_FAILED";
 
-NSString *const RTNAirshipMessageViewMessageIDKey = @"messageId";
-NSString *const RTNAirshipMessageViewRetryableKey = @"retryable";
-NSString *const RTNAirshipMessageViewErrorKey = @"error";
+NSString *const RNAirshipMessageViewMessageIDKey = @"messageId";
+NSString *const RNAirshipMessageViewRetryableKey = @"retryable";
+NSString *const RNAirshipMessageViewErrorKey = @"error";
 
-@implementation RTNAirshipMessageView
+@implementation RNAirshipMessageView
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
@@ -41,38 +43,37 @@ NSString *const RTNAirshipMessageViewErrorKey = @"error";
 - (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 RNAirshipMessageViewProps>();
         _props = defaultProps;
     }
     return self;
 }
-#endif
-
-- (instancetype) init {
-    self = [self initWithFrame:CGRectZero];
-    if (self) {
-        self.wrapper = [[RTNAirshipMessageWebViewWrapper alloc] initWithFrame:self.bounds];
-        self.wrapper.delegate = self;
-        [self addSubview:self.wrapper.webView];
-    }
-    return self;
-}
 
-#ifdef RCT_NEW_ARCH_ENABLED
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<RTNAirshipMessageViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<RNAirshipMessageViewComponentDescriptor>();
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-    const auto &newProps = *std::static_pointer_cast<const RTNAirshipMessageViewProps>(props);
+    const auto &newProps = *std::static_pointer_cast<const RNAirshipMessageViewProps>(props);
     self.messageID = [NSString stringWithUTF8String:newProps.messageId.c_str()];
-    
+
     [super updateProps:props oldProps:oldProps];
 }
 #endif
 
+- (instancetype) init {
+    self = [self initWithFrame:CGRectZero];
+    if (self) {
+        self.wrapper = [[RNAirshipMessageWebViewWrapper alloc] initWithFrame:self.bounds];
+        self.wrapper.delegate = self;
+        [self addSubview:self.wrapper.webView];
+    }
+    return self;
+}
+
+
 - (void)layoutSubviews {
     [super layoutSubviews];
     self.wrapper.webView.frame = self.bounds;
@@ -80,7 +81,7 @@ NSString *const RTNAirshipMessageViewErrorKey = @"error";
 
 - (void)setMessageID:(NSString *)messageID {
     _messageID = messageID;
-    __weak RTNAirshipMessageView *weakSelf = self;
+    __weak RNAirshipMessageView *weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
         [weakSelf.wrapper loadMessageWithMessageID:messageID];
     });
@@ -100,54 +101,55 @@ NSString *const RTNAirshipMessageViewErrorKey = @"error";
 
 - (void)onMessageGoneWithMessageID:(NSString *)messageID {
     [self dispatchOnLoadErrorEvent:messageID
-                  withErrorMessage:RTNAirshipMessageViewErrorMessageNotAvailable
+                  withErrorMessage:RNAirshipMessageViewErrorMessageNotAvailable
                          retryable:NO];
 }
 
 - (void)onMessageLoadFailedWithMessageID:(NSString *)messageID {
     [self dispatchOnLoadErrorEvent:messageID
-                  withErrorMessage:RTNAirshipMessageViewErrorFailedToFetchMessage
+                  withErrorMessage:RNAirshipMessageViewErrorFailedToFetchMessage
                          retryable:YES];
 }
 
 - (void)onMessageBodyLoadFailedWithMessageID:(NSString *)messageID {
     [self dispatchOnLoadErrorEvent:messageID
-                  withErrorMessage:RTNAirshipMessageViewErrorMessageLoadFailed
+                  withErrorMessage:RNAirshipMessageViewErrorMessageLoadFailed
                          retryable:YES];
 }
 
 - (void)dispatchOnLoadStartedEvent: (NSString*)messageID
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-    std::dynamic_pointer_cast<const facebook::react::RTNAirshipMessageViewEventEmitter>(_eventEmitter)
-        ->onLoadStarted(facebook::react::RTNAirshipMessageViewEventEmitter::OnLoadStarted{
+    std::dynamic_pointer_cast<const facebook::react::RNAirshipMessageViewEventEmitter>(_eventEmitter)
+        ->onLoadStarted(facebook::react::RNAirshipMessageViewEventEmitter::OnLoadStarted{
             .messageId = std::string([messageID UTF8String])
         });
 #else
     if (self.onLoadStarted) {
         self.onLoadStarted(@{
-            RTNAirshipMessageViewMessageIDKey: messageID
+           RNAirshipMessageViewMessageIDKey: messageID
         });
     }
 #endif
 }
 
+
 - (void)dispatchOnLoadErrorEvent: (NSString*)messageID
                 withErrorMessage: (NSString*)errorMessage
                        retryable: (BOOL)retryable
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-    std::dynamic_pointer_cast<const facebook::react::RTNAirshipMessageViewEventEmitter>(_eventEmitter)
-        ->onLoadError(facebook::react::RTNAirshipMessageViewEventEmitter::OnLoadError{
+    std::dynamic_pointer_cast<const facebook::react::RNAirshipMessageViewEventEmitter>(_eventEmitter)
+        ->onLoadError(facebook::react::RNAirshipMessageViewEventEmitter::OnLoadError{
             .messageId = std::string([messageID UTF8String]),
             .error = std::string([errorMessage UTF8String]),
             .retryable = retryable
         });
 #else
     if (self.onLoadError) {
-        self.onLoadError(@{ RTNAirshipMessageViewMessageIDKey: messageID,
-                            RTNAirshipMessageViewErrorKey: errorMessage,
-                            RTNAirshipMessageViewRetryableKey: @(retryable) });
+        self.onLoadError(@{RNAirshipMessageViewMessageIDKey: messageID,
+                           RNAirshipMessageViewErrorKey: errorMessage,
+                           RNAirshipMessageViewRetryableKey: @(retryable) });
     }
 #endif
 }
@@ -155,13 +157,13 @@ NSString *const RTNAirshipMessageViewErrorKey = @"error";
 - (void)dispatchOnLoadFinishedEvent: (NSString*)messageID
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-    std::dynamic_pointer_cast<const facebook::react::RTNAirshipMessageViewEventEmitter>(_eventEmitter)
-        ->onLoadFinished(facebook::react::RTNAirshipMessageViewEventEmitter::OnLoadFinished{
+    std::dynamic_pointer_cast<const facebook::react::RNAirshipMessageViewEventEmitter>(_eventEmitter)
+        ->onLoadFinished(facebook::react::RNAirshipMessageViewEventEmitter::OnLoadFinished{
             .messageId = std::string([messageID UTF8String])
         });
 #else
     if (self.onLoadFinished) {
-        self.onLoadFinished(@{ RTNAirshipMessageViewMessageIDKey: messageID });
+        self.onLoadFinished(@{RNAirshipMessageViewMessageIDKey: messageID });
     }
 #endif
 }
@@ -169,22 +171,23 @@ NSString *const RTNAirshipMessageViewErrorKey = @"error";
 - (void)dispatchOnCloseEvent: (NSString*)messageID
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-    std::dynamic_pointer_cast<const facebook::react::RTNAirshipMessageViewEventEmitter>(_eventEmitter)
-        ->onClose(facebook::react::RTNAirshipMessageViewEventEmitter::OnClose{
+    std::dynamic_pointer_cast<const facebook::react::RNAirshipMessageViewEventEmitter>(_eventEmitter)
+        ->onClose(facebook::react::RNAirshipMessageViewEventEmitter::OnClose{
             .messageId = std::string([messageID UTF8String])
         });
 #else
     if (self.onClose) {
-        self.onClose(@{ RTNAirshipMessageViewMessageIDKey: messageID });
+        self.onClose(@{RNAirshipMessageViewMessageIDKey: messageID });
     }
 #endif
 }
-
 @end
 
+
 #ifdef RCT_NEW_ARCH_ENABLED
-Class<RCTComponentViewProtocol> RTNAirshipMessageViewCls(void)
+
+Class<RCTComponentViewProtocol>RNAirshipMessageViewCls(void)
 {
-    return RTNAirshipMessageView.class;
+    return RNAirshipMessageView.class;
 }
 #endif

package/ios/{RTNAirshipEmbeddedViewManager.h → RNAirshipMessageViewManager.h}

@@ -4,7 +4,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RTNAirshipEmbeddedViewManager : RCTViewManager
+@interface RNAirshipMessageViewManager : RCTViewManager
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/RNAirshipMessageViewManager.mm

@@ -0,0 +1,23 @@
+/* Copyright Airship and Contributors */
+
+#import "RNAirshipMessageViewManager.h"
+#import "RNAirshipMessageView.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RNAirshipMessageViewManager
+
+RCT_EXPORT_VIEW_PROPERTY(onLoadStarted, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLoadFinished, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onLoadError, RCTBubblingEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onClose, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(messageId, messageID, NSString)
+RCT_EXPORT_MODULE(RNAirshipMessageView)
+
+- (UIView *)view {
+    return [[RNAirshipMessageView alloc] init];
+}
+
+
+@end

package/ios/generated/RNAirshipSpec/ComponentDescriptors.cpp

@@ -0,0 +1,23 @@
+
+/**
+ * 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: GenerateComponentDescriptorCpp.js
+ */
+
+#include "ComponentDescriptors.h"
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+void RNAirshipSpec_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry) {
+registry->add(concreteComponentDescriptorProvider<RNAirshipEmbeddedViewComponentDescriptor>());
+registry->add(concreteComponentDescriptorProvider<RNAirshipMessageViewComponentDescriptor>());
+}
+
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/ComponentDescriptors.h

@@ -0,0 +1,25 @@
+
+/**
+ * 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: GenerateComponentDescriptorH.js
+ */
+
+#pragma once
+
+#include "ShadowNodes.h"
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+
+namespace facebook::react {
+
+using RNAirshipEmbeddedViewComponentDescriptor = ConcreteComponentDescriptor<RNAirshipEmbeddedViewShadowNode>;
+using RNAirshipMessageViewComponentDescriptor = ConcreteComponentDescriptor<RNAirshipMessageViewShadowNode>;
+
+void RNAirshipSpec_registerComponentDescriptorsFromCodegen(
+  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
+
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/EventEmitters.cpp

@@ -0,0 +1,54 @@
+
+/**
+ * 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: GenerateEventEmitterCpp.js
+ */
+
+#include "EventEmitters.h"
+
+
+namespace facebook::react {
+
+
+void RNAirshipMessageViewEventEmitter::onLoadStarted(OnLoadStarted $event) const {
+  dispatchEvent("topLoadStarted", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "messageId", $event.messageId);
+    return $payload;
+  });
+}
+
+
+void RNAirshipMessageViewEventEmitter::onLoadFinished(OnLoadFinished $event) const {
+  dispatchEvent("topLoadFinished", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "messageId", $event.messageId);
+    return $payload;
+  });
+}
+
+
+void RNAirshipMessageViewEventEmitter::onLoadError(OnLoadError $event) const {
+  dispatchEvent("topLoadError", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "messageId", $event.messageId);
+$payload.setProperty(runtime, "retryable", $event.retryable);
+$payload.setProperty(runtime, "error", $event.error);
+    return $payload;
+  });
+}
+
+
+void RNAirshipMessageViewEventEmitter::onClose(OnClose $event) const {
+  dispatchEvent("topClose", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "messageId", $event.messageId);
+    return $payload;
+  });
+}
+
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/EventEmitters.h

@@ -0,0 +1,52 @@
+
+/**
+ * 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: GenerateEventEmitterH.js
+ */
+#pragma once
+
+#include <react/renderer/components/view/ViewEventEmitter.h>
+
+
+namespace facebook::react {
+class RNAirshipEmbeddedViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  
+  
+};
+class RNAirshipMessageViewEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+
+  struct OnLoadStarted {
+      std::string messageId;
+    };
+
+  struct OnLoadFinished {
+      std::string messageId;
+    };
+
+  struct OnLoadError {
+      std::string messageId;
+    bool retryable;
+    std::string error;
+    };
+
+  struct OnClose {
+      std::string messageId;
+    };
+  void onLoadStarted(OnLoadStarted value) const;
+
+  void onLoadFinished(OnLoadFinished value) const;
+
+  void onLoadError(OnLoadError value) const;
+
+  void onClose(OnClose value) const;
+};
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/Props.cpp

@@ -0,0 +1,32 @@
+
+/**
+ * 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: GeneratePropsCpp.js
+ */
+
+#include "Props.h"
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/propsConversions.h>
+
+namespace facebook::react {
+
+RNAirshipEmbeddedViewProps::RNAirshipEmbeddedViewProps(
+    const PropsParserContext &context,
+    const RNAirshipEmbeddedViewProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    embeddedId(convertRawProp(context, rawProps, "embeddedId", sourceProps.embeddedId, {}))
+      {}
+RNAirshipMessageViewProps::RNAirshipMessageViewProps(
+    const PropsParserContext &context,
+    const RNAirshipMessageViewProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
+
+    messageId(convertRawProp(context, rawProps, "messageId", sourceProps.messageId, {}))
+      {}
+
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/Props.h

@@ -0,0 +1,37 @@
+
+/**
+ * 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: GeneratePropsH.js
+ */
+#pragma once
+
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
+
+namespace facebook::react {
+
+class RNAirshipEmbeddedViewProps final : public ViewProps {
+ public:
+  RNAirshipEmbeddedViewProps() = default;
+  RNAirshipEmbeddedViewProps(const PropsParserContext& context, const RNAirshipEmbeddedViewProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  std::string embeddedId{};
+};
+
+class RNAirshipMessageViewProps final : public ViewProps {
+ public:
+  RNAirshipMessageViewProps() = default;
+  RNAirshipMessageViewProps(const PropsParserContext& context, const RNAirshipMessageViewProps &sourceProps, const RawProps &rawProps);
+
+#pragma mark - Props
+
+  std::string messageId{};
+};
+
+} // namespace facebook::react

package/ios/generated/RNAirshipSpec/RCTComponentViewHelpers.h

@@ -0,0 +1,24 @@
+/**
+* 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: GenerateComponentHObjCpp.js
+*/
+
+#import <Foundation/Foundation.h>
+#import <React/RCTDefines.h>
+#import <React/RCTLog.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RCTRNAirshipEmbeddedViewViewProtocol <NSObject>
+
+@end
+
+@protocol RCTRNAirshipMessageViewViewProtocol <NSObject>
+
+@end
+
+NS_ASSUME_NONNULL_END