fix bug causing presentFeedbackWidget to fail (#248)

* fix bug causing presentFeedbackWidget to fail

* versioning and changelog entry

Author: peterBrxwn

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 23.8.1
+* Fixed bug where "presentFeedbackWidget" method would fail with "Property 'eventEmitter' doesn't exist" if callbacks are provided.
+
+* Underlying Android SDK version is 23.8.2
+* Underlying iOS SDK version is 23.8.2
+
 ## 23.8.0
 * Added new Feedback interface (`Countly.feedback`) on the SDK interface that exposes the calls for feedback widgets.
 * Added Manual Reporting feature for the Feedback Widgets. This includes two new methods under the new Feedback interface:

Countly.js

@@ -18,6 +18,7 @@ Countly.serverUrl = '';
 Countly.appKey = '';
 let _state = CountlyState;
 CountlyState.CountlyReactNative = CountlyReactNative;
+CountlyState.eventEmitter = eventEmitter;
 
 Countly.feedback = Feedback;
 Countly.feedback.state = CountlyState;

CountlyReactNative.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '23.8.0'
+  s.version = '23.8.1'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE

CountlyState.js

@@ -2,5 +2,6 @@ const CountlyState = {};
 
 CountlyState.isInitialized = false
 CountlyState.CountlyReactNative = null;
+CountlyState.eventEmitter = null;
 
 export default CountlyState;

Feedback.js

@@ -1,4 +1,15 @@
 const Feedback = {};
+/*
+ * Callback to be executed when feedback widget is displayed
+ */
+let _widgetShownCallback;
+/*
+ * Callback to be executed when feedback widget is closed
+ */
+let _widgetClosedCallback;
+const widgetShownCallbackName = 'widgetShownCallback';
+const widgetClosedCallbackName = 'widgetClosedCallback';
+
 /**
  * Get a list of available feedback widgets as an array of objects.
  * @param {callback listener} onFinished - returns (retrievedWidgets, error)
@@ -37,7 +48,7 @@ async function getAvailableFeedbackWidgets(onFinished) {
 function presentFeedbackWidget(feedbackWidget, closeButtonText, widgetShownCallback, widgetClosedCallback) {
     if (!Feedback.state.isInitialized) {
         const message = "'init' must be called before 'presentFeedbackWidget'";
-        Feedback.instance.logError('presentFeedbackWidget', msg);
+        Feedback.instance.logError('presentFeedbackWidget', message);
         return { error: message };
     }
     let message = null;
@@ -62,13 +73,13 @@ function presentFeedbackWidget(feedbackWidget, closeButtonText, widgetShownCallb
     }
 
     if (widgetShownCallback) {
-        _widgetShownCallback = eventEmitter.addListener(widgetShownCallbackName, () => {
+        _widgetShownCallback = Feedback.state.eventEmitter.addListener(widgetShownCallbackName, () => {
             widgetShownCallback();
             _widgetShownCallback.remove();
         });
     }
     if (widgetClosedCallback) {
-        _widgetClosedCallback = eventEmitter.addListener(widgetClosedCallbackName, () => {
+        _widgetClosedCallback = Feedback.state.eventEmitter.addListener(widgetClosedCallbackName, () => {
             widgetClosedCallback();
             _widgetClosedCallback.remove();
         });

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -88,7 +88,7 @@ public String toString() {
 public class CountlyReactNative extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "23.8.0";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "23.8.1";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static final CountlyConfig config = new CountlyConfig();

example/install.sh

@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add [email protected].0
+yarn add [email protected].1
 
 cd ./ios
 pod install

ios/src/CountlyReactNative.m

@@ -24,7 +24,7 @@ @interface CountlyFeedbackWidget ()
 + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 @end
 
-NSString *const kCountlyReactNativeSDKVersion = @"23.8.0";
+NSString *const kCountlyReactNativeSDKVersion = @"23.8.1";
 NSString *const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";

package.json

@@ -1,6 +1,6 @@
 {
     "name": "countly-sdk-react-native-bridge",
-    "version": "23.8.0",
+    "version": "23.8.1",
     "author": "Countly <[email protected]> (https://count.ly/)",
     "bugs": {
         "url": "https://github.com/Countly/countly-sdk-react-native-bridge/issues"