@selligent-marketing-cloud/selligent-react-native 3.9.2 → 4.0.1

package/README.md

@@ -11,7 +11,7 @@ This module supports the following SDK and tools:
 | SDK                                                                            | Version |
 | ------------------------------------------------------------------------------ |---------|
 | [Android SDK](https://github.com/SelligentMarketingCloud/MobileSDK-Android)    | 4.5.0   |
-| [iOS SDK](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)            | 3.8.3   |
+| [iOS SDK](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)            | 3.8.5   |
 | ReactNative                                                                    | 0.73.4  |
 | Expo SDK                                                                       | 50      |
 
@@ -174,7 +174,7 @@ This module supports the following SDK and tools:
 
     > Do not check the "copy if needed" option to make sure you only have to manage one selligent.json file
 
-3. Add the native iOS SDK dependency in your Podfile: `s.dependency "SelligentMobileSDK/Framework", "3.8.3"` or download it manually from [here](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/master/Framework) and drag and drop it into you **Xcode project**.
+3. Add the native iOS SDK dependency in your Podfile: `s.dependency "SelligentMobileSDK/Framework", "3.8.5"` or download it manually from [here](https://github.com/SelligentMarketingCloud/MobileSDK-iOS/tree/master/Framework) and drag and drop it into you **Xcode project**.
 
 4. Add the RNSelligentMapper pod in your Podfile: `pod 'RNSelligentMapper', :path => '../node_modules/@selligent-marketing-cloud/selligent-react-native/RNSelligentMapper.podspec'`.
 

package/android/build.gradle

@@ -64,7 +64,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'com.selligent.sdk:selligent_mobile_reactnative_sdk:3.8.0'
+    implementation 'com.selligent.sdk:selligent_mobile_reactnative_sdk:3.8.2'
 }
 
 def loadSelligentSettings(variant) {

package/android/src/main/java/com/selligent/RNHelpers.java

@@ -49,6 +49,9 @@ final class RNHelpers {
             else if (value instanceof String) {
                 writableMap.putString(key, (String) value);
             }
+            else if (value instanceof Long) {
+                writableMap.putDouble(key, (Long) value);
+            }
             else {
                 writableMap.putNull(key);
             }

package/android/src/main/java/com/selligent/RNSelligent.java

@@ -20,9 +20,11 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.selligent.rnmobilesdk.DelayedEvent;
 import com.selligent.rnmobilesdk.Manager;
 import com.selligent.sdk.SMForegroundGcmBroadcastReceiver;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 public class RNSelligent extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
@@ -39,6 +41,11 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
         return BuildConfig.SELLIGENT_SETTINGS;
     }
 
+    Activity getActivity()
+    {
+        return this.getCurrentActivity();
+    }
+
     public RNSelligent(ReactApplicationContext reactContext) {
         super(reactContext);
 
@@ -116,7 +123,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
 
     @ReactMethod
     public void executeButtonAction(String buttonId, String messageId, Callback successCallback, Callback errorCallback) {
-        this.manager.executeButtonAction(this.reactContext, buttonId, messageId, error ->
+        this.manager.executeButtonAction(this.getCurrentActivity(), buttonId, messageId, error ->
             processErrorStringToCallback(error, successCallback, errorCallback)
         );
     }
@@ -239,6 +246,34 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
         );
     }
 
+    @ReactMethod
+    public void executePushAction() {
+        this.emitDelayedEvents();
+
+        Activity currentActivity = this.getActivity();
+
+        if (currentActivity == null) { return; }
+
+        this.manager.executePushAction(currentActivity);
+    }
+
+    void emitDelayedEvents()
+    {
+        ArrayList<DelayedEvent> delayedEvents = this.manager.getStoredEvents();
+
+        if (delayedEvents.size() > 0)
+        {
+            for (DelayedEvent delayedEvent: delayedEvents)
+            {
+                this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(
+                        delayedEvent.Name,
+                        RNHelpers.convertMapToWritableMap(delayedEvent.Data)
+                );
+            }
+            delayedEvents.clear();
+        }
+    }
+
     @ReactMethod
     public void setFirebaseToken(String token) {
         this.manager.setFirebaseToken(token);
@@ -291,12 +326,20 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { }
 
     private void broadcastEvent(String eventName, Map<String, Object> data) {
-        this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(
-            eventName,
-            RNHelpers.convertMapToWritableMap(data)
-        );
+        if (RNSelligent.getManager().canEmitEvent())
+        {
+            this.reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(
+                    eventName,
+                    RNHelpers.convertMapToWritableMap(data)
+            );
+        }
+        else
+        {
+            RNSelligent.getManager().storeEvent(eventName, data);
+        }
     }
 
+
     private void processErrorStringToCallback(String error, Callback successCallback, Callback errorCallback) {
         if (error == null) {
             successCallback.invoke();

package/documentation/README.md

@@ -67,7 +67,7 @@ The following properties can be used in the `selligent.json` to further configur
 | clientId                                    | string | The Marigold Engage client id to be used to integrate with your Marigold Engage platform |
 | privateKey                                  | string | The Marigold Engage private key to be used to integrate with your Marigold Engage platform |
 | customInAppUi                               | boolean| When this is enabled and a "push + inapp" notification is clicked, the SDK will NOT display the inApp message and instead a `SelligentConstants.BroadcastEventType.DISPLAYING_IN_APP_MESSAGE` event will be sent |
-| delayedPushAction                           | boolean| (iOS Only) Optin for a specific push action handling (wait for React UI to be ready) when coming from a push message and having the app killed |
+| delayedPushAction                           | boolean| Optin for a specific push action handling (wait for React UI to be ready) when coming from a push message and having the app killed |
 | interceptSelligentUniversalLinks            | boolean| (iOS Only) Optin to customly handle the execution of universal links coming from a Push/IAM [more information](#universal-linking---ios) |
 | clearCacheIntervalValue                     | [enum](#clearcacheintervalvalue) | How much time the SDK will keep things in cache |  
 | inAppMessageRefreshType                     | [enum](#inappmessagerefreshtype) | How often the SDK will check for new inapp messages |
@@ -230,46 +230,13 @@ Then, follow the [native iOS SDK documentation](https://github.com/SelligentMark
 
 ### Deep Linking
 
-**For iOS**, (and depending on your React version) it might be that deeplinks behind push notifications do not work when the App is killed.
-This is because the JS layer is loaded **after** the native iOS SDK executes the deeplink, so the JS event listeners are not there yet. If you want to fix this, follow the below steps (make sure to build for Release when testing this).
+Depending on your React version, it might be that deeplinks behind push notifications do not work when the App is killed.
+This is because the JS layer is loaded **after** the native SDK executes the deeplink, so the JS event listeners are not there yet. If you want to fix this, follow the below steps (make sure to build for Release when testing this).
 
 1. Add the `delayedPushAction` property in `selligent.json` file and set it to `true`
 
 2. Implement (if not there yet) a linking handler in your ReactNative codebase (i.e <https://facebook.github.io/react-native/docs/linking>)
 
-    Example:
-
-    ```objc
-    // In Appdelegate.m
-    - (BOOL) application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-        return [RCTLinkingManager application:application openURL:url options:options];
-    }
-    ```
-
-    ```javascript
-    // In DeeplinkHook.js
-    import { useEffect } from "react"
-    import { Alert, Linking } from "react-native"
-
-    const useHandleDeepLink = () => {
-      useEffect(() => {
-          Linking.getInitialURL().then((link) => {
-              if (link) {
-                  Alert.alert('Deep Link', link || 'No link')
-              }
-          }).catch(err => {
-              console.warn('An error occurred', err)
-          })
-
-          const urlListener = Linking.addEventListener('url', ({url}) => Alert.alert('Deep Link', url || 'No link'))
-
-          return () => urlListener.remove()
-      }, [])
-    }
-
-    export default useHandleDeepLink
-    ```
-
 3. Add a call to `Selligent.executePushAction()` in your main `App.js` file, after adding the ReactNative linking handler (and after calling `Selligent.subscribeToEvents`, if being used)
 
     ```javascript
@@ -277,15 +244,13 @@ This is because the JS layer is loaded **after** the native iOS SDK executes the
 
     const App = () => {
     // Deeplinking handling library (i.e Linking.getInitialURL() & Linking.addEventListener...)
-    useHandleDeepLink()
+    // useHandleDeepLink()
 
-    if (Platform.OS === 'ios') {
-         /* Tells the Marigold Engage SDK to execute the action associated to the last push clicked, when using `delayedPushAction` feature.
-            If you are having problems with deeplinks or 'Push + InApp Message' where the splash screen gets stuck or the push action not visible,
-            make sure you control when the splash screen is dismissed (i.e https://docs.expo.dev/versions/latest/sdk/splash-screen/) and call this method afterwards (if the dismiss is async, call this method once the async process is completely finished)
-        */
-        Selligent.executePushAction()
-    }
+    /* Tells the Marigold Engage SDK to execute the action associated to the last push clicked, when using `delayedPushAction` feature.
+    If you are having problems with deeplinks or 'Push + InApp Message' where the splash screen gets stuck or the push action not visible,
+    make sure you control when the splash screen is dismissed (i.e https://docs.expo.dev/versions/latest/sdk/splash-screen/) and call this method afterwards (if the dismiss is async, call this method once the async process is completely finished)
+    */
+    Selligent.executePushAction()
     ```
 
 #### Background Modes

package/index.d.ts

@@ -65,6 +65,7 @@ export function displayMessage(
   messageId: string,
   templateId?: string
 ): void;
+export function executePushAction(): void;
 
 // IOS
 export function enableiOSLogging(
@@ -75,7 +76,6 @@ export function enableiOSLogging(
 export function registerForProvisionalRemoteNotification(
   successCallback: Function
 ): void;
-export function executePushAction(): void;
 
 // ANDROID
 export function areInAppMessagesEnabled(successCallback: Function): any;

package/index.ios.js

@@ -83,12 +83,5 @@ export default {
 	registerForProvisionalRemoteNotification: function (successCallback) {
 		successCallback(SelligentHelpers.SUCCESS)
 		RNSelligent.registerForProvisionalRemoteNotification()
-	},
-
-	/**
-	 * Tells the Marigold Engage SDK to execute the action associated to the last push clicked, when using `delayedPushAction` feature
-	 */
-	executePushAction: function () {
-		RNSelligent.executePushAction()
 	}
 }

package/index.js

@@ -184,6 +184,13 @@ export default Object.assign(
 			}
 		},
 
+		/**
+		 * Tells the Marigold Engage SDK to execute the action associated to the last push clicked, when using `delayedPushAction` feature
+		 */
+		executePushAction: function () {
+			RNSelligent.executePushAction()
+		},
+
 		// Event
 
 		/**

package/ios/CustomEvent.h

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+@interface CustomEvent : NSObject
+
+@property(nonatomic) NSString *_Nonnull name;
+@property(nonatomic) NSString *_Nonnull type;
+@property(nonatomic) NSDictionary *_Nullable data;
+
++ (instancetype _Nonnull) eventWithData:(NSDictionary*_Nullable)data AndName:(NSString*_Nonnull)name AndType:(NSString*_Nonnull)type;
+
+@end

package/ios/CustomEvent.m

@@ -0,0 +1,18 @@
+#import "CustomEvent.h"
+
+@implementation CustomEvent
+
++ (instancetype) eventWithData:(NSDictionary*)data AndName:(NSString*)name AndType:(NSString*)type {
+  return [[self alloc] initWithData:data AndName:name AndType: type];
+}
+
+- (instancetype) initWithData:(NSDictionary*)data AndName:(NSString*)name AndType:(NSString*)type {
+  self = [super init];
+  self.data = data;
+  self.type = type;
+  self.name = name;
+    
+  return self;
+}
+
+@end

package/ios/RNSelligentMapper.h

@@ -1,11 +1,3 @@
-//
-//  RNSelligentMapper.h
-//  SelligentDevAppRN
-//
-//  Created by Marc Biosca on 16/5/23.
-//  Copyright © 2023 Facebook. All rights reserved.
-//
-
 #if __has_include(<React/RCTBridgeModule.h>)
     #import <React/RCTBridgeModule.h>
     #import <React/RCTEventEmitter.h>

package/ios/RNSelligentMapper.m

@@ -1,4 +1,5 @@
 #import "RNSelligentMapper.h"
+#import "CustomEvent.h"
 
 @implementation RNSelligentMapper
 
@@ -8,6 +9,8 @@ RCT_EXPORT_MODULE(RNSelligent)
   self = [super init];
   
   RNSelligent.eventDelegate = self;
+  self.pendingEvents = [NSMutableArray new];
+  [RNSelligent subscribeToEvents:@[]];
   
   return self;
 }
@@ -133,10 +136,27 @@ RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)data successCallback:(RCTResponseSen
 
 RCT_EXPORT_METHOD(subscribeToEvents:(NSArray<NSString *> *)events) {
   [RNSelligent subscribeToEvents:events];
+  self.listeningEvents = true;
+  [self sendPendingEvents];
 }
 
 - (void) sendBroadcastEventWithName:(NSString * _Nonnull)name type:(NSString * _Nonnull)type data:(NSDictionary * _Nullable)data {
-  [self sendEventWithName:name body:@{@"data": data ?: [NSNull null], @"broadcastEventType": type}];
+  if (self.listeningEvents) {
+    [self sendEventWithName:name body:@{@"data": data ?: [NSNull null], @"broadcastEventType": type}];
+  }
+  else {
+    [self.pendingEvents addObject:[CustomEvent eventWithData:data AndName:name AndType:type]];
+  }
+}
+
+- (void) sendPendingEvents {
+  if (self.pendingEvents.count == 0) { return; }
+
+  for (CustomEvent* event in self.pendingEvents) {
+    [self sendEventWithName:event.name body:@{@"data": event.data ?: [NSNull null], @"broadcastEventType": event.type}];
+  }
+  
+  self.pendingEvents = [NSMutableArray new];
 }
 
 - (NSArray<NSString *> *) supportedEvents {
@@ -153,4 +173,4 @@ RCT_EXPORT_METHOD(subscribeToEvents:(NSArray<NSString *> *)events) {
      ];
 }
 
-@end
+@end

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Marigold Engage React Native",
-  "version": "3.9.2",
+  "version": "4.0.1",
   "description": "React Native wrapper for the Marigold Engage Android and iOS SDKs",
   "main": "index.js",
   "repository": {