@droppii-org/chat-mobile 0.2.31 → 0.2.32

package/src/hooks/message/useSendMessage.ts

@@ -1,5 +1,6 @@
 import { useCallback } from 'react';
 import { useConversationStore } from '../../store/conversation';
+import { useUserStore } from '../../store/user';
 import type {
   CustomMsgParams,
   MessageItem,
@@ -50,15 +51,15 @@ export const useSendMessage = () => {
       pushNewMessage({ ...message, status: MessageStatus.Sending });
 
       try {
-        const sent = await OpenIMSDK.sendMessage(
-          buildSendParams(
-            message,
-            recvID,
-            groupID,
-            extendMessageInfo,
-            plainText
-          )
+        const sendParams = buildSendParams(
+          message,
+          recvID,
+          groupID,
+          extendMessageInfo,
+          plainText
         );
+        console.log('[useSendMessage] dispatchSend params', sendParams);
+        const sent = await OpenIMSDK.sendMessage(sendParams);
         deleteOneMessage(message.clientMsgID);
         pushNewMessage(sent);
       } catch {
@@ -162,6 +163,7 @@ export const useSendMessage = () => {
         recvID: recvID || '',
         groupID: groupID || '',
         message,
+        offlinePushInfo: generateOfflinePushInfo(message.contentType, ''),
       };
 
       try {
@@ -208,13 +210,14 @@ export const useSendMessage = () => {
   };
 };
 
-const generateOfflinePushInfo = (
+export const generateOfflinePushInfo = (
   contentType: MessageType,
   plainText: string
 ) => {
   const conversationData = useConversationStore
     ?.getState?.()
     ?.getCurrentConversation();
+  const operatorUserID = useUserStore.getState().user?.userID || '';
   const title = conversationData?.showName || 'Droppii';
   const desc = generateContentBasedOnMessageType(contentType, plainText);
   return {
@@ -223,6 +226,7 @@ const generateOfflinePushInfo = (
     ex: JSON.stringify({
       icon: conversationData?.faceURL || '',
       conversationId: conversationData?.conversationID || '',
+      operatorUserID,
       title,
       desc,
     }),

package/src/hooks/useChatMessages.ts

@@ -14,6 +14,7 @@ import { useMessageStore } from '../store/message';
 import { useUserStore } from '../store/user';
 import { useChatContext } from '../context';
 import { allSettled } from '../utils/promise';
+import { useSetIsShowFLashMessage } from '../context/global';
 
 type UseChatMessagesOptions = {
   conversationId: string;
@@ -46,6 +47,8 @@ export function useChatMessages({
   const conversationIdRef = useRef(conversationId);
   conversationIdRef.current = conversationId;
 
+  const setIsShowFlashMessage = useSetIsShowFLashMessage();
+
   const fetchInitial = useCallback(async () => {
     if (!conversationId) return;
 
@@ -217,16 +220,17 @@ export function useChatMessages({
 
   useEffect(() => {
     if (!enabled || !conversationId) return;
-
+    setIsShowFlashMessage(false);
     const handleNewMessages = (incoming: MessageItem[]) =>
       appendIncomingMessages(incoming);
 
     OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
 
     return () => {
+      setIsShowFlashMessage(true);
       OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
     };
-  }, [appendIncomingMessages, conversationId, enabled]);
+  }, [appendIncomingMessages, conversationId, enabled, setIsShowFlashMessage]);
 
   return {
     messages,

package/src/hooks/useImageAttachment.ts

@@ -171,6 +171,8 @@ export const useImageAttachment = (): UseImageAttachmentReturn => {
           const maxSize = isVideoFromPicker(item)
             ? UPLOAD_LIMITS.video
             : UPLOAD_LIMITS.image;
+          console.log('maxSize', maxSize);
+          console.log('item.size', item.size);
           return (item.size || 0) <= maxSize;
         };
 

package/src/index.tsx

@@ -29,17 +29,16 @@ export { AttachmentPreview } from './components/AttachmentPreview';
 export { MediaViewerModal } from './components/MediaViewerModal';
 export { Inbox } from './screens/inbox';
 export { default as MediaViewerScreen } from './screens/MediaView';
-export {
-  ChatDetail,
-  ChatDetailHeader,
-  ChatComposer,
-  ChatQuickActions,
-  ChatAttachmentPanel,
-  DEFAULT_QUICK_ACTIONS,
-  DEFAULT_PANNEL_ACTIONS,
-  DChatPannelActionItemType,
-  DChatQuickActionItemType,
-} from './screens/chat-detail';
+export * from './screens/chat-detail';
+
+// export type {
+//   PeerType,
+//   MessageItem,
+//   ConversationItem,
+// } from '@droppii/openim-rn-client-sdk';
+export type { ConversationItem } from '@droppii/openim-rn-client-sdk';
+export { LoginStatus, MessageType } from '@droppii/openim-rn-client-sdk';
+export * from './screens/chat-detail';
 export type {
   DChatActionItem,
   DChatActionIconProvider,
@@ -54,13 +53,6 @@ export type {
   ChatPanelProps,
 } from './screens/chat-detail';
 
-export { LoginStatus, MessageType } from '@droppii/openim-rn-client-sdk';
-export type {
-  PeerType,
-  ConversationItem,
-  MessageItem,
-} from '@droppii/openim-rn-client-sdk';
-
 export { registerUIUtils, UIUtils } from './utils/UIUtils';
 
 export { DFlowContext } from './types/flows';

package/src/services/attachmentOrchestrator.ts

@@ -16,6 +16,7 @@ import {
   type AttachmentType,
 } from '../config/attachment-priority';
 import { allSettled } from '../utils/promise';
+import { generateOfflinePushInfo } from '../hooks/message/useSendMessage';
 
 export namespace AttachmentOrchestratorService {
   export async function sendPreparedAttachments(
@@ -290,6 +291,7 @@ export namespace AttachmentOrchestratorService {
           recvID,
           groupID,
           message,
+          offlinePushInfo: generateOfflinePushInfo(message.contentType, ''),
         });
 
         if (result) {

package/src/types/chat.ts

@@ -33,12 +33,16 @@ export interface ChatUIAdapter {
 export interface ChatContextType {
   logGA?: LogGA;
   applicationType: DChatApplicationType;
+  onPressFlashMessage?: (message: ConversationItem) => void;
+  isShowFLashMessage: boolean;
+  setIsShowFLashMessage: (value: boolean) => void;
 }
 
 export type ChatProviderProps = PropsWithChildren<{
   logGA?: LogGA;
   applicationType: DChatApplicationType;
   getChatToken: () => Promise<GetOpenIMTokenResponse | null>;
+  onFlashMessagePress?: (c: ConversationItem) => void;
 }>;
 
 export enum DChatApplicationType {

package/src/types/imageUpload.ts

@@ -21,7 +21,7 @@ export interface ImageUploadConfig {
   retryAttempts?: number;
 }
 
-export interface UploadProgress {
+export interface IUploadProgress {
   completed: number;
   total: number;
   percentage: number;

package/src/utils/messageUtils.ts

@@ -86,8 +86,7 @@ export const getMessagePreview = (message: DMessageItem): string => {
       if (message?.customElem?.description) {
         return message?.customElem?.description;
       }
-      break;
-
+      return '';
     default:
       return '[Tin nhắn không được hỗ trợ]';
   }
@@ -99,7 +98,6 @@ export const getLastMessageText = (
   conversation?: ConversationItem
 ): string => {
   if (!message) return '';
-
   const preview = getMessagePreview(message);
   if (!preview) return '';
 

package/src/utils/toastFlashMessage.ts

@@ -0,0 +1,67 @@
+import Toast from 'react-native-toast-message';
+
+interface ShowFlashMessageParams {
+  key: string;
+  title: string;
+  body?: string;
+  onPress?: () => void;
+}
+
+let currentKey: string | null = null;
+const queue: ShowFlashMessageParams[] = [];
+
+const VISIBILITY_TIME_MS = 2000;
+
+const displayToast = (params: ShowFlashMessageParams) => {
+  currentKey = params.key;
+  Toast.show({
+    type: 'info',
+    text1: params.title,
+    text2: params.body,
+    onPress: params.onPress,
+    onHide: advanceQueue,
+    visibilityTime: VISIBILITY_TIME_MS,
+  });
+};
+
+function advanceQueue() {
+  const next = queue.shift();
+  if (!next) {
+    currentKey = null;
+    return;
+  }
+  displayToast(next);
+}
+
+export const ToastFlashMessage = {
+  show: (params: ShowFlashMessageParams) => {
+    if (params.key === currentKey) {
+      displayToast(params);
+      return;
+    }
+
+    const queuedIndex = queue.findIndex((item) => item.key === params.key);
+    if (queuedIndex !== -1) {
+      queue[queuedIndex] = params;
+      return;
+    }
+
+    if (currentKey === null) {
+      displayToast(params);
+    } else {
+      queue.push(params);
+    }
+  },
+  hide: (key: string) => {
+    if (key === currentKey) {
+      Toast.hide();
+      currentKey = null;
+      advanceQueue();
+    } else {
+      const index = queue.findIndex((item) => item.key === key);
+      if (index !== -1) {
+        queue.splice(index, 1);
+      }
+    }
+  },
+};