@droppii-org/chat-mobile 0.2.6 → 0.2.7

package/lib/module/components/ThreadCard/AvatarSection.js

@@ -2,15 +2,15 @@
 
 import { memo } from 'react';
 import { Avatar } from "../Avatar/index.js";
-import { DChatCategory } from "../../types/chat.js";
+import { PeerType } from '@droppii/openim-rn-client-sdk';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const AvatarSection = /*#__PURE__*/memo(({
   avatar,
   fullName,
-  chatCategory,
+  peerType,
   applicationType
 }) => {
-  if (chatCategory === DChatCategory.BIZ_BOT_CRM || chatCategory === DChatCategory.BIZ_BOT_PDP) {
+  if (peerType === PeerType.Bot) {
     return /*#__PURE__*/_jsx(Avatar, {
       source: avatar,
       fullName: fullName,
@@ -19,7 +19,7 @@ export const AvatarSection = /*#__PURE__*/memo(({
       }
     });
   }
-  if (applicationType === 'MALL') {
+  if (peerType === PeerType.Customer || applicationType === 'MALL') {
     return /*#__PURE__*/_jsx(Avatar, {
       source: avatar,
       fullName: fullName,

package/lib/module/components/ThreadCard/AvatarSection.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","Avatar","DChatCategory","jsx","_jsx","AvatarSection","avatar","fullName","chatCategory","applicationType","BIZ_BOT_CRM","BIZ_BOT_PDP","source","badge","variant","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/AvatarSection.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,MAAM,QAAQ,oBAAW;AAClC,SAASC,aAAa,QAAQ,qBAAkB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAUjD,OAAO,MAAMC,aAAa,gBAAGL,IAAI,CAC/B,CAAC;EAAEM,MAAM;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAoC,CAAC,KAAK;EAC3E,IACED,YAAY,KAAKN,aAAa,CAACQ,WAAW,IAC1CF,YAAY,KAAKN,aAAa,CAACS,WAAW,EAC1C;IACA,oBACEP,IAAA,CAACH,MAAM;MACLW,MAAM,EAAEN,MAAO;MACfC,QAAQ,EAAEA,QAAS;MACnBM,KAAK,EAAE;QAAEC,OAAO,EAAE;MAAM;IAAE,CAC3B,CAAC;EAEN;EAEA,IAAIL,eAAe,KAAK,MAAM,EAAE;IAC9B,oBACEL,IAAA,CAACH,MAAM;MACLW,MAAM,EAAEN,MAAO;MACfC,QAAQ,EAAEA,QAAS;MACnBM,KAAK,EAAE;QAAEC,OAAO,EAAE;MAAO;IAAE,CAC5B,CAAC;EAEN;EAEA,oBAAOV,IAAA,CAACH,MAAM;IAACW,MAAM,EAAEN,MAAO;IAACC,QAAQ,EAAEA;EAAS,CAAE,CAAC;AACvD,CACF,CAAC;AAEDF,aAAa,CAACU,WAAW,GAAG,eAAe","ignoreList":[]}
+{"version":3,"names":["memo","Avatar","PeerType","jsx","_jsx","AvatarSection","avatar","fullName","peerType","applicationType","Bot","source","badge","variant","Customer","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/AvatarSection.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,MAAM,QAAQ,oBAAW;AAElC,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AASzD,OAAO,MAAMC,aAAa,gBAAGL,IAAI,CAC/B,CAAC;EAAEM,MAAM;EAAEC,QAAQ;EAAEC,QAAQ;EAAEC;AAAoC,CAAC,KAAK;EACvE,IAAID,QAAQ,KAAKN,QAAQ,CAACQ,GAAG,EAAE;IAC7B,oBACEN,IAAA,CAACH,MAAM;MACLU,MAAM,EAAEL,MAAO;MACfC,QAAQ,EAAEA,QAAS;MACnBK,KAAK,EAAE;QAAEC,OAAO,EAAE;MAAM;IAAE,CAC3B,CAAC;EAEN;EAEA,IAAIL,QAAQ,KAAKN,QAAQ,CAACY,QAAQ,IAAIL,eAAe,KAAK,MAAM,EAAE;IAChE,oBACEL,IAAA,CAACH,MAAM;MACLU,MAAM,EAAEL,MAAO;MACfC,QAAQ,EAAEA,QAAS;MACnBK,KAAK,EAAE;QAAEC,OAAO,EAAE;MAAO;IAAE,CAC5B,CAAC;EAEN;EAEA,oBAAOT,IAAA,CAACH,MAAM;IAACU,MAAM,EAAEL,MAAO;IAACC,QAAQ,EAAEA;EAAS,CAAE,CAAC;AACvD,CACF,CAAC;AAEDF,aAAa,CAACU,WAAW,GAAG,eAAe","ignoreList":[]}

package/lib/module/components/ThreadCard/NamePrefixIcon.js

@@ -3,8 +3,8 @@
 import { memo } from 'react';
 import { Image, StyleSheet } from 'react-native';
 import { KContainer, KImage, KColors } from '@droppii/libs';
-import { DChatCategory, DChatType } from "../../types/chat.js";
 import Images from "../../assets/images/index.js";
+import { PeerType } from '@droppii/openim-rn-client-sdk';
 import { jsx as _jsx } from "react/jsx-runtime";
 const styles = StyleSheet.create({
   icon: {
@@ -13,10 +13,9 @@ const styles = StyleSheet.create({
   }
 });
 export const NamePrefixIcon = /*#__PURE__*/memo(({
-  chatCategory,
-  chatType
+  peerType
 }) => {
-  if (chatCategory === DChatCategory.BIZ_BOT_CRM) {
+  if (peerType === PeerType.Bot) {
     return /*#__PURE__*/_jsx(KContainer.View, {
       marginR: "0.25rem",
       children: /*#__PURE__*/_jsx(Image, {
@@ -25,18 +24,7 @@ export const NamePrefixIcon = /*#__PURE__*/memo(({
       })
     });
   }
-  if (chatCategory === DChatCategory.BIZ_BOT_PDP) {
-    return /*#__PURE__*/_jsx(KContainer.View, {
-      marginR: "0.25rem",
-      children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
-        name: "robot-outline",
-        provider: "MaterialCommunityIcons",
-        size: 14,
-        color: KColors.palette.primary.w400
-      })
-    });
-  }
-  if (chatType === DChatType.GROUP) {
+  if (peerType === PeerType.Group) {
     return /*#__PURE__*/_jsx(KContainer.View, {
       marginR: "0.25rem",
       children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
@@ -46,6 +34,15 @@ export const NamePrefixIcon = /*#__PURE__*/memo(({
       })
     });
   }
+
+  // if (peerType === DChatPeerType.CUSTOMER) {
+  //   return (
+  //     <KContainer.View marginR="0.25rem">
+  //       <Image source={Images.ICON_DROPPII} style={styles.icon} />
+  //     </KContainer.View>
+  //   );
+  // }
+
   return null;
 });
 NamePrefixIcon.displayName = 'NamePrefixIcon';

package/lib/module/components/ThreadCard/NamePrefixIcon.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","Image","StyleSheet","KContainer","KImage","KColors","DChatCategory","DChatType","Images","jsx","_jsx","styles","create","icon","width","height","NamePrefixIcon","chatCategory","chatType","BIZ_BOT_CRM","View","marginR","children","source","ICON_DROPPII","style","BIZ_BOT_PDP","VectorIcons","name","provider","size","color","palette","primary","w400","GROUP","black","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/NamePrefixIcon.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,KAAK,EAAEC,UAAU,QAAQ,cAAc;AAChD,SAASC,UAAU,EAAEC,MAAM,EAAEC,OAAO,QAAQ,eAAe;AAC3D,SAASC,aAAa,EAAEC,SAAS,QAAQ,qBAAkB;AAC3D,OAAOC,MAAM,MAAM,8BAAqB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEzC,MAAMC,MAAM,GAAGT,UAAU,CAACU,MAAM,CAAC;EAC/BC,IAAI,EAAE;IACJC,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE;EACV;AACF,CAAC,CAAC;AAOF,OAAO,MAAMC,cAAc,gBAAGhB,IAAI,CAChC,CAAC;EAAEiB,YAAY;EAAEC;AAA8B,CAAC,KAAK;EACnD,IAAID,YAAY,KAAKX,aAAa,CAACa,WAAW,EAAE;IAC9C,oBACET,IAAA,CAACP,UAAU,CAACiB,IAAI;MAACC,OAAO,EAAC,SAAS;MAAAC,QAAA,eAChCZ,IAAA,CAACT,KAAK;QAACsB,MAAM,EAAEf,MAAM,CAACgB,YAAa;QAACC,KAAK,EAAEd,MAAM,CAACE;MAAK,CAAE;IAAC,CAC3C,CAAC;EAEtB;EACA,IAAII,YAAY,KAAKX,aAAa,CAACoB,WAAW,EAAE;IAC9C,oBACEhB,IAAA,CAACP,UAAU,CAACiB,IAAI;MAACC,OAAO,EAAC,SAAS;MAAAC,QAAA,eAChCZ,IAAA,CAACN,MAAM,CAACuB,WAAW;QACjBC,IAAI,EAAC,eAAe;QACpBC,QAAQ,EAAC,wBAAwB;QACjCC,IAAI,EAAE,EAAG;QACTC,KAAK,EAAE1B,OAAO,CAAC2B,OAAO,CAACC,OAAO,CAACC;MAAK,CACrC;IAAC,CACa,CAAC;EAEtB;EAEA,IAAIhB,QAAQ,KAAKX,SAAS,CAAC4B,KAAK,EAAE;IAChC,oBACEzB,IAAA,CAACP,UAAU,CAACiB,IAAI;MAACC,OAAO,EAAC,SAAS;MAAAC,QAAA,eAChCZ,IAAA,CAACN,MAAM,CAACuB,WAAW;QACjBC,IAAI,EAAC,YAAY;QACjBE,IAAI,EAAE,EAAG;QACTC,KAAK,EAAE1B,OAAO,CAAC+B;MAAM,CACtB;IAAC,CACa,CAAC;EAEtB;EAEA,OAAO,IAAI;AACb,CACF,CAAC;AAEDpB,cAAc,CAACqB,WAAW,GAAG,gBAAgB","ignoreList":[]}
+{"version":3,"names":["memo","Image","StyleSheet","KContainer","KImage","KColors","Images","PeerType","jsx","_jsx","styles","create","icon","width","height","NamePrefixIcon","peerType","Bot","View","marginR","children","source","ICON_DROPPII","style","Group","VectorIcons","name","size","color","black","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/NamePrefixIcon.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,OAAO;AAC5B,SAASC,KAAK,EAAEC,UAAU,QAAQ,cAAc;AAChD,SAASC,UAAU,EAAEC,MAAM,EAAEC,OAAO,QAAQ,eAAe;AAC3D,OAAOC,MAAM,MAAM,8BAAqB;AACxC,SAASC,QAAQ,QAAQ,+BAA+B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEzD,MAAMC,MAAM,GAAGR,UAAU,CAACS,MAAM,CAAC;EAC/BC,IAAI,EAAE;IACJC,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE;EACV;AACF,CAAC,CAAC;AAMF,OAAO,MAAMC,cAAc,gBAAGf,IAAI,CAAC,CAAC;EAAEgB;AAA8B,CAAC,KAAK;EACxE,IAAIA,QAAQ,KAAKT,QAAQ,CAACU,GAAG,EAAE;IAC7B,oBACER,IAAA,CAACN,UAAU,CAACe,IAAI;MAACC,OAAO,EAAC,SAAS;MAAAC,QAAA,eAChCX,IAAA,CAACR,KAAK;QAACoB,MAAM,EAAEf,MAAM,CAACgB,YAAa;QAACC,KAAK,EAAEb,MAAM,CAACE;MAAK,CAAE;IAAC,CAC3C,CAAC;EAEtB;EAEA,IAAII,QAAQ,KAAKT,QAAQ,CAACiB,KAAK,EAAE;IAC/B,oBACEf,IAAA,CAACN,UAAU,CAACe,IAAI;MAACC,OAAO,EAAC,SAAS;MAAAC,QAAA,eAChCX,IAAA,CAACL,MAAM,CAACqB,WAAW;QAACC,IAAI,EAAC,YAAY;QAACC,IAAI,EAAE,EAAG;QAACC,KAAK,EAAEvB,OAAO,CAACwB;MAAM,CAAE;IAAC,CACzD,CAAC;EAEtB;;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;;EAEA,OAAO,IAAI;AACb,CAAC,CAAC;AAEFd,cAAc,CAACe,WAAW,GAAG,gBAAgB","ignoreList":[]}

package/lib/module/components/ThreadCard/ThreadCard.js

@@ -1,14 +1,11 @@
 "use strict";
 
 import { memo, useCallback } from 'react';
-import { StyleSheet } from 'react-native';
 import { KContainer, KImage, KLabel, KColors } from '@droppii/libs';
-import { DChatCategory } from "../../types/chat.js";
 import { AvatarSection } from "./AvatarSection.js";
 import { NamePrefixIcon } from "./NamePrefixIcon.js";
 import { UnreadBadge } from "./UnreadBadge.js";
 import { formatTimestamp, getLastMessageText } from "./thread-card.utils.js";
-import Images from "../../assets/images/index.js";
 import { useConversation, useUserStore } from "../../store/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ThreadCard = /*#__PURE__*/memo(({
@@ -16,18 +13,19 @@ const ThreadCard = /*#__PURE__*/memo(({
   onPress
 }) => {
   const {
-    peer,
-    chatCategory,
+    peerType,
+    showName,
+    faceURL,
     lastMessage,
     unreadCount = 0,
-    isMuted,
-    pinnedAt,
+    recvMsgOpt,
+    isPinned,
     applicationType,
-    chatType,
     latestMsgSendTime
   } = useConversation(item) ?? {};
-  const fullName = peer?.fullName ?? peer?.username ?? '';
+  const fullName = showName ?? '';
   const hasUnread = unreadCount > 0;
+  const isMuted = (recvMsgOpt ?? 0) !== 0;
   const timestamp = formatTimestamp(latestMsgSendTime ?? lastMessage?.sendTime ?? null);
   const currentUserId = useUserStore(s => s.user?.userID);
   const lastMessageText = getLastMessageText(lastMessage, currentUserId);
@@ -45,11 +43,10 @@ const ThreadCard = /*#__PURE__*/memo(({
     onPress: handlePress,
     activeOpacity: 0.7,
     children: [/*#__PURE__*/_jsx(AvatarSection, {
-      avatar: peer?.avatar ?? null,
+      avatar: faceURL ?? null,
       fullName: fullName,
-      chatCategory: chatCategory,
-      applicationType: applicationType,
-      chatType: chatType
+      peerType: peerType,
+      applicationType: applicationType
     }), /*#__PURE__*/_jsxs(KContainer.View, {
       flex: true,
       marginL: "0.5rem",
@@ -58,17 +55,7 @@ const ThreadCard = /*#__PURE__*/memo(({
         row: true,
         alignItems: "center",
         children: [/*#__PURE__*/_jsx(NamePrefixIcon, {
-          chatCategory: chatCategory,
-          chatType: chatType
-        }), /*#__PURE__*/_jsx(KContainer.VisibleView, {
-          visible:
-          // chatCategory === DChatCategory.BIZ_BOT_CRM ||
-          chatCategory === DChatCategory.BIZ_BOT_PDP,
-          children: /*#__PURE__*/_jsx(KImage.Base, {
-            uri: Images.ICON_BOT,
-            size: 14,
-            style: styles.botIcon
-          })
+          peerType: peerType
         }), /*#__PURE__*/_jsx(KLabel.Text, {
           typo: hasUnread ? 'TextMdBold' : 'TextMdNormal',
           numberOfLines: 1,
@@ -76,7 +63,7 @@ const ThreadCard = /*#__PURE__*/memo(({
           flex: true,
           children: fullName
         }), /*#__PURE__*/_jsx(KContainer.VisibleView, {
-          visible: !!isMuted,
+          visible: isMuted,
           children: /*#__PURE__*/_jsx(KContainer.View, {
             marginL: "0.25rem",
             children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
@@ -105,7 +92,7 @@ const ThreadCard = /*#__PURE__*/memo(({
           flex: true,
           children: lastMessageText
         }), /*#__PURE__*/_jsx(KContainer.VisibleView, {
-          visible: Boolean(pinnedAt),
+          visible: Boolean(isPinned),
           children: /*#__PURE__*/_jsx(KContainer.View, {
             marginL: "0.5rem",
             children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
@@ -124,11 +111,4 @@ const ThreadCard = /*#__PURE__*/memo(({
 });
 ThreadCard.displayName = 'ThreadCard';
 export default ThreadCard;
-const styles = StyleSheet.create({
-  botIcon: {
-    width: 16,
-    height: 16,
-    marginRight: 4
-  }
-});
 //# sourceMappingURL=ThreadCard.js.map

package/lib/module/components/ThreadCard/ThreadCard.js.map

@@ -1 +1 @@
-{"version":3,"names":["memo","useCallback","StyleSheet","KContainer","KImage","KLabel","KColors","DChatCategory","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","Images","useConversation","useUserStore","jsx","_jsx","jsxs","_jsxs","ThreadCard","item","onPress","peer","chatCategory","lastMessage","unreadCount","isMuted","pinnedAt","applicationType","chatType","latestMsgSendTime","fullName","username","hasUnread","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","children","avatar","View","flex","marginL","paddingB","VisibleView","visible","BIZ_BOT_PDP","Base","uri","ICON_BOT","size","style","styles","botIcon","Text","typo","numberOfLines","color","black","VectorIcons","name","provider","palette","gray","w500","Boolean","w400","normal","count","displayName","create","width","height","marginRight"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["memo","useCallback","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","useConversation","useUserStore","jsx","_jsx","jsxs","_jsxs","ThreadCard","item","onPress","peerType","showName","faceURL","lastMessage","unreadCount","recvMsgOpt","isPinned","applicationType","latestMsgSendTime","fullName","hasUnread","isMuted","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","children","avatar","View","flex","marginL","paddingB","Text","typo","numberOfLines","color","black","VisibleView","visible","VectorIcons","name","provider","size","palette","gray","w500","Boolean","w400","normal","count","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/context/ChatContext.js

@@ -12,20 +12,21 @@ export const useChatContext = () => {
 };
 const ChatProviderInner = ({
   logGA,
-  children
+  children,
+  applicationType
 }) => {
   const value = useMemo(() => ({
-    logGA
-  }), [logGA]);
+    logGA,
+    applicationType
+  }), [logGA, applicationType]);
   return /*#__PURE__*/_jsx(ChatContext.Provider, {
     value: value,
     children: children
   });
 };
 export const ChatProvider = ({
-  enabled,
   ...props
-}) => enabled ? /*#__PURE__*/_jsx(ChatProviderInner, {
+}) => /*#__PURE__*/_jsx(ChatProviderInner, {
   ...props
-}) : props.children;
+});
 //# sourceMappingURL=ChatContext.js.map

package/lib/module/context/ChatContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","jsx","_jsx","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","value","Provider","ChatProvider","enabled","props"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG3D,OAAO,MAAMC,WAAW,gBAAGL,aAAa,CACtCM,SACF,CAAC;AAED,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAuB;EACnD,MAAMC,OAAO,GAAGP,UAAU,CAACI,WAAW,CAAC;EACvC,IAAI,CAACG,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,iDAAiD,CAAC;EACpE;EACA,OAAOD,OAAO;AAChB,CAAC;AAED,MAAME,iBAAiB,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAA4B,CAAC,KAAK;EACpE,MAAMC,KAAK,GAAGX,OAAO,CAAC,OAAO;IAAES;EAAM,CAAC,CAAC,EAAE,CAACA,KAAK,CAAC,CAAC;EAEjD,oBAAOP,IAAA,CAACC,WAAW,CAACS,QAAQ;IAACD,KAAK,EAAEA,KAAM;IAAAD,QAAA,EAAEA;EAAQ,CAAuB,CAAC;AAC9E,CAAC;AAED,OAAO,MAAMG,YAAY,GAAGA,CAAC;EAAEC,OAAO;EAAE,GAAGC;AAAyB,CAAC,KACnED,OAAO,gBAAGZ,IAAA,CAACM,iBAAiB;EAAA,GAAKO;AAAK,CAAG,CAAC,GAAGA,KAAK,CAACL,QAAQ","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useMemo","jsx","_jsx","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","value","Provider","ChatProvider","props"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG3D,OAAO,MAAMC,WAAW,gBAAGL,aAAa,CACtCM,SACF,CAAC;AAED,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAuB;EACnD,MAAMC,OAAO,GAAGP,UAAU,CAACI,WAAW,CAAC;EACvC,IAAI,CAACG,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,iDAAiD,CAAC;EACpE;EACA,OAAOD,OAAO;AAChB,CAAC;AAED,MAAME,iBAAiB,GAAGA,CAAC;EACzBC,KAAK;EACLC,QAAQ;EACRC;AACiB,CAAC,KAAK;EACvB,MAAMC,KAAK,GAAGZ,OAAO,CACnB,OAAO;IAAES,KAAK;IAAEE;EAAgB,CAAC,CAAC,EAClC,CAACF,KAAK,EAAEE,eAAe,CACzB,CAAC;EAED,oBAAOT,IAAA,CAACC,WAAW,CAACU,QAAQ;IAACD,KAAK,EAAEA,KAAM;IAAAF,QAAA,EAAEA;EAAQ,CAAuB,CAAC;AAC9E,CAAC;AAED,OAAO,MAAMI,YAAY,GAAGA,CAAC;EAAE,GAAGC;AAAyB,CAAC,kBAC1Db,IAAA,CAACM,iBAAiB;EAAA,GAAKO;AAAK,CAAG,CAChC","ignoreList":[]}

package/lib/module/hooks/message/useSendMessage.js

@@ -0,0 +1,101 @@
+"use strict";
+
+import { useCallback } from 'react';
+import { useConversationStore } from "../../store/index.js";
+import { extractUrls } from "../../utils/url.js";
+import OpenIMSDK from '@droppii/openim-rn-client-sdk';
+import { useChatContext } from "../../context/index.js";
+import { generateContentBasedOnMessageType } from "../../utils/conversation.js";
+import { useMessageStore } from "../../store/message.js";
+export const useSendMessage = () => {
+  const applicationType = useChatContext().applicationType;
+  const pushNewMessage = useMessageStore(state => state.pushNewMessage);
+  const sendMessage = useCallback(async ({
+    plainText,
+    files,
+    urlMetadata
+  }) => {
+    const {
+      userID: recvID,
+      groupID
+    } = useConversationStore.getState().getCurrentConversation() || {};
+    if (!recvID && !groupID) return;
+    const messageList = [];
+    for (const file of files || []) {
+      if (!file) continue;
+    }
+    if (!!plainText && plainText.trim() !== '') {
+      const urls = extractUrls(plainText);
+      const isUrlMessage = urls.length > 0;
+      let message = null;
+      if (isUrlMessage) {
+        message = await createUrlTextMessage(plainText, urls);
+      } else {
+        message = await createTextMessage(plainText);
+      }
+      if (!message) return;
+      messageList.push(message);
+    }
+    for (const message of messageList) {
+      const extendMessageInfo = {
+        applicationType,
+        urlMetadata
+      };
+      const successMessage = await OpenIMSDK.sendMessage({
+        groupID: groupID || '',
+        recvID: recvID || '',
+        message: {
+          ...message,
+          ex: JSON.stringify(extendMessageInfo) || '{}'
+        },
+        offlinePushInfo: generateOfflinePushInfo(message.contentType, plainText || '')
+      });
+      pushNewMessage(successMessage);
+    }
+  }, [applicationType, pushNewMessage]);
+  return {
+    sendMessage
+  };
+};
+const generateOfflinePushInfo = (contentType, plainText) => {
+  const conversationData = useConversationStore?.getState?.()?.getCurrentConversation();
+  const title = conversationData?.showName || 'Droppii';
+  const desc = generateContentBasedOnMessageType(contentType, plainText);
+  return {
+    title,
+    desc,
+    ex: JSON.stringify({
+      icon: conversationData?.faceURL || '',
+      conversationId: conversationData?.conversationId || '',
+      title,
+      desc
+    }),
+    iOSPushSound: 'default',
+    iOSBadgeCount: true
+  };
+};
+export const createTextMessage = async text => {
+  let textMessage = await OpenIMSDK.createTextMessage(text, new Date().getTime().toString()).then(data => {
+    return data;
+  }).catch(({
+    errCode,
+    errMsg
+  }) => {
+    console.error('createTextMessage', errCode, errMsg);
+    return null;
+  });
+  return textMessage;
+};
+export const createUrlTextMessage = async (text, urls) => {
+  let urlTextMessage = await OpenIMSDK.createUrlTextMessage(text, urls, new Date().getTime().toString()).then(data => {
+    return data;
+  }).catch(({
+    errCode,
+    errMsg
+  }) => {
+    console.error('createUrlTextMessage', errCode, errMsg);
+    return null;
+  });
+  return urlTextMessage;
+};
+//# sourceMappingURL=useSendMessage.js.map

package/lib/module/hooks/message/useSendMessage.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useCallback","useConversationStore","extractUrls","OpenIMSDK","useChatContext","generateContentBasedOnMessageType","useMessageStore","useSendMessage","applicationType","pushNewMessage","state","sendMessage","plainText","files","urlMetadata","userID","recvID","groupID","getState","getCurrentConversation","messageList","file","trim","urls","isUrlMessage","length","message","createUrlTextMessage","createTextMessage","push","extendMessageInfo","successMessage","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","conversationData","title","showName","desc","icon","faceURL","conversationId","iOSPushSound","iOSBadgeCount","text","textMessage","Date","getTime","toString","then","data","catch","errCode","errMsg","console","error","urlTextMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AAEnC,SAASC,oBAAoB,QAAQ,sBAAa;AAMlD,SAASC,WAAW,QAAQ,oBAAiB;AAC7C,OAAOC,SAAS,MAAM,+BAA+B;AAErD,SAASC,cAAc,QAAQ,wBAAe;AAC9C,SAASC,iCAAiC,QAAQ,6BAA0B;AAC5E,SAASC,eAAe,QAAQ,wBAAqB;AAGrD,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAM;EAClC,MAAMC,eAAe,GAAGJ,cAAc,CAAC,CAAC,CAACI,eAAe;EACxD,MAAMC,cAAc,GAAGH,eAAe,CAAEI,KAAK,IAAKA,KAAK,CAACD,cAAc,CAAC;EAEvE,MAAME,WAAW,GAAGX,WAAW,CAC7B,OAAO;IACLY,SAAS;IACTC,KAAK;IACLC;EAKF,CAAC,KAAK;IACJ,MAAM;MAAEC,MAAM,EAAEC,MAAM;MAAEC;IAAQ,CAAC,GAC/BhB,oBAAoB,CAACiB,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAACH,MAAM,IAAI,CAACC,OAAO,EAAE;IAEzB,MAAMG,WAA0B,GAAG,EAAE;IAErC,KAAK,MAAMC,IAAI,IAAIR,KAAK,IAAI,EAAE,EAAE;MAC9B,IAAI,CAACQ,IAAI,EAAE;IACb;IAEA,IAAI,CAAC,CAACT,SAAS,IAAIA,SAAS,CAACU,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;MAC1C,MAAMC,IAAI,GAAGrB,WAAW,CAACU,SAAS,CAAC;MACnC,MAAMY,YAAY,GAAGD,IAAI,CAACE,MAAM,GAAG,CAAC;MACpC,IAAIC,OAA2B,GAAG,IAAI;MACtC,IAAIF,YAAY,EAAE;QAChBE,OAAO,GAAG,MAAMC,oBAAoB,CAACf,SAAS,EAAEW,IAAI,CAAC;MACvD,CAAC,MAAM;QACLG,OAAO,GAAG,MAAME,iBAAiB,CAAChB,SAAS,CAAC;MAC9C;MACA,IAAI,CAACc,OAAO,EAAE;MACdN,WAAW,CAACS,IAAI,CAACH,OAAO,CAAC;IAC3B;IAEA,KAAK,MAAMA,OAAO,IAAIN,WAAW,EAAE;MACjC,MAAMU,iBAAiC,GAAG;QACxCtB,eAAe;QACfM;MACF,CAAC;MAED,MAAMiB,cAAc,GAAG,MAAM5B,SAAS,CAACQ,WAAW,CAAC;QACjDM,OAAO,EAAEA,OAAO,IAAI,EAAE;QACtBD,MAAM,EAAEA,MAAM,IAAI,EAAE;QACpBU,OAAO,EAAE;UACP,GAAGA,OAAO;UACVM,EAAE,EAAEC,IAAI,CAACC,SAAS,CAACJ,iBAAiB,CAAC,IAAI;QAC3C,CAAC;QACDK,eAAe,EAAEC,uBAAuB,CACtCV,OAAO,CAACW,WAAW,EACnBzB,SAAS,IAAI,EACf;MACF,CAAC,CAAC;MAEFH,cAAc,CAACsB,cAAc,CAAC;IAChC;EACF,CAAC,EACD,CAACvB,eAAe,EAAEC,cAAc,CAClC,CAAC;EAED,OAAO;IACLE;EACF,CAAC;AACH,CAAC;AAED,MAAMyB,uBAAuB,GAAGA,CAC9BC,WAAwB,EACxBzB,SAAiB,KACd;EACH,MAAM0B,gBAAgB,GAAGrC,oBAAoB,EACzCiB,QAAQ,GAAG,CAAC,EACZC,sBAAsB,CAAC,CAAC;EAC5B,MAAMoB,KAAK,GAAGD,gBAAgB,EAAEE,QAAQ,IAAI,SAAS;EACrD,MAAMC,IAAI,GAAGpC,iCAAiC,CAACgC,WAAW,EAAEzB,SAAS,CAAC;EACtE,OAAO;IACL2B,KAAK;IACLE,IAAI;IACJT,EAAE,EAAEC,IAAI,CAACC,SAAS,CAAC;MACjBQ,IAAI,EAAEJ,gBAAgB,EAAEK,OAAO,IAAI,EAAE;MACrCC,cAAc,EAAEN,gBAAgB,EAAEM,cAAc,IAAI,EAAE;MACtDL,KAAK;MACLE;IACF,CAAC,CAAC;IACFI,YAAY,EAAE,SAAS;IACvBC,aAAa,EAAE;EACjB,CAAC;AACH,CAAC;AAED,OAAO,MAAMlB,iBAAiB,GAAG,MAAOmB,IAAY,IAAK;EACvD,IAAIC,WAAW,GAAG,MAAM7C,SAAS,CAACyB,iBAAiB,CACjDmB,IAAI,EACJ,IAAIE,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,QAAQ,CAAC,CAChC,CAAC,CACEC,IAAI,CAAEC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BC,OAAO,CAACC,KAAK,CAAC,mBAAmB,EAAEH,OAAO,EAAEC,MAAM,CAAC;IACnD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOR,WAAW;AACpB,CAAC;AAED,OAAO,MAAMrB,oBAAoB,GAAG,MAAAA,CAAOoB,IAAY,EAAExB,IAAc,KAAK;EAC1E,IAAIoC,cAAc,GAAG,MAAMxD,SAAS,CAACwB,oBAAoB,CACvDoB,IAAI,EACJxB,IAAI,EACJ,IAAI0B,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC,CAACC,QAAQ,CAAC,CAChC,CAAC,CACEC,IAAI,CAAEC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BC,OAAO,CAACC,KAAK,CAAC,sBAAsB,EAAEH,OAAO,EAAEC,MAAM,CAAC;IACtD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOG,cAAc;AACvB,CAAC","ignoreList":[]}

package/lib/module/hooks/useChatMessages.js

@@ -3,46 +3,28 @@
 import OpenIMSDK, { OpenIMEvent } from '@droppii/openim-rn-client-sdk';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { ChatMessageAPI } from "../services/message.js";
-import { belongsToConversation, getHistoryPaginationAnchor, hasNewHistoryMessages, mergeMessages } from "../utils/message.js";
+import { belongsToConversation, hasNewHistoryMessages, mergeMessages } from "../utils/message.js";
+import { useMessageStore } from "../store/message.js";
 export function useChatMessages({
   conversationId,
   enabled = true,
   pageSize = 20
 }) {
-  const [messages, setMessages] = useState([]);
+  const messages = useMessageStore(s => s.messages);
+  const hasMoreEarlier = useMessageStore(s => s.hasMoreEarlier);
+  const hasMoreNewer = useMessageStore(s => s.hasMoreNewer);
+  const setMessages = useMessageStore(s => s.setMessages);
+  const pushNewMessage = useMessageStore(s => s.pushNewMessage);
+  const reset = useMessageStore(s => s.reset);
   const [currentUserId, setCurrentUserId] = useState();
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingEarlier, setIsLoadingEarlier] = useState(false);
-  const [hasMoreEarlier, setHasMoreEarlier] = useState(false);
   const [isLoadingNewer, setIsLoadingNewer] = useState(false);
-  const [hasMoreNewer, setHasMoreNewer] = useState(false);
   const [error, setError] = useState(null);
   const conversationIdRef = useRef(conversationId);
   conversationIdRef.current = conversationId;
-  const isLoadingEarlierRef = useRef(false);
-  const isLoadingNewerRef = useRef(false);
-  const messagesRef = useRef(messages);
-  const hasMoreEarlierRef = useRef(hasMoreEarlier);
-  const hasMoreNewerRef = useRef(hasMoreNewer);
-  const historyAnchorRef = useRef(null);
-  const newestAnchorRef = useRef(null);
-  messagesRef.current = messages;
-  hasMoreEarlierRef.current = hasMoreEarlier;
-  hasMoreNewerRef.current = hasMoreNewer;
-  const resetState = useCallback(() => {
-    setMessages([]);
-    setHasMoreEarlier(false);
-    setHasMoreNewer(false);
-    setError(null);
-    isLoadingEarlierRef.current = false;
-    isLoadingNewerRef.current = false;
-    historyAnchorRef.current = null;
-    newestAnchorRef.current = null;
-  }, []);
-  const loadInitialMessages = useCallback(async () => {
-    if (!conversationId) {
-      return;
-    }
+  const fetchInitial = useCallback(async () => {
+    if (!conversationId) return;
     setIsLoading(true);
     setError(null);
     try {
@@ -50,135 +32,72 @@ export function useChatMessages({
         count: pageSize
       }), ChatMessageAPI.getCurrentUserId()]);
       const initialMessages = history.messageList;
-      const oldestAnchor = getHistoryPaginationAnchor(initialMessages);
       setCurrentUserId(userId);
-      setMessages(mergeMessages([], initialMessages));
-      historyAnchorRef.current = oldestAnchor ? {
-        clientMsgID: oldestAnchor.clientMsgID
-        // lastMinSeq: resolveHistoryLastMinSeq(
-        //   history,
-        //   initialMessages.find(
-        //     (message) => message.clientMsgID === oldestAnchor.clientMsgID
-        //   )
-        // ),
-      } : null;
-      setHasMoreEarlier(!history.isEnd && !!oldestAnchor);
+      setMessages(mergeMessages([], initialMessages), !history.isEnd);
       ChatMessageAPI.markConversationAsRead(conversationId).catch(() => undefined);
     } catch (err) {
       setError(err instanceof Error ? err : new Error(String(err)));
     } finally {
       setIsLoading(false);
     }
-  }, [conversationId, pageSize]);
+  }, [conversationId, pageSize, setMessages]);
   const onLoadEarlier = useCallback(async () => {
-    if (!conversationId || isLoadingEarlierRef.current || !hasMoreEarlierRef.current || !messagesRef.current.length) {
-      return;
-    }
-    isLoadingEarlierRef.current = true;
+    if (isLoadingEarlier || !hasMoreEarlier || !messages.length) return;
     setIsLoadingEarlier(true);
     setError(null);
-    const anchor = historyAnchorRef.current;
-    if (!anchor?.clientMsgID) {
-      isLoadingEarlierRef.current = false;
-      setIsLoadingEarlier(false);
-      return;
-    }
     try {
       const history = await ChatMessageAPI.fetchHistoryMessages(conversationId, {
         count: pageSize,
-        startClientMsgID: anchor.clientMsgID
+        startClientMsgID: messages[0].clientMsgID
       });
       const incoming = history.messageList;
-      const hasNewMessages = hasNewHistoryMessages(messagesRef.current, incoming);
-      if (hasNewMessages) {
-        setMessages(current => mergeMessages(current, incoming));
+      const hasNew = hasNewHistoryMessages(messages, incoming);
+      if (hasNew) {
+        setMessages(mergeMessages(messages, incoming), !history.isEnd && hasNew);
+      } else {
+        setMessages(messages, false);
       }
-      const nextAnchor = getHistoryPaginationAnchor(incoming);
-      historyAnchorRef.current = nextAnchor ? {
-        clientMsgID: nextAnchor.clientMsgID
-        // lastMinSeq: resolveHistoryLastMinSeq(
-        //   history,
-        //   incoming.find(
-        //     (message) => message.clientMsgID === nextAnchor.clientMsgID
-        //   )
-        // ),
-      } : null;
-      setHasMoreEarlier(!history.isEnd && hasNewMessages && !!nextAnchor);
     } catch (err) {
       setError(err instanceof Error ? err : new Error(String(err)));
     } finally {
-      isLoadingEarlierRef.current = false;
       setIsLoadingEarlier(false);
     }
-  }, [conversationId, pageSize]);
+  }, [conversationId, hasMoreEarlier, isLoadingEarlier, messages, pageSize, setMessages]);
   const onLoadNewer = useCallback(async () => {
-    if (!conversationId || isLoadingNewerRef.current || !hasMoreNewerRef.current || !messagesRef.current.length) {
-      return;
-    }
-    isLoadingNewerRef.current = true;
+    if (isLoadingNewer || !hasMoreNewer || !messages.length) return;
     setIsLoadingNewer(true);
     setError(null);
-    const anchor = newestAnchorRef.current;
-    if (!anchor?.clientMsgID && messagesRef.current.length === 0) {
-      isLoadingNewerRef.current = false;
-      setIsLoadingNewer(false);
-      return;
-    }
     try {
-      // Get the newest message ID to load from
-      const newestMessage = messagesRef.current[messagesRef.current.length - 1];
       const history = await ChatMessageAPI.fetchHistoryMessages(conversationId, {
         count: pageSize,
-        startClientMsgID: newestMessage?.clientMsgID
+        startClientMsgID: messages[messages.length - 1].clientMsgID
       });
       const incoming = history.messageList;
-      const hasNewMessages = incoming.length > 0;
-      if (hasNewMessages) {
-        setMessages(current => mergeMessages(current, incoming));
+      const hasNew = incoming.length > 0;
+      if (hasNew) {
+        setMessages(mergeMessages(messages, incoming), !history.isEnd && hasNew);
       }
-      setHasMoreNewer(!history.isEnd && hasNewMessages);
     } catch (err) {
       setError(err instanceof Error ? err : new Error(String(err)));
     } finally {
-      isLoadingNewerRef.current = false;
       setIsLoadingNewer(false);
     }
-  }, [conversationId, pageSize]);
-  const sendTextMessage = useCallback(async text => {
-    const trimmed = text.trim();
-    if (!trimmed) {
-      return;
-    }
-    const sentMessage = await ChatMessageAPI.sendTextMessage({
-      text: trimmed
-    });
-    setMessages(current => mergeMessages(current, [sentMessage]));
-  }, []);
+  }, [conversationId, hasMoreNewer, isLoadingNewer, messages, pageSize, setMessages]);
   const appendIncomingMessages = useCallback(incoming => {
     const relevant = incoming.filter(message => belongsToConversation(message, conversationIdRef.current));
-    if (!relevant.length) {
-      return;
-    }
-    setMessages(current => mergeMessages(current, relevant));
+    if (!relevant.length) return;
+    relevant.forEach(msg => pushNewMessage(msg));
     ChatMessageAPI.markConversationAsRead(conversationIdRef.current).catch(() => undefined);
-  }, []);
+  }, [pushNewMessage]);
   useEffect(() => {
-    resetState();
-    if (!enabled || !conversationId) {
-      return;
-    }
-    loadInitialMessages();
-  }, [conversationId, enabled, loadInitialMessages, resetState]);
+    reset();
+    if (!enabled || !conversationId) return;
+    fetchInitial();
+  }, [conversationId, enabled, fetchInitial, reset]);
   useEffect(() => {
-    if (!enabled || !conversationId) {
-      return;
-    }
-    const handleNewMessages = incoming => {
-      appendIncomingMessages(incoming);
-    };
-    const handleNewMessage = incoming => {
-      appendIncomingMessages([incoming]);
-    };
+    if (!enabled || !conversationId) return;
+    const handleNewMessages = incoming => appendIncomingMessages(incoming);
+    const handleNewMessage = incoming => appendIncomingMessages([incoming]);
     OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
     OpenIMSDK.on(OpenIMEvent.OnRecvNewMessage, handleNewMessage);
     return () => {
@@ -197,8 +116,7 @@ export function useChatMessages({
     error,
     onLoadEarlier,
     onLoadNewer,
-    sendTextMessage,
-    refresh: loadInitialMessages
+    refresh: fetchInitial
   };
 }
 //# sourceMappingURL=useChatMessages.js.map