@droppii-org/chat-mobile 0.2.63 → 0.2.64

package/src/utils/highlightSearch.ts

@@ -0,0 +1,48 @@
+export interface HighlightResult {
+  before: string;
+  match: string;
+  after: string;
+}
+
+export const highlightSearch = (
+  text: string,
+  keyword: string,
+  maxLength = 30
+): HighlightResult | null => {
+  if (!keyword) return null;
+
+  const lowerText = text.toLowerCase();
+  const lowerKeyword = keyword.toLowerCase();
+  const index = lowerText.indexOf(lowerKeyword);
+
+  if (index === -1) return null;
+
+  const before = text.slice(0, index);
+  const match = text.slice(index, index + keyword.length);
+  const after = text.slice(index + keyword.length);
+
+  if (keyword.length >= maxLength) {
+    return { before: '', match: match.slice(0, maxLength), after: '' };
+  }
+
+  const remain = maxLength - match.length;
+  let left = Math.floor(remain / 2);
+  let right = remain - left;
+
+  if (before.length < left) {
+    right += left - before.length;
+    left = before.length;
+  }
+
+  if (after.length < right) {
+    left += right - after.length;
+    right = after.length;
+  }
+
+  const displayedBefore =
+    before.length > left ? '…' + before.slice(before.length - left) : before;
+  const displayedAfter =
+    after.length > right ? after.slice(0, right) + '…' : after;
+
+  return { before: displayedBefore, match, after: displayedAfter };
+};

package/src/utils/messageUtils.ts

@@ -216,6 +216,21 @@ export const getPinnedMessagePreview = (
   }
 };
 
+export const getSenderName = (
+  message: MessageItem,
+  currentUserId?: string,
+  conversation?: ConversationItem
+): string => {
+  const sender =
+    currentUserId && message.sendID === currentUserId
+      ? 'Bạn'
+      : message?.senderNickname ||
+        (conversation?.peerType === PeerType.Bot
+          ? conversation?.showName || ''
+          : undefined);
+  return sender || '';
+};
+
 export interface GetLastMessageTextParams {
   message: MessageItem | undefined;
   currentUserId?: string;
@@ -233,13 +248,7 @@ export const getLastMessageText = ({
   const preview = getMessagePreview(message);
   if (!preview) return '';
 
-  const sender =
-    currentUserId && message.sendID === currentUserId
-      ? 'Bạn'
-      : message.senderNickname ||
-        (conversation?.peerType === PeerType.Bot
-          ? conversation?.showName || ''
-          : undefined);
+  const sender = getSenderName(message, currentUserId, conversation);
 
   if (!sender) return preview;