react-native-moengage-cards 5.1.0 → 6.0.0

package/ReactNativeMoEngageCards.podspec

@@ -14,12 +14,12 @@ Pod::Spec.new do |s|
   s.homepage     = "https://www.moengage.com"
   s.license      = package['license']
   s.authors      = "MoEngage Inc."
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => "13.0" }
  s.source              = {:file => './' }
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.public_header_files = 'ios/**/*.h'
   s.dependency          'React'
-  s.dependency          'MoEngagePluginCards','2.3.0'
+  s.dependency          'MoEngagePluginCards','3.3.1'
   s.dependency 'ReactNativeMoEngage'
   s.module_map = false
 

package/android/build.gradle

@@ -16,9 +16,10 @@ buildscript {
 
 ext {
   //dependency version
-  moengageCoreVersion = "13.06.00"
-  moengageCardsCoreVersion = "2.4.0"
-  pluginBaseCardVersion = "3.1.0"
+  moengageCoreVersion = "14.03.00"
+  moengageCardsCoreVersion = "3.1.0"
+  pluginBaseCardVersion = "4.0.0"
+  pluginBaseVersion = "5.1.0"
 }
 
 apply plugin: 'com.android.library'
@@ -27,10 +28,10 @@ apply plugin: "org.jlleitschuh.gradle.ktlint"
 apply plugin: 'com.facebook.react'
 
 android {
-    compileSdk 34
+    compileSdk 35
     namespace "com.moengage.react.cards"
     defaultConfig {
-        minSdk 21
+        minSdk 23
         versionCode 1
         versionName "1.0"
 
@@ -80,6 +81,7 @@ dependencies {
     compileOnly("com.moengage:moe-android-sdk:$moengageCoreVersion")
     api("com.moengage:cards-core:$moengageCardsCoreVersion")
     implementation("com.moengage:plugin-base-cards:$pluginBaseCardVersion")
+    compileOnly("com.moengage:plugin-base:$pluginBaseVersion")
 }
 
 def isNewArchitectureEnabled() {

package/android/src/main/java/com/moengage/react/cards/MoEngageCardsBridgeHandler.kt

@@ -19,7 +19,8 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.moengage.core.LogLevel
 import com.moengage.core.internal.logger.Logger
 import com.moengage.plugin.base.cards.CardsPluginHelper
-import com.moengage.plugin.base.cards.internal.cardListToJson
+import com.moengage.plugin.base.cards.internal.cardDataToJson
+import com.moengage.plugin.base.internal.instanceMetaFromJson
 import com.moengage.plugin.base.cards.internal.setCardsEventEmitter
 import org.json.JSONObject
 
@@ -181,14 +182,8 @@ internal class MoEngageCardsBridgeHandler(private val reactContext: ReactApplica
         try {
             Logger.print { "$tag fetchCards() : $payload" }
             val accountMetaPayload = JSONObject(payload)
-            cardsPluginHelper.fetchCards(context, payload) { cardsData ->
-                val response = JSONObject()
-                response.put(ARGUMENT_ACCOUNT_META, accountMetaPayload)
-                val cardData = JSONObject()
-                cardData.put(ARGUMENT_CARDS, cardListToJson(cardsData?.cards ?: emptyList()))
-                response.put(ARGUMENT_DATA, cardData)
-
-                promise.resolve(response.toString())
+            cardsPluginHelper.fetchCards(context, payload) { cardData ->
+                promise.resolve(cardDataToJson(cardData, instanceMetaFromJson(JSONObject(payload))).toString())
             }
         } catch (t: Throwable) {
             Logger.print(LogLevel.ERROR, t) { "$tag fetchCards() : " }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-moengage-cards",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "Cards Module for the MoEngage Platform",
   "main": "src/index.ts",
   "keywords": [

package/src/internal/MoEngageCardHandler.ts

@@ -120,7 +120,7 @@ class MoEngageCardHandler {
             return cardInfo;
         } catch (error) {
             MoEngageLogger.error(`${this.TAG} getCardsInfo() `, error);
-            return new CardInfo(false, [], []);
+            return new CardInfo(false, [], [], null);
         }
     }
 
@@ -161,7 +161,7 @@ class MoEngageCardHandler {
             return cardsData;
         } catch (error) {
             MoEngageLogger.error(`${this.TAG} getCardsForCategory() `, error);
-            return new CardsData(category, []);
+            return new CardsData(category, [], null);
         }
     }
 
@@ -175,7 +175,7 @@ class MoEngageCardHandler {
             return cardsData;
         } catch (error) {
             MoEngageLogger.error(`${this.TAG} fetchCards() `, error);
-            return new CardsData("", []);
+            return new CardsData("", [], null);
         }
     }
 

package/src/internal/utils/JsonToModelMapper.ts

@@ -81,6 +81,8 @@ import {
     keyWidgets
 } from "../Constants";
 import { assertUnsupportedError, getEnumByName } from "../utils/Util";
+import StaticImageType from "../../model/enums/StaticImageType";
+import { MoEAccessibilityData, KEY_ACCESSIBILITY } from "react-native-moengage";
 
 export function actionFromJson(json: { [k: string]: any }): Action {
     const navigationType: ActionType = getEnumByName(ActionType, json[keyActionType] ?? "");
@@ -171,7 +173,8 @@ export function cardInfoFromJson(json: { [k: string]: any }): CardInfo {
         Array.from((json[keyCards] ?? []) as Iterable<{ [k: string]: any }>)
             .map((cardJson) => {
                 return cardFromJson(cardJson);
-            })
+            }),
+        staticImageFromJson(json[KEY_ACCESSIBILITY] ?? null),
     );
 }
 
@@ -181,7 +184,8 @@ export function cardsDataFromJson(json: { [k: string]: any }): CardsData {
         Array.from((json[keyCards] ?? []) as Iterable<{ [k: string]: any }>)
             .map((cardObject) => {
                 return cardFromJson(cardObject);
-            })
+            }),
+        staticImageFromJson(json[KEY_ACCESSIBILITY] ?? null),
     );
 }
 
@@ -262,6 +266,20 @@ export function widgetFromJson(json: { [k: string]: any }): Widget {
         Array.from((json[keyActions] ?? []) as Iterable<{ [k: string]: any }>)
             .map((action) => {
                 return actionFromJson(action);
-            })
+            }),
+        json[KEY_ACCESSIBILITY] != null ? MoEAccessibilityData.fromJson(json[KEY_ACCESSIBILITY]) : null,
     );
+}
+
+export function staticImageFromJson(json: { [k: string]: any } | null): { [key in StaticImageType]: MoEAccessibilityData } | null {
+    if (!json || Object.keys(json).length === 0) {
+        return null
+    }
+    const result: { [key in StaticImageType]?: MoEAccessibilityData } = {};
+    for (const type of Object.values(StaticImageType)) {
+        if (json[type]) {
+            result[type as StaticImageType] = MoEAccessibilityData.fromJson(json[type]);
+        }
+    }
+    return result as { [key in StaticImageType]: MoEAccessibilityData };
 }

package/src/internal/utils/ModelToJsonMapper.ts

@@ -75,6 +75,8 @@ import {
     keyWidgets
 } from "../Constants";
 import { assertUnsupportedError } from "../utils/Util";
+import { KEY_ACCESSIBILITY, MoEAccessibilityData } from "react-native-moengage";
+import StaticImageType from "../../model/enums/StaticImageType";
 
 export function actionToJson(action: Action): { [k: string]: any } {
     if (action instanceof NavigationAction) {
@@ -161,7 +163,8 @@ export function cardInfoToJson(cardInfo: CardInfo): { [k: string]: any } {
         [keyCategories]: cardInfo.categories,
         [keyCards]: cardInfo.cards.map((card) => {
             return cardToJson(card);
-        })
+        }),
+        [KEY_ACCESSIBILITY]: staticImageAccessibilityDataToJson(cardInfo.staticImageAccessibilityData)
     };
 }
 
@@ -170,7 +173,8 @@ export function cardsDataToJson(cardsData: CardsData): { [k: string]: any } {
         [keyCategory]: cardsData.category,
         [keyCards]: cardsData.cards.map((card) => {
             return cardToJson(card);
-        })
+        }),
+        [KEY_ACCESSIBILITY]: staticImageAccessibilityDataToJson(cardsData.staticImageAccessibilityData)
     };
 }
 
@@ -245,6 +249,14 @@ export function widgetToJson(widget: Widget): { [k: string]: any } {
         [keyWidgetStyle]: widgetStyleToJson(widget.style),
         [keyActions]: widget.actionList.map((action) => {
             return actionToJson(action);
-        })
+        }),
+        [KEY_ACCESSIBILITY]: widget.accessibilityData?.toJson() 
     };
+}
+
+export function staticImageAccessibilityDataToJson(staticImageAccessibilityData: { [key in StaticImageType]: MoEAccessibilityData } | null): { [key: string]: any } | null {
+    return staticImageAccessibilityData ? 
+        Object.fromEntries(
+            Object.entries(staticImageAccessibilityData).map(([key, value]) => [key, value.toJson()])
+        ) : null;
 }

package/src/model/CardInfo.ts

@@ -1,4 +1,6 @@
 import Card from "./Card";
+import StaticImageType from "./enums/StaticImageType";
+import { MoEAccessibilityData } from "react-native-moengage";
 
 /**
  * All data for cards.
@@ -26,10 +28,18 @@ class CardInfo {
      */
     cards: Array<Card>;
 
-    constructor(shouldShowAllTab: boolean, categories: Array<string>, cards: Array<Card>) {
+    /**
+     * Accessibility data for static images used in cards.
+     * 
+     * @since 6.0.0
+     */ 
+    staticImageAccessibilityData:  { [key in StaticImageType]: MoEAccessibilityData } | null;
+
+    constructor(shouldShowAllTab: boolean, categories: Array<string>, cards: Array<Card>, staticImageAccessibilityData:  { [key in StaticImageType]: MoEAccessibilityData } | null) {
         this.shouldShowAllTab = shouldShowAllTab;
         this.categories = categories;
         this.cards = cards;
+        this.staticImageAccessibilityData = staticImageAccessibilityData;
     }
 }
 

package/src/model/CardsData.ts

@@ -1,4 +1,6 @@
 import Card from "./Card";
+import StaticImageType from "./enums/StaticImageType";
+import { MoEAccessibilityData } from "react-native-moengage";
 
 /**
  * Data for cards
@@ -20,9 +22,18 @@ class CardsData {
      */
     cards: Array<Card>;
 
-    constructor(category: string, cards: Array<Card>) {
+    /**
+     * Accessibility data for static images used in cards.
+     * 
+     * @since 6.0.0
+     */
+    staticImageAccessibilityData:  { [key in StaticImageType]: MoEAccessibilityData } | null;
+
+
+    constructor(category: string, cards: Array<Card>, staticImageAccessibilityData: { [key in StaticImageType]: MoEAccessibilityData } | null) {
         this.category = category;
         this.cards = cards;
+        this.staticImageAccessibilityData = staticImageAccessibilityData;
     }
 }
 

package/src/model/Widget.ts

@@ -2,6 +2,7 @@ import Action from "./action/Action";
 import WidgetType from "./enums/WidgetType";
 import WidgetStyle from "./styles/WidgetStyle";
 
+import { MoEAccessibilityData } from "react-native-moengage";
 /**
  * UI element in a card.
  * 
@@ -40,18 +41,27 @@ class Widget {
      */
     actionList: Array<Action>;
 
+
+    /**
+     * Accessibility data for the widget
+     * @since 6.0.0
+     */
+    accessibilityData: MoEAccessibilityData | null;
+
     constructor(
         id: number,
         widgetType: WidgetType,
         content: string,
         style: WidgetStyle | undefined,
-        actionList: Array<Action>
+        actionList: Array<Action>,
+        accessibilityData: MoEAccessibilityData | null
     ) {
         this.id = id;
         this.widgetType = widgetType;
         this.content = content;
         this.style = style;
         this.actionList = actionList;
+        this.accessibilityData = accessibilityData;
     }
 }
 

package/src/model/enums/StaticImageType.ts

@@ -0,0 +1,23 @@
+/**
+ * Enum representing different types of static images used in the application.
+ * 
+ * @since 6.0.0
+ */
+enum StaticImageType {
+    /**
+     * Image for No cards/Empty State
+     */
+    EMPTY_STATE = "no_cards",
+    
+    /**
+     * Pin Card image
+     */
+    PIN_CARD = "pinned_card",
+   
+    /**
+     * Place Holder image for card loading
+     */
+    LOADING_PLACE_HOLDER = "place_holder",
+}
+
+export default StaticImageType;