@droppii-org/chat-mobile 0.2.39 → 0.2.41

package/src/screens/chat-detail/legend/LegendChatMessage.tsx

@@ -31,6 +31,7 @@ interface LegendChatMessageProps {
   onMediaPress?: (items: MediaItem[], index?: number) => void;
   onPressUrl?: (url: string) => void;
   onRetry?: (message: MessageItem) => void;
+  onPress?: () => void;
   onLongPress?: () => void;
   customMessageItemFactory?: (m: MessageItem) => ReactNode;
 }
@@ -66,6 +67,7 @@ export const LegendChatMessage = memo(
     onMediaPress,
     onPressUrl,
     onRetry,
+    onPress,
     onLongPress,
     customMessageItemFactory,
   }: LegendChatMessageProps) => {
@@ -91,7 +93,7 @@ export const LegendChatMessage = memo(
           onRetry={onRetry}
         />
         <KContainer.View style={styles.content}>
-          <LongPressWrapper onLongPress={onLongPress}>
+          <LongPressWrapper onPress={onPress} onLongPress={onLongPress}>
             <MessageComponent
               message={message}
               isOutgoing={isOutgoing}
@@ -139,29 +141,40 @@ const styles = StyleSheet.create({
     elevation: 3,
     borderWidth: 1,
     borderColor: KColors.white,
+    zIndex: Number.MAX_SAFE_INTEGER,
   },
 });
 
 const LongPressWrapper = ({
   children,
+  onPress,
   onLongPress,
-}: PropsWithChildren<{ onLongPress?: () => void }>) => {
-  const longPressGesture = useMemo(
-    () =>
-      onLongPress
-        ? Gesture.LongPress().onStart(() => {
-            runOnJS(onLongPress)();
-          })
-        : null,
-    [onLongPress]
-  );
+}: PropsWithChildren<{ onPress?: () => void; onLongPress?: () => void }>) => {
+  const gesture = useMemo(() => {
+    const gestures = [
+      onLongPress &&
+        Gesture.LongPress().onStart(() => {
+          runOnJS(onLongPress)();
+        }),
+      onPress &&
+        Gesture.Tap().onStart(() => {
+          runOnJS(onPress)();
+        }),
+    ].filter(Boolean) as ReturnType<typeof Gesture.Tap>[];
+
+    if (!gestures.length) {
+      return null;
+    }
+
+    return gestures.length > 1 ? Gesture.Race(...gestures) : gestures[0];
+  }, [onPress, onLongPress]);
 
-  if (!longPressGesture) {
+  if (!gesture) {
     return children;
   }
 
   return (
-    <GestureDetector gesture={longPressGesture}>
+    <GestureDetector gesture={gesture}>
       <KContainer.View>{children}</KContainer.View>
     </GestureDetector>
   );

package/src/store/message.ts

@@ -57,4 +57,38 @@ export const markMessageRevoked = (clientMsgID: string) => {
   useMessageStore
     .getState()
     .updateOneMessage({ clientMsgID, contentType: MessageType.RevokeMessage });
+
+  revokeQuotedReferences(clientMsgID);
+};
+
+const revokeQuotedReferences = (clientMsgID: string) => {
+  const { messages, updateOneMessage } = useMessageStore.getState();
+
+  messages.forEach((msg) => {
+    if (msg.quoteElem?.quoteMessage?.clientMsgID === clientMsgID) {
+      updateOneMessage({
+        clientMsgID: msg.clientMsgID,
+        quoteElem: {
+          ...msg.quoteElem,
+          quoteMessage: {
+            ...msg.quoteElem.quoteMessage,
+            contentType: MessageType.RevokeMessage,
+          },
+        },
+      });
+    }
+
+    if (msg.atTextElem?.quoteMessage?.clientMsgID === clientMsgID) {
+      updateOneMessage({
+        clientMsgID: msg.clientMsgID,
+        atTextElem: {
+          ...msg.atTextElem,
+          quoteMessage: {
+            ...msg.atTextElem.quoteMessage,
+            contentType: MessageType.RevokeMessage,
+          },
+        },
+      });
+    }
+  });
 };

package/src/translation/resources/i18n.ts

@@ -43,15 +43,17 @@ const i18nKey: Record<string, string> = {
   'chat:pinned_image_subtitle': 'Hình ảnh từ {{sender}}',
   'chat:pinned_video_subtitle': 'Video từ {{sender}}',
   'chat:pinned_file_subtitle': 'Tài liệu từ {{sender}}',
-  'chat:pinned_link_subtitle': 'Liên kết từ {{sender}}',
+  'chat:pinned_link_subtitle': 'Từ {{sender}}',
   'chat:pin_limit_title': 'Không thể ghim thêm tin nhắn',
   'chat:pin_limit_desc':
     'Chỉ được ghim tối đa 5 tin nhắn. Vui lòng bỏ ghim một tin nhắn hiện có trước khi ghim tin nhắn mới.',
   'chat:pin_limit_primary': 'Đã hiểu',
   'chat:pinned_messages_title': 'Tin nhắn đã ghim',
   'chat:pinned_messages_hint':
-    'Nhấn giữ tin nhắn để chọn "Bỏ Ghim" hoặc "Xem tin nhắn gốc"',
+    'Nhấn vào tin nhắn để xem tin nhắn gốc, nhấn vào biểu tượng để bỏ ghim',
   'chat:view_original_message': 'Xem tin nhắn gốc',
+  'chat:scroll_to_message_todo':
+    'Tính năng di chuyển đến tin nhắn gốc sẽ sớm được cập nhật',
   'msg_type_image': '[Hình ảnh]',
   'msg_type_voice': '[Tin nhắn thoại]',
   'msg_type_video': '[Video]',

package/src/types/chat.ts

@@ -28,7 +28,7 @@ export interface ChatUIAdapter {
   toast?: { open: (params: any) => void };
   alert?: { open: (params: any) => void };
   popup?: { open: (params: any) => void };
-  bottomSheet?: { open: (params: any) => void };
+  bottomSheet?: { open: (params: any) => void; dismiss: () => void };
 }
 
 export interface ChatContextType {

package/src/utils/UIUtils.ts

@@ -10,7 +10,7 @@ const defaultAdapter: Required<ChatUIAdapter> = {
   toast: { open: openWithAlert },
   alert: { open: openWithAlert },
   popup: { open: openWithAlert },
-  bottomSheet: { open: openWithAlert },
+  bottomSheet: { open: openWithAlert, dismiss: () => {} },
 };
 
 let _adapter: ChatUIAdapter = {};
@@ -32,5 +32,7 @@ export const UIUtils: Required<ChatUIAdapter> = {
   bottomSheet: {
     open: (params) =>
       (_adapter.bottomSheet ?? defaultAdapter.bottomSheet).open(params),
+    dismiss: () =>
+      (_adapter.bottomSheet ?? defaultAdapter.bottomSheet).dismiss(),
   },
 };

package/src/utils/toastFlashMessage.ts

@@ -4,6 +4,7 @@ interface ShowFlashMessageParams {
   key: string;
   title: string;
   body?: string;
+  ellipsizeMiddle?: boolean;
   onPress?: () => void;
 }
 
@@ -21,6 +22,11 @@ const displayToast = (params: ShowFlashMessageParams) => {
     onPress: params.onPress,
     onHide: advanceQueue,
     visibilityTime: VISIBILITY_TIME_MS,
+    text2Props: params.ellipsizeMiddle
+      ? {
+          ellipsizeMode: 'middle',
+        }
+      : {},
   });
 };