Merge branch 'main' of github.com:3dsinteractive/pam-react-native

Author: heart

.npmignore

@@ -0,0 +1,4 @@
+.git/
+node_modules/
+src/
+*.log

example/src/App.tsx

@@ -1,11 +1,13 @@
 import { Pam } from 'pam-react-native';
 import { Button, Text, View, StyleSheet } from 'react-native';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 export default function App() {
+  const [contactID, setContactID] = useState<string | undefined>('');
+
   useEffect(() => {
     Pam.initialize({
-      baseApi: 'https://stgx.pams.ai',
+      baseApi: 'https://awc-uat.pams.ai',
       trackingConsentMessageId: '2VNmHzWrxPYJj0zDiM1cQGeW2S5',
       publicDBAlias: 'ecom-public',
       loginDBAlias: 'ecom-login',
@@ -26,25 +28,46 @@ export default function App() {
     });
   }
 
-  function allowConsent() {
-    Pam.allowAllTrackingConsent('2VNmHzWrxPYJj0zDiM1cQGeW2S5');
+  function sendEvent() {
+    Pam.track('click-btn', {});
+  }
+
+  async function allowConsent() {
+    await Pam.allowAllTrackingConsent('2VNmHzWrxPYJj0zDiM1cQGeW2S5');
+
+    const cid = Pam.shared?.contactState?.getContactId();
+    setContactID(cid);
   }
 
   return (
     <View style={styles.container}>
-      <Text>Test</Text>
-      <Button
-        onPress={allowConsent}
-        title="allowConsent"
-        color="#841584"
-        accessibilityLabel="Learn more about this purple button"
-      />
-      <Button
-        onPress={onPressLearnMore}
-        title="load App Attention"
-        color="#841584"
-        accessibilityLabel="Learn more about this purple button"
-      />
+      <Text style={styles.mb}>Contact ID: {contactID}</Text>
+      <View style={styles.mb}>
+        <Button
+          onPress={allowConsent}
+          title="allowConsent"
+          color="#ff3300"
+          accessibilityLabel="Learn more about this purple button"
+        />
+      </View>
+
+      <View style={styles.mb}>
+        <Button
+          onPress={sendEvent}
+          title="Send Event"
+          color="#669933"
+          accessibilityLabel="Learn more about this purple button"
+        />
+      </View>
+
+      <View style={styles.mb}>
+        <Button
+          onPress={onPressLearnMore}
+          title="load App Attention"
+          color="#ff0066"
+          accessibilityLabel="Learn more about this purple button"
+        />
+      </View>
     </View>
   );
 }
@@ -55,4 +78,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
+  mb: {
+    marginBottom: 10,
+  },
 });

ios/PamReactNative.swift

@@ -3,30 +3,27 @@ import UIKit
 @objc(PamReactNative)
 class PamReactNative: NSObject {
 
-  @objc(multiply:withB:withResolver:withRejecter:)
-  func multiply(a: Float, b: Float, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
-    resolve(a*b)
-  }
-
-
-
   @objc(displayPopup:withBtnColor:withBtnLabel:withBtnLabelColor:withResolver:withRejecter:)
-  func displayPopup(banner:NSDictionary, btnColor: String, btnLabel:String, btnLabelColor: String, resolve: @escaping RCTPromiseResolveBlock,reject: @escaping RCTPromiseRejectBlock) -> Void {
+  func displayPopup(
+    banner: NSDictionary, btnColor: String, btnLabel: String, btnLabelColor: String,
+    resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
+  ) {
     DispatchQueue.main.async {
       let popupVC = PopupViewController()
       popupVC.resolve = resolve
-      popupVC.popupData = banner as? [String:Any]
+      popupVC.popupData = banner as? [String: Any]
       popupVC.modalPresentationStyle = .overFullScreen  // ให้แสดงแบบเต็มจอ
-      
+
       popupVC.btnColor = btnColor
       popupVC.btnLabel = btnLabel
       popupVC.btnLabelColor = btnLabelColor
-      
+
       if let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-         let window = scene.windows.first {
-          window.rootViewController?.present(popupVC, animated: false, completion: nil)
+        let window = scene.windows.first
+      {
+        window.rootViewController?.present(popupVC, animated: false, completion: nil)
       }
-      
+
     }
   }
 

package.json

@@ -1,10 +1,11 @@
 {
   "name": "pam-react-native",
-  "version": "0.1.0",
+  "version": "0.1.11",
   "description": "Pam SDK for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
+  "types": "./lib/typescript/module/src/index.d.ts",
   "exports": {
     ".": {
       "import": {

publish.sh

@@ -0,0 +1,3 @@
+yarn
+yarn prepare
+npm publish --access public

src/PamTracker.ts

@@ -109,7 +109,7 @@ class PamTracker {
   });
 
   constructor(config: IConfig, storage?: IStorageProvider) {
-    Utils.setConfig(config);
+    // Utils.setConfig(config);
     if (storage) {
       this.storage = storage;
       Utils.setStorageProvider(storage);

src/index.tsx

@@ -34,10 +34,6 @@ const PamReactNative = NativeModules.PamReactNative
       }
     );
 
-export function multiply(a: number, b: number): Promise<number> {
-  return PamReactNative.multiply(a, b);
-}
-
 interface PamConfig {
   baseApi: string;
   trackingConsentMessageId: string;
@@ -96,18 +92,6 @@ export class Pam {
       | ((banner: any) => boolean)
       | ((banner: any) => Promise<boolean>)
   ) {
-    // console.log('appAttention', pageName);
-
-    // const banner = {
-    //   title: 'title',
-    //   description: 'description',
-    //   image:
-    //     'https://s3-ap-southeast-1.amazonaws.com/pam4-sansiri/ecom/public/2sFQrLjdyBbXkHkAMV03HrNtbhC.jpg',
-    //   size: 'large',
-    // };
-
-    // PamReactNative.displayPopup(banner, btnColor, btnLabel, btnLabelColor);
-
     const contectID = Pam._instance.contactState?.getContactId();
     if (contectID) {
       const appAttention = await Pam.pamApi.loadAppAttention(

src/utils.ts

@@ -1,13 +1,13 @@
-import type IConfig from './interface/iconfig';
+// import type IConfig from './interface/iconfig';
 import type { IStorageProvider } from './storage_provider';
 
 export class Utils {
   private static storage: IStorageProvider;
-  private static config: IConfig;
+  // private static config: IConfig;
 
-  static setConfig(config: IConfig) {
-    Utils.config = config;
-  }
+  // static setConfig(config: IConfig) {
+  //   Utils.config = config;
+  // }
 
   static setStorageProvider(storage: IStorageProvider) {
     Utils.storage = storage;