@droppii-org/chat-mobile 0.2.63 → 0.2.64

package/lib/module/screens/SearchConversation/SearchEmpty.js

@@ -4,8 +4,27 @@ import { KContainer, KImage, KLabel, KSpacingValue } from '@droppii/libs';
 import { StyleSheet } from 'react-native';
 import Images from "../../assets/images/index.js";
 import { trans } from "../../translation/index.js";
+import { memo, useMemo } from 'react';
+import { isEmpty } from 'lodash';
+import { SearchConversationTabResultType } from "./types.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-export const SearchEmpty = () => {
+export const SearchEmpty = /*#__PURE__*/memo(({
+  searchTerm,
+  searchType
+}) => {
+  const emptyHint = useMemo(() => {
+    if (!isEmpty(searchTerm?.trim())) {
+      return 'search:empty_description';
+    }
+    switch (searchType) {
+      case SearchConversationTabResultType.Messages:
+        return 'search_message:empty_hint';
+      case SearchConversationTabResultType.Conversations:
+        return 'search_conversation:empty_hint';
+      default:
+        return 'search:empty_hint';
+    }
+  }, [searchTerm, searchType]);
   return /*#__PURE__*/_jsxs(KContainer.View, {
     style: styles.container,
     children: [/*#__PURE__*/_jsx(KImage.Base, {
@@ -16,10 +35,10 @@ export const SearchEmpty = () => {
     }), /*#__PURE__*/_jsx(KLabel.Text, {
       typo: "TextMdNormal",
       textAlign: "center",
-      children: trans('search:empty_description')
+      children: trans(emptyHint)
     })]
   });
-};
+});
 const styles = StyleSheet.create({
   container: {
     paddingHorizontal: KSpacingValue['2rem'],

package/lib/module/screens/SearchConversation/SearchEmpty.js.map

@@ -1 +1 @@
-{"version":3,"names":["KContainer","KImage","KLabel","KSpacingValue","StyleSheet","Images","trans","jsx","_jsx","jsxs","_jsxs","SearchEmpty","View","style","styles","container","children","Base","uri","SEARCH_EMPTY","width","height","resizeMode","Text","typo","textAlign","create","paddingHorizontal","paddingVertical","justifyContent","alignItems","gap"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchEmpty.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,MAAM,EAAEC,MAAM,EAAEC,aAAa,QAAQ,eAAe;AACzE,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,MAAM,MAAM,8BAAqB;AACxC,SAASC,KAAK,QAAQ,4BAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAE1C,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAM;EAC/B,oBACED,KAAA,CAACV,UAAU,CAACY,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,gBACvCR,IAAA,CAACP,MAAM,CAACgB,IAAI;MACVC,GAAG,EAAEb,MAAM,CAACc,YAAa;MACzBC,KAAK,EAAE,GAAI;MACXC,MAAM,EAAE,GAAI;MACZC,UAAU,EAAC;IAAS,CACrB,CAAC,eACFd,IAAA,CAACN,MAAM,CAACqB,IAAI;MAACC,IAAI,EAAC,cAAc;MAACC,SAAS,EAAC,QAAQ;MAAAT,QAAA,EAChDV,KAAK,CAAC,0BAA0B;IAAC,CACvB,CAAC;EAAA,CACC,CAAC;AAEtB,CAAC;AAED,MAAMQ,MAAM,GAAGV,UAAU,CAACsB,MAAM,CAAC;EAC/BX,SAAS,EAAE;IACTY,iBAAiB,EAAExB,aAAa,CAAC,MAAM,CAAC;IACxCyB,eAAe,EAAE,EAAE;IACnBC,cAAc,EAAE,QAAQ;IACxBC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAE5B,aAAa,CAAC,SAAS;EAC9B;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["KContainer","KImage","KLabel","KSpacingValue","StyleSheet","Images","trans","memo","useMemo","isEmpty","SearchConversationTabResultType","jsx","_jsx","jsxs","_jsxs","SearchEmpty","searchTerm","searchType","emptyHint","trim","Messages","Conversations","View","style","styles","container","children","Base","uri","SEARCH_EMPTY","width","height","resizeMode","Text","typo","textAlign","create","paddingHorizontal","paddingVertical","justifyContent","alignItems","gap"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchEmpty.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,MAAM,EAAEC,MAAM,EAAEC,aAAa,QAAQ,eAAe;AACzE,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,MAAM,MAAM,8BAAqB;AACxC,SAASC,KAAK,QAAQ,4BAAmB;AACzC,SAASC,IAAI,EAAEC,OAAO,QAAQ,OAAO;AACrC,SAASC,OAAO,QAAQ,QAAQ;AAChC,SAASC,+BAA+B,QAAQ,YAAS;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAO1D,OAAO,MAAMC,WAAW,gBAAGR,IAAI,CAC7B,CAAC;EAAES,UAAU;EAAEC;AAA6B,CAAC,KAAK;EAChD,MAAMC,SAAS,GAAGV,OAAO,CAAC,MAAM;IAC9B,IAAI,CAACC,OAAO,CAACO,UAAU,EAAEG,IAAI,CAAC,CAAC,CAAC,EAAE;MAChC,OAAO,0BAA0B;IACnC;IACA,QAAQF,UAAU;MAChB,KAAKP,+BAA+B,CAACU,QAAQ;QAC3C,OAAO,2BAA2B;MACpC,KAAKV,+BAA+B,CAACW,aAAa;QAChD,OAAO,gCAAgC;MACzC;QACE,OAAO,mBAAmB;IAC9B;EACF,CAAC,EAAE,CAACL,UAAU,EAAEC,UAAU,CAAC,CAAC;EAE5B,oBACEH,KAAA,CAACd,UAAU,CAACsB,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,gBACvCd,IAAA,CAACX,MAAM,CAAC0B,IAAI;MACVC,GAAG,EAAEvB,MAAM,CAACwB,YAAa;MACzBC,KAAK,EAAE,GAAI;MACXC,MAAM,EAAE,GAAI;MACZC,UAAU,EAAC;IAAS,CACrB,CAAC,eACFpB,IAAA,CAACV,MAAM,CAAC+B,IAAI;MAACC,IAAI,EAAC,cAAc;MAACC,SAAS,EAAC,QAAQ;MAAAT,QAAA,EAChDpB,KAAK,CAACY,SAAS;IAAC,CACN,CAAC;EAAA,CACC,CAAC;AAEtB,CACF,CAAC;AAED,MAAMM,MAAM,GAAGpB,UAAU,CAACgC,MAAM,CAAC;EAC/BX,SAAS,EAAE;IACTY,iBAAiB,EAAElC,aAAa,CAAC,MAAM,CAAC;IACxCmC,eAAe,EAAE,EAAE;IACnBC,cAAc,EAAE,QAAQ;IACxBC,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAEtC,aAAa,CAAC,SAAS;EAC9B;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/screens/SearchConversation/SearchMessagesResult.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import { KContainer, KDivider, KSpacingValue } from '@droppii/libs';
+import { KColors, KContainer, KDivider, KSpacingValue } from '@droppii/libs';
 import { memo, useCallback } from 'react';
 import { useSearchMessage } from "../../hooks/message/useSearchMessage.js";
 import { useChatContext } from "../../context/index.js";
-import { FlatList, StyleSheet } from 'react-native';
+import { FlatList, StyleSheet, ActivityIndicator } from 'react-native';
 import SearchResultItem from "./SearchResultItem.js";
 import { SearchConversationTabResultType } from "./types.js";
 import { SearchEmpty } from "./SearchEmpty.js";
@@ -20,7 +20,10 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
     dataFlatten,
     hasNextPage,
     fetchNextPage,
-    isFetchingNextPage
+    isFetchingNextPage,
+    isFetching,
+    isRefetching,
+    refetch
   } = useSearchMessage({
     query: searchTerm,
     applicationType
@@ -31,9 +34,10 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
     return /*#__PURE__*/_jsx(SearchResultItem, {
       item: item,
       tabResultType: SearchConversationTabResultType.Messages,
-      onPressItem: onPressItem
+      onPressItem: onPressItem,
+      searchTerm: searchTerm
     });
-  }, [onPressItem]);
+  }, [onPressItem, searchTerm]);
   const keyExtractor = useCallback(item => {
     return `${item?.conversation?.conversationID}-${item?.chatLog?.clientMsgID}`;
   }, []);
@@ -50,7 +54,14 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
   }, []);
   return /*#__PURE__*/_jsx(KContainer.View, {
     flex: true,
-    children: /*#__PURE__*/_jsx(FlatList, {
+    children: isFetching && !isFetchingNextPage && !isRefetching ? /*#__PURE__*/_jsx(KContainer.View, {
+      flex: true,
+      center: true,
+      children: /*#__PURE__*/_jsx(ActivityIndicator, {
+        color: KColors.primary.normal,
+        size: 'small'
+      })
+    }) : /*#__PURE__*/_jsx(FlatList, {
       data: dataFlatten,
       renderItem: renderItem,
       keyExtractor: keyExtractor,
@@ -58,7 +69,12 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
       showsVerticalScrollIndicator: false,
       onEndReached: onEndReached,
       ItemSeparatorComponent: ItemSeparatorComponent,
-      ListEmptyComponent: /*#__PURE__*/_jsx(SearchEmpty, {})
+      ListEmptyComponent: /*#__PURE__*/_jsx(SearchEmpty, {
+        searchTerm: searchTerm,
+        searchType: SearchConversationTabResultType.Messages
+      }),
+      refreshing: isFetching,
+      onRefresh: refetch
     })
   });
 });

package/lib/module/screens/SearchConversation/SearchMessagesResult.js.map

@@ -1 +1 @@
-{"version":3,"names":["KContainer","KDivider","KSpacingValue","memo","useCallback","useSearchMessage","useChatContext","FlatList","StyleSheet","SearchResultItem","SearchConversationTabResultType","SearchEmpty","jsx","_jsx","SearchMessagesResult","searchTerm","onPressItem","applicationType","dataFlatten","hasNextPage","fetchNextPage","isFetchingNextPage","query","renderItem","item","tabResultType","Messages","keyExtractor","conversation","conversationID","chatLog","clientMsgID","onEndReached","ItemSeparatorComponent","size","vertical","View","flex","children","data","contentContainerStyle","styles","container","showsVerticalScrollIndicator","ListEmptyComponent","create","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchMessagesResult.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,eAAe;AACnE,SAASC,IAAI,EAAEC,WAAW,QAAQ,OAAO;AACzC,SAASC,gBAAgB,QAAQ,yCAAsC;AACvE,SAASC,cAAc,QAAQ,wBAAe;AAC9C,SAASC,QAAQ,EAAEC,UAAU,QAAQ,cAAc;AAEnD,OAAOC,gBAAgB,MAAM,uBAAoB;AACjD,SAASC,+BAA+B,QAAQ,YAAS;AACzD,SAASC,WAAW,QAAQ,kBAAe;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAM5C,MAAMC,oBAAoB,gBAAGX,IAAI,CAC/B,CAAC;EAAEY,UAAU;EAAEC;AAAwC,CAAC,KAAK;EAC3D,MAAM;IAAEC;EAAgB,CAAC,GAAGX,cAAc,CAAC,CAAC;EAC5C,MAAM;IAAEY,WAAW;IAAEC,WAAW;IAAEC,aAAa;IAAEC;EAAmB,CAAC,GACnEhB,gBAAgB,CAAC;IACfiB,KAAK,EAAEP,UAAU;IACjBE;EACF,CAAC,CAAC;EAEJ,MAAMM,UAAU,GAAGnB,WAAW,CAC5B,CAAC;IAAEoB;EAAmC,CAAC,KAAK;IAC1C,oBACEX,IAAA,CAACJ,gBAAgB;MACfe,IAAI,EAAEA,IAAK;MACXC,aAAa,EAAEf,+BAA+B,CAACgB,QAAS;MACxDV,WAAW,EAAEA;IAAY,CAC1B,CAAC;EAEN,CAAC,EACD,CAACA,WAAW,CACd,CAAC;EAED,MAAMW,YAAY,GAAGvB,WAAW,CAAEoB,IAAwB,IAAK;IAC7D,OAAO,GAAGA,IAAI,EAAEI,YAAY,EAAEC,cAAc,IAAIL,IAAI,EAAEM,OAAO,EAAEC,WAAW,EAAE;EAC9E,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,YAAY,GAAG5B,WAAW,CAAC,MAAM;IACrC,IAAIe,WAAW,IAAI,CAACE,kBAAkB,EAAE;MACtCD,aAAa,CAAC,CAAC;IACjB;EACF,CAAC,EAAE,CAACD,WAAW,EAAEE,kBAAkB,EAAED,aAAa,CAAC,CAAC;EAEpD,MAAMa,sBAAsB,GAAG7B,WAAW,CAAC,MAAM;IAC/C,oBAAOS,IAAA,CAACZ,QAAQ;MAACiC,IAAI,EAAE,UAAW;MAACC,QAAQ,EAAE;IAAM,CAAE,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;EAEN,oBACEtB,IAAA,CAACb,UAAU,CAACoC,IAAI;IAACC,IAAI;IAAAC,QAAA,eACnBzB,IAAA,CAACN,QAAQ;MACPgC,IAAI,EAAErB,WAAY;MAClBK,UAAU,EAAEA,UAAW;MACvBI,YAAY,EAAEA,YAAa;MAC3Ba,qBAAqB,EAAEC,MAAM,CAACC,SAAU;MACxCC,4BAA4B,EAAE,KAAM;MACpCX,YAAY,EAAEA,YAAa;MAC3BC,sBAAsB,EAAEA,sBAAuB;MAC/CW,kBAAkB,eAAE/B,IAAA,CAACF,WAAW,IAAE;IAAE,CACrC;EAAC,CACa,CAAC;AAEtB,CACF,CAAC;AAED,eAAeG,oBAAoB;AAEnC,MAAM2B,MAAM,GAAGjC,UAAU,CAACqC,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,iBAAiB,EAAE5C,aAAa,CAAC,SAAS;EAC5C;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["KColors","KContainer","KDivider","KSpacingValue","memo","useCallback","useSearchMessage","useChatContext","FlatList","StyleSheet","ActivityIndicator","SearchResultItem","SearchConversationTabResultType","SearchEmpty","jsx","_jsx","SearchMessagesResult","searchTerm","onPressItem","applicationType","dataFlatten","hasNextPage","fetchNextPage","isFetchingNextPage","isFetching","isRefetching","refetch","query","renderItem","item","tabResultType","Messages","keyExtractor","conversation","conversationID","chatLog","clientMsgID","onEndReached","ItemSeparatorComponent","size","vertical","View","flex","children","center","color","primary","normal","data","contentContainerStyle","styles","container","showsVerticalScrollIndicator","ListEmptyComponent","searchType","refreshing","onRefresh","create","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchMessagesResult.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/SearchConversation/SearchResultItem.js

@@ -1,28 +1,45 @@
 "use strict";
 
 import { KColors, KContainer, KImage, KLabel, KSpacingValue } from '@droppii/libs';
-import { memo, useCallback } from 'react';
+import { memo, useCallback, useMemo } from 'react';
 import { StyleSheet } from 'react-native';
 import { SearchConversationTabResultType } from "./types.js";
 import { AvatarSection, NamePrefixIcon } from "../../components/ThreadCard/index.js";
-import { getLastMessageText } from "../../utils/messageUtils.js";
+import { getMessagePreview, getSenderName } from "../../utils/messageUtils.js";
 import { useUserStore } from "../../store/index.js";
 import { formatTimestamp } from "../../utils/dateTimeUtils.js";
+import { highlightSearch } from "../../utils/highlightSearch.js";
+import isEmpty from 'lodash/isEmpty';
+import { MessageType } from '@droppii/openim-rn-client-sdk';
+import { UIUtils } from "../../utils/UIUtils.js";
+import { trans } from "../../translation/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const SearchResultItem = /*#__PURE__*/memo(props => {
   const {
     item,
     tabResultType,
-    onPressItem
+    onPressItem,
+    searchTerm
   } = props || {};
   const currentUserId = useUserStore(s => s.user?.userID);
   const timestamp = formatTimestamp(item?.chatLog?.sendTime ?? null);
-  const lastMessageText = getLastMessageText({
-    message: item?.chatLog,
-    currentUserId,
-    conversation: item?.conversation
-  });
+  const senderName = getSenderName(item?.chatLog, currentUserId, item?.conversation);
+  const lastMessageText = getMessagePreview(item?.chatLog);
+  const highlightResult = useMemo(() => {
+    if (isEmpty(searchTerm?.trim())) return null;
+    if (tabResultType === SearchConversationTabResultType.Conversations) {
+      return highlightSearch(item?.conversation?.showName || '', searchTerm || '');
+    }
+    return highlightSearch(lastMessageText, searchTerm || '');
+  }, [lastMessageText, searchTerm, tabResultType, item?.conversation?.showName]);
   const handlePressItem = useCallback(() => {
+    const isRevoked = item?.chatLog?.contentType === MessageType.RevokeMessage;
+    if (isRevoked) {
+      UIUtils.toast.open({
+        title: trans('search_message:revoked_message')
+      });
+      return;
+    }
     onPressItem?.({
       conversation: item?.conversation,
       chatLog: item?.chatLog
@@ -44,21 +61,45 @@ const SearchResultItem = /*#__PURE__*/memo(props => {
           style: styles.messageContainer,
           children: [/*#__PURE__*/_jsx(NamePrefixIcon, {
             peerType: item?.conversation?.peerType
-          }), /*#__PURE__*/_jsx(KLabel.Text, {
+          }), !!highlightResult && tabResultType === SearchConversationTabResultType.Conversations ? /*#__PURE__*/_jsxs(KLabel.Text, {
+            typo: "TextMdMedium",
+            numberOfLines: 1,
+            flex: true,
+            children: [highlightResult?.before || '', /*#__PURE__*/_jsx(KLabel.Text, {
+              typo: "TextMdMedium",
+              color: KColors.primary.normal,
+              children: highlightResult?.match || ''
+            }), /*#__PURE__*/_jsx(KLabel.Text, {
+              typo: "TextMdMedium",
+              children: highlightResult?.after || ''
+            })]
+          }) : /*#__PURE__*/_jsx(KLabel.Text, {
             typo: "TextMdMedium",
             numberOfLines: 1,
             flex: true,
-            children: item?.conversation?.showName
+            children: item?.conversation?.showName || ''
           }), /*#__PURE__*/_jsx(KLabel.Text, {
             typo: "TextXsNormal",
             color: KColors.gray.light,
             children: timestamp
           })]
-        }), /*#__PURE__*/_jsx(KLabel.Text, {
+        }), !!highlightResult && tabResultType === SearchConversationTabResultType.Messages ? /*#__PURE__*/_jsxs(KLabel.Text, {
+          typo: "TextNmNormal",
+          numberOfLines: 1,
+          flex: true,
+          children: [`${senderName}: ${highlightResult?.before || ''}`, /*#__PURE__*/_jsx(KLabel.Text, {
+            typo: "TextNmNormal",
+            color: KColors.primary.normal,
+            children: highlightResult?.match || ''
+          }), /*#__PURE__*/_jsx(KLabel.Text, {
+            typo: "TextNmNormal",
+            children: highlightResult?.after || ''
+          })]
+        }) : /*#__PURE__*/_jsx(KLabel.Text, {
           typo: "TextNmNormal",
           numberOfLines: 1,
           flex: true,
-          children: lastMessageText
+          children: `${senderName}: ${lastMessageText}`
         })]
       })]
     }), /*#__PURE__*/_jsx(KContainer.VisibleView, {

package/lib/module/screens/SearchConversation/SearchResultItem.js.map

@@ -1 +1 @@
-{"version":3,"names":["KColors","KContainer","KImage","KLabel","KSpacingValue","memo","useCallback","StyleSheet","SearchConversationTabResultType","AvatarSection","NamePrefixIcon","getLastMessageText","useUserStore","formatTimestamp","jsx","_jsx","jsxs","_jsxs","SearchResultItem","props","item","tabResultType","onPressItem","currentUserId","s","user","userID","timestamp","chatLog","sendTime","lastMessageText","message","conversation","handlePressItem","Touchable","style","styles","container","onPress","children","View","leftContainer","avatar","faceURL","fullName","showName","peerType","size","contentContainer","messageContainer","Text","typo","numberOfLines","flex","color","gray","light","VisibleView","visible","Conversations","rightContainer","VectorIcons","name","normal","create","flexDirection","justifyContent","alignItems","gap","paddingVertical"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchResultItem.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["KColors","KContainer","KImage","KLabel","KSpacingValue","memo","useCallback","useMemo","StyleSheet","SearchConversationTabResultType","AvatarSection","NamePrefixIcon","getMessagePreview","getSenderName","useUserStore","formatTimestamp","highlightSearch","isEmpty","MessageType","UIUtils","trans","jsx","_jsx","jsxs","_jsxs","SearchResultItem","props","item","tabResultType","onPressItem","searchTerm","currentUserId","s","user","userID","timestamp","chatLog","sendTime","senderName","conversation","lastMessageText","highlightResult","trim","Conversations","showName","handlePressItem","isRevoked","contentType","RevokeMessage","toast","open","title","Touchable","style","styles","container","onPress","children","View","leftContainer","avatar","faceURL","fullName","peerType","size","contentContainer","messageContainer","Text","typo","numberOfLines","flex","before","color","primary","normal","match","after","gray","light","Messages","VisibleView","visible","rightContainer","VectorIcons","name","create","flexDirection","justifyContent","alignItems","gap","paddingVertical"],"sourceRoot":"../../../../src","sources":["screens/SearchConversation/SearchResultItem.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/SearchMessage/SearchMessageResult.js

@@ -1,12 +1,13 @@
 "use strict";
 
-import { KContainer, KDivider, KSpacingValue } from '@droppii/libs';
+import { KColors, KContainer, KDivider, KSpacingValue } from '@droppii/libs';
 import { memo, useCallback } from 'react';
 import { useSearchMessage } from "../../hooks/message/useSearchMessage.js";
 import { useChatContext } from "../../context/index.js";
-import { FlatList, StyleSheet } from 'react-native';
+import { ActivityIndicator, FlatList, StyleSheet } from 'react-native';
 import { SearchEmpty } from "../SearchConversation/SearchEmpty.js";
 import SearchResultItem from "./SearchResultItem.js";
+import { SearchConversationTabResultType } from "../SearchConversation/types.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const SearchMessagesResult = /*#__PURE__*/memo(({
   searchTerm,
@@ -20,7 +21,10 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
     dataFlatten,
     hasNextPage,
     fetchNextPage,
-    isFetchingNextPage
+    isFetchingNextPage,
+    isFetching,
+    isRefetching,
+    refetch
   } = useSearchMessage({
     query: searchTerm,
     applicationType,
@@ -31,9 +35,10 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
   }) => {
     return /*#__PURE__*/_jsx(SearchResultItem, {
       item: item,
-      onPressItem: onPressItem
+      onPressItem: onPressItem,
+      searchTerm: searchTerm
     });
-  }, [onPressItem]);
+  }, [onPressItem, searchTerm]);
   const keyExtractor = useCallback(item => {
     return `${item?.conversation?.conversationID}-${item?.chatLog?.clientMsgID}`;
   }, []);
@@ -50,7 +55,14 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
   }, []);
   return /*#__PURE__*/_jsx(KContainer.View, {
     flex: true,
-    children: /*#__PURE__*/_jsx(FlatList, {
+    children: isFetching && !isFetchingNextPage && !isRefetching ? /*#__PURE__*/_jsx(KContainer.View, {
+      flex: true,
+      center: true,
+      children: /*#__PURE__*/_jsx(ActivityIndicator, {
+        color: KColors.primary.normal,
+        size: 'small'
+      })
+    }) : /*#__PURE__*/_jsx(FlatList, {
       data: dataFlatten,
       renderItem: renderItem,
       keyExtractor: keyExtractor,
@@ -58,7 +70,12 @@ const SearchMessagesResult = /*#__PURE__*/memo(({
       showsVerticalScrollIndicator: false,
       onEndReached: onEndReached,
       ItemSeparatorComponent: ItemSeparatorComponent,
-      ListEmptyComponent: /*#__PURE__*/_jsx(SearchEmpty, {})
+      ListEmptyComponent: /*#__PURE__*/_jsx(SearchEmpty, {
+        searchTerm: searchTerm,
+        searchType: SearchConversationTabResultType.Messages
+      }),
+      refreshing: isFetching,
+      onRefresh: refetch
     })
   });
 });

package/lib/module/screens/SearchMessage/SearchMessageResult.js.map

@@ -1 +1 @@
-{"version":3,"names":["KContainer","KDivider","KSpacingValue","memo","useCallback","useSearchMessage","useChatContext","FlatList","StyleSheet","SearchEmpty","SearchResultItem","jsx","_jsx","SearchMessagesResult","searchTerm","onPressItem","conversationId","applicationType","dataFlatten","hasNextPage","fetchNextPage","isFetchingNextPage","query","renderItem","item","keyExtractor","conversation","conversationID","chatLog","clientMsgID","onEndReached","ItemSeparatorComponent","size","vertical","View","flex","children","data","contentContainerStyle","styles","container","showsVerticalScrollIndicator","ListEmptyComponent","create","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["screens/SearchMessage/SearchMessageResult.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,QAAQ,EAAEC,aAAa,QAAQ,eAAe;AACnE,SAASC,IAAI,EAAEC,WAAW,QAAQ,OAAO;AACzC,SAASC,gBAAgB,QAAQ,yCAAsC;AACvE,SAASC,cAAc,QAAQ,wBAAe;AAC9C,SAASC,QAAQ,EAAEC,UAAU,QAAQ,cAAc;AAEnD,SAASC,WAAW,QAAQ,sCAAmC;AAC/D,OAAOC,gBAAgB,MAAM,uBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAOlD,MAAMC,oBAAoB,gBAAGV,IAAI,CAC/B,CAAC;EAAEW,UAAU;EAAEC,WAAW;EAAEC;AAA2C,CAAC,KAAK;EAC3E,MAAM;IAAEC;EAAgB,CAAC,GAAGX,cAAc,CAAC,CAAC;EAC5C,MAAM;IAAEY,WAAW;IAAEC,WAAW;IAAEC,aAAa;IAAEC;EAAmB,CAAC,GACnEhB,gBAAgB,CAAC;IACfiB,KAAK,EAAER,UAAU;IACjBG,eAAe;IACfD;EACF,CAAC,CAAC;EAEJ,MAAMO,UAAU,GAAGnB,WAAW,CAC5B,CAAC;IAAEoB;EAAmC,CAAC,KAAK;IAC1C,oBAAOZ,IAAA,CAACF,gBAAgB;MAACc,IAAI,EAAEA,IAAK;MAACT,WAAW,EAAEA;IAAY,CAAE,CAAC;EACnE,CAAC,EACD,CAACA,WAAW,CACd,CAAC;EAED,MAAMU,YAAY,GAAGrB,WAAW,CAAEoB,IAAwB,IAAK;IAC7D,OAAO,GAAGA,IAAI,EAAEE,YAAY,EAAEC,cAAc,IAAIH,IAAI,EAAEI,OAAO,EAAEC,WAAW,EAAE;EAC9E,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,YAAY,GAAG1B,WAAW,CAAC,MAAM;IACrC,IAAIe,WAAW,IAAI,CAACE,kBAAkB,EAAE;MACtCD,aAAa,CAAC,CAAC;IACjB;EACF,CAAC,EAAE,CAACD,WAAW,EAAEE,kBAAkB,EAAED,aAAa,CAAC,CAAC;EAEpD,MAAMW,sBAAsB,GAAG3B,WAAW,CAAC,MAAM;IAC/C,oBAAOQ,IAAA,CAACX,QAAQ;MAAC+B,IAAI,EAAE,UAAW;MAACC,QAAQ,EAAE;IAAM,CAAE,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;EAEN,oBACErB,IAAA,CAACZ,UAAU,CAACkC,IAAI;IAACC,IAAI;IAAAC,QAAA,eACnBxB,IAAA,CAACL,QAAQ;MACP8B,IAAI,EAAEnB,WAAY;MAClBK,UAAU,EAAEA,UAAW;MACvBE,YAAY,EAAEA,YAAa;MAC3Ba,qBAAqB,EAAEC,MAAM,CAACC,SAAU;MACxCC,4BAA4B,EAAE,KAAM;MACpCX,YAAY,EAAEA,YAAa;MAC3BC,sBAAsB,EAAEA,sBAAuB;MAC/CW,kBAAkB,eAAE9B,IAAA,CAACH,WAAW,IAAE;IAAE,CACrC;EAAC,CACa,CAAC;AAEtB,CACF,CAAC;AAED,eAAeI,oBAAoB;AAEnC,MAAM0B,MAAM,GAAG/B,UAAU,CAACmC,MAAM,CAAC;EAC/BH,SAAS,EAAE;IACTI,iBAAiB,EAAE1C,aAAa,CAAC,SAAS;EAC5C;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["KColors","KContainer","KDivider","KSpacingValue","memo","useCallback","useSearchMessage","useChatContext","ActivityIndicator","FlatList","StyleSheet","SearchEmpty","SearchResultItem","SearchConversationTabResultType","jsx","_jsx","SearchMessagesResult","searchTerm","onPressItem","conversationId","applicationType","dataFlatten","hasNextPage","fetchNextPage","isFetchingNextPage","isFetching","isRefetching","refetch","query","renderItem","item","keyExtractor","conversation","conversationID","chatLog","clientMsgID","onEndReached","ItemSeparatorComponent","size","vertical","View","flex","children","center","color","primary","normal","data","contentContainerStyle","styles","container","showsVerticalScrollIndicator","ListEmptyComponent","searchType","Messages","refreshing","onRefresh","create","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["screens/SearchMessage/SearchMessageResult.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/SearchMessage/SearchResultItem.js

@@ -6,12 +6,17 @@ import { StyleSheet } from 'react-native';
 import { AvatarSection, NamePrefixIcon } from "../../components/ThreadCard/index.js";
 import { getMessagePreview } from "../../utils/messageUtils.js";
 import { formatTimestamp } from "../../utils/dateTimeUtils.js";
-import { PeerType } from '@droppii/openim-rn-client-sdk';
+import { MessageType, PeerType } from '@droppii/openim-rn-client-sdk';
+import { highlightSearch } from "../../utils/highlightSearch.js";
+import isEmpty from 'lodash/isEmpty';
+import { UIUtils } from "../../utils/UIUtils.js";
+import { trans } from "../../translation/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const SearchResultItem = /*#__PURE__*/memo(props => {
   const {
     item,
-    onPressItem
+    onPressItem,
+    searchTerm
   } = props || {};
   const isBotConversation = useMemo(() => {
     return item?.conversation?.peerType === PeerType.Bot;
@@ -20,7 +25,18 @@ const SearchResultItem = /*#__PURE__*/memo(props => {
   const lastMessageText = getMessagePreview(item?.chatLog);
   const faceURL = isBotConversation ? item?.conversation?.faceURL : item?.chatLog?.senderFaceUrl;
   const showName = isBotConversation ? item?.conversation?.showName : item?.chatLog?.senderNickname;
+  const highlightResult = useMemo(() => {
+    if (isEmpty(searchTerm?.trim())) return null;
+    return highlightSearch(lastMessageText, searchTerm || '');
+  }, [lastMessageText, searchTerm]);
   const handlePressItem = useCallback(() => {
+    const isRevoked = item?.chatLog?.contentType === MessageType.RevokeMessage;
+    if (isRevoked) {
+      UIUtils.toast.open({
+        title: trans('search_message:revoked_message')
+      });
+      return;
+    }
     onPressItem?.({
       conversation: item?.conversation,
       chatLog: item?.chatLog
@@ -52,7 +68,19 @@ const SearchResultItem = /*#__PURE__*/memo(props => {
             color: KColors.gray.light,
             children: timestamp
           })]
-        }), /*#__PURE__*/_jsx(KLabel.Text, {
+        }), highlightResult ? /*#__PURE__*/_jsxs(KLabel.Text, {
+          typo: "TextNmNormal",
+          numberOfLines: 1,
+          flex: true,
+          children: [highlightResult?.before || '', /*#__PURE__*/_jsx(KLabel.Text, {
+            typo: "TextNmNormal",
+            color: KColors.primary.normal,
+            children: highlightResult?.match || ''
+          }), /*#__PURE__*/_jsx(KLabel.Text, {
+            typo: "TextNmNormal",
+            children: highlightResult?.after || ''
+          })]
+        }) : /*#__PURE__*/_jsx(KLabel.Text, {
           typo: "TextNmNormal",
           numberOfLines: 1,
           flex: true,

package/lib/module/screens/SearchMessage/SearchResultItem.js.map

@@ -1 +1 @@
-{"version":3,"names":["KColors","KContainer","KLabel","KSpacingValue","memo","useCallback","useMemo","StyleSheet","AvatarSection","NamePrefixIcon","getMessagePreview","formatTimestamp","PeerType","jsx","_jsx","jsxs","_jsxs","SearchResultItem","props","item","onPressItem","isBotConversation","conversation","peerType","Bot","timestamp","chatLog","sendTime","lastMessageText","faceURL","senderFaceUrl","showName","senderNickname","handlePressItem","Touchable","style","styles","container","onPress","children","View","leftContainer","avatar","fullName","size","contentContainer","messageContainer","Text","typo","numberOfLines","flex","color","gray","light","create","flexDirection","justifyContent","alignItems","gap","paddingVertical","rightContainer"],"sourceRoot":"../../../../src","sources":["screens/SearchMessage/SearchResultItem.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["KColors","KContainer","KLabel","KSpacingValue","memo","useCallback","useMemo","StyleSheet","AvatarSection","NamePrefixIcon","getMessagePreview","formatTimestamp","MessageType","PeerType","highlightSearch","isEmpty","UIUtils","trans","jsx","_jsx","jsxs","_jsxs","SearchResultItem","props","item","onPressItem","searchTerm","isBotConversation","conversation","peerType","Bot","timestamp","chatLog","sendTime","lastMessageText","faceURL","senderFaceUrl","showName","senderNickname","highlightResult","trim","handlePressItem","isRevoked","contentType","RevokeMessage","toast","open","title","Touchable","style","styles","container","onPress","children","View","leftContainer","avatar","fullName","size","contentContainer","messageContainer","Text","typo","numberOfLines","flex","color","gray","light","before","primary","normal","match","after","create","flexDirection","justifyContent","alignItems","gap","paddingVertical","rightContainer"],"sourceRoot":"../../../../src","sources":["screens/SearchMessage/SearchResultItem.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/screens/chat-detail/ChatListLegend.js

@@ -11,7 +11,7 @@ import { LegendChatMessage } from "./legend/LegendChatMessage.js";
 import { LegendChatDay } from "./legend/LegendChatDay.js";
 import { LegendChatLoadEarlier } from "./legend/LegendChatLoadEarlier.js";
 import { useChatDetailContext } from "../../context/ChatDetailContext.js";
-import { getFlowInputButtonsNode } from "../../utils/flows.js";
+import { getFlowInputButtonsNodes } from "../../utils/flows.js";
 import { InputButtonFlow } from "../../components/flows/inputButtons/index.js";
 import { useResetFlow, useRunFlow } from "../../hooks/flows/useFlow.js";
 import { useSendMessage } from "../../hooks/message/useSendMessage.js";
@@ -29,7 +29,7 @@ import ChatImageDimens, { CHAT_IMAGE_VIEW_SOURCE } from "../../utils/chatImageDi
 // Row wrapper (`messageRowLeft`/`messageRowRight` in `components/messages/styles.ts`)
 // adds only a bottom margin — no vertical padding — so a fixed-size item's true
 // rendered height is `content height + this margin`.
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const ROW_MARGIN_BOTTOM = KSpacingValue['0.25rem'];
 
 // KeyboardAwareLegendList auto scroll when modal opened
@@ -79,6 +79,8 @@ export const ChatListLegend = /*#__PURE__*/memo(({
   const scrollDebounceRef = useRef(undefined);
   const rowRefsMap = useRef(new Map());
   const [showBadge, setShowBadge] = useState(false);
+  const [highlightedId, setHighlightedId] = useState(null);
+  const highlightTimerRef = useRef(null);
   const {
     applicationType
   } = useChatContext();
@@ -109,7 +111,8 @@ export const ChatListLegend = /*#__PURE__*/memo(({
       if (!item) return null;
       const message = item;
       const isOutgoing = message.sendID === currentUserId;
-      const isLastIncoming = !isOutgoing && (message.clientMsgID || message.serverMsgID) === lastMessageId;
+      const isLastMessage = (message.clientMsgID || message.serverMsgID) === lastMessageId;
+      const isLastIncoming = !isOutgoing && isLastMessage;
       const messageId = message.clientMsgID || message.serverMsgID || `temp-${message.sendTime || message.createTime}-${index}`;
       const messageData = messageDataMap.get(messageId);
       if (!messageData) {
@@ -119,20 +122,20 @@ export const ChatListLegend = /*#__PURE__*/memo(({
         dayStart,
         createdAt
       } = messageData;
-      let flowInputButtonsNode = null;
-      if (isLastIncoming && isBotConversation) {
-        flowInputButtonsNode = getFlowInputButtonsNode(conversationFlow?.flowCurrentStep);
+      let flowInputButtonsNodes = [];
+      if ((isLastMessage && conversationFlow?.havingBotMessage === false || isLastIncoming) && isBotConversation) {
+        flowInputButtonsNodes = getFlowInputButtonsNodes(conversationFlow?.flowCurrentStep);
       }
       return /*#__PURE__*/_jsxs(_Fragment, {
         children: [dayStart && /*#__PURE__*/_jsx(LegendChatDay, {
           createdAt: createdAt
-        }), /*#__PURE__*/_jsxs(KContainer.View, {
+        }), /*#__PURE__*/_jsx(KContainer.View, {
           ref: node => {
             if (node) rowRefsMap.current.set(messageId, node);else rowRefsMap.current.delete(messageId);
           },
           style: isOutgoing ? messageStyles.messageRowRight : messageStyles.messageRowLeft,
           collapsable: false,
-          children: [/*#__PURE__*/_jsx(LegendChatMessage, {
+          children: /*#__PURE__*/_jsx(LegendChatMessage, {
             message: message,
             isOutgoing: isOutgoing,
             createdAtTime: createdAt,
@@ -140,12 +143,13 @@ export const ChatListLegend = /*#__PURE__*/memo(({
             onPressUrl: onPressUrl,
             onRetry: retryMessage,
             onLongPress: onLongPress ? () => handleMessageLongPress(messageId, message) : undefined,
-            customMessageItemFactory: customMessageItemFactory
-          }), !!flowInputButtonsNode && /*#__PURE__*/_jsx(InputButtonFlow, {
-            nodeData: flowInputButtonsNode,
-            onResetFlow: onResetFlow,
-            onRunFlow: onRunFlow
-          })]
+            customMessageItemFactory: customMessageItemFactory,
+            isHighlighted: highlightedId === messageId
+          })
+        }), flowInputButtonsNodes && flowInputButtonsNodes.length > 0 && /*#__PURE__*/_jsx(InputButtonFlow, {
+          nodeData: flowInputButtonsNodes,
+          onResetFlow: onResetFlow,
+          onRunFlow: onRunFlow
         })]
       });
     } catch (error) {
@@ -158,7 +162,7 @@ export const ChatListLegend = /*#__PURE__*/memo(({
         })
       });
     }
-  }, [currentUserId, lastMessageId, messageDataMap, isBotConversation, onMediaPress, onPressUrl, onLongPress, handleMessageLongPress, customMessageItemFactory, onResetFlow, onRunFlow, conversationFlow?.flowCurrentStep, retryMessage]);
+  }, [currentUserId, lastMessageId, messageDataMap, isBotConversation, onMediaPress, onPressUrl, onLongPress, handleMessageLongPress, customMessageItemFactory, onResetFlow, onRunFlow, conversationFlow?.flowCurrentStep, conversationFlow?.havingBotMessage, retryMessage, highlightedId]);
 
   // const maintainScrollConfig = useMemo(
   //   () => ({
@@ -235,7 +239,8 @@ export const ChatListLegend = /*#__PURE__*/memo(({
     if (customMessageItemFactory?.(message)) return undefined;
     const isOutgoing = message.sendID === currentUserId;
     const isLastIncoming = !isOutgoing && messageId === lastMessageId;
-    if (isLastIncoming && isBotConversation && getFlowInputButtonsNode(conversationFlow?.flowCurrentStep)) {
+    const flowInputButtonsNodes = getFlowInputButtonsNodes(conversationFlow?.flowCurrentStep);
+    if (isLastIncoming && isBotConversation && flowInputButtonsNodes.length > 0) {
       return undefined;
     }
     return candidateSize;
@@ -321,6 +326,10 @@ export const ChatListLegend = /*#__PURE__*/memo(({
             index,
             animated: true,
             viewPosition: 0.5
+          }).finally(() => {
+            if (highlightTimerRef.current) clearTimeout(highlightTimerRef.current);
+            setHighlightedId(clientMessageId);
+            highlightTimerRef.current = setTimeout(() => setHighlightedId(null), 5000);
           });
         } catch {
           // scrollToIndex throws if item not rendered yet — force refetch messages
@@ -368,7 +377,7 @@ export const ChatListLegend = /*#__PURE__*/memo(({
       getFixedItemSize: getFixedItemSize,
       keyExtractor: item => String(item.clientMsgID || item.serverMsgID),
       recycleItems: false,
-      extraData: `${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}`,
+      extraData: `${conversationFlow?.flowCurrentStep?.id ?? ''}-${lastMessageId ?? ''}-${highlightedId ?? ''}`,
       alignItemsAtEnd: true,
       maintainVisibleContentPosition: maintainVisiblePositionConfig,
       maintainScrollAtEnd: true,