@trycourier/courier-react-native 2.0.0-beta6 → 2.0.0-beta7

package/android/build.gradle

@@ -102,6 +102,7 @@ dependencies {
 
   // Courier Core SDK
   api 'com.github.trycourier:courier-android:2.0.32'
+  api 'androidx.recyclerview:recyclerview:1.3.1'
 
 }
 

package/android/src/main/java/com/courierreactnative/CourierReactNativeViewManager.kt

@@ -1,42 +1,160 @@
 package com.courierreactnative
 
+import android.content.Context
 import android.graphics.Color
+import android.graphics.Typeface
 import android.view.View
-import android.widget.FrameLayout
+import androidx.recyclerview.widget.DividerItemDecoration
 import com.courier.android.inbox.CourierInbox
+import com.courier.android.inbox.CourierInboxButtonStyles
+import com.courier.android.inbox.CourierInboxFont
+import com.courier.android.inbox.CourierInboxTheme
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class CourierReactNativeViewManager : SimpleViewManager<FrameLayout>() {
+
+class CourierReactNativeViewManager : SimpleViewManager<CourierInbox>() {
+
+  private companion object {
+    const val ON_CLICK_MESSAGE_AT_INDEX = "courierClickMessageAtIndex"
+    const val ON_CLICK_ACTION_AT_INDEX = "courierClickActionAtIndex"
+    const val ON_SCROLL = "courierScrollInbox"
+  }
 
   override fun getName() = "CourierReactNativeView"
 
-  override fun createViewInstance(reactContext: ThemedReactContext): FrameLayout {
-    return FrameLayout(reactContext)
+  override fun createViewInstance(reactContext: ThemedReactContext): CourierInbox {
+    return CourierInbox(reactContext)
+  }
+
+  private val View.reactContext: ThemedReactContext get() = context as ThemedReactContext
+
+  @ReactProp(name = "onClickInboxMessageAtIndex")
+  fun setOnClickInboxMessageAtIndex(view: CourierInbox, callback: Boolean) {
+
+    view.setOnClickMessageListener { message, index ->
+
+      val map = Arguments.createMap()
+      map.putMap("message", message.toWritableMap())
+      map.putInt("index", index)
+
+      view.reactContext.sendEvent(ON_CLICK_MESSAGE_AT_INDEX, map)
+
+    }
+
+  }
+
+  @ReactProp(name = "onClickInboxActionForMessageAtIndex")
+  fun setOnClickInboxActionForMessageAtIndex(view: CourierInbox, callback: Boolean) {
+
+    view.setOnClickActionListener { action, message, index ->
+
+      val map = Arguments.createMap()
+      map.putMap("action", action.toWritableMap())
+      map.putMap("message", message.toWritableMap())
+      map.putInt("index", index)
+
+      view.reactContext.sendEvent(ON_CLICK_ACTION_AT_INDEX, map)
+
+    }
+
+  }
+
+  @ReactProp(name = "onScrollInbox")
+  fun setOnScrollInbox(view: CourierInbox, callback: Boolean) {
+
+    view.setOnScrollInboxListener { offsetInDp ->
+
+      val offset = Arguments.createMap()
+      offset.putInt("y", offsetInDp)
+      offset.putInt("x", 0)
+
+      val map = Arguments.createMap()
+      map.putMap("contentOffset", offset)
+
+      view.reactContext.sendEvent(ON_SCROLL, map)
+
+    }
+
   }
 
   @ReactProp(name = "theme")
-  fun setTheme(view: FrameLayout, theme: ReadableMap) {
+  fun setTheme(view: CourierInbox, theme: ReadableMap) {
+    view.lightTheme = theme.getMap("light")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_LIGHT
+    view.darkTheme = theme.getMap("dark")?.toTheme(view) ?: CourierInboxTheme.DEFAULT_DARK
+  }
+
+  private fun ReadableMap.toTheme(view: View): CourierInboxTheme {
 
-    view.removeAllViews()
+    val android = getMap("android")
+    val dividerItemDecoration = android?.getString("dividerItemDecoration")
 
-    // Create the view
-    val courierInbox = CourierInbox(view.context)
+    val unreadIndicatorBarColor = getString("unreadIndicatorBarColor")
+    val loadingIndicatorColor = getString("loadingIndicatorColor")
 
-    // Set the layout params
-    val layoutParams = FrameLayout.LayoutParams(
-      FrameLayout.LayoutParams.MATCH_PARENT,
-      FrameLayout.LayoutParams.MATCH_PARENT
+    val titleFont = getMap("titleFont")
+    val timeFont = getMap("timeFont")
+    val bodyFont = getMap("bodyFont")
+    val detailTitleFont = getMap("detailTitleFont")
+    val buttonStyles = getMap("buttonStyles")
+
+    val context = view.context
+
+    return CourierInboxTheme(
+      dividerItemDecoration = dividerItemDecoration?.toDivider(context),
+      unreadIndicatorBarColor = unreadIndicatorBarColor?.toColor(),
+      loadingIndicatorColor = loadingIndicatorColor?.toColor(),
+      titleFont = titleFont?.toFont(context) ?: CourierInboxFont(),
+      timeFont = timeFont?.toFont(context) ?: CourierInboxFont(),
+      bodyFont = bodyFont?.toFont(context) ?: CourierInboxFont(),
+      detailTitleFont = detailTitleFont?.toFont(context) ?: CourierInboxFont(),
+      buttonStyles = buttonStyles?.toButtonStyles(context) ?: CourierInboxButtonStyles()
     )
-    courierInbox.layoutParams = layoutParams
 
-    // Add the view to the parent
-    view.addView(courierInbox)
+  }
 
-    view.setBackgroundColor(Color.parseColor(theme.getString("color")))
+  private fun String.toColor(): Int = Color.parseColor(this)
+
+  private fun String.toFont(context: Context): Typeface? {
+    return try {
+      val assetManager = context.assets
+      Typeface.createFromAsset(assetManager, this)
+    } catch (e: Exception) {
+      e.printStackTrace()
+      null
+    }
+  }
+
+  private fun String.toDivider(context: Context): DividerItemDecoration? = if (this == "vertical") DividerItemDecoration(context, DividerItemDecoration.VERTICAL) else null
+
+  private fun ReadableMap.toFont(context: Context): CourierInboxFont {
+
+    val typeface = getString("family")
+    val size = if (isNull("size")) null else getDouble("size")
+    val color = getString("color")
+
+    return CourierInboxFont(
+        typeface = typeface?.toFont(context),
+        color = color?.toColor(),
+        sizeInSp = size?.toInt()
+      )
+
+  }
+
+  private fun ReadableMap.toButtonStyles(context: Context): CourierInboxButtonStyles {
+
+    val font = getMap("font")
+    val backgroundColor = getString("backgroundColor")
+    val cornerRadius = if (isNull("cornerRadius")) null else getDouble("cornerRadius")
+
+    return CourierInboxButtonStyles(
+      font = font?.toFont(context),
+      backgroundColor = backgroundColor?.toColor(),
+      cornerRadiusInDp = cornerRadius?.toInt()
+    )
 
   }
 

package/lib/commonjs/views/CourierInboxView.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CourierInboxView = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const ComponentName = 'CourierReactNativeView';
 const LINKING_ERROR = `The package '@trycourier/courier-react-native' doesn't seem to be linked. Make sure: \n\n` + _reactNative.Platform.select({
   ios: "- You have run 'pod install'\n",
@@ -16,27 +17,59 @@ const CourierInbox = _reactNative.UIManager.getViewManagerConfig(ComponentName)
   throw new Error(LINKING_ERROR);
 };
 const CourierInboxView = props => {
+  let onClickInboxMessageAtIndexListener = undefined;
+  let onClickInboxActionForMessageAtIndexListener = undefined;
+  let onScrollInboxListener = undefined;
+  (0, _react.useEffect)(() => {
+    return () => {
+      var _onClickInboxMessageA, _onClickInboxActionFo, _onScrollInboxListene;
+      (_onClickInboxMessageA = onClickInboxMessageAtIndexListener) === null || _onClickInboxMessageA === void 0 ? void 0 : _onClickInboxMessageA.remove();
+      (_onClickInboxActionFo = onClickInboxActionForMessageAtIndexListener) === null || _onClickInboxActionFo === void 0 ? void 0 : _onClickInboxActionFo.remove();
+      (_onScrollInboxListene = onScrollInboxListener) === null || _onScrollInboxListene === void 0 ? void 0 : _onScrollInboxListene.remove();
+    };
+  }, []);
+  (0, _react.useEffect)(() => {
+    var _onClickInboxMessageA2;
+    (_onClickInboxMessageA2 = onClickInboxMessageAtIndexListener) === null || _onClickInboxMessageA2 === void 0 ? void 0 : _onClickInboxMessageA2.remove();
+    if (_reactNative.Platform.OS === 'android' && props.onClickInboxMessageAtIndex) {
+      onClickInboxMessageAtIndexListener = _reactNative.DeviceEventEmitter.addListener('courierClickMessageAtIndex', onClickInboxMessageAtIndex);
+    }
+  }, [props.onClickInboxMessageAtIndex]);
   const onClickInboxMessageAtIndex = event => {
     // Parse the native event data
     if (props.onClickInboxMessageAtIndex) {
-      const index = event.nativeEvent["index"];
-      const message = event.nativeEvent["message"];
+      const index = event["index"];
+      const message = event["message"];
       props.onClickInboxMessageAtIndex(message, index);
     }
   };
+  (0, _react.useEffect)(() => {
+    var _onClickInboxActionFo2;
+    (_onClickInboxActionFo2 = onClickInboxActionForMessageAtIndexListener) === null || _onClickInboxActionFo2 === void 0 ? void 0 : _onClickInboxActionFo2.remove();
+    if (_reactNative.Platform.OS === 'android' && props.onClickInboxActionForMessageAtIndex) {
+      onClickInboxActionForMessageAtIndexListener = _reactNative.DeviceEventEmitter.addListener('courierClickActionAtIndex', onClickInboxActionForMessageAtIndex);
+    }
+  }, [props.onClickInboxActionForMessageAtIndex]);
   const onClickInboxActionForMessageAtIndex = event => {
     // Parse the native event data
     if (props.onClickInboxActionForMessageAtIndex) {
-      const index = event.nativeEvent["index"];
-      const action = event.nativeEvent["action"];
-      const message = event.nativeEvent["message"];
+      const index = event["index"];
+      const action = event["action"];
+      const message = event["message"];
       props.onClickInboxActionForMessageAtIndex(action, message, index);
     }
   };
+  (0, _react.useEffect)(() => {
+    var _onScrollInboxListene2;
+    (_onScrollInboxListene2 = onScrollInboxListener) === null || _onScrollInboxListene2 === void 0 ? void 0 : _onScrollInboxListene2.remove();
+    if (_reactNative.Platform.OS === 'android' && props.onScrollInbox) {
+      onScrollInboxListener = _reactNative.DeviceEventEmitter.addListener('courierScrollInbox', onScrollInbox);
+    }
+  }, [props.onScrollInbox]);
   const onScrollInbox = event => {
     // Parse the native event data
     if (props.onScrollInbox) {
-      const contentOffset = event.nativeEvent["contentOffset"];
+      const contentOffset = event["contentOffset"];
       props.onScrollInbox(contentOffset["y"], contentOffset["x"]);
     }
   };
@@ -45,9 +78,9 @@ const CourierInboxView = props => {
       light: undefined,
       dark: undefined
     },
-    onClickInboxMessageAtIndex: onClickInboxMessageAtIndex,
-    onClickInboxActionForMessageAtIndex: onClickInboxActionForMessageAtIndex,
-    onScrollInbox: onScrollInbox,
+    onClickInboxMessageAtIndex: event => onClickInboxMessageAtIndex(event.nativeEvent),
+    onClickInboxActionForMessageAtIndex: event => onClickInboxActionForMessageAtIndex(event.nativeEvent),
+    onScrollInbox: event => onScrollInbox(event.nativeEvent),
     style: props.style
   });
 };

package/lib/commonjs/views/CourierInboxView.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","obj","__esModule","default","ComponentName","LINKING_ERROR","Platform","select","ios","CourierInbox","UIManager","getViewManagerConfig","requireNativeComponent","Error","CourierInboxView","props","onClickInboxMessageAtIndex","event","index","nativeEvent","message","onClickInboxActionForMessageAtIndex","action","onScrollInbox","contentOffset","createElement","theme","light","undefined","dark","style","exports"],"sourceRoot":"../../../src","sources":["views/CourierInboxView.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAAsF,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAgBtF,MAAMG,aAAa,GAAG,wBAAwB;AAE9C,MAAMC,aAAa,GAChB,2FAA0F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEL,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMM,YAAY,GAChBC,sBAAS,CAACC,oBAAoB,CAACP,aAAa,CAAC,IAAI,IAAI,GACjD,IAAAQ,mCAAsB,EAAwBR,aAAa,CAAC,GAC5D,MAAM;EACJ,MAAM,IAAIS,KAAK,CAACR,aAAa,CAAC;AAChC,CAAC;AAEA,MAAMS,gBAAgB,GAAIC,KAA4B,IAAK;EAEhE,MAAMC,0BAA0B,GAAIC,KAAU,IAAK;IAEjD;IACA,IAAIF,KAAK,CAACC,0BAA0B,EAAE;MAEpC,MAAME,KAAK,GAAGD,KAAK,CAACE,WAAW,CAAC,OAAO,CAAC;MACxC,MAAMC,OAAO,GAAGH,KAAK,CAACE,WAAW,CAAC,SAAS,CAAiB;MAE5DJ,KAAK,CAACC,0BAA0B,CAACI,OAAO,EAAEF,KAAK,CAAC;IAElD;EAEF,CAAC;EAED,MAAMG,mCAAmC,GAAIJ,KAAU,IAAK;IAE1D;IACA,IAAIF,KAAK,CAACM,mCAAmC,EAAE;MAE7C,MAAMH,KAAK,GAAGD,KAAK,CAACE,WAAW,CAAC,OAAO,CAAC;MACxC,MAAMG,MAAM,GAAGL,KAAK,CAACE,WAAW,CAAC,QAAQ,CAAgB;MACzD,MAAMC,OAAO,GAAGH,KAAK,CAACE,WAAW,CAAC,SAAS,CAAiB;MAE5DJ,KAAK,CAACM,mCAAmC,CAACC,MAAM,EAAEF,OAAO,EAAEF,KAAK,CAAC;IAEnE;EAEF,CAAC;EAED,MAAMK,aAAa,GAAIN,KAAU,IAAK;IAEpC;IACA,IAAIF,KAAK,CAACQ,aAAa,EAAE;MAEvB,MAAMC,aAAa,GAAGP,KAAK,CAACE,WAAW,CAAC,eAAe,CAAC;MACxDJ,KAAK,CAACQ,aAAa,CAACC,aAAa,CAAC,GAAG,CAAC,EAAEA,aAAa,CAAC,GAAG,CAAC,CAAC;IAE7D;EAEF,CAAC;EAED,oBACE3B,MAAA,CAAAM,OAAA,CAAAsB,aAAA,CAAChB,YAAY;IACXiB,KAAK,EAAEX,KAAK,CAACW,KAAK,IAAI;MAAEC,KAAK,EAAEC,SAAS;MAAEC,IAAI,EAAED;IAAU,CAAE;IAC5DZ,0BAA0B,EAAEA,0BAA2B;IACvDK,mCAAmC,EAAEA,mCAAoC;IACzEE,aAAa,EAAEA,aAAc;IAC7BO,KAAK,EAAEf,KAAK,CAACe;EAAM,CACpB,CAAC;AAGN,CAAC;AAAAC,OAAA,CAAAjB,gBAAA,GAAAA,gBAAA"}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","ComponentName","LINKING_ERROR","Platform","select","ios","CourierInbox","UIManager","getViewManagerConfig","requireNativeComponent","Error","CourierInboxView","props","onClickInboxMessageAtIndexListener","undefined","onClickInboxActionForMessageAtIndexListener","onScrollInboxListener","useEffect","_onClickInboxMessageA","_onClickInboxActionFo","_onScrollInboxListene","remove","_onClickInboxMessageA2","OS","onClickInboxMessageAtIndex","DeviceEventEmitter","addListener","event","index","message","_onClickInboxActionFo2","onClickInboxActionForMessageAtIndex","action","_onScrollInboxListene2","onScrollInbox","contentOffset","createElement","theme","light","dark","nativeEvent","style","exports"],"sourceRoot":"../../../src","sources":["views/CourierInboxView.tsx"],"mappings":"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"}

package/lib/module/views/CourierInboxView.js

@@ -1,5 +1,5 @@
-import React from "react";
-import { Platform, requireNativeComponent, UIManager } from "react-native";
+import React, { useEffect } from "react";
+import { Platform, requireNativeComponent, UIManager, DeviceEventEmitter } from "react-native";
 const ComponentName = 'CourierReactNativeView';
 const LINKING_ERROR = `The package '@trycourier/courier-react-native' doesn't seem to be linked. Make sure: \n\n` + Platform.select({
   ios: "- You have run 'pod install'\n",
@@ -9,27 +9,59 @@ const CourierInbox = UIManager.getViewManagerConfig(ComponentName) != null ? req
   throw new Error(LINKING_ERROR);
 };
 export const CourierInboxView = props => {
+  let onClickInboxMessageAtIndexListener = undefined;
+  let onClickInboxActionForMessageAtIndexListener = undefined;
+  let onScrollInboxListener = undefined;
+  useEffect(() => {
+    return () => {
+      var _onClickInboxMessageA, _onClickInboxActionFo, _onScrollInboxListene;
+      (_onClickInboxMessageA = onClickInboxMessageAtIndexListener) === null || _onClickInboxMessageA === void 0 ? void 0 : _onClickInboxMessageA.remove();
+      (_onClickInboxActionFo = onClickInboxActionForMessageAtIndexListener) === null || _onClickInboxActionFo === void 0 ? void 0 : _onClickInboxActionFo.remove();
+      (_onScrollInboxListene = onScrollInboxListener) === null || _onScrollInboxListene === void 0 ? void 0 : _onScrollInboxListene.remove();
+    };
+  }, []);
+  useEffect(() => {
+    var _onClickInboxMessageA2;
+    (_onClickInboxMessageA2 = onClickInboxMessageAtIndexListener) === null || _onClickInboxMessageA2 === void 0 ? void 0 : _onClickInboxMessageA2.remove();
+    if (Platform.OS === 'android' && props.onClickInboxMessageAtIndex) {
+      onClickInboxMessageAtIndexListener = DeviceEventEmitter.addListener('courierClickMessageAtIndex', onClickInboxMessageAtIndex);
+    }
+  }, [props.onClickInboxMessageAtIndex]);
   const onClickInboxMessageAtIndex = event => {
     // Parse the native event data
     if (props.onClickInboxMessageAtIndex) {
-      const index = event.nativeEvent["index"];
-      const message = event.nativeEvent["message"];
+      const index = event["index"];
+      const message = event["message"];
       props.onClickInboxMessageAtIndex(message, index);
     }
   };
+  useEffect(() => {
+    var _onClickInboxActionFo2;
+    (_onClickInboxActionFo2 = onClickInboxActionForMessageAtIndexListener) === null || _onClickInboxActionFo2 === void 0 ? void 0 : _onClickInboxActionFo2.remove();
+    if (Platform.OS === 'android' && props.onClickInboxActionForMessageAtIndex) {
+      onClickInboxActionForMessageAtIndexListener = DeviceEventEmitter.addListener('courierClickActionAtIndex', onClickInboxActionForMessageAtIndex);
+    }
+  }, [props.onClickInboxActionForMessageAtIndex]);
   const onClickInboxActionForMessageAtIndex = event => {
     // Parse the native event data
     if (props.onClickInboxActionForMessageAtIndex) {
-      const index = event.nativeEvent["index"];
-      const action = event.nativeEvent["action"];
-      const message = event.nativeEvent["message"];
+      const index = event["index"];
+      const action = event["action"];
+      const message = event["message"];
       props.onClickInboxActionForMessageAtIndex(action, message, index);
     }
   };
+  useEffect(() => {
+    var _onScrollInboxListene2;
+    (_onScrollInboxListene2 = onScrollInboxListener) === null || _onScrollInboxListene2 === void 0 ? void 0 : _onScrollInboxListene2.remove();
+    if (Platform.OS === 'android' && props.onScrollInbox) {
+      onScrollInboxListener = DeviceEventEmitter.addListener('courierScrollInbox', onScrollInbox);
+    }
+  }, [props.onScrollInbox]);
   const onScrollInbox = event => {
     // Parse the native event data
     if (props.onScrollInbox) {
-      const contentOffset = event.nativeEvent["contentOffset"];
+      const contentOffset = event["contentOffset"];
       props.onScrollInbox(contentOffset["y"], contentOffset["x"]);
     }
   };
@@ -38,9 +70,9 @@ export const CourierInboxView = props => {
       light: undefined,
       dark: undefined
     },
-    onClickInboxMessageAtIndex: onClickInboxMessageAtIndex,
-    onClickInboxActionForMessageAtIndex: onClickInboxActionForMessageAtIndex,
-    onScrollInbox: onScrollInbox,
+    onClickInboxMessageAtIndex: event => onClickInboxMessageAtIndex(event.nativeEvent),
+    onClickInboxActionForMessageAtIndex: event => onClickInboxActionForMessageAtIndex(event.nativeEvent),
+    onScrollInbox: event => onScrollInbox(event.nativeEvent),
     style: props.style
   });
 };

package/lib/module/views/CourierInboxView.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Platform","requireNativeComponent","UIManager","ComponentName","LINKING_ERROR","select","ios","default","CourierInbox","getViewManagerConfig","Error","CourierInboxView","props","onClickInboxMessageAtIndex","event","index","nativeEvent","message","onClickInboxActionForMessageAtIndex","action","onScrollInbox","contentOffset","createElement","theme","light","undefined","dark","style"],"sourceRoot":"../../../src","sources":["views/CourierInboxView.tsx"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,EAAEC,sBAAsB,EAAEC,SAAS,QAAmB,cAAc;AAgBrF,MAAMC,aAAa,GAAG,wBAAwB;AAE9C,MAAMC,aAAa,GAChB,2FAA0F,GAC3FJ,QAAQ,CAACK,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,YAAY,GAChBN,SAAS,CAACO,oBAAoB,CAACN,aAAa,CAAC,IAAI,IAAI,GACjDF,sBAAsB,CAAwBE,aAAa,CAAC,GAC5D,MAAM;EACJ,MAAM,IAAIO,KAAK,CAACN,aAAa,CAAC;AAChC,CAAC;AAEP,OAAO,MAAMO,gBAAgB,GAAIC,KAA4B,IAAK;EAEhE,MAAMC,0BAA0B,GAAIC,KAAU,IAAK;IAEjD;IACA,IAAIF,KAAK,CAACC,0BAA0B,EAAE;MAEpC,MAAME,KAAK,GAAGD,KAAK,CAACE,WAAW,CAAC,OAAO,CAAC;MACxC,MAAMC,OAAO,GAAGH,KAAK,CAACE,WAAW,CAAC,SAAS,CAAiB;MAE5DJ,KAAK,CAACC,0BAA0B,CAACI,OAAO,EAAEF,KAAK,CAAC;IAElD;EAEF,CAAC;EAED,MAAMG,mCAAmC,GAAIJ,KAAU,IAAK;IAE1D;IACA,IAAIF,KAAK,CAACM,mCAAmC,EAAE;MAE7C,MAAMH,KAAK,GAAGD,KAAK,CAACE,WAAW,CAAC,OAAO,CAAC;MACxC,MAAMG,MAAM,GAAGL,KAAK,CAACE,WAAW,CAAC,QAAQ,CAAgB;MACzD,MAAMC,OAAO,GAAGH,KAAK,CAACE,WAAW,CAAC,SAAS,CAAiB;MAE5DJ,KAAK,CAACM,mCAAmC,CAACC,MAAM,EAAEF,OAAO,EAAEF,KAAK,CAAC;IAEnE;EAEF,CAAC;EAED,MAAMK,aAAa,GAAIN,KAAU,IAAK;IAEpC;IACA,IAAIF,KAAK,CAACQ,aAAa,EAAE;MAEvB,MAAMC,aAAa,GAAGP,KAAK,CAACE,WAAW,CAAC,eAAe,CAAC;MACxDJ,KAAK,CAACQ,aAAa,CAACC,aAAa,CAAC,GAAG,CAAC,EAAEA,aAAa,CAAC,GAAG,CAAC,CAAC;IAE7D;EAEF,CAAC;EAED,oBACEtB,KAAA,CAAAuB,aAAA,CAACd,YAAY;IACXe,KAAK,EAAEX,KAAK,CAACW,KAAK,IAAI;MAAEC,KAAK,EAAEC,SAAS;MAAEC,IAAI,EAAED;IAAU,CAAE;IAC5DZ,0BAA0B,EAAEA,0BAA2B;IACvDK,mCAAmC,EAAEA,mCAAoC;IACzEE,aAAa,EAAEA,aAAc;IAC7BO,KAAK,EAAEf,KAAK,CAACe;EAAM,CACpB,CAAC;AAGN,CAAC"}
+{"version":3,"names":["React","useEffect","Platform","requireNativeComponent","UIManager","DeviceEventEmitter","ComponentName","LINKING_ERROR","select","ios","default","CourierInbox","getViewManagerConfig","Error","CourierInboxView","props","onClickInboxMessageAtIndexListener","undefined","onClickInboxActionForMessageAtIndexListener","onScrollInboxListener","_onClickInboxMessageA","_onClickInboxActionFo","_onScrollInboxListene","remove","_onClickInboxMessageA2","OS","onClickInboxMessageAtIndex","addListener","event","index","message","_onClickInboxActionFo2","onClickInboxActionForMessageAtIndex","action","_onScrollInboxListene2","onScrollInbox","contentOffset","createElement","theme","light","dark","nativeEvent","style"],"sourceRoot":"../../../src","sources":["views/CourierInboxView.tsx"],"mappings":"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"}

package/lib/typescript/models/CourierInboxTheme.d.ts

@@ -30,5 +30,8 @@ export default interface CourierInboxTheme {
             selectionStyle?: 'none' | 'blue' | 'gray' | 'default';
         };
     };
+    android?: {
+        dividerItemDecoration?: 'none' | 'vertical';
+    };
 }
 //# sourceMappingURL=CourierInboxTheme.d.ts.map

package/lib/typescript/models/CourierInboxTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CourierInboxTheme.d.ts","sourceRoot":"","sources":["../../../src/models/CourierInboxTheme.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,gBAAgB,CAAA;IACvB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB;IACxC,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,eAAe,CAAC,EAAE,gBAAgB,CAAA;IAClC,YAAY,CAAC,EAAE,wBAAwB,CAAA;IACvC,GAAG,CAAC,EAAE;QACJ,qBAAqB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;QACvG,UAAU,CAAC,EAAE;YACX,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAAC;YAC5D,eAAe,CAAC,EAAE;gBAAE,GAAG,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE,MAAM,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YACnF,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;SACtD,CAAA;KACF,CAAA;CACF"}
+{"version":3,"file":"CourierInboxTheme.d.ts","sourceRoot":"","sources":["../../../src/models/CourierInboxTheme.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,gBAAgB,CAAA;IACvB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB;IACxC,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,eAAe,CAAC,EAAE,gBAAgB,CAAA;IAClC,YAAY,CAAC,EAAE,wBAAwB,CAAA;IACvC,GAAG,CAAC,EAAE;QACJ,qBAAqB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;QACvG,UAAU,CAAC,EAAE;YACX,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAAC;YAC5D,eAAe,CAAC,EAAE;gBAAE,GAAG,CAAC,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE,MAAM,CAAC;gBAAC,KAAK,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YACnF,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvD,CAAA;KACF,CAAC;IACF,OAAO,CAAC,EAAE;QACR,qBAAqB,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;KAC7C,CAAA;CACF"}

package/lib/typescript/views/CourierInboxView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CourierInboxView.d.ts","sourceRoot":"","sources":["../../../src/views/CourierInboxView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAA+C,SAAS,EAAE,MAAM,cAAc,CAAC;AACtF,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,KAAK,qBAAqB,GAAG;IAC3B,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,iBAAiB,CAAC;QAC1B,IAAI,CAAC,EAAE,iBAAiB,CAAA;KACzB,CAAC;IACF,0BAA0B,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5E,mCAAmC,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1G,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,CAAC;AAiBF,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,sBAqD5D,CAAA"}
+{"version":3,"file":"CourierInboxView.d.ts","sourceRoot":"","sources":["../../../src/views/CourierInboxView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AACzC,OAAO,EAA+C,SAAS,EAA2C,MAAM,cAAc,CAAC;AAC/H,OAAO,iBAAiB,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,KAAK,qBAAqB,GAAG;IAC3B,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,iBAAiB,CAAC;QAC1B,IAAI,CAAC,EAAE,iBAAiB,CAAA;KACzB,CAAC;IACF,0BAA0B,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5E,mCAAmC,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1G,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,CAAC;AAiBF,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,sBAiG5D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "2.0.0-beta6",
+  "version": "2.0.0-beta7",
   "description": "Inbox & Push Notifications for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/models/CourierInboxTheme.tsx

@@ -24,7 +24,10 @@ export default interface CourierInboxTheme {
       separatorStyle?: 'none' | 'singleLine' | 'singleLineEtched',
       separatorInsets?: { top?: number, left?: number, bottom?: number, right?: number },
       separatorColor?: string,
-      selectionStyle?: 'none' | 'blue' | 'gray' | 'default'
+      selectionStyle?: 'none' | 'blue' | 'gray' | 'default',
     }
+  },
+  android?: {
+    dividerItemDecoration?: 'none' | 'vertical',
   }
 }

package/src/views/CourierInboxView.tsx

@@ -1,5 +1,5 @@
-import React from "react";
-import { Platform, requireNativeComponent, UIManager, ViewStyle } from "react-native";
+import React, { useEffect } from "react";
+import { Platform, requireNativeComponent, UIManager, ViewStyle, DeviceEventEmitter, EmitterSubscription } from "react-native";
 import CourierInboxTheme from "src/models/CourierInboxTheme";
 import { InboxAction } from "src/models/InboxAction";
 import { InboxMessage } from "src/models/InboxMessage";
@@ -32,13 +32,37 @@ const CourierInbox =
 
 export const CourierInboxView = (props: CourierInboxViewProps) => {
 
+  let onClickInboxMessageAtIndexListener: EmitterSubscription | undefined = undefined;
+  let onClickInboxActionForMessageAtIndexListener: EmitterSubscription | undefined = undefined;
+  let onScrollInboxListener: EmitterSubscription | undefined = undefined;
+
+  useEffect(() => {
+
+    return () => {
+      onClickInboxMessageAtIndexListener?.remove();
+      onClickInboxActionForMessageAtIndexListener?.remove();
+      onScrollInboxListener?.remove();
+    }
+
+  }, [])
+
+  useEffect(() => {
+
+    onClickInboxMessageAtIndexListener?.remove();
+
+    if (Platform.OS === 'android' && props.onClickInboxMessageAtIndex) {
+      onClickInboxMessageAtIndexListener = DeviceEventEmitter.addListener('courierClickMessageAtIndex', onClickInboxMessageAtIndex);
+    }
+
+  }, [props.onClickInboxMessageAtIndex])
+
   const onClickInboxMessageAtIndex = (event: any) => {
 
     // Parse the native event data
     if (props.onClickInboxMessageAtIndex) {
 
-      const index = event.nativeEvent["index"]
-      const message = event.nativeEvent["message"] as InboxMessage
+      const index = event["index"]
+      const message = event["message"] as InboxMessage
 
       props.onClickInboxMessageAtIndex(message, index)
 
@@ -46,14 +70,24 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
 
   }
 
+  useEffect(() => {
+
+    onClickInboxActionForMessageAtIndexListener?.remove();
+
+    if (Platform.OS === 'android' && props.onClickInboxActionForMessageAtIndex) {
+      onClickInboxActionForMessageAtIndexListener = DeviceEventEmitter.addListener('courierClickActionAtIndex', onClickInboxActionForMessageAtIndex);
+    }
+
+  }, [props.onClickInboxActionForMessageAtIndex])
+
   const onClickInboxActionForMessageAtIndex = (event: any) => {
 
     // Parse the native event data
     if (props.onClickInboxActionForMessageAtIndex) {
 
-      const index = event.nativeEvent["index"]
-      const action = event.nativeEvent["action"] as InboxAction
-      const message = event.nativeEvent["message"] as InboxMessage
+      const index = event["index"]
+      const action = event["action"] as InboxAction
+      const message = event["message"] as InboxMessage
 
       props.onClickInboxActionForMessageAtIndex(action, message, index)
 
@@ -61,12 +95,22 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
 
   }
 
+  useEffect(() => {
+
+    onScrollInboxListener?.remove();
+
+    if (Platform.OS === 'android' && props.onScrollInbox) {
+      onScrollInboxListener = DeviceEventEmitter.addListener('courierScrollInbox', onScrollInbox);
+    }
+
+  }, [props.onScrollInbox])
+
   const onScrollInbox = (event: any) => {
 
     // Parse the native event data
     if (props.onScrollInbox) {
 
-      const contentOffset = event.nativeEvent["contentOffset"]
+      const contentOffset = event["contentOffset"]
       props.onScrollInbox(contentOffset["y"], contentOffset["x"])
 
     }
@@ -76,9 +120,9 @@ export const CourierInboxView = (props: CourierInboxViewProps) => {
   return (
     <CourierInbox 
       theme={props.theme ?? { light: undefined, dark: undefined }} 
-      onClickInboxMessageAtIndex={onClickInboxMessageAtIndex}
-      onClickInboxActionForMessageAtIndex={onClickInboxActionForMessageAtIndex}
-      onScrollInbox={onScrollInbox}
+      onClickInboxMessageAtIndex={(event: any) => onClickInboxMessageAtIndex(event.nativeEvent)}
+      onClickInboxActionForMessageAtIndex={(event: any) => onClickInboxActionForMessageAtIndex(event.nativeEvent)}
+      onScrollInbox={(event: any) => onScrollInbox(event.nativeEvent)}
       style={props.style}
     />
   )