@droppii-org/chat-mobile 0.2.38 → 0.2.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/components/ThreadCard/ThreadCard.js +2 -1
- package/lib/module/components/ThreadCard/ThreadCard.js.map +1 -1
- package/lib/module/components/messages/quotedMessage/index.js +7 -3
- package/lib/module/components/messages/quotedMessage/index.js.map +1 -1
- package/lib/module/core/useChatListener.js +15 -5
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/screens/chat-detail/ChatCurrentQuotedMessage.js +4 -2
- package/lib/module/screens/chat-detail/ChatCurrentQuotedMessage.js.map +1 -1
- package/lib/module/screens/chat-detail/PinnedMessageBar.js +8 -3
- package/lib/module/screens/chat-detail/PinnedMessageBar.js.map +1 -1
- package/lib/module/screens/chat-detail/PinnedMessagesSheet.js +80 -110
- package/lib/module/screens/chat-detail/PinnedMessagesSheet.js.map +1 -1
- package/lib/module/screens/chat-detail/PinnedMessagesSheetBackup.js +179 -0
- package/lib/module/screens/chat-detail/PinnedMessagesSheetBackup.js.map +1 -0
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js +18 -6
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js.map +1 -1
- package/lib/module/translation/resources/i18n.js +3 -2
- package/lib/module/translation/resources/i18n.js.map +1 -1
- package/lib/module/utils/UIUtils.js +4 -2
- package/lib/module/utils/UIUtils.js.map +1 -1
- package/lib/module/utils/messageUtils.js +29 -5
- package/lib/module/utils/messageUtils.js.map +1 -1
- package/lib/typescript/src/components/ThreadCard/ThreadCard.d.ts.map +1 -1
- package/lib/typescript/src/components/messages/quotedMessage/index.d.ts.map +1 -1
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatCurrentQuotedMessage.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessageBar.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessageBar.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheet.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheet.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheetBackup.d.ts +9 -0
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheetBackup.d.ts.map +1 -0
- package/lib/typescript/src/screens/chat-detail/legend/LegendChatMessage.d.ts +2 -1
- package/lib/typescript/src/screens/chat-detail/legend/LegendChatMessage.d.ts.map +1 -1
- package/lib/typescript/src/translation/resources/i18n.d.ts.map +1 -1
- package/lib/typescript/src/types/chat.d.ts +1 -0
- package/lib/typescript/src/types/chat.d.ts.map +1 -1
- package/lib/typescript/src/utils/UIUtils.d.ts.map +1 -1
- package/lib/typescript/src/utils/messageUtils.d.ts +7 -0
- package/lib/typescript/src/utils/messageUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/ThreadCard/ThreadCard.tsx +5 -1
- package/src/components/messages/quotedMessage/index.tsx +7 -3
- package/src/core/useChatListener.ts +29 -6
- package/src/screens/chat-detail/ChatCurrentQuotedMessage.tsx +5 -2
- package/src/screens/chat-detail/PinnedMessageBar.tsx +19 -5
- package/src/screens/chat-detail/PinnedMessagesSheet.tsx +118 -153
- package/src/screens/chat-detail/PinnedMessagesSheetBackup.tsx +253 -0
- package/src/screens/chat-detail/legend/LegendChatMessage.tsx +26 -13
- package/src/translation/resources/i18n.ts +4 -2
- package/src/types/chat.ts +1 -1
- package/src/utils/UIUtils.ts +3 -1
- package/src/utils/messageUtils.ts +39 -6
|
@@ -7,7 +7,7 @@ import { AvatarSection } from "./AvatarSection.js";
|
|
|
7
7
|
import { NamePrefixIcon } from "./NamePrefixIcon.js";
|
|
8
8
|
import { UnreadBadge } from "./UnreadBadge.js";
|
|
9
9
|
import { formatTimestamp } from "../../utils/dateTimeUtils.js";
|
|
10
|
-
import { getLastMessageText } from "../../utils/messageUtils.js";
|
|
10
|
+
import { getLastMessageText, getMessagePreviewTextProps } from "../../utils/messageUtils.js";
|
|
11
11
|
import { useConversation, useUserStore } from "../../store/index.js";
|
|
12
12
|
import { MessageReceiveOptType } from '@droppii/openim-rn-client-sdk';
|
|
13
13
|
import { MuteThread } from "./MuteThread.js";
|
|
@@ -127,6 +127,7 @@ const ThreadCard = /*#__PURE__*/memo(({
|
|
|
127
127
|
color: hasUnread ? KColors.black : KColors.gray.normal,
|
|
128
128
|
numberOfLines: 1,
|
|
129
129
|
flex: true,
|
|
130
|
+
...getMessagePreviewTextProps(latestMsgData),
|
|
130
131
|
children: lastMessageText
|
|
131
132
|
}), /*#__PURE__*/_jsx(KContainer.VisibleView, {
|
|
132
133
|
visible: Boolean(isPinned),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useMemo","ReanimatedSwipeable","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","useConversation","useUserStore","MessageReceiveOptType","MuteThread","useIsJoinedGroup","isEmpty","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ThreadCard","item","onPress","conversation","peerType","showName","faceURL","unreadCount","recvMsgOpt","Normal","isPinned","latestMsgSendTime","latestMsg","groupID","data","isJoinedGroup","isNotInGroup","latestMsgData","result","JSON","parse","error","console","fullName","hasUnread","isMuted","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","renderRightActions","_progress","_translation","swipeableMethods","children","VisibleView","visible","friction","rightThreshold","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","background","white","avatar","View","flex","marginL","paddingB","Text","typo","numberOfLines","color","black","VectorIcons","name","provider","size","palette","gray","w500","Boolean","w400","normal","count","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,EAAEC,OAAO,QAAQ,OAAO;AAElD,OAAOC,mBAAmB,MAAM,kDAAkD;AAElF,SAASC,UAAU,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,QAAQ,eAAe;AACnE,SAASC,aAAa,QAAQ,oBAAiB;AAC/C,SAASC,cAAc,QAAQ,qBAAkB;AACjD,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,eAAe,QAAQ,8BAA2B;AAC3D,
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useMemo","ReanimatedSwipeable","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","getMessagePreviewTextProps","useConversation","useUserStore","MessageReceiveOptType","MuteThread","useIsJoinedGroup","isEmpty","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ThreadCard","item","onPress","conversation","peerType","showName","faceURL","unreadCount","recvMsgOpt","Normal","isPinned","latestMsgSendTime","latestMsg","groupID","data","isJoinedGroup","isNotInGroup","latestMsgData","result","JSON","parse","error","console","fullName","hasUnread","isMuted","timestamp","sendTime","currentUserId","s","user","userID","lastMessageText","handlePress","event","renderRightActions","_progress","_translation","swipeableMethods","children","VisibleView","visible","friction","rightThreshold","Touchable","row","alignItems","paddingH","paddingV","activeOpacity","background","white","avatar","View","flex","marginL","paddingB","Text","typo","numberOfLines","color","black","VectorIcons","name","provider","size","palette","gray","w500","Boolean","w400","normal","count","displayName"],"sourceRoot":"../../../../src","sources":["components/ThreadCard/ThreadCard.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,7 +7,7 @@ import { KColors, KContainer, KImage, KLabel, KRadiusValue, KSpacingValue } from
|
|
|
7
7
|
import { StyleSheet } from 'react-native';
|
|
8
8
|
import { CHAT_BUBBLE_COLORS } from "../../../screens/chat-detail/constants.js";
|
|
9
9
|
import { MessageType } from '@droppii/openim-rn-client-sdk';
|
|
10
|
-
import {
|
|
10
|
+
import { getMessagePreviewParts, getReplySenderName, parseUrlMetadata } from "../../../utils/messageUtils.js";
|
|
11
11
|
import { getFileIcon, getMimeType } from "../../../utils/imageUtils.js";
|
|
12
12
|
import { useUserStore } from "../../../store/index.js";
|
|
13
13
|
import { useChatDetailContext } from "../../../context/index.js";
|
|
@@ -24,6 +24,7 @@ const QuotedMessage = /*#__PURE__*/memo(props => {
|
|
|
24
24
|
} = useChatDetailContext();
|
|
25
25
|
const currentUserId = useUserStore(s => s.user?.userID);
|
|
26
26
|
const quotedMessage = message?.quoteElem?.quoteMessage;
|
|
27
|
+
const messagePreview = getMessagePreviewParts(quotedMessage);
|
|
27
28
|
const timeLabel = formatMessageTime(createdAtTime);
|
|
28
29
|
const imageUrl = useMemo(() => {
|
|
29
30
|
switch (quotedMessage?.contentType) {
|
|
@@ -84,6 +85,7 @@ const QuotedMessage = /*#__PURE__*/memo(props => {
|
|
|
84
85
|
resizeMode: "contain"
|
|
85
86
|
})
|
|
86
87
|
}), /*#__PURE__*/_jsxs(KContainer.View, {
|
|
88
|
+
flexS: 1,
|
|
87
89
|
style: styles.content,
|
|
88
90
|
children: [/*#__PURE__*/_jsx(KLabel.Text, {
|
|
89
91
|
typo: "TextNmMedium",
|
|
@@ -93,7 +95,8 @@ const QuotedMessage = /*#__PURE__*/memo(props => {
|
|
|
93
95
|
typo: "TextSmNormal",
|
|
94
96
|
color: KColors.gray.light,
|
|
95
97
|
numberOfLines: 1,
|
|
96
|
-
|
|
98
|
+
...messagePreview.textProps,
|
|
99
|
+
children: messagePreview.text
|
|
97
100
|
})]
|
|
98
101
|
})]
|
|
99
102
|
}), /*#__PURE__*/_jsx(KLabel.Text, {
|
|
@@ -127,7 +130,8 @@ const styles = StyleSheet.create({
|
|
|
127
130
|
gap: KSpacingValue['0.5rem'],
|
|
128
131
|
borderTopRightRadius: KRadiusValue['3x'],
|
|
129
132
|
borderBottomRightRadius: KRadiusValue['3x'],
|
|
130
|
-
paddingRight: KSpacingValue['0.5rem']
|
|
133
|
+
paddingRight: KSpacingValue['0.5rem'],
|
|
134
|
+
maxWidth: '100%'
|
|
131
135
|
},
|
|
132
136
|
dot: {
|
|
133
137
|
width: 3,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useMemo","messageStyles","formatMessageTime","KColors","KContainer","KImage","KLabel","KRadiusValue","KSpacingValue","StyleSheet","CHAT_BUBBLE_COLORS","MessageType","
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useMemo","messageStyles","formatMessageTime","KColors","KContainer","KImage","KLabel","KRadiusValue","KSpacingValue","StyleSheet","CHAT_BUBBLE_COLORS","MessageType","getMessagePreviewParts","getReplySenderName","parseUrlMetadata","getFileIcon","getMimeType","useUserStore","useChatDetailContext","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","QuotedMessage","props","message","isOutgoing","onPressQuotedMessage","createdAtTime","conversation","currentUserId","s","user","userID","quotedMessage","quoteElem","quoteMessage","messagePreview","timeLabel","imageUrl","contentType","PictureMessage","pictureElem","snapshotPicture","url","VideoMessage","videoElem","snapshotUrl","UrlTextMessage","metadata","ex","image","iconSource","FileMessage","mimeType","fileElem","fileName","handlePressQuotedMessage","clientMsgID","children","View","style","bubble","styles","container","bubbleSent","bubbleReceived","Touchable","quotedContainer","onPress","dot","VisibleView","visible","imageContainer","Base","uri","playIconContainer","playIcon","VectorIcons","name","size","color","white","icon","resizeMode","flexS","content","Text","typo","numberOfLines","gray","light","textProps","text","row","alignItems","timestamp","marginL","displayName","create","gap","backgroundColor","flexDirection","borderTopRightRadius","borderBottomRightRadius","paddingRight","maxWidth","width","height","palette","grayCool","w200","borderRadius","x","marginRight","paddingHorizontal","paddingVertical","position","top","left","right","bottom","justifyContent","padding","hexToRgba","black","marginTop"],"sourceRoot":"../../../../../src","sources":["components/messages/quotedMessage/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import OpenIMSDK, { MessageReceiveOptType, OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
3
|
+
import OpenIMSDK, { MessageReceiveOptType, MessageType, OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
4
4
|
import { useCallback, useEffect } from 'react';
|
|
5
5
|
import { useConversationStore } from "../store/conversation.js";
|
|
6
6
|
import { ToastFlashMessage } from "../utils/toastFlashMessage.js";
|
|
7
7
|
import { useUserStore } from "../store/user.js";
|
|
8
|
-
import { getLastMessageText } from "../utils/messageUtils.js";
|
|
8
|
+
import { getLastMessageText, truncateMiddle } from "../utils/messageUtils.js";
|
|
9
9
|
import { useChatContext } from "../context/index.js";
|
|
10
10
|
import isEmpty from 'lodash/isEmpty';
|
|
11
11
|
import { markMessageRevoked, useMessageStore } from "../store/message.js";
|
|
12
12
|
import { syncPinnedMessagesOnEvent } from "../hooks/message/usePinMessage.js";
|
|
13
|
+
const MAX_TOAST_FILE_NAME_LENGTH = 40;
|
|
13
14
|
export const useChatListener = () => {
|
|
14
15
|
const updateOneMessage = useMessageStore(state => state.updateOneMessage);
|
|
15
16
|
const currentUserId = useUserStore(s => s.user?.userID);
|
|
@@ -27,14 +28,22 @@ export const useChatListener = () => {
|
|
|
27
28
|
updateOneMessage(message);
|
|
28
29
|
}, [updateOneMessage]);
|
|
29
30
|
const onConversationChanged = useCallback(conversations => {
|
|
30
|
-
useConversationStore.getState().
|
|
31
|
+
const oldMap = useConversationStore.getState().map;
|
|
31
32
|
if (isShowFLashMessage) {
|
|
32
33
|
for (const conversation of conversations) {
|
|
33
|
-
|
|
34
|
+
const oldConversation = oldMap[conversation.conversationID];
|
|
35
|
+
if (conversation.recvMsgOpt === MessageReceiveOptType.NotNotify || isEmpty(conversation?.latestMsg) || oldConversation?.latestMsgSendTime === conversation?.latestMsgSendTime) {
|
|
34
36
|
continue;
|
|
35
37
|
}
|
|
36
38
|
const latestMsg = JSON.parse(conversation.latestMsg || '{}');
|
|
37
|
-
const
|
|
39
|
+
const messageForToast = latestMsg.contentType === MessageType.FileMessage && latestMsg.fileElem?.fileName ? {
|
|
40
|
+
...latestMsg,
|
|
41
|
+
fileElem: {
|
|
42
|
+
...latestMsg.fileElem,
|
|
43
|
+
fileName: truncateMiddle(latestMsg.fileElem.fileName, MAX_TOAST_FILE_NAME_LENGTH)
|
|
44
|
+
}
|
|
45
|
+
} : latestMsg;
|
|
46
|
+
const lastMessageText = getLastMessageText(messageForToast, currentUserId, conversation);
|
|
38
47
|
ToastFlashMessage.show({
|
|
39
48
|
key: conversation.conversationID,
|
|
40
49
|
title: conversation.showName || 'New Message',
|
|
@@ -45,6 +54,7 @@ export const useChatListener = () => {
|
|
|
45
54
|
}
|
|
46
55
|
});
|
|
47
56
|
}
|
|
57
|
+
useConversationStore.getState().updateConversations(conversations);
|
|
48
58
|
}
|
|
49
59
|
}, [currentUserId, isShowFLashMessage, onPressFlashMessage]);
|
|
50
60
|
const onNewConversation = useCallback(conversations => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","getState","
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","truncateMiddle","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","MAX_TOAST_FILE_NAME_LENGTH","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","oldMap","getState","map","conversation","oldConversation","conversationID","recvMsgOpt","NotNotify","latestMsg","latestMsgSendTime","JSON","parse","messageForToast","contentType","FileMessage","fileElem","fileName","lastMessageText","show","key","title","showName","body","onPress","hide","updateConversations","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","onMessageRevoked","revokedInfo","onMessagePinned","messagePinned","currentConversationId","isPinned","pinnedByUserID","operatorUserID","undefined","pinnedTime","on","OnConversationChanged","OnNewConversation","OnGroupMemberAdded","OnGroupMemberDeleted","SendMessageProgress","OnNewRecvMessageRevoked","OnRecvMessagePinned","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,7 +4,7 @@ import { KColors, KContainer, KImage, KLabel, KRadiusValue, KSpacingValue } from
|
|
|
4
4
|
import { memo, useMemo } from 'react';
|
|
5
5
|
import { StyleSheet } from 'react-native';
|
|
6
6
|
import { useChatDetailContext } from "../../context/index.js";
|
|
7
|
-
import {
|
|
7
|
+
import { getMessagePreviewParts, getReplySenderName, parseUrlMetadata } from "../../utils/messageUtils.js";
|
|
8
8
|
import { trans } from "../../translation/index.js";
|
|
9
9
|
import { useUserStore } from "../../store/index.js";
|
|
10
10
|
import { MessageType } from '@droppii/openim-rn-client-sdk';
|
|
@@ -16,6 +16,7 @@ export const ChatCurrentQuotedMessage = /*#__PURE__*/memo(() => {
|
|
|
16
16
|
conversation,
|
|
17
17
|
setQuotedMessage
|
|
18
18
|
} = useChatDetailContext();
|
|
19
|
+
const messagePreview = getMessagePreviewParts(quotedMessage);
|
|
19
20
|
const currentUserId = useUserStore(s => s.user?.userID);
|
|
20
21
|
const imageUrl = useMemo(() => {
|
|
21
22
|
switch (quotedMessage?.contentType) {
|
|
@@ -81,7 +82,8 @@ export const ChatCurrentQuotedMessage = /*#__PURE__*/memo(() => {
|
|
|
81
82
|
typo: "TextSmNormal",
|
|
82
83
|
color: KColors.gray.light,
|
|
83
84
|
numberOfLines: 1,
|
|
84
|
-
|
|
85
|
+
...messagePreview.textProps,
|
|
86
|
+
children: messagePreview.text
|
|
85
87
|
})]
|
|
86
88
|
}), /*#__PURE__*/_jsx(KContainer.Touchable, {
|
|
87
89
|
onPress: () => setQuotedMessage(undefined),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["KColors","KContainer","KImage","KLabel","KRadiusValue","KSpacingValue","memo","useMemo","StyleSheet","useChatDetailContext","
|
|
1
|
+
{"version":3,"names":["KColors","KContainer","KImage","KLabel","KRadiusValue","KSpacingValue","memo","useMemo","StyleSheet","useChatDetailContext","getMessagePreviewParts","getReplySenderName","parseUrlMetadata","trans","useUserStore","MessageType","getFileIcon","getMimeType","jsx","_jsx","jsxs","_jsxs","ChatCurrentQuotedMessage","quotedMessage","conversation","setQuotedMessage","messagePreview","currentUserId","s","user","userID","imageUrl","contentType","PictureMessage","pictureElem","snapshotPicture","url","VideoMessage","videoElem","snapshotUrl","UrlTextMessage","metadata","ex","image","iconSource","FileMessage","mimeType","fileElem","fileName","View","style","styles","container","children","dot","VisibleView","visible","imageContainer","Base","uri","playIconContainer","playIcon","VectorIcons","name","size","color","white","icon","resizeMode","content","Text","typo","numberOfLines","gray","light","textProps","text","Touchable","onPress","undefined","displayName","create","paddingVertical","paddingHorizontal","backgroundColor","opacity","grayLight","flexDirection","alignItems","gap","justifyContent","width","height","palette","grayCool","w200","borderRadius","x","flex","position","top","left","right","bottom","padding","hexToRgba","black"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatCurrentQuotedMessage.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,8 +4,10 @@ import { memo, useMemo } from 'react';
|
|
|
4
4
|
import { StyleSheet } from 'react-native';
|
|
5
5
|
import { KContainer, KImage, KLabel, KColors, KSpacingValue, KBadge } from '@droppii/libs';
|
|
6
6
|
import { trans } from "../../translation/index.js";
|
|
7
|
-
import {
|
|
7
|
+
import { getMessagePreviewParts, getPinnedMessagePreview } from "../../utils/messageUtils.js";
|
|
8
|
+
import { MessageType } from '@droppii/openim-rn-client-sdk';
|
|
8
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
10
|
+
const HIDDEN_PREVIEW_TEXT_TYPES = new Set([MessageType.PictureMessage, MessageType.VideoMessage, MessageType.MergeMessage]);
|
|
9
11
|
const PinnedMessageThumbnail = /*#__PURE__*/memo(({
|
|
10
12
|
message
|
|
11
13
|
}) => {
|
|
@@ -63,6 +65,8 @@ export const PinnedMessageBar = /*#__PURE__*/memo(({
|
|
|
63
65
|
const {
|
|
64
66
|
subtitleKey
|
|
65
67
|
} = getPinnedMessagePreview(latest);
|
|
68
|
+
const messagePreview = getMessagePreviewParts(latest);
|
|
69
|
+
const hidePreviewText = HIDDEN_PREVIEW_TEXT_TYPES.has(latest.contentType);
|
|
66
70
|
return /*#__PURE__*/_jsxs(KContainer.Touchable, {
|
|
67
71
|
activeOpacity: 0.7,
|
|
68
72
|
onPress: onPress,
|
|
@@ -76,10 +80,11 @@ export const PinnedMessageBar = /*#__PURE__*/memo(({
|
|
|
76
80
|
paddingR: "0.75rem",
|
|
77
81
|
children: [/*#__PURE__*/_jsxs(KContainer.View, {
|
|
78
82
|
style: styles.content,
|
|
79
|
-
children: [/*#__PURE__*/_jsx(KLabel.Text, {
|
|
83
|
+
children: [!hidePreviewText && /*#__PURE__*/_jsx(KLabel.Text, {
|
|
80
84
|
typo: "TextNmMedium",
|
|
81
85
|
numberOfLines: 1,
|
|
82
|
-
|
|
86
|
+
...messagePreview.textProps,
|
|
87
|
+
children: messagePreview.text
|
|
83
88
|
}), /*#__PURE__*/_jsxs(KContainer.View, {
|
|
84
89
|
row: true,
|
|
85
90
|
alignItems: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useMemo","StyleSheet","KContainer","KImage","KLabel","KColors","KSpacingValue","KBadge","trans","
|
|
1
|
+
{"version":3,"names":["memo","useMemo","StyleSheet","KContainer","KImage","KLabel","KColors","KSpacingValue","KBadge","trans","getMessagePreviewParts","getPinnedMessagePreview","MessageType","jsx","_jsx","jsxs","_jsxs","HIDDEN_PREVIEW_TEXT_TYPES","Set","PictureMessage","VideoMessage","MergeMessage","PinnedMessageThumbnail","message","preview","mediaType","thumbnailUrl","Base","uri","style","styles","thumbnail","resizeMode","View","children","videoOverlay","center","VectorIcons","name","provider","size","color","white","fileIcon","marginL","displayName","PinnedMessageBar","messages","currentUserId","onPress","length","latest","sender","sendID","senderNickname","remainingCount","subtitleKey","messagePreview","hidePreviewText","has","contentType","Touchable","activeOpacity","container","row","alignItems","flex","paddingR","content","Text","typo","numberOfLines","textProps","text","primary","normal","gray","light","BaseV2","badge","skipConvertBadge","badgeSize","width","height","wrapperLabelTextStyle","paddingHorizontal","create","flexDirection","backgroundColor","palette","w25","paddingRight","paddingLeft","paddingVertical","overflow","position","top","left","right","bottom","minWidth","borderRadius","justifyContent","marginRight"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/PinnedMessageBar.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,110 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
3
|
+
import { memo, useCallback } from 'react';
|
|
4
|
+
import { StyleSheet } from 'react-native';
|
|
5
|
+
import { MessageType } from '@droppii/openim-rn-client-sdk';
|
|
6
|
+
import { KContainer, KLabel, KColors, KImage, KSpacingValue } from '@droppii/libs';
|
|
6
7
|
import { UIUtils } from "../../utils/UIUtils.js";
|
|
7
8
|
import { trans } from "../../translation/index.js";
|
|
8
9
|
import { usePinnedMessageStore } from "../../store/pinnedMessage.js";
|
|
9
10
|
import { LegendChatMessage } from "./legend/LegendChatMessage.js";
|
|
10
|
-
import { formatMessageTime
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
import { formatMessageTime } from "./legend/messageTypes.js";
|
|
12
|
+
|
|
13
|
+
// Text/quote/link bubbles already render their own timestamp for incoming
|
|
14
|
+
// messages (see textMessage, quotedMessage, linkMessage) — skip the external
|
|
15
|
+
// label for those to avoid showing the time twice.
|
|
13
16
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
14
|
-
|
|
15
|
-
// menu) but restricted to the 2 actions relevant to an already-pinned
|
|
16
|
-
// message: unpin and jump to the original message.
|
|
17
|
-
const PinnedMessageToolboxOverlay = /*#__PURE__*/memo(/*#__PURE__*/forwardRef(({
|
|
18
|
-
currentUserId,
|
|
19
|
-
unpinMessage,
|
|
20
|
-
customMessageItemFactory
|
|
21
|
-
}, ref) => {
|
|
22
|
-
const [visible, setVisible] = useState(false);
|
|
23
|
-
const [message, setMessage] = useState(undefined);
|
|
24
|
-
const [rect, setRect] = useState(null);
|
|
25
|
-
const hide = useCallback(() => {
|
|
26
|
-
setVisible(false);
|
|
27
|
-
setMessage(undefined);
|
|
28
|
-
setRect(null);
|
|
29
|
-
}, []);
|
|
30
|
-
const show = useCallback((msg, msgRect) => {
|
|
31
|
-
setMessage(msg);
|
|
32
|
-
setRect(msgRect);
|
|
33
|
-
setVisible(true);
|
|
34
|
-
}, []);
|
|
35
|
-
useImperativeHandle(ref, () => ({
|
|
36
|
-
show,
|
|
37
|
-
hide
|
|
38
|
-
}), [show, hide]);
|
|
39
|
-
const handleUnpinMessage = useCallback(() => {
|
|
40
|
-
if (!message) return;
|
|
41
|
-
hide();
|
|
42
|
-
unpinMessage(message);
|
|
43
|
-
}, [message, hide, unpinMessage]);
|
|
44
|
-
const handleViewOriginalMessage = useCallback(() => {
|
|
45
|
-
if (!message) return;
|
|
46
|
-
hide();
|
|
47
|
-
// TODO: implement navigating to / highlighting the original message
|
|
48
|
-
}, [message, hide]);
|
|
49
|
-
if (!visible || !message || !rect) {
|
|
50
|
-
return null;
|
|
51
|
-
}
|
|
52
|
-
const isOutgoing = message.sendID === currentUserId;
|
|
53
|
-
return /*#__PURE__*/_jsxs(Modal, {
|
|
54
|
-
visible: visible,
|
|
55
|
-
transparent: true,
|
|
56
|
-
statusBarTranslucent: true,
|
|
57
|
-
animationType: "fade",
|
|
58
|
-
onRequestClose: hide,
|
|
59
|
-
children: [/*#__PURE__*/_jsx(Pressable, {
|
|
60
|
-
style: styles.backdrop,
|
|
61
|
-
onPress: hide
|
|
62
|
-
}), /*#__PURE__*/_jsx(MessageToolboxWrapper, {
|
|
63
|
-
rect: rect,
|
|
64
|
-
isOutgoing: isOutgoing,
|
|
65
|
-
message: /*#__PURE__*/_jsx(LegendChatMessage, {
|
|
66
|
-
message: message,
|
|
67
|
-
isOutgoing: isOutgoing,
|
|
68
|
-
createdAtTime: message.sendTime || message.createTime,
|
|
69
|
-
customMessageItemFactory: customMessageItemFactory
|
|
70
|
-
}),
|
|
71
|
-
toolbox: /*#__PURE__*/_jsx(MessageToolboxMenu, {
|
|
72
|
-
showUnpinMessage: true,
|
|
73
|
-
showViewOriginalMessage: true,
|
|
74
|
-
onUnpinMessage: handleUnpinMessage,
|
|
75
|
-
onViewOriginalMessage: handleViewOriginalMessage
|
|
76
|
-
})
|
|
77
|
-
})]
|
|
78
|
-
});
|
|
79
|
-
}));
|
|
80
|
-
PinnedMessageToolboxOverlay.displayName = 'PinnedMessageToolboxOverlay';
|
|
81
|
-
const styles = StyleSheet.create({
|
|
82
|
-
backdrop: {
|
|
83
|
-
position: 'absolute',
|
|
84
|
-
top: 0,
|
|
85
|
-
left: 0,
|
|
86
|
-
right: 0,
|
|
87
|
-
bottom: 0,
|
|
88
|
-
backgroundColor: 'rgba(0,0,0,0.75)'
|
|
89
|
-
}
|
|
90
|
-
});
|
|
17
|
+
const SELF_RENDERS_TIME_FOR_INCOMING = new Set([MessageType.TextMessage, MessageType.AtTextMessage, MessageType.QuoteMessage, MessageType.UrlTextMessage]);
|
|
91
18
|
const PinnedMessagesSheetContent = /*#__PURE__*/memo(({
|
|
92
19
|
currentUserId,
|
|
93
20
|
unpinMessage,
|
|
94
21
|
customMessageItemFactory
|
|
95
22
|
}) => {
|
|
96
23
|
const messages = usePinnedMessageStore(state => state.messages);
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
24
|
+
const handleUnpinMessage = useCallback(async message => {
|
|
25
|
+
await unpinMessage(message);
|
|
26
|
+
if (usePinnedMessageStore.getState().messages.length === 0) {
|
|
27
|
+
UIUtils.bottomSheet.dismiss();
|
|
28
|
+
}
|
|
29
|
+
}, [unpinMessage]);
|
|
30
|
+
const handlePressMessage = useCallback(() => {
|
|
31
|
+
UIUtils.bottomSheet.dismiss();
|
|
32
|
+
UIUtils.alert.open({
|
|
33
|
+
title: trans('chat:view_original_message'),
|
|
34
|
+
message: trans('chat:scroll_to_message_todo')
|
|
108
35
|
});
|
|
109
36
|
}, []);
|
|
110
37
|
return /*#__PURE__*/_jsxs(KContainer.View, {
|
|
@@ -119,18 +46,34 @@ const PinnedMessagesSheetContent = /*#__PURE__*/memo(({
|
|
|
119
46
|
const isOutgoing = message.sendID === currentUserId;
|
|
120
47
|
const messageId = message.clientMsgID || message.serverMsgID;
|
|
121
48
|
const createdAtTime = message.sendTime || message.createTime;
|
|
122
|
-
const
|
|
49
|
+
const hasInternalTimeLabel = !isOutgoing && SELF_RENDERS_TIME_FOR_INCOMING.has(message.contentType);
|
|
50
|
+
const timeLabel = hasInternalTimeLabel ? '' : formatMessageTime(createdAtTime);
|
|
51
|
+
const unpinButton = /*#__PURE__*/_jsx(KContainer.Touchable, {
|
|
52
|
+
center: true,
|
|
53
|
+
br: "round",
|
|
54
|
+
width: 28,
|
|
55
|
+
height: 28,
|
|
56
|
+
background: KColors.background,
|
|
57
|
+
style: isOutgoing ? styles.unpinButtonLeft : styles.unpinButtonRight,
|
|
58
|
+
onPress: () => handleUnpinMessage(message),
|
|
59
|
+
children: /*#__PURE__*/_jsx(KImage.VectorIcons, {
|
|
60
|
+
name: "thumbtack-off-o",
|
|
61
|
+
provider: "DroppiiNew",
|
|
62
|
+
size: 14,
|
|
63
|
+
color: KColors.gray.dark
|
|
64
|
+
})
|
|
65
|
+
});
|
|
123
66
|
return /*#__PURE__*/_jsxs(KContainer.View, {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
67
|
+
style: isOutgoing ? styles.rowRight : styles.rowLeft,
|
|
68
|
+
children: [/*#__PURE__*/_jsxs(KContainer.View, {
|
|
69
|
+
style: [styles.messageRow, isOutgoing ? styles.messageRowRight : styles.messageRowLeft],
|
|
70
|
+
children: [isOutgoing && unpinButton, /*#__PURE__*/_jsx(LegendChatMessage, {
|
|
71
|
+
message: message,
|
|
72
|
+
isOutgoing: isOutgoing,
|
|
73
|
+
createdAtTime: createdAtTime,
|
|
74
|
+
onPress: handlePressMessage,
|
|
75
|
+
customMessageItemFactory: customMessageItemFactory
|
|
76
|
+
}), !isOutgoing && unpinButton]
|
|
134
77
|
}), !!timeLabel && /*#__PURE__*/_jsx(KLabel.Text, {
|
|
135
78
|
typo: "TextXsNormal",
|
|
136
79
|
color: KColors.gray.light,
|
|
@@ -138,15 +81,42 @@ const PinnedMessagesSheetContent = /*#__PURE__*/memo(({
|
|
|
138
81
|
children: timeLabel
|
|
139
82
|
})]
|
|
140
83
|
}, messageId);
|
|
141
|
-
}), /*#__PURE__*/_jsx(PinnedMessageToolboxOverlay, {
|
|
142
|
-
ref: toolboxRef,
|
|
143
|
-
currentUserId: currentUserId,
|
|
144
|
-
unpinMessage: unpinMessage,
|
|
145
|
-
customMessageItemFactory: customMessageItemFactory
|
|
146
84
|
})]
|
|
147
85
|
});
|
|
148
86
|
});
|
|
149
87
|
PinnedMessagesSheetContent.displayName = 'PinnedMessagesSheetContent';
|
|
88
|
+
const UNPIN_BUTTON_GAP = KSpacingValue['0.5rem'];
|
|
89
|
+
const styles = StyleSheet.create({
|
|
90
|
+
rowLeft: {
|
|
91
|
+
width: '100%',
|
|
92
|
+
paddingHorizontal: KSpacingValue['0.75rem'],
|
|
93
|
+
marginBottom: KSpacingValue['0.25rem'],
|
|
94
|
+
alignItems: 'flex-start'
|
|
95
|
+
},
|
|
96
|
+
rowRight: {
|
|
97
|
+
width: '100%',
|
|
98
|
+
paddingHorizontal: KSpacingValue['0.75rem'],
|
|
99
|
+
marginBottom: KSpacingValue['0.25rem'],
|
|
100
|
+
alignItems: 'flex-end'
|
|
101
|
+
},
|
|
102
|
+
messageRow: {
|
|
103
|
+
width: '100%',
|
|
104
|
+
flexDirection: 'row',
|
|
105
|
+
alignItems: 'center'
|
|
106
|
+
},
|
|
107
|
+
messageRowLeft: {
|
|
108
|
+
justifyContent: 'flex-start'
|
|
109
|
+
},
|
|
110
|
+
messageRowRight: {
|
|
111
|
+
justifyContent: 'flex-end'
|
|
112
|
+
},
|
|
113
|
+
unpinButtonLeft: {
|
|
114
|
+
marginRight: UNPIN_BUTTON_GAP
|
|
115
|
+
},
|
|
116
|
+
unpinButtonRight: {
|
|
117
|
+
marginLeft: UNPIN_BUTTON_GAP
|
|
118
|
+
}
|
|
119
|
+
});
|
|
150
120
|
export const openPinnedMessagesSheet = ({
|
|
151
121
|
currentUserId,
|
|
152
122
|
unpinMessage,
|