@droppii-org/chat-mobile 0.2.6 → 0.2.8

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","hasText","trim","hasPreview","url","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":"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","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,140 +32,74 @@ 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);
     OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
-    OpenIMSDK.on(OpenIMEvent.OnRecvNewMessage, handleNewMessage);
     return () => {
       OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
-      OpenIMSDK.off(OpenIMEvent.OnRecvNewMessage, handleNewMessage);
     };
   }, [appendIncomingMessages, conversationId, enabled]);
   return {
@@ -197,8 +113,7 @@ export function useChatMessages({
     error,
     onLoadEarlier,
     onLoadNewer,
-    sendTextMessage,
-    refresh: loadInitialMessages
+    refresh: fetchInitial
   };
 }
 //# sourceMappingURL=useChatMessages.js.map

package/lib/module/hooks/useChatMessages.js.map

@@ -1 +1 @@
-{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useRef","useState","ChatMessageAPI","belongsToConversation","getHistoryPaginationAnchor","hasNewHistoryMessages","mergeMessages","useChatMessages","conversationId","enabled","pageSize","messages","setMessages","currentUserId","setCurrentUserId","isLoading","setIsLoading","isLoadingEarlier","setIsLoadingEarlier","hasMoreEarlier","setHasMoreEarlier","isLoadingNewer","setIsLoadingNewer","hasMoreNewer","setHasMoreNewer","error","setError","conversationIdRef","current","isLoadingEarlierRef","isLoadingNewerRef","messagesRef","hasMoreEarlierRef","hasMoreNewerRef","historyAnchorRef","newestAnchorRef","resetState","loadInitialMessages","history","userId","Promise","all","fetchHistoryMessages","count","getCurrentUserId","initialMessages","messageList","oldestAnchor","clientMsgID","isEnd","markConversationAsRead","catch","undefined","err","Error","String","onLoadEarlier","length","anchor","startClientMsgID","incoming","hasNewMessages","nextAnchor","onLoadNewer","newestMessage","sendTextMessage","text","trimmed","trim","sentMessage","appendIncomingMessages","relevant","filter","message","handleNewMessages","handleNewMessage","on","OnRecvNewMessages","OnRecvNewMessage","off","refresh"],"sourceRoot":"../../../src","sources":["hooks/useChatMessages.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useRef","useState","ChatMessageAPI","belongsToConversation","hasNewHistoryMessages","mergeMessages","useMessageStore","useChatMessages","conversationId","enabled","pageSize","messages","s","hasMoreEarlier","hasMoreNewer","setMessages","pushNewMessage","reset","currentUserId","setCurrentUserId","isLoading","setIsLoading","isLoadingEarlier","setIsLoadingEarlier","isLoadingNewer","setIsLoadingNewer","error","setError","conversationIdRef","current","fetchInitial","history","userId","Promise","all","fetchHistoryMessages","count","getCurrentUserId","initialMessages","messageList","isEnd","markConversationAsRead","catch","undefined","err","Error","String","onLoadEarlier","length","startClientMsgID","clientMsgID","incoming","hasNew","onLoadNewer","appendIncomingMessages","relevant","filter","message","forEach","msg","handleNewMessages","on","OnRecvNewMessages","off","refresh"],"sourceRoot":"../../../src","sources":["hooks/useChatMessages.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/hooks/useConversationList.js

@@ -3,10 +3,31 @@
 import { useEffect } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import OpenIMSDK from '@droppii/openim-rn-client-sdk';
-import { ChatAPI } from "../services/index.js";
 import { conversationQueryKeys } from "./query-keys.js";
 import { useConversationStore } from "../store/index.js";
-import { mergeOpenIMIntoConversation } from "../utils/conversation.js";
+function toConversationItem(raw) {
+  let lastMessage;
+  if (raw.latestMsg) {
+    try {
+      lastMessage = JSON.parse(raw.latestMsg);
+    } catch {
+      // leave undefined
+    }
+  }
+  let applicationType;
+  if (raw.ex) {
+    try {
+      applicationType = JSON.parse(raw.ex).applicationType;
+    } catch {
+      // leave undefined
+    }
+  }
+  return {
+    ...raw,
+    lastMessage,
+    applicationType
+  };
+}
 export function useConversationList({
   applicationType,
   page = 1,
@@ -18,23 +39,14 @@ export function useConversationList({
     enabled: enabled !== false,
     queryFn: async () => {
       const offset = (page - 1) * 20;
-      const [{
-        data: droppiiList
-      }, openimList] = await Promise.all([ChatAPI.queryConversations({
-        applicationType,
-        page,
-        pageSize: 20
-      }), OpenIMSDK.getConversationListSplit({
+      const rawList = await OpenIMSDK.getConversationListSplitApp({
         offset,
-        count: 20
-      })]);
-      const openimMap = new Map(openimList.map(c => [c.conversationID, c]));
-      const merged = droppiiList.map(conv => {
-        const openimConv = openimMap.get(conv.conversationId);
-        return openimConv ? mergeOpenIMIntoConversation(conv, openimConv) : conv;
+        count: 20,
+        applicationType
       });
-      useConversationStore.getState().updateConversations(merged);
-      return merged;
+      const conversations = rawList.map(toConversationItem);
+      useConversationStore.getState().updateConversations(conversations);
+      return conversations;
     }
   });
 

package/lib/module/hooks/useConversationList.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useQuery","OpenIMSDK","ChatAPI","conversationQueryKeys","useConversationStore","mergeOpenIMIntoConversation","useConversationList","applicationType","page","enabled","newConversationSignal","s","query","queryKey","list","queryFn","offset","data","droppiiList","openimList","Promise","all","queryConversations","pageSize","getConversationListSplit","count","openimMap","Map","map","c","conversationID","merged","conv","openimConv","get","conversationId","getState","updateConversations","refetch"],"sourceRoot":"../../../src","sources":["hooks/useConversationList.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,QAAQ,QAAQ,uBAAuB;AAChD,OAAOC,SAAS,MAAM,+BAA+B;AACrD,SAASC,OAAO,QAAQ,sBAAa;AACrC,SAASC,qBAAqB,QAAQ,iBAAc;AACpD,SAASC,oBAAoB,QAAQ,mBAAU;AAC/C,SAASC,2BAA2B,QAAQ,0BAAuB;AAQnE,OAAO,SAASC,mBAAmBA,CAAC;EAClCC,eAAe;EACfC,IAAI,GAAG,CAAC;EACRC,OAAO,GAAG;AACJ,CAAC,EAAE;EACT,MAAMC,qBAAqB,GAAGN,oBAAoB,CAC/CO,CAAC,IAAKA,CAAC,CAACD,qBACX,CAAC;EAED,MAAME,KAAK,GAAGZ,QAAQ,CAAC;IACrBa,QAAQ,EAAE,CAAC,GAAGV,qBAAqB,CAACW,IAAI,CAACP,eAAe,CAAC,EAAEC,IAAI,CAAC;IAChEC,OAAO,EAAEA,OAAO,KAAK,KAAK;IAC1BM,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,MAAMC,MAAM,GAAG,CAACR,IAAI,GAAG,CAAC,IAAI,EAAE;MAC9B,MAAM,CAAC;QAAES,IAAI,EAAEC;MAAY,CAAC,EAAEC,UAAU,CAAC,GAAG,MAAMC,OAAO,CAACC,GAAG,CAAC,CAC5DnB,OAAO,CAACoB,kBAAkB,CAAC;QAAEf,eAAe;QAAEC,IAAI;QAAEe,QAAQ,EAAE;MAAG,CAAC,CAAC,EACnEtB,SAAS,CAACuB,wBAAwB,CAAC;QAAER,MAAM;QAAES,KAAK,EAAE;MAAG,CAAC,CAAC,CAC1D,CAAC;MACF,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAACR,UAAU,CAACS,GAAG,CAAEC,CAAC,IAAK,CAACA,CAAC,CAACC,cAAc,EAAED,CAAC,CAAC,CAAC,CAAC;MAEvE,MAAME,MAAM,GAAGb,WAAW,CAACU,GAAG,CAAEI,IAAI,IAAK;QACvC,MAAMC,UAAU,GAAGP,SAAS,CAACQ,GAAG,CAACF,IAAI,CAACG,cAAc,CAAC;QACrD,OAAOF,UAAU,GACb5B,2BAA2B,CAAC2B,IAAI,EAAEC,UAAU,CAAC,GAC7CD,IAAI;MACV,CAAC,CAAC;MAEF5B,oBAAoB,CAACgC,QAAQ,CAAC,CAAC,CAACC,mBAAmB,CAACN,MAAM,CAAC;MAC3D,OAAOA,MAAM;IACf;EACF,CAAC,CAAC;;EAEF;EACA;EACAhC,SAAS,CAAC,MAAM;IACd,IAAIW,qBAAqB,GAAG,CAAC,EAAE;MAC7BE,KAAK,CAAC0B,OAAO,CAAC,CAAC;IACjB;IACA;EACF,CAAC,EAAE,CAAC5B,qBAAqB,CAAC,CAAC;EAE3B,OAAOE,KAAK;AACd","ignoreList":[]}
+{"version":3,"names":["useEffect","useQuery","OpenIMSDK","conversationQueryKeys","useConversationStore","toConversationItem","raw","lastMessage","latestMsg","JSON","parse","applicationType","ex","useConversationList","page","enabled","newConversationSignal","s","query","queryKey","list","queryFn","offset","rawList","getConversationListSplitApp","count","conversations","map","getState","updateConversations","refetch"],"sourceRoot":"../../../src","sources":["hooks/useConversationList.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AACjC,SAASC,QAAQ,QAAQ,uBAAuB;AAChD,OAAOC,SAAS,MAET,+BAA+B;AACtC,SAASC,qBAAqB,QAAQ,iBAAc;AACpD,SAASC,oBAAoB,QAAQ,mBAAU;AAS/C,SAASC,kBAAkBA,CAACC,GAAqB,EAAqB;EACpE,IAAIC,WAAqC;EACzC,IAAID,GAAG,CAACE,SAAS,EAAE;IACjB,IAAI;MACFD,WAAW,GAAGE,IAAI,CAACC,KAAK,CAACJ,GAAG,CAACE,SAAS,CAAiB;IACzD,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ;EAEA,IAAIG,eAAmC;EACvC,IAAIL,GAAG,CAACM,EAAE,EAAE;IACV,IAAI;MACFD,eAAe,GAAIF,IAAI,CAACC,KAAK,CAACJ,GAAG,CAACM,EAAE,CAAC,CAClCD,eAAe;IACpB,CAAC,CAAC,MAAM;MACN;IAAA;EAEJ;EAEA,OAAO;IAAE,GAAIL,GAAyB;IAAEC,WAAW;IAAEI;EAAgB,CAAC;AACxE;AAEA,OAAO,SAASE,mBAAmBA,CAAC;EAClCF,eAAe;EACfG,IAAI,GAAG,CAAC;EACRC,OAAO,GAAG;AACJ,CAAC,EAAE;EACT,MAAMC,qBAAqB,GAAGZ,oBAAoB,CAC/Ca,CAAC,IAAKA,CAAC,CAACD,qBACX,CAAC;EAED,MAAME,KAAK,GAAGjB,QAAQ,CAAC;IACrBkB,QAAQ,EAAE,CAAC,GAAGhB,qBAAqB,CAACiB,IAAI,CAACT,eAAe,CAAC,EAAEG,IAAI,CAAC;IAChEC,OAAO,EAAEA,OAAO,KAAK,KAAK;IAC1BM,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,MAAMC,MAAM,GAAG,CAACR,IAAI,GAAG,CAAC,IAAI,EAAE;MAC9B,MAAMS,OAAO,GAAG,MAAMrB,SAAS,CAACsB,2BAA2B,CAAC;QAC1DF,MAAM;QACNG,KAAK,EAAE,EAAE;QACTd;MACF,CAAC,CAAC;MAEF,MAAMe,aAAa,GAAGH,OAAO,CAACI,GAAG,CAACtB,kBAAkB,CAAC;MACrDD,oBAAoB,CAACwB,QAAQ,CAAC,CAAC,CAACC,mBAAmB,CAACH,aAAa,CAAC;MAClE,OAAOA,aAAa;IACtB;EACF,CAAC,CAAC;;EAEF;EACA;EACA1B,SAAS,CAAC,MAAM;IACd,IAAIgB,qBAAqB,GAAG,CAAC,EAAE;MAC7BE,KAAK,CAACY,OAAO,CAAC,CAAC;IACjB;IACA;EACF,CAAC,EAAE,CAACd,qBAAqB,CAAC,CAAC;EAE3B,OAAOE,KAAK;AACd","ignoreList":[]}

package/lib/module/hooks/useImageAttachment.js

@@ -0,0 +1,263 @@
+"use strict";
+
+import { useCallback, useState } from 'react';
+import RNFS from 'react-native-fs';
+import DeviceUtils from "../utils/device.js";
+import UIUtils from "../utils/ui.js";
+import { trans } from "../translation/index.js";
+import { getMimeType, isVideoFromPicker } from "../utils/imageUtils.js";
+import { ImageUploadAPI } from "../services/imageUpload.js";
+import VideoThumbnailUtil from "../utils/videoThumbnail.js";
+export const useImageAttachment = () => {
+  const [selectedImages, setSelectedImages] = useState([]);
+  const [isImagePreviewVisible, setIsImagePreviewVisible] = useState(false);
+  const updateImageStatus = useCallback((index, updates) => {
+    setSelectedImages(prev => {
+      const newImages = [...prev];
+      if (newImages[index]) {
+        newImages[index] = {
+          ...newImages[index],
+          ...updates
+        };
+      }
+      return newImages;
+    });
+  }, []);
+  const uploadImage = useCallback(async (index, image) => {
+    console.log('Upload', 'Step 1: Starting upload for image', {
+      index
+    });
+    let cachedFilePath = null;
+    try {
+      console.log('Upload', 'Step 2: Updating status to uploading...');
+      updateImageStatus(index, {
+        isUploading: true,
+        error: null,
+        uploadProgress: 0
+      });
+      try {
+        console.log('Upload', 'Step 3: Preparing file...', {
+          originalPath: image.path,
+          filename: image.filename
+        });
+        const ext = image.filename?.split('.').pop() || 'jpg';
+        const fileName = `temp-image-${Date.now()}-${index}.${ext}`;
+        cachedFilePath = `${RNFS.DocumentDirectoryPath}/${fileName}`;
+        console.log('Upload', 'Step 4: Copying file to cache...', {
+          from: image.path,
+          to: cachedFilePath
+        });
+        await RNFS.copyFile(image.path, cachedFilePath);
+        console.log('Upload', 'Step 5: File copied successfully');
+      } catch (fileError) {
+        console.error('Upload', 'File copy error', fileError);
+        throw new Error(`Failed to prepare file: ${fileError?.message || 'Unknown error'}`);
+      }
+      const filename = image.filename || 'image.jpg';
+      const setProgress = progress => {
+        try {
+          console.log('Upload', 'Progress', {
+            percentage: progress
+          });
+          updateImageStatus(index, {
+            uploadProgress: progress
+          });
+        } catch (err) {
+          console.error('Upload', 'Progress update error', err);
+        }
+      };
+      let uploadedImage;
+      try {
+        console.log('Upload', 'Step 6: Uploading to server...', {
+          filename,
+          size: image.size
+        });
+        uploadedImage = await ImageUploadAPI.uploadImageFile({
+          path: cachedFilePath || '',
+          filename,
+          size: image.size || 0,
+          width: image.width || 0,
+          height: image.height || 0,
+          mime: getMimeType(filename)
+        }, setProgress);
+        console.log('Upload', 'Step 7: Upload successful!', {
+          url: uploadedImage?.url
+        });
+      } catch (uploadError) {
+        console.error('Upload', 'Server upload error', uploadError);
+        throw new Error(`Upload failed: ${uploadError?.message || 'Unknown error'}`);
+      }
+      if (!uploadedImage?.url) {
+        throw new Error('No URL returned from server');
+      }
+      console.log('Upload', 'Step 8: Upload complete, preparing data...');
+      updateImageStatus(index, {
+        isUploading: false,
+        uploadProgress: 100,
+        uploadedUrl: uploadedImage.url
+      });
+      console.log('Upload', 'Step 9: Ready to send - waiting for user confirmation');
+      console.log('Upload', 'Step 11: Cleaning up cache file...');
+      try {
+        if (cachedFilePath) {
+          await ImageUploadAPI.cleanupImageFile(cachedFilePath);
+        }
+      } catch (cleanupError) {
+        console.warn('Upload', 'Cleanup warning', cleanupError);
+      }
+      console.log('Upload', 'Step 12: COMPLETE ✓');
+    } catch (error) {
+      console.error('Upload', 'ERROR', error);
+      const errorMsg = error?.message || trans('chat:image_upload_failed');
+      updateImageStatus(index, {
+        isUploading: false,
+        error: errorMsg
+      });
+      try {
+        if (cachedFilePath) {
+          await ImageUploadAPI.cleanupImageFile(cachedFilePath);
+        }
+      } catch (cleanupError) {
+        console.warn('Upload', 'Cleanup after error', cleanupError);
+      }
+      console.error('uploadImage', 'Full error', error);
+    }
+  }, [updateImageStatus]);
+  const generateVideoThumbnail = useCallback(async (index, image) => {
+    if (!isVideoFromPicker(image)) return; // Only for videos
+
+    try {
+      console.log('[ImageAttach] Generating thumbnail for video:', {
+        index,
+        filename: image.filename
+      });
+      const videoDuration = image.duration || 0;
+      const timeMs = Math.min(1000, Math.floor(videoDuration / 2));
+
+      // Copy video to safe location
+      const ext = image.filename?.split('.').pop() || 'mp4';
+      const cachedFileName = `thumb-cache-${Date.now()}-${index}.${ext}`;
+      const cachedVideoPath = `${RNFS.DocumentDirectoryPath}/${cachedFileName}`;
+      await RNFS.copyFile(image.path, cachedVideoPath);
+
+      // Generate thumbnail
+      const thumbnail = await VideoThumbnailUtil.generateThumbnail(cachedVideoPath, {
+        time: timeMs,
+        quality: 80
+      });
+      if (!thumbnail) throw new Error('Thumbnail generation failed');
+
+      // Upload thumbnail (force .jpg extension for image file)
+      const baseName = image.filename?.split('.')[0] || 'video';
+      const uploadedThumbnail = await ImageUploadAPI.uploadImageFile({
+        path: thumbnail.path,
+        filename: `thumb-${baseName}.jpg`,
+        size: 0,
+        width: thumbnail.width || 320,
+        height: thumbnail.height || 180,
+        mime: 'image/jpeg'
+      }, progress => {
+        console.log('[ImageAttach] Thumbnail upload progress:', {
+          index,
+          percentage: progress
+        });
+      });
+      if (!uploadedThumbnail?.url) {
+        throw new Error('No thumbnail URL returned');
+      }
+
+      // Update state with thumbnail
+      updateImageStatus(index, {
+        thumbnailUrl: uploadedThumbnail.url,
+        thumbnailSize: uploadedThumbnail.size || 0
+      });
+      console.log(`✅ [ImageAttach] THUMBNAIL URL (picked): ${uploadedThumbnail.url}`);
+
+      // Cleanup cached video
+      try {
+        await RNFS.unlink(cachedVideoPath);
+      } catch (err) {
+        console.warn('[ImageAttach] Failed to clean cached video:', err);
+      }
+    } catch (error) {
+      console.error('[ImageAttach] Video thumbnail generation error:', error);
+      UIUtils.toast.open({
+        title: 'Thumbnail Error',
+        message: `Failed to generate thumbnail for ${image.filename}`,
+        theme: 'danger'
+      });
+    }
+  }, [updateImageStatus]);
+  const handleImageAttach = useCallback(async (multipleMode = true) => {
+    console.log('ImageAttach', 'Step 1: User tapped attachment button', {
+      multipleMode
+    });
+    try {
+      console.log('ImageAttach', 'Step 2: Opening image picker...');
+      const images = await DeviceUtils.openImagePicker(multipleMode);
+      if (!images || images.length === 0) {
+        console.log('ImageAttach', 'Step 3: User cancelled picker');
+        return;
+      }
+      console.log('ImageAttach', 'Step 4: Images picked', {
+        count: images.length
+      });
+      const MAX_FILE_SIZE = 5 * 1024 * 1024;
+      const oversizedImages = images.filter(img => (img.size || 0) > MAX_FILE_SIZE);
+      if (oversizedImages.length > 0) {
+        console.warn('ImageAttach', 'Step 5: Some images too large', {
+          count: oversizedImages.length,
+          maxSize: MAX_FILE_SIZE
+        });
+        UIUtils.toast.open({
+          title: trans('chat:image_too_large'),
+          theme: 'danger'
+        });
+        const validImages = images.filter(img => (img.size || 0) <= MAX_FILE_SIZE);
+        if (validImages.length === 0) return;
+        images.splice(0, images.length, ...validImages);
+      }
+      console.log('ImageAttach', 'Step 6: Size validation passed');
+      const startIndex = selectedImages.length;
+      console.log('ImageAttach', 'Step 7: Adding to preview list', {
+        count: images.length,
+        startIndex
+      });
+      setSelectedImages(prev => [...prev, ...images.map(image => ({
+        image,
+        uploadProgress: 0,
+        error: null,
+        isUploading: true
+      }))]);
+      setIsImagePreviewVisible(true);
+
+      // Generate thumbnails for videos (parallel)
+      console.log('ImageAttach', 'Step 7.5: Generating thumbnails for videos...');
+      await Promise.all(images.map((image, offset) => generateVideoThumbnail(startIndex + offset, image)));
+      console.log('ImageAttach', 'Step 8: Starting uploads...');
+      await Promise.all(images.map((image, offset) => uploadImage(startIndex + offset, image)));
+    } catch (error) {
+      console.error('ImageAttach', 'ERROR', error);
+      UIUtils.toast.open({
+        title: trans('chat:image_pick_failed'),
+        message: error instanceof Error ? error.message : 'Unknown error',
+        theme: 'danger'
+      });
+    }
+  }, [selectedImages.length, uploadImage, generateVideoThumbnail]);
+  const handleImageRemove = useCallback(index => {
+    setSelectedImages(prev => prev.filter((_, i) => i !== index));
+  }, []);
+  const clearAllImages = useCallback(() => {
+    setSelectedImages([]);
+    setIsImagePreviewVisible(false);
+  }, []);
+  return {
+    selectedImages,
+    isImagePreviewVisible,
+    handleImageAttach,
+    handleImageRemove,
+    clearAllImages
+  };
+};
+//# sourceMappingURL=useImageAttachment.js.map