@droppii-org/chat-mobile 0.2.42 → 0.2.44
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/messages/quotedMessage/index.js +6 -4
- package/lib/module/components/messages/quotedMessage/index.js.map +1 -1
- package/lib/module/context/ChatContext.js +11 -0
- package/lib/module/context/ChatContext.js.map +1 -1
- package/lib/module/core/useChatListener.js +12 -3
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/hooks/message/useMessages.js +65 -0
- package/lib/module/hooks/message/useMessages.js.map +1 -0
- package/lib/module/hooks/message/useSendMessage.js +10 -2
- package/lib/module/hooks/message/useSendMessage.js.map +1 -1
- package/lib/module/index.js +0 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/screens/chat-detail/ChatDetail.js +35 -30
- package/lib/module/screens/chat-detail/ChatDetail.js.map +1 -1
- package/lib/module/screens/chat-detail/ChatListLegend.js +83 -84
- package/lib/module/screens/chat-detail/ChatListLegend.js.map +1 -1
- package/lib/module/screens/chat-detail/PinnedMessagesSheet.js +9 -9
- package/lib/module/screens/chat-detail/PinnedMessagesSheet.js.map +1 -1
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js +9 -3
- package/lib/module/screens/chat-detail/legend/LegendChatMessage.js.map +1 -1
- package/lib/module/services/attachmentOrchestrator.js +4 -0
- package/lib/module/services/attachmentOrchestrator.js.map +1 -1
- package/lib/module/store/message.js +148 -6
- package/lib/module/store/message.js.map +1 -1
- package/lib/module/types/chat.js.map +1 -1
- package/lib/module/types/events.js +8 -0
- package/lib/module/types/events.js.map +1 -0
- package/lib/module/utils/conversation.js +13 -1
- package/lib/module/utils/conversation.js.map +1 -1
- package/lib/typescript/src/components/messages/quotedMessage/index.d.ts +0 -1
- package/lib/typescript/src/components/messages/quotedMessage/index.d.ts.map +1 -1
- package/lib/typescript/src/context/ChatContext.d.ts +1 -1
- package/lib/typescript/src/context/ChatContext.d.ts.map +1 -1
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/hooks/message/useMessages.d.ts +16 -0
- package/lib/typescript/src/hooks/message/useMessages.d.ts.map +1 -0
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +0 -1
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatDetail.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatDetail.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatListLegend.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/ChatListLegend.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheet.d.ts +2 -1
- package/lib/typescript/src/screens/chat-detail/PinnedMessagesSheet.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/legend/LegendChatMessage.d.ts +1 -1
- package/lib/typescript/src/screens/chat-detail/legend/LegendChatMessage.d.ts.map +1 -1
- package/lib/typescript/src/screens/chat-detail/types.d.ts +7 -7
- package/lib/typescript/src/screens/chat-detail/types.d.ts.map +1 -1
- package/lib/typescript/src/services/attachmentOrchestrator.d.ts.map +1 -1
- package/lib/typescript/src/store/message.d.ts.map +1 -1
- package/lib/typescript/src/types/chat.d.ts +19 -2
- package/lib/typescript/src/types/chat.d.ts.map +1 -1
- package/lib/typescript/src/types/events.d.ts +8 -0
- package/lib/typescript/src/types/events.d.ts.map +1 -0
- package/lib/typescript/src/utils/conversation.d.ts +1 -0
- package/lib/typescript/src/utils/conversation.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/components/messages/quotedMessage/index.tsx +8 -8
- package/src/context/ChatContext.tsx +11 -0
- package/src/core/useChatListener.ts +18 -2
- package/src/hooks/message/useMessages.ts +82 -0
- package/src/hooks/message/useSendMessage.ts +13 -2
- package/src/index.tsx +0 -1
- package/src/screens/chat-detail/ChatDetail.tsx +37 -28
- package/src/screens/chat-detail/ChatListLegend.tsx +96 -90
- package/src/screens/chat-detail/PinnedMessagesSheet.tsx +12 -7
- package/src/screens/chat-detail/legend/LegendChatMessage.tsx +11 -3
- package/src/screens/chat-detail/types.ts +7 -7
- package/src/services/attachmentOrchestrator.ts +5 -0
- package/src/store/message.ts +174 -8
- package/src/types/chat.ts +21 -2
- package/src/types/events.ts +8 -0
- package/src/utils/conversation.ts +14 -0
- package/lib/module/hooks/useChatMessages.js +0 -155
- package/lib/module/hooks/useChatMessages.js.map +0 -1
- package/lib/typescript/src/hooks/useChatMessages.d.ts +0 -21
- package/lib/typescript/src/hooks/useChatMessages.d.ts.map +0 -1
- package/src/hooks/useChatMessages.ts +0 -246
|
@@ -4,19 +4,19 @@ import { memo, useCallback, useMemo } from 'react';
|
|
|
4
4
|
import { messageStyles } from "../styles.js";
|
|
5
5
|
import { formatMessageTime } from "../types.js";
|
|
6
6
|
import { KColors, KContainer, KImage, KLabel, KRadiusValue, KSpacingValue } from '@droppii/libs';
|
|
7
|
-
import { StyleSheet } from 'react-native';
|
|
7
|
+
import { DeviceEventEmitter, 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
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";
|
|
14
|
+
import { ChatEvent } from "../../../types/events.js";
|
|
14
15
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
15
16
|
const QuotedMessage = /*#__PURE__*/memo(props => {
|
|
16
17
|
const {
|
|
17
18
|
message,
|
|
18
19
|
isOutgoing,
|
|
19
|
-
onPressQuotedMessage,
|
|
20
20
|
createdAtTime
|
|
21
21
|
} = props || {};
|
|
22
22
|
const {
|
|
@@ -45,8 +45,10 @@ const QuotedMessage = /*#__PURE__*/memo(props => {
|
|
|
45
45
|
return getFileIcon(mimeType);
|
|
46
46
|
}, [quotedMessage]);
|
|
47
47
|
const handlePressQuotedMessage = useCallback(() => {
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
DeviceEventEmitter.emit(ChatEvent.ScrollToMessage, {
|
|
49
|
+
clientMessageId: quotedMessage?.clientMsgID || ''
|
|
50
|
+
});
|
|
51
|
+
}, [quotedMessage]);
|
|
50
52
|
return /*#__PURE__*/_jsxs(_Fragment, {
|
|
51
53
|
children: [/*#__PURE__*/_jsxs(KContainer.View, {
|
|
52
54
|
style: [messageStyles.bubble, styles.container, isOutgoing ? messageStyles.bubbleSent : messageStyles.bubbleReceived],
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useMemo","messageStyles","formatMessageTime","KColors","KContainer","KImage","KLabel","KRadiusValue","KSpacingValue","DeviceEventEmitter","StyleSheet","CHAT_BUBBLE_COLORS","MessageType","getMessagePreviewParts","getReplySenderName","parseUrlMetadata","getFileIcon","getMimeType","useUserStore","useChatDetailContext","ChatEvent","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","QuotedMessage","props","message","isOutgoing","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","emit","ScrollToMessage","clientMessageId","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":[]}
|
|
@@ -38,6 +38,11 @@ const ChatProviderInner = ({
|
|
|
38
38
|
if (userInfo) {
|
|
39
39
|
useUserStore.getState().setUser(userInfo);
|
|
40
40
|
}
|
|
41
|
+
} else if (loginStatus === LoginStatus.Logged) {
|
|
42
|
+
const userInfo = await OpenIMSDK.getSelfUserInfo();
|
|
43
|
+
if (userInfo) {
|
|
44
|
+
useUserStore.getState().setUser(userInfo);
|
|
45
|
+
}
|
|
41
46
|
}
|
|
42
47
|
} catch (error) {
|
|
43
48
|
console.error('Failed to login chat sdk', error);
|
|
@@ -86,6 +91,12 @@ const ChatSdkBridge = () => {
|
|
|
86
91
|
export const ChatProvider = ({
|
|
87
92
|
...props
|
|
88
93
|
}) => {
|
|
94
|
+
const {
|
|
95
|
+
enabled = false
|
|
96
|
+
} = props;
|
|
97
|
+
if (!enabled) {
|
|
98
|
+
return props.children;
|
|
99
|
+
}
|
|
89
100
|
return /*#__PURE__*/_jsx(ChatProviderInner, {
|
|
90
101
|
...props
|
|
91
102
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useChatSdk","useSafeAreaInsets","uuid","useUserStore","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","isShowFLashMessage","setShow","handleLoginSdk","res","loginStatus","getLoginStatus","id","token","Logout","login","userID","v4","userInfo","getSelfUserInfo","getState","setUser","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,WAAW,EACXC,UAAU,EACVC,SAAS,EACTC,OAAO,EACPC,QAAQ,QACH,OAAO;AAEd,OAAOC,SAAS,IACdC,WAAW,QAEN,+BAA+B;AACtC,OAAOC,KAAK,MAAM,4BAA4B;AAC9C,SAASC,UAAU,QAAQ,kBAAS;AACpC,SAASC,iBAAiB,QAAQ,gCAAgC;AAClE,OAAOC,IAAI,MAAM,mBAAmB;AACpC,SAASC,YAAY,QAAQ,mBAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAExC,OAAO,MAAMC,WAAW,gBAAGnB,aAAa,CACtCoB,SACF,CAAC;AAED,OAAO,MAAMC,cAAc,GAAGA,CAAA,KAAuB;EACnD,MAAMC,OAAO,GAAGpB,UAAU,CAACiB,WAAW,CAAC;EACvC,IAAI,CAACG,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,iDAAiD,CAAC;EACpE;EACA,OAAOD,OAAO;AAChB,CAAC;AAED,MAAME,iBAAiB,GAAGA,CAAC;EACzBC,KAAK;EACLC,QAAQ;EACRC,eAAe;EACfC,YAAY;EACZC;AACiB,CAAC,KAAK;EACvB,MAAM,CAACC,kBAAkB,EAAEC,OAAO,CAAC,GAAG1B,QAAQ,CAAC,IAAI,CAAC;EAEpD,MAAM2B,cAAc,GAAG/B,WAAW,CAAC,YAAY;IAC7C,IAAI2B,YAAY,EAAE;MAChB,IAAI;QACF,MAAMK,GAAG,GAAG,MAAML,YAAY,CAAC,CAAC;QAChC,MAAMM,WAAW,GAAG,MAAM5B,SAAS,CAAC6B,cAAc,CAAC,CAAC;QACpD,IAAI,CAAC,CAACF,GAAG,EAAEG,EAAE,IAAI,CAAC,CAACH,GAAG,EAAEI,KAAK,IAAIH,WAAW,KAAK3B,WAAW,CAAC+B,MAAM,EAAE;UACnE,MAAMhC,SAAS,CAACiC,KAAK,CACnB;YACEF,KAAK,EAAEJ,GAAG,CAACI,KAAK;YAChBG,MAAM,EAAEP,GAAG,CAACG;UACd,CAAC,EACDzB,IAAI,CAAC8B,EAAE,CAAC,CACV,CAAC;UACD,MAAMC,QAAQ,GAAG,MAAMpC,SAAS,CAACqC,eAAe,CAAC,CAAC;UAClD,IAAID,QAAQ,EAAE;YACZ9B,YAAY,CAACgC,QAAQ,CAAC,CAAC,CAACC,OAAO,CAACH,QAAQ,CAAC;UAC3C;QACF;MACF,CAAC,CAAC,
|
|
1
|
+
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useChatSdk","useSafeAreaInsets","uuid","useUserStore","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","isShowFLashMessage","setShow","handleLoginSdk","res","loginStatus","getLoginStatus","id","token","Logout","login","userID","v4","userInfo","getSelfUserInfo","getState","setUser","Logged","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props","enabled"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -10,6 +10,7 @@ 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
|
+
import { belongsToConversation } from "../utils/message.js";
|
|
13
14
|
export const useChatListener = () => {
|
|
14
15
|
const updateOneMessage = useMessageStore(state => state.updateOneMessage);
|
|
15
16
|
const currentUserId = useUserStore(s => s.user?.userID);
|
|
@@ -81,11 +82,18 @@ export const useChatListener = () => {
|
|
|
81
82
|
}
|
|
82
83
|
syncPinnedMessagesOnEvent(messagePinned.conversationID);
|
|
83
84
|
}, [updateOneMessage]);
|
|
85
|
+
const onRecvNewMessages = useCallback(messages => {
|
|
86
|
+
console.log('[Listener] OnRecvNewMessages', messages);
|
|
87
|
+
const conversationId = useConversationStore.getState().currentConversationId;
|
|
88
|
+
if (!conversationId) return;
|
|
89
|
+
const relevant = messages.filter(message => belongsToConversation(message, conversationId));
|
|
90
|
+
if (!relevant.length) return;
|
|
91
|
+
relevant.forEach(msg => useMessageStore.getState().pushNewMessage(msg));
|
|
92
|
+
}, []);
|
|
84
93
|
useEffect(() => {
|
|
85
94
|
// Conversation
|
|
86
95
|
OpenIMSDK.on(OpenIMEvent.OnConversationChanged, onConversationChanged);
|
|
87
96
|
OpenIMSDK.on(OpenIMEvent.OnNewConversation, onNewConversation);
|
|
88
|
-
// OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
89
97
|
|
|
90
98
|
// Group members
|
|
91
99
|
OpenIMSDK.on(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
|
|
@@ -95,6 +103,7 @@ export const useChatListener = () => {
|
|
|
95
103
|
OpenIMSDK.on(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
|
|
96
104
|
OpenIMSDK.on(OpenIMEvent.OnNewRecvMessageRevoked, onMessageRevoked);
|
|
97
105
|
OpenIMSDK.on(OpenIMEvent.OnRecvMessagePinned, onMessagePinned);
|
|
106
|
+
OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
98
107
|
return () => {
|
|
99
108
|
// Conversation
|
|
100
109
|
OpenIMSDK.off(OpenIMEvent.OnConversationChanged, onConversationChanged);
|
|
@@ -106,10 +115,10 @@ export const useChatListener = () => {
|
|
|
106
115
|
|
|
107
116
|
// Message status
|
|
108
117
|
OpenIMSDK.off(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
|
|
109
|
-
|
|
118
|
+
OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
110
119
|
OpenIMSDK.off(OpenIMEvent.OnNewRecvMessageRevoked, onMessageRevoked);
|
|
111
120
|
OpenIMSDK.off(OpenIMEvent.OnRecvMessagePinned, onMessagePinned);
|
|
112
121
|
};
|
|
113
|
-
}, [onConversationChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessagePinned, onMessageRevoked, onNewConversation, onSendMessageProgress]);
|
|
122
|
+
}, [onConversationChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessagePinned, onMessageRevoked, onNewConversation, onSendMessageProgress, onRecvNewMessages]);
|
|
114
123
|
};
|
|
115
124
|
//# sourceMappingURL=useChatListener.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","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","oldMap","getState","map","conversation","oldConversation","conversationID","recvMsgOpt","NotNotify","latestMsg","latestMsgSendTime","JSON","parse","lastMessageText","show","key","title","showName","body","ellipsizeMiddle","contentType","FileMessage","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":";;AAAA,OAAOA,SAAS,IACdC,qBAAqB,EACrBC,WAAW,EACXC,WAAW,QAMN,+BAA+B;AACtC,SAASC,WAAW,EAAEC,SAAS,QAAQ,OAAO;AAC9C,SAASC,oBAAoB,QAAQ,0BAAuB;AAC5D,SAASC,iBAAiB,QAAQ,+BAA4B;AAC9D,SAASC,YAAY,QAAQ,kBAAe;AAC5C,SAASC,kBAAkB,QAAQ,0BAAuB;AAC1D,SAASC,cAAc,QAAQ,qBAAY;AAC3C,OAAOC,OAAO,MAAM,gBAAgB;AACpC,SAASC,kBAAkB,EAAEC,eAAe,QAAQ,qBAAkB;AACtE,SAASC,yBAAyB,QAAQ,mCAAgC;
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","syncPinnedMessagesOnEvent","belongsToConversation","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","lastMessageText","show","key","title","showName","body","ellipsizeMiddle","contentType","FileMessage","onPress","hide","updateConversations","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","onMessageRevoked","revokedInfo","onMessagePinned","messagePinned","currentConversationId","isPinned","pinnedByUserID","operatorUserID","undefined","pinnedTime","onRecvNewMessages","messages","conversationId","relevant","filter","length","forEach","msg","pushNewMessage","on","OnConversationChanged","OnNewConversation","OnGroupMemberAdded","OnGroupMemberDeleted","SendMessageProgress","OnNewRecvMessageRevoked","OnRecvMessagePinned","OnRecvNewMessages","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { useCallback, useEffect } from 'react';
|
|
4
|
+
import { useMessageStore } from "../../store/message.js";
|
|
5
|
+
import { useChatContext } from "../../context/index.js";
|
|
6
|
+
export const useMessages = ({
|
|
7
|
+
conversationId,
|
|
8
|
+
startClientMsgId
|
|
9
|
+
}) => {
|
|
10
|
+
const messages = useMessageStore(s => s.messages);
|
|
11
|
+
const {
|
|
12
|
+
applicationType
|
|
13
|
+
} = useChatContext();
|
|
14
|
+
const getMoreOldMessages = useMessageStore(s => s.getMoreOldMessages);
|
|
15
|
+
const getMoreNewMessages = useMessageStore(s => s.getMoreNewMessages);
|
|
16
|
+
const searchMessages = useMessageStore(s => s.searchMessages);
|
|
17
|
+
const initLoading = useMessageStore(s => s.initLoading);
|
|
18
|
+
const moreOldLoading = useMessageStore(s => s.moreOldLoading);
|
|
19
|
+
const moreNewLoading = useMessageStore(s => s.moreNewLoading);
|
|
20
|
+
const hasMoreOld = useMessageStore(s => s.hasMoreOld);
|
|
21
|
+
const hasMoreNew = useMessageStore(s => s.hasMoreNew);
|
|
22
|
+
const handleLoadMoreOld = useCallback(loadMore => {
|
|
23
|
+
if (!conversationId || !applicationType) return;
|
|
24
|
+
getMoreOldMessages({
|
|
25
|
+
loadMore,
|
|
26
|
+
applicationType: applicationType,
|
|
27
|
+
conversationId: conversationId
|
|
28
|
+
});
|
|
29
|
+
}, [getMoreOldMessages, applicationType, conversationId]);
|
|
30
|
+
const handleLoadMoreNew = useCallback(loadMore => {
|
|
31
|
+
if (!conversationId || !applicationType) return;
|
|
32
|
+
getMoreNewMessages({
|
|
33
|
+
loadMore,
|
|
34
|
+
applicationType: applicationType,
|
|
35
|
+
conversationId: conversationId
|
|
36
|
+
});
|
|
37
|
+
}, [getMoreNewMessages, applicationType, conversationId]);
|
|
38
|
+
useEffect(() => {
|
|
39
|
+
if (!conversationId || !applicationType) return;
|
|
40
|
+
if (startClientMsgId) {
|
|
41
|
+
searchMessages({
|
|
42
|
+
applicationType,
|
|
43
|
+
conversationId,
|
|
44
|
+
startClientMsgId
|
|
45
|
+
});
|
|
46
|
+
} else {
|
|
47
|
+
getMoreOldMessages({
|
|
48
|
+
loadMore: false,
|
|
49
|
+
applicationType,
|
|
50
|
+
conversationId
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}, [conversationId, applicationType, startClientMsgId, getMoreOldMessages, searchMessages]);
|
|
54
|
+
return {
|
|
55
|
+
messages,
|
|
56
|
+
getMoreNewMessages: handleLoadMoreNew,
|
|
57
|
+
getMoreOldMessages: handleLoadMoreOld,
|
|
58
|
+
initLoading,
|
|
59
|
+
moreOldLoading,
|
|
60
|
+
moreNewLoading,
|
|
61
|
+
hasMoreOld,
|
|
62
|
+
hasMoreNew
|
|
63
|
+
};
|
|
64
|
+
};
|
|
65
|
+
//# sourceMappingURL=useMessages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useMessageStore","useChatContext","useMessages","conversationId","startClientMsgId","messages","s","applicationType","getMoreOldMessages","getMoreNewMessages","searchMessages","initLoading","moreOldLoading","moreNewLoading","hasMoreOld","hasMoreNew","handleLoadMoreOld","loadMore","handleLoadMoreNew"],"sourceRoot":"../../../../src","sources":["hooks/message/useMessages.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,SAAS,QAAQ,OAAO;AAC9C,SAASC,eAAe,QAAQ,wBAAqB;AACrD,SAASC,cAAc,QAAQ,wBAAe;AAO9C,OAAO,MAAMC,WAAW,GAAGA,CAAC;EAC1BC,cAAc;EACdC;AACiB,CAAC,KAAK;EACvB,MAAMC,QAAQ,GAAGL,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACD,QAAQ,CAAC;EACnD,MAAM;IAAEE;EAAgB,CAAC,GAAGN,cAAc,CAAC,CAAC;EAC5C,MAAMO,kBAAkB,GAAGR,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACE,kBAAkB,CAAC;EACvE,MAAMC,kBAAkB,GAAGT,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACG,kBAAkB,CAAC;EACvE,MAAMC,cAAc,GAAGV,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACI,cAAc,CAAC;EAC/D,MAAMC,WAAW,GAAGX,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACK,WAAW,CAAC;EACzD,MAAMC,cAAc,GAAGZ,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACM,cAAc,CAAC;EAC/D,MAAMC,cAAc,GAAGb,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACO,cAAc,CAAC;EAC/D,MAAMC,UAAU,GAAGd,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACQ,UAAU,CAAC;EACvD,MAAMC,UAAU,GAAGf,eAAe,CAAEM,CAAC,IAAKA,CAAC,CAACS,UAAU,CAAC;EAEvD,MAAMC,iBAAiB,GAAGlB,WAAW,CAClCmB,QAAiB,IAAK;IACrB,IAAI,CAACd,cAAc,IAAI,CAACI,eAAe,EAAE;IACzCC,kBAAkB,CAAC;MACjBS,QAAQ;MACRV,eAAe,EAAEA,eAAe;MAChCJ,cAAc,EAAEA;IAClB,CAAC,CAAC;EACJ,CAAC,EACD,CAACK,kBAAkB,EAAED,eAAe,EAAEJ,cAAc,CACtD,CAAC;EAED,MAAMe,iBAAiB,GAAGpB,WAAW,CAClCmB,QAAiB,IAAK;IACrB,IAAI,CAACd,cAAc,IAAI,CAACI,eAAe,EAAE;IACzCE,kBAAkB,CAAC;MACjBQ,QAAQ;MACRV,eAAe,EAAEA,eAAe;MAChCJ,cAAc,EAAEA;IAClB,CAAC,CAAC;EACJ,CAAC,EACD,CAACM,kBAAkB,EAAEF,eAAe,EAAEJ,cAAc,CACtD,CAAC;EAEDJ,SAAS,CAAC,MAAM;IACd,IAAI,CAACI,cAAc,IAAI,CAACI,eAAe,EAAE;IACzC,IAAIH,gBAAgB,EAAE;MACpBM,cAAc,CAAC;QACbH,eAAe;QACfJ,cAAc;QACdC;MACF,CAAC,CAAC;IACJ,CAAC,MAAM;MACLI,kBAAkB,CAAC;QACjBS,QAAQ,EAAE,KAAK;QACfV,eAAe;QACfJ;MACF,CAAC,CAAC;IACJ;EACF,CAAC,EAAE,CACDA,cAAc,EACdI,eAAe,EACfH,gBAAgB,EAChBI,kBAAkB,EAClBE,cAAc,CACf,CAAC;EAEF,OAAO;IACLL,QAAQ;IACRI,kBAAkB,EAAES,iBAAiB;IACrCV,kBAAkB,EAAEQ,iBAAiB;IACrCL,WAAW;IACXC,cAAc;IACdC,cAAc;IACdC,UAAU;IACVC;EACF,CAAC;AACH,CAAC","ignoreList":[]}
|
|
@@ -8,9 +8,11 @@ import { extractUrls } from "../../utils/url.js";
|
|
|
8
8
|
import OpenIMSDK from '@droppii/openim-rn-client-sdk';
|
|
9
9
|
import { CustomMessageType } from "../../types/chat.js";
|
|
10
10
|
import { useChatContext, useChatDetailContext } from "../../context/index.js";
|
|
11
|
-
import { generateContentBasedOnMessageType } from "../../utils/conversation.js";
|
|
11
|
+
import { generateContentBasedOnMessageType, getBotId } from "../../utils/conversation.js";
|
|
12
12
|
import { markMessageRevoked, useMessageStore } from "../../store/message.js";
|
|
13
13
|
import uuid from 'react-native-uuid';
|
|
14
|
+
import { DeviceEventEmitter } from 'react-native';
|
|
15
|
+
import { ChatEvent } from "../../types/events.js";
|
|
14
16
|
const buildSendParams = (message, recvID, groupID, extendMessageInfo, plainText) => ({
|
|
15
17
|
groupID,
|
|
16
18
|
recvID,
|
|
@@ -46,6 +48,8 @@ export const useSendMessage = () => {
|
|
|
46
48
|
status: MessageStatus.Failed
|
|
47
49
|
});
|
|
48
50
|
}
|
|
51
|
+
await new Promise(resolve => setTimeout(resolve, 300));
|
|
52
|
+
DeviceEventEmitter.emit(ChatEvent.ScrollToBottom);
|
|
49
53
|
}, [pushNewMessage, updateOneMessage, deleteOneMessage]);
|
|
50
54
|
const sendMessage = useCallback(async ({
|
|
51
55
|
plainText,
|
|
@@ -132,6 +136,8 @@ export const useSendMessage = () => {
|
|
|
132
136
|
status: MessageStatus.Failed
|
|
133
137
|
});
|
|
134
138
|
}
|
|
139
|
+
await new Promise(resolve => setTimeout(resolve, 300));
|
|
140
|
+
DeviceEventEmitter.emit(ChatEvent.ScrollToBottom);
|
|
135
141
|
}, [pushNewMessage, updateOneMessage, deleteOneMessage]);
|
|
136
142
|
const revokeMessage = useCallback(async message => {
|
|
137
143
|
const conversationID = useConversationStore.getState().getCurrentConversation()?.conversationID;
|
|
@@ -159,7 +165,9 @@ export const generateOfflinePushInfo = (contentType, plainText) => {
|
|
|
159
165
|
ex: JSON.stringify({
|
|
160
166
|
icon: conversationData?.faceURL || '',
|
|
161
167
|
conversationId: conversationData?.conversationID || '',
|
|
162
|
-
operatorUserID,
|
|
168
|
+
userId: operatorUserID,
|
|
169
|
+
groupId: conversationData?.groupID || '',
|
|
170
|
+
botId: getBotId(conversationData) || '',
|
|
163
171
|
title,
|
|
164
172
|
desc
|
|
165
173
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","generateContentBasedOnMessageType","markMessageRevoked","useMessageStore","uuid","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","quotedMessage","setQuotedMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","createQuotedMessage","text","undefined","createUrlTextMessage","createTextMessage","push","customElem","data","extension","type","description","Order","orderCode","createCustomMessage","retryMessage","isAttachment","PictureMessage","VideoMessage","FileMessage","MergeMessage","includes","params","sendMessageNotOss","parse","revokeMessage","conversationID","Error","conversationData","operatorUserID","user","title","showName","desc","icon","faceURL","conversationId","iOSPushSound","iOSBadgeCount","textMessage","v4","then","catch","errCode","errMsg","error","urlTextMessage","createQuoteMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,oBAAoB,QAAQ,6BAA0B;AAC/D,SAASC,YAAY,QAAQ,qBAAkB;AAO/C,SAASC,aAAa,EAAEC,WAAW,QAAQ,+BAA+B;AAC1E,SAASC,WAAW,QAAQ,oBAAiB;AAC7C,OAAOC,SAAS,MAAM,+BAA+B;AACrD,SACEC,iBAAiB,QAGZ,qBAAkB;AACzB,SAASC,cAAc,EAAEC,oBAAoB,QAAQ,wBAAe;AACpE,
|
|
1
|
+
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","useChatDetailContext","generateContentBasedOnMessageType","getBotId","markMessageRevoked","useMessageStore","uuid","DeviceEventEmitter","ChatEvent","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","quotedMessage","setQuotedMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","Promise","resolve","setTimeout","emit","ScrollToBottom","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","createQuotedMessage","text","undefined","createUrlTextMessage","createTextMessage","push","customElem","data","extension","type","description","Order","orderCode","createCustomMessage","retryMessage","isAttachment","PictureMessage","VideoMessage","FileMessage","MergeMessage","includes","params","sendMessageNotOss","parse","revokeMessage","conversationID","Error","conversationData","operatorUserID","user","title","showName","desc","icon","faceURL","conversationId","userId","groupId","botId","iOSPushSound","iOSBadgeCount","textMessage","v4","then","catch","errCode","errMsg","error","urlTextMessage","createQuoteMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,oBAAoB,QAAQ,6BAA0B;AAC/D,SAASC,YAAY,QAAQ,qBAAkB;AAO/C,SAASC,aAAa,EAAEC,WAAW,QAAQ,+BAA+B;AAC1E,SAASC,WAAW,QAAQ,oBAAiB;AAC7C,OAAOC,SAAS,MAAM,+BAA+B;AACrD,SACEC,iBAAiB,QAGZ,qBAAkB;AACzB,SAASC,cAAc,EAAEC,oBAAoB,QAAQ,wBAAe;AACpE,SACEC,iCAAiC,EACjCC,QAAQ,QACH,6BAA0B;AACjC,SAASC,kBAAkB,EAAEC,eAAe,QAAQ,wBAAqB;AACzE,OAAOC,IAAI,MAAM,mBAAmB;AAIpC,SAASC,kBAAkB,QAAQ,cAAc;AACjD,SAASC,SAAS,QAAQ,uBAAoB;AAE9C,MAAMC,eAAe,GAAGA,CACtBC,OAAoB,EACpBC,MAAc,EACdC,OAAe,EACfC,iBAAiC,EACjCC,SAAiB,MACb;EACJF,OAAO;EACPD,MAAM;EACND,OAAO,EAAE;IAAE,GAAGA,OAAO;IAAEK,EAAE,EAAEC,IAAI,CAACC,SAAS,CAACJ,iBAAiB,CAAC,IAAI;EAAK,CAAC;EACtEK,eAAe,EAAEC,uBAAuB,CAACT,OAAO,CAACU,WAAW,EAAEN,SAAS;AACzE,CAAC,CAAC;AAEF,OAAO,MAAMO,cAAc,GAAGA,CAAA,KAAM;EAClC,MAAMC,eAAe,GAAGtB,cAAc,CAAC,CAAC,CAACsB,eAAe;EACxD,MAAMC,cAAc,GAAGlB,eAAe,CAAEmB,KAAK,IAAKA,KAAK,CAACD,cAAc,CAAC;EACvE,MAAME,gBAAgB,GAAGpB,eAAe,CAAEmB,KAAK,IAAKA,KAAK,CAACC,gBAAgB,CAAC;EAC3E,MAAMC,gBAAgB,GAAGrB,eAAe,CAAEmB,KAAK,IAAKA,KAAK,CAACE,gBAAgB,CAAC;EAC3E,MAAM;IAAEC,aAAa;IAAEC;EAAiB,CAAC,GAAG3B,oBAAoB,CAAC,CAAC;EAElE,MAAM4B,YAAY,GAAGrC,WAAW,CAC9B,OACEkB,OAAoB,EACpBC,MAAc,EACdC,OAAe,EACfC,iBAAiC,EACjCC,SAAiB,KACd;IACHS,cAAc,CAAC;MAAE,GAAGb,OAAO;MAAEoB,MAAM,EAAEnC,aAAa,CAACoC;IAAQ,CAAC,CAAC;IAE7D,IAAI;MACF,MAAMC,UAAU,GAAGvB,eAAe,CAChCC,OAAO,EACPC,MAAM,EACNC,OAAO,EACPC,iBAAiB,EACjBC,SACF,CAAC;MACDmB,OAAO,CAACC,GAAG,CAAC,sCAAsC,EAAEF,UAAU,CAAC;MAC/D,MAAMG,IAAI,GAAG,MAAMrC,SAAS,CAACsC,WAAW,CAACJ,UAAU,CAAC;MACpDN,gBAAgB,CAAChB,OAAO,CAAC2B,WAAW,CAAC;MACrCd,cAAc,CAACY,IAAI,CAAC;IACtB,CAAC,CAAC,MAAM;MACNV,gBAAgB,CAAC;QAAE,GAAGf,OAAO;QAAEoB,MAAM,EAAEnC,aAAa,CAAC2C;MAAO,CAAC,CAAC;IAChE;IACA,MAAM,IAAIC,OAAO,CAAEC,OAAO,IAAKC,UAAU,CAACD,OAAO,EAAE,GAAG,CAAC,CAAC;IACxDjC,kBAAkB,CAACmC,IAAI,CAAClC,SAAS,CAACmC,cAAc,CAAC;EACnD,CAAC,EACD,CAACpB,cAAc,EAAEE,gBAAgB,EAAEC,gBAAgB,CACrD,CAAC;EAED,MAAMU,WAAW,GAAG5C,WAAW,CAC7B,OAAO;IACLsB,SAAS;IACT8B,WAAW;IACXC,IAAI;IACJC;EAMF,CAAC,KAAK;IACJ,MAAM;MAAEC,MAAM,EAAEpC,MAAM;MAAEC;IAAQ,CAAC,GAC/BnB,oBAAoB,CAACuD,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAACtC,MAAM,IAAI,CAACC,OAAO,EAAE;IAEzB,MAAMsC,WAA0B,GAAG,EAAE;IAErC,MAAMC,OAAO,GAAG,CAAC,CAACrC,SAAS,IAAIA,SAAS,CAACsC,IAAI,CAAC,CAAC,KAAK,EAAE;IACtD,MAAMC,UAAU,GAAG,CAAC,CAACT,WAAW,EAAEU,GAAG;;IAErC;IACA,IAAIH,OAAO,EAAE;MACX,MAAMI,IAAI,GAAGJ,OAAO,GAAGtD,WAAW,CAACiB,SAAS,CAAC,GAAG,EAAE;MAClD,MAAM0C,YAAY,GAAGD,IAAI,CAACE,MAAM,GAAG,CAAC,IAAIJ,UAAU;MAClD,IAAI3C,OAA2B,GAAG,IAAI;MAEtC,IAAIiB,aAAa,EAAE;QACjBjB,OAAO,GAAG,MAAMgD,mBAAmB,CAAC;UAClCC,IAAI,EAAE7C,SAAS,IAAI,EAAE;UACrBJ,OAAO,EAAEiB;QACX,CAAC,CAAC;QACFC,gBAAgB,CAACgC,SAAS,CAAC;MAC7B,CAAC,MAAM,IAAIJ,YAAY,EAAE;QACvB9C,OAAO,GAAG,MAAMmD,oBAAoB,CAAC/C,SAAS,IAAI,EAAE,EAAEyC,IAAI,CAAC;MAC7D,CAAC,MAAM,IAAIJ,OAAO,EAAE;QAClBzC,OAAO,GAAG,MAAMoD,iBAAiB,CAAChD,SAAS,CAAC;MAC9C;MAEA,IAAI,CAACJ,OAAO,EAAE;MACdwC,WAAW,CAACa,IAAI,CAACrD,OAAO,CAAC;IAC3B;;IAEA;IACA,IAAIoC,aAAa,EAAE;MACjB,IAAIkB,UAA2B,GAAG;QAChCC,IAAI,EAAEjD,IAAI,CAACC,SAAS,CAAC6B,aAAa,CAACmB,IAAI,CAAC;QACxCC,SAAS,EAAEpB,aAAa,CAACqB,IAAI;QAC7BC,WAAW,EACTtB,aAAa,EAAEqB,IAAI,KAAKpE,iBAAiB,CAACsE,KAAK,GAC3CvB,aAAa,EAAEmB,IAAI,EAAEK,SAAS,GAC9B;MACR,CAAC;MACD,MAAM5D,OAAO,GAAG,MAAM6D,mBAAmB,CAACP,UAAU,CAAC;MACrD,IAAI,CAACtD,OAAO,EAAE;MACdwC,WAAW,CAACa,IAAI,CAACrD,OAAO,CAAC;IAC3B;IAEA,KAAK,MAAMA,OAAO,IAAIwC,WAAW,EAAE;MACjC,MAAMrC,iBAAiC,GAAG;QACxCS,eAAe;QACfsB,WAAW;QACXC;MACF,CAAC;MAED,MAAMhB,YAAY,CAChBnB,OAAO,EACPC,MAAM,IAAI,EAAE,EACZC,OAAO,IAAI,EAAE,EACbC,iBAAiB,EACjBC,SAAS,IAAI,EACf,CAAC;IACH;EACF,CAAC,EACD,CAACQ,eAAe,EAAEO,YAAY,EAAEF,aAAa,EAAEC,gBAAgB,CACjE,CAAC;EAED,MAAM4C,YAAY,GAAGhF,WAAW,CAC9B,MAAOkB,OAAoB,IAAK;IAC9B,MAAM;MAAEqC,MAAM,EAAEpC,MAAM;MAAEC;IAAQ,CAAC,GAC/BnB,oBAAoB,CAACuD,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAACtC,MAAM,IAAI,CAACC,OAAO,EAAE;IAEzBa,gBAAgB,CAAC;MAAE,GAAGf,OAAO;MAAEoB,MAAM,EAAEnC,aAAa,CAACoC;IAAQ,CAAC,CAAC;;IAE/D;IACA;IACA,MAAM0C,YAAY,GAChB,CACE7E,WAAW,CAAC8E,cAAc,EAC1B9E,WAAW,CAAC+E,YAAY,EACxB/E,WAAW,CAACgF,WAAW,EACvBhF,WAAW,CAACiF,YAAY,CACzB,CACDC,QAAQ,CAACpE,OAAO,CAACU,WAAW,CAAC;IAE/B,MAAM2D,MAAM,GAAG;MACbpE,MAAM,EAAEA,MAAM,IAAI,EAAE;MACpBC,OAAO,EAAEA,OAAO,IAAI,EAAE;MACtBF,OAAO;MACPQ,eAAe,EAAEC,uBAAuB,CAACT,OAAO,CAACU,WAAW,EAAE,EAAE;IAClE,CAAC;IAED,IAAI;MACF,MAAMe,IAAI,GAAGsC,YAAY,GACrB,MAAM3E,SAAS,CAACkF,iBAAiB,CAACD,MAAM,CAAC,GACzC,MAAMjF,SAAS,CAACsC,WAAW,CACzB3B,eAAe,CACbC,OAAO,EACPC,MAAM,IAAI,EAAE,EACZC,OAAO,IAAI,EAAE,EACbI,IAAI,CAACiE,KAAK,CAACvE,OAAO,CAACK,EAAE,IAAI,IAAI,CAAC,EAC9B,EACF,CACF,CAAC;MACLW,gBAAgB,CAAChB,OAAO,CAAC2B,WAAW,CAAC;MACrCd,cAAc,CAACY,IAAI,CAAC;IACtB,CAAC,CAAC,MAAM;MACNV,gBAAgB,CAAC;QAAE,GAAGf,OAAO;QAAEoB,MAAM,EAAEnC,aAAa,CAAC2C;MAAO,CAAC,CAAC;IAChE;IACA,MAAM,IAAIC,OAAO,CAAEC,OAAO,IAAKC,UAAU,CAACD,OAAO,EAAE,GAAG,CAAC,CAAC;IACxDjC,kBAAkB,CAACmC,IAAI,CAAClC,SAAS,CAACmC,cAAc,CAAC;EACnD,CAAC,EACD,CAACpB,cAAc,EAAEE,gBAAgB,EAAEC,gBAAgB,CACrD,CAAC;EAED,MAAMwD,aAAa,GAAG1F,WAAW,CAAC,MAAOkB,OAAoB,IAAK;IAChE,MAAMyE,cAAc,GAAG1F,oBAAoB,CACxCuD,QAAQ,CAAC,CAAC,CACVC,sBAAsB,CAAC,CAAC,EAAEkC,cAAc;IAC3C,IAAI,CAACA,cAAc,EAAE,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;IAE9D,MAAMtF,SAAS,CAACoF,aAAa,CAAC;MAC5BC,cAAc;MACd9C,WAAW,EAAE3B,OAAO,CAAC2B;IACvB,CAAC,CAAC;IAEFjC,kBAAkB,CAACM,OAAO,CAAC2B,WAAW,CAAC;EACzC,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IACLD,WAAW;IACXoC,YAAY;IACZU;EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAM/D,uBAAuB,GAAGA,CACrCC,WAAwB,EACxBN,SAAiB,KACd;EACH,MAAMuE,gBAAgB,GAAG5F,oBAAoB,EACzCuD,QAAQ,GAAG,CAAC,EACZC,sBAAsB,CAAC,CAAC;EAC5B,MAAMqC,cAAc,GAAG5F,YAAY,CAACsD,QAAQ,CAAC,CAAC,CAACuC,IAAI,EAAExC,MAAM,IAAI,EAAE;EACjE,MAAMyC,KAAK,GAAGH,gBAAgB,EAAEI,QAAQ,IAAI,SAAS;EACrD,MAAMC,IAAI,GAAGxF,iCAAiC,CAACkB,WAAW,EAAEN,SAAS,CAAC;EACtE,OAAO;IACL0E,KAAK;IACLE,IAAI;IACJ3E,EAAE,EAAEC,IAAI,CAACC,SAAS,CAAC;MACjB0E,IAAI,EAAEN,gBAAgB,EAAEO,OAAO,IAAI,EAAE;MACrCC,cAAc,EAAER,gBAAgB,EAAEF,cAAc,IAAI,EAAE;MACtDW,MAAM,EAAER,cAAc;MACtBS,OAAO,EAAEV,gBAAgB,EAAEzE,OAAO,IAAI,EAAE;MACxCoF,KAAK,EAAE7F,QAAQ,CAACkF,gBAAgB,CAAC,IAAI,EAAE;MACvCG,KAAK;MACLE;IACF,CAAC,CAAC;IACFO,YAAY,EAAE,SAAS;IACvBC,aAAa,EAAE;EACjB,CAAC;AACH,CAAC;AAED,OAAO,MAAMpC,iBAAiB,GAAG,MAAOH,IAAY,IAAK;EACvD,IAAIwC,WAAW,GAAG,MAAMrG,SAAS,CAACgE,iBAAiB,CAACH,IAAI,EAAErD,IAAI,CAAC8F,EAAE,CAAC,CAAC,CAAC,CACjEC,IAAI,CAAEpC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDqC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BvE,OAAO,CAACwE,KAAK,CAAC,mBAAmB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACnD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOL,WAAW;AACpB,CAAC;AAED,OAAO,MAAMtC,oBAAoB,GAAG,MAAAA,CAAOF,IAAY,EAAEJ,IAAc,KAAK;EAC1E,IAAImD,cAAc,GAAG,MAAM5G,SAAS,CAAC+D,oBAAoB,CACvDF,IAAI,EACJJ,IAAI,EACJjD,IAAI,CAAC8F,EAAE,CAAC,CACV,CAAC,CACEC,IAAI,CAAEpC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDqC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BvE,OAAO,CAACwE,KAAK,CAAC,sBAAsB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACtD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOE,cAAc;AACvB,CAAC;AAED,OAAO,MAAMnC,mBAAmB,GAAG,MAAOQ,MAAuB,IAAK;EACpE,IAAIjC,aAAa,GAAG,MAAMhD,SAAS,CAACyE,mBAAmB,CAACQ,MAAM,EAAEzE,IAAI,CAAC8F,EAAE,CAAC,CAAC,CAAC,CACvEC,IAAI,CAAEpC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDqC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BvE,OAAO,CAACwE,KAAK,CAAC,sBAAsB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACtD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAO1D,aAAa;AACtB,CAAC;AAED,OAAO,MAAMY,mBAAmB,GAAG,MAAOqB,MAAsB,IAAK;EACnE,IAAIpD,aAAa,GAAG,MAAM7B,SAAS,CAAC6G,kBAAkB,CAAC5B,MAAM,EAAEzE,IAAI,CAAC8F,EAAE,CAAC,CAAC,CAAC,CACtEC,IAAI,CAAEpC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDqC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9BvE,OAAO,CAACwE,KAAK,CAAC,qBAAqB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACrD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAO7E,aAAa;AACtB,CAAC","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -8,7 +8,6 @@ export * from "./core/index.js";
|
|
|
8
8
|
export * from "./store/index.js";
|
|
9
9
|
export * from "./context/index.js";
|
|
10
10
|
export * from "./hooks/useConversationList.js";
|
|
11
|
-
export * from "./hooks/useChatMessages.js";
|
|
12
11
|
export * from "./hooks/message/useSendMessage.js";
|
|
13
12
|
export { useImageAttachment } from "./hooks/useImageAttachment.js";
|
|
14
13
|
export { useMediaViewer } from "./hooks/useMediaViewer.js";
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["ChatAPI","setAuthToken","getAuthToken","clearAuthToken","setTokenRefreshCallback","setTokenRefreshFailedCallback","refreshAuthToken","initBaseUrl","getBaseUrl","Config","useImageAttachment","useMediaViewer","initializeAttachmentHandlers","AttachmentOrchestratorService","Avatar","ThreadCard","AttachmentPreview","MediaViewerModal","Inbox","default","MediaViewerScreen","LoginStatus","MessageType","registerUIUtils","UIUtils","DFlowContext"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,qBAAY;AACpC,SACEC,YAAY,EACZC,YAAY,EACZC,cAAc,EACdC,uBAAuB,EACvBC,6BAA6B,EAC7BC,gBAAgB,QACX,oBAAiB;AACxB,SAASC,WAAW,EAAEC,UAAU,QAAQ,2BAAwB;AAChE,SAASC,MAAM,QAAQ,mBAAU;AACjC,cAAc,iBAAQ;AACtB,cAAc,kBAAS;AACvB,cAAc,oBAAW;AACzB,cAAc,gCAA6B;AAC3C,cAAc,
|
|
1
|
+
{"version":3,"names":["ChatAPI","setAuthToken","getAuthToken","clearAuthToken","setTokenRefreshCallback","setTokenRefreshFailedCallback","refreshAuthToken","initBaseUrl","getBaseUrl","Config","useImageAttachment","useMediaViewer","initializeAttachmentHandlers","AttachmentOrchestratorService","Avatar","ThreadCard","AttachmentPreview","MediaViewerModal","Inbox","default","MediaViewerScreen","LoginStatus","MessageType","registerUIUtils","UIUtils","DFlowContext"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,qBAAY;AACpC,SACEC,YAAY,EACZC,YAAY,EACZC,cAAc,EACdC,uBAAuB,EACvBC,6BAA6B,EAC7BC,gBAAgB,QACX,oBAAiB;AACxB,SAASC,WAAW,EAAEC,UAAU,QAAQ,2BAAwB;AAChE,SAASC,MAAM,QAAQ,mBAAU;AACjC,cAAc,iBAAQ;AACtB,cAAc,kBAAS;AACvB,cAAc,oBAAW;AACzB,cAAc,gCAA6B;AAC3C,cAAc,mCAAgC;AAC9C,SAASC,kBAAkB,QAAQ,+BAA4B;AAC/D,SAASC,cAAc,QAAQ,2BAAwB;AAEvD,cAAc,iBAAc;AAC5B,cAAc,wBAAqB;AACnC,cAAc,uBAAoB;AAClC,SAASC,4BAA4B,QAAQ,wCAA+B;AAC5E,SAASC,6BAA6B,QAAQ,sCAAmC;AACjF,SAASC,MAAM,QAAQ,8BAAqB;AAC5C,SAASC,UAAU,QAAQ,kCAAyB;AACpD,SAASC,iBAAiB,QAAQ,yCAAgC;AAClE,SAASC,gBAAgB,QAAQ,kCAA+B;AAChE,SAASC,KAAK,QAAQ,0BAAiB;AACvC,SAASC,OAAO,IAAIC,iBAAiB,QAAQ,8BAAqB;AAClE,cAAc,gCAAuB;AAOrC,SAASC,WAAW,EAAEC,WAAW,QAAQ,+BAA+B;AACxE,cAAc,gCAAuB;AAerC,SAASC,eAAe,EAAEC,OAAO,QAAQ,oBAAiB;AAE1D,SAASC,YAAY,QAAQ,kBAAe","ignoreList":[]}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
|
|
4
|
-
import { Platform, StyleSheet } from 'react-native';
|
|
4
|
+
import { DeviceEventEmitter, Platform, StyleSheet } from 'react-native';
|
|
5
5
|
import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
|
|
6
6
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
7
7
|
import { KContainer } from '@droppii/libs';
|
|
8
8
|
import { useNavigation } from '@react-navigation/native';
|
|
9
|
-
import { useChatMessages } from "../../hooks/useChatMessages.js";
|
|
10
9
|
import { usePinMessage } from "../../hooks/message/usePinMessage.js";
|
|
11
10
|
import { PinnedMessageBar } from "./PinnedMessageBar.js";
|
|
12
11
|
import { openPinnedMessagesSheet } from "./PinnedMessagesSheet.js";
|
|
13
12
|
import { MediaViewerModal } from "../../components/MediaViewerModal.js";
|
|
14
|
-
import { useConversation, useConversationStore } from "../../store/index.js";
|
|
13
|
+
import { useConversation, useConversationStore, useUserStore } from "../../store/index.js";
|
|
15
14
|
import ChatDetailHeader from "./ChatDetailHeader.js";
|
|
16
15
|
import { ChatListLegend } from "./ChatListLegend.js";
|
|
17
16
|
import { ChatComposer } from "./ChatComposer.js";
|
|
@@ -21,13 +20,15 @@ import { MessageToolboxOverlay } from "./messageToolbox/MessageToolboxOverlay.js
|
|
|
21
20
|
import { DBotStatusValue } from "../../types/chat.js";
|
|
22
21
|
import { useGetConversationDetail, useGetStatusConversationBot } from "../../hooks/conversation/useGetConversationDetail.js";
|
|
23
22
|
import { PeerType } from '@droppii/openim-rn-client-sdk';
|
|
23
|
+
import { useMessages } from "../../hooks/message/useMessages.js";
|
|
24
|
+
import { getBotId } from "../../utils/conversation.js";
|
|
25
|
+
import { ChatEvent } from "../../types/events.js";
|
|
24
26
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
25
27
|
const ChatDetail = /*#__PURE__*/memo(({
|
|
26
28
|
targetConversationId = '',
|
|
27
29
|
targetUserId = '',
|
|
28
30
|
targetGroupId = '',
|
|
29
31
|
targetBotId = '',
|
|
30
|
-
enabled = true,
|
|
31
32
|
showAddMember,
|
|
32
33
|
onBack,
|
|
33
34
|
onPressSearch,
|
|
@@ -41,6 +42,7 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
41
42
|
const navigation = useNavigation();
|
|
42
43
|
const mediaViewerRef = useRef(null);
|
|
43
44
|
const messageToolboxRef = useRef(null);
|
|
45
|
+
const currentUser = useUserStore(s => s.user);
|
|
44
46
|
const {
|
|
45
47
|
conversationId,
|
|
46
48
|
isLoading: isLoadingConversation
|
|
@@ -56,16 +58,10 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
56
58
|
if (targetBotId) {
|
|
57
59
|
return targetBotId;
|
|
58
60
|
}
|
|
59
|
-
|
|
60
|
-
const id = JSON.parse(conversation?.ex ?? '{}')?.sessionInfo?.data?.botId;
|
|
61
|
-
return id;
|
|
62
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
63
|
-
} catch (_) {
|
|
64
|
-
return undefined;
|
|
65
|
-
}
|
|
61
|
+
return getBotId(conversation);
|
|
66
62
|
}
|
|
67
63
|
return undefined;
|
|
68
|
-
}, [conversation
|
|
64
|
+
}, [conversation, targetBotId]);
|
|
69
65
|
const {
|
|
70
66
|
data: botInfo
|
|
71
67
|
} = useGetStatusConversationBot(botId);
|
|
@@ -80,14 +76,15 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
80
76
|
}, []);
|
|
81
77
|
const {
|
|
82
78
|
messages,
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
79
|
+
initLoading,
|
|
80
|
+
moreOldLoading,
|
|
81
|
+
moreNewLoading,
|
|
82
|
+
getMoreOldMessages,
|
|
83
|
+
getMoreNewMessages,
|
|
84
|
+
hasMoreOld,
|
|
85
|
+
hasMoreNew
|
|
86
|
+
} = useMessages({
|
|
87
|
+
conversationId
|
|
91
88
|
});
|
|
92
89
|
const {
|
|
93
90
|
pinnedMessages,
|
|
@@ -116,11 +113,16 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
116
113
|
}, []);
|
|
117
114
|
const handlePressPinnedMessageBar = useCallback(() => {
|
|
118
115
|
openPinnedMessagesSheet({
|
|
119
|
-
currentUserId,
|
|
116
|
+
currentUserId: currentUser?.userID,
|
|
120
117
|
unpinMessage,
|
|
121
|
-
customMessageItemFactory
|
|
118
|
+
customMessageItemFactory,
|
|
119
|
+
onPressMessage: message => {
|
|
120
|
+
DeviceEventEmitter.emit(ChatEvent.ScrollToMessage, {
|
|
121
|
+
clientMessageId: message?.clientMsgID
|
|
122
|
+
});
|
|
123
|
+
}
|
|
122
124
|
});
|
|
123
|
-
}, [
|
|
125
|
+
}, [currentUser, unpinMessage, customMessageItemFactory]);
|
|
124
126
|
return /*#__PURE__*/_jsxs(KContainer.Page, {
|
|
125
127
|
flex: true,
|
|
126
128
|
edges: ['bottom'],
|
|
@@ -134,7 +136,7 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
134
136
|
onPressAvatar: onPressAvatar
|
|
135
137
|
}), /*#__PURE__*/_jsx(PinnedMessageBar, {
|
|
136
138
|
messages: pinnedMessages,
|
|
137
|
-
currentUserId:
|
|
139
|
+
currentUserId: currentUser?.userID,
|
|
138
140
|
onPress: handlePressPinnedMessageBar
|
|
139
141
|
}), /*#__PURE__*/_jsxs(KeyboardAvoidingView, {
|
|
140
142
|
style: styles.keyboardAvoiding,
|
|
@@ -142,12 +144,15 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
142
144
|
keyboardVerticalOffset: keyboardVerticalOffset,
|
|
143
145
|
children: [/*#__PURE__*/_jsx(ChatListLegend, {
|
|
144
146
|
messages: messages,
|
|
145
|
-
|
|
147
|
+
conversationId: conversationId,
|
|
146
148
|
customMessageItemFactory: customMessageItemFactory,
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
149
|
+
isLoading: initLoading || isLoadingConversation,
|
|
150
|
+
onLoadMoreOld: getMoreOldMessages,
|
|
151
|
+
hasMoreOld: hasMoreOld,
|
|
152
|
+
moreOldLoading: moreOldLoading,
|
|
153
|
+
onLoadMoreNew: getMoreNewMessages,
|
|
154
|
+
hasMoreNew: hasMoreNew,
|
|
155
|
+
moreNewLoading: moreNewLoading,
|
|
151
156
|
onMediaPress: handleMediaPress,
|
|
152
157
|
onPressUrl: handlePressUrl,
|
|
153
158
|
onLongPress: handleMessageLongPress
|
|
@@ -160,7 +165,7 @@ const ChatDetail = /*#__PURE__*/memo(({
|
|
|
160
165
|
ref: mediaViewerRef
|
|
161
166
|
}), /*#__PURE__*/_jsx(MessageToolboxOverlay, {
|
|
162
167
|
ref: messageToolboxRef,
|
|
163
|
-
currentUserId:
|
|
168
|
+
currentUserId: currentUser?.userID,
|
|
164
169
|
customMessageItemFactory: customMessageItemFactory,
|
|
165
170
|
onPinMessage: pinMessage,
|
|
166
171
|
onUnpinMessage: unpinMessage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useEffect","useMemo","useRef","Platform","StyleSheet","KeyboardAvoidingView","useSafeAreaInsets","KContainer","useNavigation","
|
|
1
|
+
{"version":3,"names":["memo","useCallback","useEffect","useMemo","useRef","DeviceEventEmitter","Platform","StyleSheet","KeyboardAvoidingView","useSafeAreaInsets","KContainer","useNavigation","usePinMessage","PinnedMessageBar","openPinnedMessagesSheet","MediaViewerModal","useConversation","useConversationStore","useUserStore","ChatDetailHeader","ChatListLegend","ChatComposer","shouldShowAddMember","normalizeUrl","MessageToolboxOverlay","DBotStatusValue","useGetConversationDetail","useGetStatusConversationBot","PeerType","useMessages","getBotId","ChatEvent","jsx","_jsx","jsxs","_jsxs","ChatDetail","targetConversationId","targetUserId","targetGroupId","targetBotId","showAddMember","onBack","onPressSearch","onPressAddMember","onPressMenu","onPressAvatar","onPressUrl","customMessageItemFactory","pannelActions","navigation","mediaViewerRef","messageToolboxRef","currentUser","s","user","conversationId","isLoading","isLoadingConversation","conversation","botId","peerType","Bot","undefined","data","botInfo","status","botStatus","handleBackDefault","goBack","handleMediaPress","items","index","current","show","messages","initLoading","moreOldLoading","moreNewLoading","getMoreOldMessages","getMoreNewMessages","hasMoreOld","hasMoreNew","pinnedMessages","pinMessage","unpinMessage","getState","setCurrentConversation","resolvedShowAddMember","insets","keyboardVerticalOffset","select","android","bottom","default","handlePressUrl","url","handleMessageLongPress","message","rect","handlePressPinnedMessageBar","currentUserId","userID","onPressMessage","emit","ScrollToMessage","clientMessageId","clientMsgID","Page","flex","edges","children","onPress","style","styles","keyboardAvoiding","behavior","onLoadMoreOld","onLoadMoreNew","onMediaPress","onLongPress","isEmptyMessage","length","isDisableCompose","INACTIVE","ref","onPinMessage","onUnpinMessage","displayName","create"],"sourceRoot":"../../../../src","sources":["screens/chat-detail/ChatDetail.tsx"],"mappings":";;AAAA,SAASA,IAAI,EAAEC,WAAW,EAAEC,SAAS,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AACrE,SAASC,kBAAkB,EAAEC,QAAQ,EAAEC,UAAU,QAAQ,cAAc;AAEvE,SAASC,oBAAoB,QAAQ,kCAAkC;AACvE,SAASC,iBAAiB,QAAQ,gCAAgC;AAClE,SAASC,UAAU,QAAQ,eAAe;AAC1C,SAASC,aAAa,QAAQ,0BAA0B;AACxD,SAASC,aAAa,QAAQ,sCAAmC;AACjE,SAASC,gBAAgB,QAAQ,uBAAoB;AACrD,SAASC,uBAAuB,QAAQ,0BAAuB;AAC/D,SACEC,gBAAgB,QAEX,sCAAmC;AAC1C,SACEC,eAAe,EACfC,oBAAoB,EACpBC,YAAY,QACP,sBAAa;AACpB,OAAOC,gBAAgB,MAAM,uBAAoB;AACjD,SAASC,cAAc,QAAQ,qBAAkB;AACjD,SAASC,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,mBAAmB,QAAQ,+BAA4B;AAEhE,SAASC,YAAY,QAAQ,oBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,2CAAwC;AAE9E,SAASC,eAAe,QAAQ,qBAAkB;AAClD,SACEC,wBAAwB,EACxBC,2BAA2B,QACtB,sDAAmD;AAC1D,SAASC,QAAQ,QAAQ,+BAA+B;AAExD,SAASC,WAAW,QAAQ,oCAAiC;AAC7D,SAASC,QAAQ,QAAQ,6BAA0B;AACnD,SAASC,SAAS,QAAQ,uBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAE/C,MAAMC,UAAU,gBAAGpC,IAAI,CACrB,CAAC;EACCqC,oBAAoB,GAAG,EAAE;EACzBC,YAAY,GAAG,EAAE;EACjBC,aAAa,GAAG,EAAE;EAClBC,WAAW,GAAG,EAAE;EAChBC,aAAa;EACbC,MAAM;EACNC,aAAa;EACbC,gBAAgB;EAChBC,WAAW;EACXC,aAAa;EACbC,UAAU;EACVC,wBAAwB;EACxBC;AACe,CAAC,KAAK;EACrB,MAAMC,UAAU,GAAGvC,aAAa,CAAC,CAAC;EAClC,MAAMwC,cAAc,GAAG/C,MAAM,CAAyB,IAAI,CAAC;EAC3D,MAAMgD,iBAAiB,GAAGhD,MAAM,CAAoB,IAAI,CAAC;EACzD,MAAMiD,WAAW,GAAGnC,YAAY,CAAEoC,CAAC,IAAKA,CAAC,CAACC,IAAI,CAAC;EAE/C,MAAM;IAAEC,cAAc;IAAEC,SAAS,EAAEC;EAAsB,CAAC,GACxDhC,wBAAwB,CAAC;IACvBW,oBAAoB;IACpBC,YAAY;IACZC,aAAa;IACbC;EACF,CAAC,CAAC;EAEJ,MAAMmB,YAAY,GAAG3C,eAAe,CAACwC,cAAc,CAAC;EAEpD,MAAMI,KAAK,GAAGzD,OAAO,CAAC,MAAM;IAC1B,IAAIwD,YAAY,EAAEE,QAAQ,KAAKjC,QAAQ,CAACkC,GAAG,EAAE;MAC3C,IAAItB,WAAW,EAAE;QACf,OAAOA,WAAW;MACpB;MACA,OAAOV,QAAQ,CAAC6B,YAAY,CAAC;IAC/B;IACA,OAAOI,SAAS;EAClB,CAAC,EAAE,CAACJ,YAAY,EAAEnB,WAAW,CAAC,CAAC;EAE/B,MAAM;IAAEwB,IAAI,EAAEC;EAAQ,CAAC,GAAGtC,2BAA2B,CAACiC,KAAK,CAAC;EAE5D,MAAM;IAAEM,MAAM,EAAEC;EAAU,CAAC,GAAGF,OAAO,IAAI,CAAC,CAAC;EAE3C,MAAMG,iBAAiB,GAAGnE,WAAW,CAAC,MAAM;IAC1CiD,UAAU,CAACmB,MAAM,CAAC,CAAC;EACrB,CAAC,EAAE,CAACnB,UAAU,CAAC,CAAC;EAEhB,MAAMoB,gBAAgB,GAAGrE,WAAW,CAClC,CACEsE,KAAoD,EACpDC,KAAc,KACX;IACHrB,cAAc,CAACsB,OAAO,EAAEC,IAAI,CAACH,KAAK,EAAEC,KAAK,CAAC;EAC5C,CAAC,EACD,EACF,CAAC;EAED,MAAM;IACJG,QAAQ;IACRC,WAAW;IACXC,cAAc;IACdC,cAAc;IACdC,kBAAkB;IAClBC,kBAAkB;IAClBC,UAAU;IACVC;EACF,CAAC,GAAGrD,WAAW,CAAC;IAAE2B;EAAe,CAAC,CAAC;EAEnC,MAAM;IAAE2B,cAAc;IAAEC,UAAU;IAAEC;EAAa,CAAC,GAChDzE,aAAa,CAAC4C,cAAc,CAAC;EAE/BtD,SAAS,CAAC,MAAM;IACd,IAAIsD,cAAc,EAAE;MAClBvC,oBAAoB,CAACqE,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC/B,cAAc,CAAC;IACxE;IACA,OAAO,MAAM;MACXvC,oBAAoB,CAACqE,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAACxB,SAAS,CAAC;IACnE,CAAC;EACH,CAAC,EAAE,CAACP,cAAc,CAAC,CAAC;EAEpB,MAAMgC,qBAAqB,GACzB/C,aAAa,IAAInB,mBAAmB,CAACqC,YAAY,CAAC;EAEpD,MAAM8B,MAAM,GAAGhF,iBAAiB,CAAC,CAAC;EAElC,MAAMiF,sBAAsB,GAAGvF,OAAO,CACpC,MAAMG,QAAQ,CAACqF,MAAM,CAAC;IAAEC,OAAO,EAAEH,MAAM,CAACI,MAAM;IAAEC,OAAO,EAAE;EAAE,CAAC,CAAC,EAC7D,CAACL,MAAM,CAACI,MAAM,CAChB,CAAC;EAED,MAAME,cAAc,GAAG9F,WAAW,CAC/B+F,GAAW,IAAK;IACfjD,UAAU,GAAGxB,YAAY,CAACyE,GAAG,CAAC,CAAC;EACjC,CAAC,EACD,CAACjD,UAAU,CACb,CAAC;EAED,MAAMkD,sBAAsB,GAAGhG,WAAW,CACxC,CAACiG,OAAoB,EAAEC,IAAkB,KAAK;IAC5C/C,iBAAiB,CAACqB,OAAO,EAAEC,IAAI,CAACwB,OAAO,EAAEC,IAAI,CAAC;EAChD,CAAC,EACD,EACF,CAAC;EAED,MAAMC,2BAA2B,GAAGnG,WAAW,CAAC,MAAM;IACpDa,uBAAuB,CAAC;MACtBuF,aAAa,EAAEhD,WAAW,EAAEiD,MAAM;MAClCjB,YAAY;MACZrC,wBAAwB;MACxBuD,cAAc,EAAGL,OAAoB,IAAK;QACxC7F,kBAAkB,CAACmG,IAAI,CAACzE,SAAS,CAAC0E,eAAe,EAAE;UACjDC,eAAe,EAAER,OAAO,EAAES;QAC5B,CAAC,CAAC;MACJ;IACF,CAAC,CAAC;EACJ,CAAC,EAAE,CAACtD,WAAW,EAAEgC,YAAY,EAAErC,wBAAwB,CAAC,CAAC;EAEzD,oBACEb,KAAA,CAACzB,UAAU,CAACkG,IAAI;IAACC,IAAI;IAACC,KAAK,EAAE,CAAC,QAAQ,CAAE;IAAAC,QAAA,gBACtC9E,IAAA,CAACd,gBAAgB;MACfqC,cAAc,EAAEA,cAAe;MAC/Bf,aAAa,EAAE+C,qBAAsB;MACrC9C,MAAM,EAAEA,MAAM,IAAI0B,iBAAkB;MACpCzB,aAAa,EAAEA,aAAc;MAC7BC,gBAAgB,EAAEA,gBAAiB;MACnCC,WAAW,EAAEA,WAAY;MACzBC,aAAa,EAAEA;IAAc,CAC9B,CAAC,eAEFb,IAAA,CAACpB,gBAAgB;MACf8D,QAAQ,EAAEQ,cAAe;MACzBkB,aAAa,EAAEhD,WAAW,EAAEiD,MAAO;MACnCU,OAAO,EAAEZ;IAA4B,CACtC,CAAC,eAEFjE,KAAA,CAAC3B,oBAAoB;MACnByG,KAAK,EAAEC,MAAM,CAACC,gBAAiB;MAC/BC,QAAQ,EAAC,SAAS;MAClB1B,sBAAsB,EAAEA,sBAAuB;MAAAqB,QAAA,gBAE/C9E,IAAA,CAACb,cAAc;QACbuD,QAAQ,EAAEA,QAAS;QACnBnB,cAAc,EAAEA,cAAe;QAC/BR,wBAAwB,EAAEA,wBAAyB;QACnDS,SAAS,EAAEmB,WAAW,IAAIlB,qBAAsB;QAChD2D,aAAa,EAAEtC,kBAAmB;QAClCE,UAAU,EAAEA,UAAW;QACvBJ,cAAc,EAAEA,cAAe;QAC/ByC,aAAa,EAAEtC,kBAAmB;QAClCE,UAAU,EAAEA,UAAW;QACvBJ,cAAc,EAAEA,cAAe;QAC/ByC,YAAY,EAAEjD,gBAAiB;QAC/BvB,UAAU,EAAEgD,cAAe;QAC3ByB,WAAW,EAAEvB;MAAuB,CACrC,CAAC,eAEFhE,IAAA,CAACZ,YAAY;QACXoG,cAAc,EAAE9C,QAAQ,EAAE+C,MAAM,KAAK,CAAE;QACvCzE,aAAa,EAAEA,aAAc;QAC7B0E,gBAAgB,EAAExD,SAAS,KAAK1C,eAAe,CAACmG;MAAS,CAC1D,CAAC;IAAA,CACkB,CAAC,eAEvB3F,IAAA,CAAClB,gBAAgB;MAAC8G,GAAG,EAAE1E;IAAe,CAAE,CAAC,eACzClB,IAAA,CAACT,qBAAqB;MACpBqG,GAAG,EAAEzE,iBAAkB;MACvBiD,aAAa,EAAEhD,WAAW,EAAEiD,MAAO;MACnCtD,wBAAwB,EAAEA,wBAAyB;MACnD8E,YAAY,EAAE1C,UAAW;MACzB2C,cAAc,EAAE1C;IAAa,CAC9B,CAAC;EAAA,CACa,CAAC;AAEtB,CACF,CAAC;AAEDjD,UAAU,CAAC4F,WAAW,GAAG,YAAY;AAErC,MAAMd,MAAM,GAAG3G,UAAU,CAAC0H,MAAM,CAAC;EAC/Bd,gBAAgB,EAAE;IAAEN,IAAI,EAAE;EAAE;AAC9B,CAAC,CAAC;AAEF,eAAezE,UAAU","ignoreList":[]}
|