Add onDismissHandler API to BugReporting

Author: TheBuggedYRN

android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java

@@ -1,6 +1,7 @@
 package com.instabug.reactlibrary;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.instabug.apm.model.LogLevel;
 import com.instabug.bug.BugReporting;
@@ -41,6 +42,17 @@ public ArrayList<T> getAll(ArrayList<String> keys) {
             }
             return values;
         }
+
+        @Nullable
+        public String getKey(T value) {
+            for (Entry<String, T> entry : this.entrySet()) {
+                if (entry.getValue().equals(value)) {
+                    return entry.getKey();
+                }
+            }
+
+            return null;
+        }
     }
 
     static Map<String, Object> getAll() {
@@ -53,6 +65,7 @@ static Map<String, Object> getAll() {
             putAll(recordButtonPositions);
             putAll(welcomeMessageStates);
             putAll(reportTypes);
+            putAll(sdkDismissReportTypes);
             putAll(dismissTypes);
             putAll(actionTypes);
             putAll(extendedBugReportStates);
@@ -121,6 +134,13 @@ static Map<String, Object> getAll() {
         put("bugReportingReportTypeQuestion", BugReporting.ReportType.QUESTION);
     }};
 
+    static final ArgsMap<OnSdkDismissCallback.ReportType> sdkDismissReportTypes = new ArgsMap<OnSdkDismissCallback.ReportType>() {{
+        put("bugReportingReportTypeBug", OnSdkDismissCallback.ReportType.BUG);
+        put("bugReportingReportTypeFeedback", OnSdkDismissCallback.ReportType.FEEDBACK);
+        put("bugReportingReportTypeQuestion", OnSdkDismissCallback.ReportType.QUESTION);
+        put("bugReportingReportTypeOther", OnSdkDismissCallback.ReportType.OTHER);
+    }};
+
     static final ArgsMap<DismissType> dismissTypes = new ArgsMap<DismissType>() {{
         put("dismissTypeSubmit", DismissType.SUBMIT);
         put("dismissTypeCancel", DismissType.CANCEL);

android/src/main/java/com/instabug/reactlibrary/RNInstabugBugReportingModule.java

@@ -291,9 +291,13 @@ public void run() {
                     BugReporting.setOnDismissCallback(new OnSdkDismissCallback() {
                         @Override
                         public void call(DismissType dismissType, ReportType reportType) {
-                            WritableMap params = Arguments.createMap();
-                            params.putString("dismissType", dismissType.toString());
-                            params.putString("reportType", reportType.toString());
+                            final String dismissKey = ArgsRegistry.dismissTypes.getKey(dismissType);
+                            final String reportKey = ArgsRegistry.sdkDismissReportTypes.getKey(reportType);
+                            final WritableMap params = Arguments.createMap();
+
+                            params.putString("dismissType", dismissKey);
+                            params.putString("reportType", reportKey);
+
                             sendEvent(Constants.IBG_POST_INVOCATION_HANDLER, params);
                         }
                     });

ios/RNInstabug/InstabugBugReportingBridge.m

@@ -60,28 +60,14 @@ + (BOOL)requiresMainQueueSetup
 RCT_EXPORT_METHOD(setOnSDKDismissedHandler:(RCTResponseSenderBlock)callBack) {
     if (callBack != nil) {
         IBGBugReporting.didDismissHandler = ^(IBGDismissType dismissType, IBGReportType reportType) {
-            
-            //parse dismiss type enum
-            NSString* dismissTypeString;
-            if (dismissType == IBGDismissTypeCancel) {
-                dismissTypeString = @"CANCEL";
-            } else if (dismissType == IBGDismissTypeSubmit) {
-                dismissTypeString = @"SUBMIT";
-            } else if (dismissType == IBGDismissTypeAddAttachment) {
-                dismissTypeString = @"ADD_ATTACHMENT";
-            }
-            
-            //parse report type enum
-            NSString* reportTypeString;
-            if (reportType == IBGReportTypeBug) {
-                reportTypeString = @"bug";
-            } else if (reportType == IBGReportTypeFeedback) {
-                reportTypeString = @"feedback";
-            } else {
-                reportTypeString = @"other";
-            }
-            NSDictionary *result = @{ @"dismissType": dismissTypeString,
-                                      @"reportType": reportTypeString};
+            // Unlinke Android, we do NOT need to map the iOS Enums to their JS constant names.
+            // This is because the JS Enums are mapped to the actual values of the
+            // iOS Enums (NSInteger), not strings as it's implemented on Android.
+            NSDictionary *result = @{
+                @"dismissType": @(dismissType),
+                @"reportType": @(reportType)
+            };
+
             [self sendEventWithName:@"IBGpostInvocationHandler" body: result];
         };
     } else {

src/modules/BugReporting.ts

@@ -60,6 +60,9 @@ export const onInvokeHandler = (handler: () => void) => {
 };
 
 /**
+ * @deprecated Use {@link onDismissHandler} instead as it has correct types
+ * for the `handler` parameters.
+ *
  * Sets a block of code to be executed right after the SDK's UI is dismissed.
  * This block is executed on the UI thread. Could be used for performing any
  * UI changes after the SDK's UI is dismissed.
@@ -68,9 +71,41 @@ export const onInvokeHandler = (handler: () => void) => {
 export const onSDKDismissedHandler = (
   handler: (dismissType: dismissType | DismissType, reportType: reportType | ReportType) => void,
 ) => {
-  emitter.addListener(NativeEvents.ON_DISMISS_HANDLER, (payload) => {
-    handler(payload.dismissType, payload.reportType);
+  // Remapped to new API, while keeping the old incorrect behavior.
+  onDismissHandler((dismiss: dismissType, report: reportType) => {
+    const dismissTypes: Record<dismissType, string> = {
+      [dismissType.addAttachment]: 'ADD_ATTACHMENT',
+      [dismissType.submit]: 'SUBMIT',
+      [dismissType.cancel]: 'CANCEL',
+    };
+
+    const reportTypes: Record<reportType, string> = {
+      [reportType.bug]: 'bug',
+      [reportType.feedback]: 'feedback',
+      [reportType.question]: 'question',
+      [reportType.other]: 'other',
+    };
+
+    handler(dismissTypes[dismiss] as any, reportTypes[report] as any);
   });
+};
+
+/**
+ * Sets a block of code to be executed right after the SDK's UI is dismissed.
+ * This block is executed on the UI thread. Could be used for performing any
+ * UI changes after the SDK's UI is dismissed.
+ * @param handler A callback to get executed after dismissing the SDK.
+ */
+export const onDismissHandler = (
+  handler: (dismissType: dismissType | DismissType, reportType: reportType | ReportType) => void,
+) => {
+  emitter.addListener(
+    NativeEvents.ON_DISMISS_HANDLER,
+    (payload: { dismissType: any; reportType: any }) => {
+      handler(payload.dismissType, payload.reportType);
+    },
+  );
+
   NativeBugReporting.setOnSDKDismissedHandler(handler);
 };
 

src/native/NativeConstants.ts

@@ -76,6 +76,7 @@ interface NativeReportType {
   bugReportingReportTypeBug: any;
   bugReportingReportTypeFeedback: any;
   bugReportingReportTypeQuestion: any;
+  bugReportingReportTypeOther: any;
 }
 
 interface NativeDismissType {

src/utils/ArgsRegistry.ts

@@ -118,6 +118,7 @@ export enum reportType {
   bug = constants.bugReportingReportTypeBug,
   feedback = constants.bugReportingReportTypeFeedback,
   question = constants.bugReportingReportTypeQuestion,
+  other = constants.bugReportingReportTypeOther,
 }
 
 /**

src/utils/Enums.ts

@@ -76,6 +76,7 @@ export enum ReportType {
   bug = constants.bugReportingReportTypeBug,
   feedback = constants.bugReportingReportTypeFeedback,
   question = constants.bugReportingReportTypeQuestion,
+  other = constants.bugReportingReportTypeOther,
 }
 
 /**