react-native-moengage 7.3.0 → 7.4.0

package/CHANGELOG.md

@@ -1,7 +1,10 @@
 # react-native-moengage
 ---
 ## Change Log:
-
+### 7.4.0
+Release Date: 12th May 2022
+- Bugfix iOS: Fixed the PushClick callback issue in terminated state, that was appearing when the react-native version is above 0.65.
+      
 ### 7.3.0
 Release Date: 16th September 2021
 - HTML InApp Support Added.

package/ReactNativeMoEngage.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.platform            = :ios, "10.0"
   s.source_files        = 'iOS/MoEReactBridge/**/*.{h,m}'
   s.dependency          'React'
-  s.dependency          'MoEPluginBase','>= 2.1.0','< 2.2.0'
+  s.dependency          'MoEPluginBase','>= 2.3.0','< 2.4.0'
 
   s.prepare_command = <<-CMD
     echo // Generated file, do not edit > iOS/MoEReactBridge/MOReactPluginInfo.h

package/iOS/MoEReactBridge/MOReactInitializer.m

@@ -10,6 +10,7 @@
 #import <MoEngage/MoEngage.h>
 #import <MoEPluginBase/MoEPluginBase.h>
 #import "MoEReactConstants.h"
+#import "MoEReactBridge.h"
 
 @interface MOReactInitializer() <MoEPluginBridgeDelegate>
 
@@ -43,7 +44,6 @@
 }
 
 - (void)intializeSDKWithConfig:(MOSDKConfig*)sdkConfig withSDKState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions{
-    [[MoEPluginBridge sharedInstance] trackPluginVersion:MO_REACT_PLUGIN_VERSION forIntegrationType:ReactNative];
     [MoEPluginBridge sharedInstance].bridgeDelegate = self;
   
     if (sdkConfig.moeAppID == nil || sdkConfig == nil) {
@@ -53,7 +53,7 @@
     sdkConfig.pluginIntegrationType = REACT_NATIVE;
     sdkConfig.pluginIntegrationVersion = MO_REACT_PLUGIN_VERSION;
     
-    [[MoEPluginInitializer sharedInstance] intializeSDKWithConfig:sdkConfig withSDKState:isSdkEnabled andLaunchOptions:launchOptions];
+    [[MoEPluginInitializer sharedInstance] initializeSDKWithConfig:sdkConfig withSDKState:isSdkEnabled andLaunchOptions:launchOptions];
 }
 
 -(MOSDKConfig*)fetchSDKConfig {
@@ -164,9 +164,8 @@
     }
     
     NSDictionary* userInfo = @{kEventName:name,kPayloadDict:updatedDict};
-    [[NSNotificationCenter defaultCenter] postNotificationName:kEventEmitted
-                                                        object:self
-                                                      userInfo:userInfo];
+    MoEReactBridge *reactBridge = [MoEReactBridge allocWithZone: nil];
+    [reactBridge sendEventWithName:userInfo];
 
 }
 

package/iOS/MoEReactBridge/MoEReactBridge.h

@@ -11,5 +11,5 @@
 #import <React/RCTEventEmitter.h>
 
 @interface MoEReactBridge : RCTEventEmitter <RCTBridgeModule>
-
+-(void)sendEventWithName:(NSDictionary *)payloadDict;
 @end

package/iOS/MoEReactBridge/MoEReactBridge.m

@@ -16,38 +16,78 @@
 #import "MoEReactConstants.h"
 
 @interface MoEReactBridge()
-
 @end
 
 @implementation MoEReactBridge
 
+{
+  bool hasListeners;
+  NSMutableArray *delayedEvents;
+}
+
+- (instancetype)init
+{
+    if (self = [super init]) {
+        if (delayedEvents == nil)
+            delayedEvents = [NSMutableArray array];
+    }
+    return self;
+}
+
++ (id)allocWithZone:(NSZone *)zone {
+    static MoEReactBridge *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [super allocWithZone:zone];
+    });
+    return sharedInstance;
+}
+
++ (BOOL)requiresMainQueueSetup {
+    return true;
+}
+
 #pragma mark- Observers
 // Will be called when this module's first listener is added.
 -(void)startObserving {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(emitEventInternal:)
-                                                 name:kEventEmitted
-                                               object:nil];
+    hasListeners = YES;
+    [self flushDelayedEvents];
+
 }
 
 // Will be called when this module's last listener is removed, or on dealloc.
 -(void)stopObserving {
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:kEventEmitted object:nil];
+    hasListeners = NO;
 }
 
--(void)emitEventInternal:(NSNotification *)notification
-{
-    NSDictionary* userInfo = notification.userInfo;
-    if (userInfo) {
-        NSString* name = userInfo[kEventName];
-        NSDictionary* payload = userInfo[kPayloadDict];
+-(void)flushDelayedEvents{
+    if (delayedEvents.count > 0){
+        for (NSDictionary* payloadDict in delayedEvents){
+            [self emitEvent:payloadDict];
+        }
+    }
+    
+    [delayedEvents removeAllObjects];
+}
+
+-(void)sendEventWithName:(NSDictionary *)payloadDict{
+    if (hasListeners) {
+        [self emitEvent:payloadDict];
+    } else {
+        [delayedEvents addObject:payloadDict];
+    }
+}
+
+-(void)emitEvent:(NSDictionary*)payloadDict{
+    if (payloadDict){
+        NSString* name = payloadDict[kEventName];
+        NSDictionary* payload = payloadDict[kPayloadDict];
         if (name != nil && payload != nil) {
             [self sendEventWithName:name body:payload];
         }
     }
 }
 
-
 #pragma mark- Event Emitters
 - (NSArray<NSString *> *)supportedEvents
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-moengage",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "MoEngage is a mobile marketing automation company. This react-native SDK helps you track events, trigger smart notifications and in-apps, provides a drop-in Inbox Controller for notifications.",
   "main": "src/index.ts",
   "keywords": [