@droppii-org/chat-mobile 0.2.31 → 0.2.32
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 +4 -0
- package/lib/module/components/ThreadCard/ThreadCard.js.map +1 -1
- package/lib/module/context/ChatContext.js +46 -12
- package/lib/module/context/ChatContext.js.map +1 -1
- package/lib/module/context/global.js +6 -0
- package/lib/module/context/global.js.map +1 -0
- package/lib/module/core/useChatListener.js +33 -12
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/hooks/message/useSendMessage.js +9 -3
- package/lib/module/hooks/message/useSendMessage.js.map +1 -1
- package/lib/module/hooks/useChatMessages.js +5 -1
- package/lib/module/hooks/useChatMessages.js.map +1 -1
- package/lib/module/hooks/useImageAttachment.js +2 -0
- package/lib/module/hooks/useImageAttachment.js.map +1 -1
- package/lib/module/index.js +9 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/services/attachmentOrchestrator.js +3 -1
- package/lib/module/services/attachmentOrchestrator.js.map +1 -1
- package/lib/module/types/chat.js.map +1 -1
- package/lib/module/utils/messageUtils.js +1 -1
- package/lib/module/utils/messageUtils.js.map +1 -1
- package/lib/module/utils/toastFlashMessage.js +56 -0
- package/lib/module/utils/toastFlashMessage.js.map +1 -0
- package/lib/typescript/src/components/ThreadCard/ThreadCard.d.ts.map +1 -1
- package/lib/typescript/src/context/ChatContext.d.ts.map +1 -1
- package/lib/typescript/src/context/global.d.ts +3 -0
- package/lib/typescript/src/context/global.d.ts.map +1 -0
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts +3 -1
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useChatMessages.d.ts.map +1 -1
- package/lib/typescript/src/hooks/useImageAttachment.d.ts.map +1 -1
- package/lib/typescript/src/index.d.ts +4 -3
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/services/attachmentOrchestrator.d.ts.map +1 -1
- package/lib/typescript/src/types/chat.d.ts +4 -0
- package/lib/typescript/src/types/chat.d.ts.map +1 -1
- package/lib/typescript/src/types/imageUpload.d.ts +1 -1
- package/lib/typescript/src/types/imageUpload.d.ts.map +1 -1
- package/lib/typescript/src/utils/messageUtils.d.ts.map +1 -1
- package/lib/typescript/src/utils/toastFlashMessage.d.ts +12 -0
- package/lib/typescript/src/utils/toastFlashMessage.d.ts.map +1 -0
- package/package.json +4 -2
- package/src/components/ThreadCard/ThreadCard.tsx +4 -0
- package/src/context/ChatContext.tsx +66 -9
- package/src/context/global.ts +6 -0
- package/src/core/useChatListener.ts +47 -11
- package/src/hooks/message/useSendMessage.ts +13 -9
- package/src/hooks/useChatMessages.ts +6 -2
- package/src/hooks/useImageAttachment.ts +2 -0
- package/src/index.tsx +10 -18
- package/src/services/attachmentOrchestrator.ts +2 -0
- package/src/types/chat.ts +4 -0
- package/src/types/imageUpload.ts +1 -1
- package/src/utils/messageUtils.ts +1 -3
- package/src/utils/toastFlashMessage.ts +67 -0
|
@@ -12,6 +12,7 @@ import { useConversation, useUserStore } from "../../store/index.js";
|
|
|
12
12
|
import { MessageReceiveOptType } from '@droppii/openim-rn-client-sdk';
|
|
13
13
|
import { MuteThread } from "./MuteThread.js";
|
|
14
14
|
import { useIsJoinedGroup } from "../../hooks/useIsJoinedGroup.js";
|
|
15
|
+
import isEmpty from 'lodash/isEmpty';
|
|
15
16
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
16
17
|
const ThreadCard = /*#__PURE__*/memo(({
|
|
17
18
|
item,
|
|
@@ -35,6 +36,9 @@ const ThreadCard = /*#__PURE__*/memo(({
|
|
|
35
36
|
const isNotInGroup = groupID ? !isJoinedGroup : false;
|
|
36
37
|
const latestMsgData = useMemo(() => {
|
|
37
38
|
let result = null;
|
|
39
|
+
if (isEmpty(latestMsg)) {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
38
42
|
try {
|
|
39
43
|
result = JSON.parse(latestMsg || '{}');
|
|
40
44
|
} catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","useCallback","useMemo","ReanimatedSwipeable","KContainer","KImage","KLabel","KColors","AvatarSection","NamePrefixIcon","UnreadBadge","formatTimestamp","getLastMessageText","useConversation","useUserStore","MessageReceiveOptType","MuteThread","useIsJoinedGroup","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,SAASC,kBAAkB,QAAQ,6BAA0B;AAC7D,SAASC,eAAe,EAAEC,YAAY,QAAQ,sBAAa;AAC3D,SACEC,qBAAqB,QAEhB,+BAA+B;AACtC,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,gBAAgB,QAAQ,iCAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;
|
|
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,SAASC,kBAAkB,QAAQ,6BAA0B;AAC7D,SAASC,eAAe,EAAEC,YAAY,QAAQ,sBAAa;AAC3D,SACEC,qBAAqB,QAEhB,+BAA+B;AACtC,SAASC,UAAU,QAAQ,iBAAc;AACzC,SAASC,gBAAgB,QAAQ,iCAA8B;AAC/D,OAAOC,OAAO,MAAM,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAOrC,MAAMC,UAAU,gBAAGzB,IAAI,CAAC,CAAC;EAAE0B,IAAI;EAAEC;AAAyB,CAAC,KAAK;EAC9D,MAAMC,YAAY,GAAGf,eAAe,CAACa,IAAI,CAAC;EAE1C,MAAM;IACJG,QAAQ;IACRC,QAAQ;IACRC,OAAO;IACPC,WAAW,GAAG,CAAC;IACfC,UAAU,GAAGlB,qBAAqB,CAACmB,MAAM;IACzCC,QAAQ;IACRC,iBAAiB;IACjBC,SAAS;IACTC;EACF,CAAC,GAAGV,YAAY,IAAI,CAAC,CAAC;EAEtB,MAAM;IAAEW,IAAI,EAAEC;EAAc,CAAC,GAAGvB,gBAAgB,CAACqB,OAAO,CAAC;EACzD,MAAMG,YAAY,GAAGH,OAAO,GAAG,CAACE,aAAa,GAAG,KAAK;EAErD,MAAME,aAA0B,GAAGxC,OAAO,CAAC,MAAM;IAC/C,IAAIyC,MAAM,GAAG,IAAI;IACjB,IAAIzB,OAAO,CAACmB,SAAS,CAAC,EAAE;MACtB,OAAO,IAAI;IACb;IACA,IAAI;MACFM,MAAM,GAAGC,IAAI,CAACC,KAAK,CAACR,SAAS,IAAI,IAAI,CAAC;IACxC,CAAC,CAAC,OAAOS,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,iCAAiC,EAAEA,KAAK,CAAC;IACzD;IACA,OAAOH,MAAM;EACf,CAAC,EAAE,CAACN,SAAS,CAAC,CAAC;EAEf,MAAMW,QAAQ,GAAGlB,QAAQ,IAAI,EAAE;EAC/B,MAAMmB,SAAS,GAAGjB,WAAW,GAAG,CAAC;EACjC,MAAMkB,OAAO,GAAGjB,UAAU,KAAKlB,qBAAqB,CAACmB,MAAM;EAC3D,MAAMiB,SAAS,GAAGxC,eAAe,CAC/ByB,iBAAiB,IAAIM,aAAa,EAAEU,QAAQ,IAAI,IAClD,CAAC;EACD,MAAMC,aAAa,GAAGvC,YAAY,CAAEwC,CAAC,IAAKA,CAAC,CAACC,IAAI,EAAEC,MAAM,CAAC;EACzD,MAAMC,eAAe,GAAG7C,kBAAkB,CACxC8B,aAAa,EACbW,aAAa,EACbzB,YACF,CAAC;EAED,MAAM8B,WAAW,GAAGzD,WAAW,CAC5B0D,KAA4B,IAAK;IAChChC,OAAO,GAAG;MAAED,IAAI;MAAEiC;IAAM,CAAC,CAAC;EAC5B,CAAC,EACD,CAACjC,IAAI,EAAEC,OAAO,CAChB,CAAC;EAED,MAAMiC,kBAAkB,GAAG3D,WAAW,CACpC,CACE4D,SAAkB,EAClBC,YAAqB,EACrBC,gBAAkC,kBAElC3C,IAAA,CAAAE,SAAA;IAAA0C,QAAA,eACE5C,IAAA,CAAChB,UAAU,CAAC6D,WAAW;MAACC,OAAO,EAAE,CAACzB,YAAa;MAAAuB,QAAA,eAC7C5C,IAAA,CAACJ,UAAU;QACTY,YAAY,EAAEA,YAAa;QAC3BsB,OAAO,EAAEA,OAAQ;QACjBa,gBAAgB,EAAEA;MAAiB,CACpC;IAAC,CACoB;EAAC,CACzB,CACH,EACD,CAACb,OAAO,EAAEtB,YAAY,EAAEa,YAAY,CACtC,CAAC;EAED,oBACErB,IAAA,CAACjB,mBAAmB;IAClBgE,QAAQ,EAAE,CAAE;IACZC,cAAc,EAAE,EAAG;IACnBR,kBAAkB,EAAEA,kBAAmB;IAAAI,QAAA,eAEvCxC,KAAA,CAACpB,UAAU,CAACiE,SAAS;MACnBC,GAAG;MACHC,UAAU,EAAC,QAAQ;MACnBC,QAAQ,EAAC,SAAS;MAClBC,QAAQ,EAAC,SAAS;MAClB9C,OAAO,EAAE+B,WAAY;MACrBgB,aAAa,EAAE,CAAE;MACjBC,UAAU,EAAEpE,OAAO,CAACqE,KAAM;MAAAZ,QAAA,gBAE1B5C,IAAA,CAACZ,aAAa;QACZqE,MAAM,EAAE9C,OAAO,IAAI,IAAK;QACxBiB,QAAQ,EAAEA,QAAS;QACnBnB,QAAQ,EAAEA;MAAS,CACpB,CAAC,eAGFL,KAAA,CAACpB,UAAU,CAAC0E,IAAI;QAACC,IAAI;QAACC,OAAO,EAAC,QAAQ;QAACC,QAAQ,EAAE,CAAE;QAAAjB,QAAA,gBAEjDxC,KAAA,CAACpB,UAAU,CAAC0E,IAAI;UAACR,GAAG;UAACC,UAAU,EAAC,QAAQ;UAAAP,QAAA,gBACtC5C,IAAA,CAACX,cAAc;YAACoB,QAAQ,EAAEA;UAAS,CAAE,CAAC,eACtCT,IAAA,CAACd,MAAM,CAAC4E,IAAI;YACVC,IAAI,EAAElC,SAAS,GAAG,YAAY,GAAG,cAAe;YAChDmC,aAAa,EAAE,CAAE;YACjBC,KAAK,EAAE9E,OAAO,CAAC+E,KAAM;YACrBP,IAAI;YAAAf,QAAA,EAEHhB;UAAQ,CACE,CAAC,eACd5B,IAAA,CAAChB,UAAU,CAAC6D,WAAW;YAACC,OAAO,EAAEhB,OAAQ;YAAAc,QAAA,eACvC5C,IAAA,CAAChB,UAAU,CAAC0E,IAAI;cAACE,OAAO,EAAC,SAAS;cAAAhB,QAAA,eAChC5C,IAAA,CAACf,MAAM,CAACkF,WAAW;gBACjBC,IAAI,EAAC,YAAY;gBACjBC,QAAQ,EAAC,YAAY;gBACrBC,IAAI,EAAE,EAAG;gBACTL,KAAK,EAAE9E,OAAO,CAACoF,OAAO,CAACC,IAAI,CAACC;cAAK,CAClC;YAAC,CACa;UAAC,CACI,CAAC,eACzBzE,IAAA,CAAChB,UAAU,CAAC6D,WAAW;YAACC,OAAO,EAAE4B,OAAO,CAAC3C,SAAS,CAAE;YAAAa,QAAA,eAClD5C,IAAA,CAACd,MAAM,CAAC4E,IAAI;cACVC,IAAI,EAAC,cAAc;cACnBE,KAAK,EAAE9E,OAAO,CAACoF,OAAO,CAACC,IAAI,CAACG,IAAK;cACjCf,OAAO,EAAC,SAAS;cAAAhB,QAAA,EAEhBb;YAAS,CACC;UAAC,CACQ,CAAC;QAAA,CACV,CAAC,eAGlB3B,KAAA,CAACpB,UAAU,CAAC0E,IAAI;UAACR,GAAG;UAACC,UAAU,EAAC,QAAQ;UAAAP,QAAA,gBACtC5C,IAAA,CAACd,MAAM,CAAC4E,IAAI;YACVC,IAAI,EAAElC,SAAS,GAAG,cAAc,GAAG,cAAe;YAClDoC,KAAK,EAAEpC,SAAS,GAAG1C,OAAO,CAAC+E,KAAK,GAAG/E,OAAO,CAACqF,IAAI,CAACI,MAAO;YACvDZ,aAAa,EAAE,CAAE;YACjBL,IAAI;YAAAf,QAAA,EAEHP;UAAe,CACL,CAAC,eACdrC,IAAA,CAAChB,UAAU,CAAC6D,WAAW;YAACC,OAAO,EAAE4B,OAAO,CAAC3D,QAAQ,CAAE;YAAA6B,QAAA,eACjD5C,IAAA,CAAChB,UAAU,CAAC0E,IAAI;cAACE,OAAO,EAAC,QAAQ;cAAAhB,QAAA,eAC/B5C,IAAA,CAACf,MAAM,CAACkF,WAAW;gBACjBC,IAAI,EAAC,aAAa;gBAClBC,QAAQ,EAAC,wBAAwB;gBACjCC,IAAI,EAAE,EAAG;gBACTL,KAAK,EAAE9E,OAAO,CAACoF,OAAO,CAACC,IAAI,CAACG;cAAK,CAClC;YAAC,CACa;UAAC,CACI,CAAC,eACzB3E,IAAA,CAACV,WAAW;YAACuF,KAAK,EAAEjE;UAAY,CAAE,CAAC;QAAA,CACpB,CAAC;MAAA,CACH,CAAC;IAAA,CACE;EAAC,CACJ,CAAC;AAE1B,CAAC,CAAC;AAEFP,UAAU,CAACyE,WAAW,GAAG,YAAY;AAErC,eAAezE,UAAU","ignoreList":[]}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
|
|
3
|
+
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
|
|
4
4
|
import OpenIMSDK, { LoginStatus } from '@droppii/openim-rn-client-sdk';
|
|
5
|
+
import Toast from 'react-native-toast-message';
|
|
5
6
|
import { useUserStore } from "../store/index.js";
|
|
6
|
-
import {
|
|
7
|
+
import { useChatSdk } from "../core/index.js";
|
|
8
|
+
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
9
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
7
10
|
export const ChatContext = /*#__PURE__*/createContext(undefined);
|
|
8
11
|
export const useChatContext = () => {
|
|
9
12
|
const context = useContext(ChatContext);
|
|
@@ -16,14 +19,11 @@ const ChatProviderInner = ({
|
|
|
16
19
|
logGA,
|
|
17
20
|
children,
|
|
18
21
|
applicationType,
|
|
19
|
-
getChatToken
|
|
22
|
+
getChatToken,
|
|
23
|
+
onFlashMessagePress
|
|
20
24
|
}) => {
|
|
21
25
|
const connectStatus = useUserStore(state => state.connectStatus);
|
|
22
|
-
const
|
|
23
|
-
logGA,
|
|
24
|
-
applicationType,
|
|
25
|
-
getChatToken
|
|
26
|
-
}), [logGA, applicationType, getChatToken]);
|
|
26
|
+
const [isShowFLashMessage, setShow] = useState(true);
|
|
27
27
|
const handleSdkLogin = useCallback(async () => {
|
|
28
28
|
if (!!getChatToken && connectStatus === LoginStatus.Logout) {
|
|
29
29
|
const res = await getChatToken();
|
|
@@ -42,14 +42,48 @@ const ChatProviderInner = ({
|
|
|
42
42
|
useEffect(() => {
|
|
43
43
|
handleSdkLogin();
|
|
44
44
|
}, [handleSdkLogin]);
|
|
45
|
+
const onPressFlashMessage = useCallback(c => {
|
|
46
|
+
onFlashMessagePress?.(c);
|
|
47
|
+
}, [onFlashMessagePress]);
|
|
48
|
+
const setIsShowFLashMessage = useCallback(v => {
|
|
49
|
+
console.log('setIsShowFLashMessage');
|
|
50
|
+
setShow(v);
|
|
51
|
+
}, []);
|
|
52
|
+
const value = useMemo(() => ({
|
|
53
|
+
logGA,
|
|
54
|
+
applicationType,
|
|
55
|
+
getChatToken,
|
|
56
|
+
onPressFlashMessage,
|
|
57
|
+
isShowFLashMessage: isShowFLashMessage,
|
|
58
|
+
setIsShowFLashMessage: setIsShowFLashMessage
|
|
59
|
+
}), [logGA, applicationType, getChatToken, onPressFlashMessage, isShowFLashMessage, setIsShowFLashMessage]);
|
|
60
|
+
const {
|
|
61
|
+
top
|
|
62
|
+
} = useSafeAreaInsets();
|
|
45
63
|
return /*#__PURE__*/_jsx(ChatContext.Provider, {
|
|
46
64
|
value: value,
|
|
47
|
-
children:
|
|
65
|
+
children: /*#__PURE__*/_jsxs(_Fragment, {
|
|
66
|
+
children: [/*#__PURE__*/_jsx(ChatSdkBridge, {}), children, /*#__PURE__*/_jsx(Toast, {
|
|
67
|
+
topOffset: top
|
|
68
|
+
})]
|
|
69
|
+
})
|
|
48
70
|
});
|
|
49
71
|
};
|
|
72
|
+
|
|
73
|
+
// useChatSdk() -> useChatListener() -> useFlashMessagePress() reads from
|
|
74
|
+
// ChatContext via useChatContext(), which throws unless called by a
|
|
75
|
+
// descendant of ChatContext.Provider. ChatProviderInner IS the component
|
|
76
|
+
// that creates the Provider, so it cannot consume its own context — this
|
|
77
|
+
// bridge exists purely to run useChatSdk() one level below the Provider.
|
|
78
|
+
const ChatSdkBridge = () => {
|
|
79
|
+
useChatSdk();
|
|
80
|
+
return null;
|
|
81
|
+
};
|
|
50
82
|
export const ChatProvider = ({
|
|
51
83
|
...props
|
|
52
|
-
}) =>
|
|
53
|
-
|
|
54
|
-
|
|
84
|
+
}) => {
|
|
85
|
+
return /*#__PURE__*/_jsx(ChatProviderInner, {
|
|
86
|
+
...props
|
|
87
|
+
});
|
|
88
|
+
};
|
|
55
89
|
//# sourceMappingURL=ChatContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","OpenIMSDK","LoginStatus","useUserStore","jsx","_jsx","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","connectStatus","state","
|
|
1
|
+
{"version":3,"names":["createContext","useCallback","useContext","useEffect","useMemo","useState","OpenIMSDK","LoginStatus","Toast","useUserStore","useChatSdk","useSafeAreaInsets","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ChatContext","undefined","useChatContext","context","Error","ChatProviderInner","logGA","children","applicationType","getChatToken","onFlashMessagePress","connectStatus","state","isShowFLashMessage","setShow","handleSdkLogin","Logout","res","id","token","login","userID","then","getState","updateConnectStatus","Logged","catch","error","console","onPressFlashMessage","c","setIsShowFLashMessage","v","log","value","top","Provider","ChatSdkBridge","topOffset","ChatProvider","props"],"sourceRoot":"../../../src","sources":["context/ChatContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { useChatContext } from "./ChatContext.js";
|
|
4
|
+
export const useGetIsShowFLashMessage = () => useChatContext?.().isShowFLashMessage;
|
|
5
|
+
export const useSetIsShowFLashMessage = () => useChatContext?.().setIsShowFLashMessage;
|
|
6
|
+
//# sourceMappingURL=global.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useChatContext","useGetIsShowFLashMessage","isShowFLashMessage","useSetIsShowFLashMessage","setIsShowFLashMessage"],"sourceRoot":"../../../src","sources":["context/global.ts"],"mappings":";;AAAA,SAASA,cAAc,QAAQ,kBAAe;AAE9C,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KACtCD,cAAc,GAAG,CAAC,CAACE,kBAAkB;AACvC,OAAO,MAAMC,wBAAwB,GAAGA,CAAA,KACtCH,cAAc,GAAG,CAAC,CAACI,qBAAqB","ignoreList":[]}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import OpenIMSDK, { OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
3
|
+
import OpenIMSDK, { MessageReceiveOptType, OpenIMEvent } from '@droppii/openim-rn-client-sdk';
|
|
4
4
|
import { useCallback, useEffect } from 'react';
|
|
5
5
|
import { useConversationStore } from "../store/conversation.js";
|
|
6
|
+
import { ToastFlashMessage } from "../utils/toastFlashMessage.js";
|
|
7
|
+
import { useUserStore } from "../store/user.js";
|
|
8
|
+
import { getLastMessageText } from "../utils/messageUtils.js";
|
|
9
|
+
import { useChatContext } from "../context/index.js";
|
|
10
|
+
import isEmpty from 'lodash/isEmpty';
|
|
6
11
|
import { markMessageRevoked, useMessageStore } from "../store/message.js";
|
|
7
12
|
export const useChatListener = () => {
|
|
8
13
|
const updateOneMessage = useMessageStore(state => state.updateOneMessage);
|
|
14
|
+
const currentUserId = useUserStore(s => s.user?.userID);
|
|
15
|
+
const onPressFlashMessage = useChatContext()?.onPressFlashMessage;
|
|
16
|
+
const isShowFLashMessage = useChatContext()?.isShowFLashMessage;
|
|
9
17
|
const onSendMessageProgress = useCallback(({
|
|
10
18
|
progress,
|
|
11
19
|
message
|
|
@@ -18,17 +26,29 @@ export const useChatListener = () => {
|
|
|
18
26
|
updateOneMessage(message);
|
|
19
27
|
}, [updateOneMessage]);
|
|
20
28
|
const onConversationChanged = useCallback(conversations => {
|
|
21
|
-
console.log('
|
|
22
|
-
count: conversations.length,
|
|
23
|
-
ids: conversations.map(c => c.conversationID)
|
|
24
|
-
});
|
|
29
|
+
// console.log('isShowFLashMessage', isShowFLashMessage);
|
|
25
30
|
useConversationStore.getState().updateConversations(conversations);
|
|
26
|
-
|
|
31
|
+
if (isShowFLashMessage) {
|
|
32
|
+
for (const conversation of conversations) {
|
|
33
|
+
if (conversation.recvMsgOpt === MessageReceiveOptType.NotNotify && !isEmpty(conversation?.latestMsg)) {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
const latestMsg = JSON.parse(conversation.latestMsg || '{}');
|
|
37
|
+
const lastMessageText = getLastMessageText(latestMsg, currentUserId, conversation);
|
|
38
|
+
ToastFlashMessage.show({
|
|
39
|
+
key: conversation.conversationID,
|
|
40
|
+
title: conversation.showName || 'New Message',
|
|
41
|
+
body: lastMessageText,
|
|
42
|
+
onPress: () => {
|
|
43
|
+
ToastFlashMessage.hide(conversation.conversationID);
|
|
44
|
+
onPressFlashMessage?.(conversation);
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}, [currentUserId, isShowFLashMessage, onPressFlashMessage]);
|
|
27
50
|
const onNewConversation = useCallback(conversations => {
|
|
28
|
-
console.log('[Listener] OnNewConversation',
|
|
29
|
-
count: conversations.length,
|
|
30
|
-
ids: conversations.map(c => c.conversationID)
|
|
31
|
-
});
|
|
51
|
+
console.log('[Listener] OnNewConversation', conversations);
|
|
32
52
|
useConversationStore.getState().updateConversations(conversations);
|
|
33
53
|
}, []);
|
|
34
54
|
const onGroupMemberAdded = useCallback(member => {
|
|
@@ -50,6 +70,7 @@ export const useChatListener = () => {
|
|
|
50
70
|
// Conversation
|
|
51
71
|
OpenIMSDK.on(OpenIMEvent.OnConversationChanged, onConversationChanged);
|
|
52
72
|
OpenIMSDK.on(OpenIMEvent.OnNewConversation, onNewConversation);
|
|
73
|
+
// OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
53
74
|
|
|
54
75
|
// Group members
|
|
55
76
|
OpenIMSDK.on(OpenIMEvent.OnGroupMemberAdded, onGroupMemberAdded);
|
|
@@ -69,9 +90,9 @@ export const useChatListener = () => {
|
|
|
69
90
|
|
|
70
91
|
// Message status
|
|
71
92
|
OpenIMSDK.off(OpenIMEvent.SendMessageProgress, onSendMessageProgress);
|
|
93
|
+
// OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, onRecvNewMessages);
|
|
72
94
|
OpenIMSDK.off(OpenIMEvent.OnNewRecvMessageRevoked, onMessageRevoked);
|
|
73
95
|
};
|
|
74
|
-
|
|
75
|
-
}, []);
|
|
96
|
+
}, [onConversationChanged, onGroupMemberAdded, onGroupMemberDeleted, onMessageRevoked, onNewConversation, onSendMessageProgress]);
|
|
76
97
|
};
|
|
77
98
|
//# sourceMappingURL=useChatListener.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useConversationStore","markMessageRevoked","useMessageStore","useChatListener","updateOneMessage","state","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","useChatContext","isEmpty","markMessageRevoked","useMessageStore","useChatListener","updateOneMessage","state","currentUserId","s","user","userID","onPressFlashMessage","isShowFLashMessage","onSendMessageProgress","progress","message","console","log","clientMsgID","status","onConversationChanged","conversations","getState","updateConversations","conversation","recvMsgOpt","NotNotify","latestMsg","JSON","parse","lastMessageText","show","key","conversationID","title","showName","body","onPress","hide","onNewConversation","onGroupMemberAdded","member","groupID","onGroupMemberDeleted","onMessageRevoked","revokedInfo","on","OnConversationChanged","OnNewConversation","OnGroupMemberAdded","OnGroupMemberDeleted","SendMessageProgress","OnNewRecvMessageRevoked","off"],"sourceRoot":"../../../src","sources":["core/useChatListener.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { useCallback } from 'react';
|
|
4
4
|
import { useConversationStore } from "../../store/conversation.js";
|
|
5
|
+
import { useUserStore } from "../../store/user.js";
|
|
5
6
|
import { MessageStatus, MessageType } from '@droppii/openim-rn-client-sdk';
|
|
6
7
|
import { extractUrls } from "../../utils/url.js";
|
|
7
8
|
import OpenIMSDK from '@droppii/openim-rn-client-sdk';
|
|
@@ -30,7 +31,9 @@ export const useSendMessage = () => {
|
|
|
30
31
|
status: MessageStatus.Sending
|
|
31
32
|
});
|
|
32
33
|
try {
|
|
33
|
-
const
|
|
34
|
+
const sendParams = buildSendParams(message, recvID, groupID, extendMessageInfo, plainText);
|
|
35
|
+
console.log('[useSendMessage] dispatchSend params', sendParams);
|
|
36
|
+
const sent = await OpenIMSDK.sendMessage(sendParams);
|
|
34
37
|
deleteOneMessage(message.clientMsgID);
|
|
35
38
|
pushNewMessage(sent);
|
|
36
39
|
} catch {
|
|
@@ -106,7 +109,8 @@ export const useSendMessage = () => {
|
|
|
106
109
|
const params = {
|
|
107
110
|
recvID: recvID || '',
|
|
108
111
|
groupID: groupID || '',
|
|
109
|
-
message
|
|
112
|
+
message,
|
|
113
|
+
offlinePushInfo: generateOfflinePushInfo(message.contentType, '')
|
|
110
114
|
};
|
|
111
115
|
try {
|
|
112
116
|
const sent = isAttachment ? await OpenIMSDK.sendMessageNotOss(params) : await OpenIMSDK.sendMessage(buildSendParams(message, recvID || '', groupID || '', JSON.parse(message.ex || '{}'), ''));
|
|
@@ -137,8 +141,9 @@ export const useSendMessage = () => {
|
|
|
137
141
|
revokeMessage
|
|
138
142
|
};
|
|
139
143
|
};
|
|
140
|
-
const generateOfflinePushInfo = (contentType, plainText) => {
|
|
144
|
+
export const generateOfflinePushInfo = (contentType, plainText) => {
|
|
141
145
|
const conversationData = useConversationStore?.getState?.()?.getCurrentConversation();
|
|
146
|
+
const operatorUserID = useUserStore.getState().user?.userID || '';
|
|
142
147
|
const title = conversationData?.showName || 'Droppii';
|
|
143
148
|
const desc = generateContentBasedOnMessageType(contentType, plainText);
|
|
144
149
|
return {
|
|
@@ -147,6 +152,7 @@ const generateOfflinePushInfo = (contentType, plainText) => {
|
|
|
147
152
|
ex: JSON.stringify({
|
|
148
153
|
icon: conversationData?.faceURL || '',
|
|
149
154
|
conversationId: conversationData?.conversationID || '',
|
|
155
|
+
operatorUserID,
|
|
150
156
|
title,
|
|
151
157
|
desc
|
|
152
158
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useConversationStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","generateContentBasedOnMessageType","markMessageRevoked","useMessageStore","uuid","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","dispatchSend","status","Sending","sent","sendMessage","clientMsgID","Failed","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","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","title","showName","desc","icon","faceURL","conversationId","iOSPushSound","iOSBadgeCount","text","textMessage","v4","then","catch","errCode","errMsg","
|
|
1
|
+
{"version":3,"names":["useCallback","useConversationStore","useUserStore","MessageStatus","MessageType","extractUrls","OpenIMSDK","CustomMessageType","useChatContext","generateContentBasedOnMessageType","markMessageRevoked","useMessageStore","uuid","buildSendParams","message","recvID","groupID","extendMessageInfo","plainText","ex","JSON","stringify","offlinePushInfo","generateOfflinePushInfo","contentType","useSendMessage","applicationType","pushNewMessage","state","updateOneMessage","deleteOneMessage","dispatchSend","status","Sending","sendParams","console","log","sent","sendMessage","clientMsgID","Failed","urlMetadata","flow","customMessage","userID","getState","getCurrentConversation","messageList","hasText","trim","hasPreview","url","urls","isUrlMessage","length","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","text","textMessage","v4","then","catch","errCode","errMsg","error","urlTextMessage"],"sourceRoot":"../../../../src","sources":["hooks/message/useSendMessage.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -8,6 +8,7 @@ import { useMessageStore } from "../store/message.js";
|
|
|
8
8
|
import { useUserStore } from "../store/user.js";
|
|
9
9
|
import { useChatContext } from "../context/index.js";
|
|
10
10
|
import { allSettled } from "../utils/promise.js";
|
|
11
|
+
import { useSetIsShowFLashMessage } from "../context/global.js";
|
|
11
12
|
export function useChatMessages({
|
|
12
13
|
conversationId,
|
|
13
14
|
enabled = true,
|
|
@@ -30,6 +31,7 @@ export function useChatMessages({
|
|
|
30
31
|
const [error, setError] = useState(null);
|
|
31
32
|
const conversationIdRef = useRef(conversationId);
|
|
32
33
|
conversationIdRef.current = conversationId;
|
|
34
|
+
const setIsShowFlashMessage = useSetIsShowFLashMessage();
|
|
33
35
|
const fetchInitial = useCallback(async () => {
|
|
34
36
|
if (!conversationId) return;
|
|
35
37
|
setIsLoading(true);
|
|
@@ -128,12 +130,14 @@ export function useChatMessages({
|
|
|
128
130
|
}, [conversationId, enabled, fetchInitial, reset]);
|
|
129
131
|
useEffect(() => {
|
|
130
132
|
if (!enabled || !conversationId) return;
|
|
133
|
+
setIsShowFlashMessage(false);
|
|
131
134
|
const handleNewMessages = incoming => appendIncomingMessages(incoming);
|
|
132
135
|
OpenIMSDK.on(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
|
|
133
136
|
return () => {
|
|
137
|
+
setIsShowFlashMessage(true);
|
|
134
138
|
OpenIMSDK.off(OpenIMEvent.OnRecvNewMessages, handleNewMessages);
|
|
135
139
|
};
|
|
136
|
-
}, [appendIncomingMessages, conversationId, enabled]);
|
|
140
|
+
}, [appendIncomingMessages, conversationId, enabled, setIsShowFlashMessage]);
|
|
137
141
|
return {
|
|
138
142
|
messages,
|
|
139
143
|
currentUserId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useRef","useState","ChatMessageAPI","belongsToConversation","hasNewHistoryMessages","mergeMessages","useMessageStore","useUserStore","useChatContext","allSettled","useChatMessages","conversationId","enabled","pageSize","messages","s","hasMoreEarlier","hasMoreNewer","setMessages","pushNewMessage","reset","applicationType","cachedUserId","user","userID","currentUserId","setCurrentUserId","isLoading","setIsLoading","isLoadingEarlier","setIsLoadingEarlier","isLoadingNewer","setIsLoadingNewer","error","setError","conversationIdRef","current","fetchInitial","historyResult","userIdResult","fetchHistoryMessages","count","getCurrentUserId","status","value","initialMessages","messageList","isEnd","markConversationAsRead","catch","undefined","console","warn","reason","localResult","searchLocalMessages","localMessages","searchResultItems","flatMap","item","log","length","err","Error","String","onLoadEarlier","history","startClientMsgID","clientMsgID","incoming","hasNew","onLoadNewer","appendIncomingMessages","total","clientMsgIDs","map","m","relevant","filter","message","forEach","msg","handleNewMessages","on","OnRecvNewMessages","off","refresh"],"sourceRoot":"../../../src","sources":["hooks/useChatMessages.ts"],"mappings":";;AAAA,OAAOA,SAAS,IACdC,WAAW,QAEN,+BAA+B;AACtC,SAASC,WAAW,EAAEC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AAChE,SAASC,cAAc,QAAQ,wBAAqB;AAEpD,SACEC,qBAAqB,EACrBC,qBAAqB,EACrBC,aAAa,QACR,qBAAkB;AACzB,SAASC,eAAe,QAAQ,qBAAkB;AAClD,SAASC,YAAY,QAAQ,kBAAe;AAC5C,SAASC,cAAc,QAAQ,qBAAY;AAC3C,SAASC,UAAU,QAAQ,qBAAkB;
|
|
1
|
+
{"version":3,"names":["OpenIMSDK","OpenIMEvent","useCallback","useEffect","useRef","useState","ChatMessageAPI","belongsToConversation","hasNewHistoryMessages","mergeMessages","useMessageStore","useUserStore","useChatContext","allSettled","useSetIsShowFLashMessage","useChatMessages","conversationId","enabled","pageSize","messages","s","hasMoreEarlier","hasMoreNewer","setMessages","pushNewMessage","reset","applicationType","cachedUserId","user","userID","currentUserId","setCurrentUserId","isLoading","setIsLoading","isLoadingEarlier","setIsLoadingEarlier","isLoadingNewer","setIsLoadingNewer","error","setError","conversationIdRef","current","setIsShowFlashMessage","fetchInitial","historyResult","userIdResult","fetchHistoryMessages","count","getCurrentUserId","status","value","initialMessages","messageList","isEnd","markConversationAsRead","catch","undefined","console","warn","reason","localResult","searchLocalMessages","localMessages","searchResultItems","flatMap","item","log","length","err","Error","String","onLoadEarlier","history","startClientMsgID","clientMsgID","incoming","hasNew","onLoadNewer","appendIncomingMessages","total","clientMsgIDs","map","m","relevant","filter","message","forEach","msg","handleNewMessages","on","OnRecvNewMessages","off","refresh"],"sourceRoot":"../../../src","sources":["hooks/useChatMessages.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -112,6 +112,8 @@ export const useImageAttachment = () => {
|
|
|
112
112
|
if (!images || images.length === 0) return;
|
|
113
113
|
const isWithinLimit = item => {
|
|
114
114
|
const maxSize = isVideoFromPicker(item) ? UPLOAD_LIMITS.video : UPLOAD_LIMITS.image;
|
|
115
|
+
console.log('maxSize', maxSize);
|
|
116
|
+
console.log('item.size', item.size);
|
|
115
117
|
return (item.size || 0) <= maxSize;
|
|
116
118
|
};
|
|
117
119
|
const oversizedItems = images.filter(img => !isWithinLimit(img));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useState","DeviceUtils","UIUtils","trans","getMimeType","isVideoFromPicker","UPLOAD_CONCURRENCY","UPLOAD_LIMITS","ImageUploadAPI","VideoThumbnailUtil","pLimit","useImageAttachment","selectedImages","setSelectedImages","isImagePreviewVisible","setIsImagePreviewVisible","updateImageStatus","index","updates","prev","newImages","uploadImage","image","isUploading","error","uploadProgress","filePath","path","startsWith","replace","filename","uploadedImage","uploadImageFile","size","width","height","mime","progress","url","Error","uploadedUrl","msg","message","toast","open","title","theme","generateVideoThumbnail","video","videoDuration","duration","timeMs","Math","min","max","floor","baseName","thumbnail","generateThumbnail","time","quality","cacheId","Date","now","uploadedThumbnail","thumbnailUrl","thumbnailSize","__DEV__","console","warn","cleanupThumbnail","catch","handleImageAttach","multipleMode","images","openImagePicker","length","isWithinLimit","item","maxSize","oversizedItems","filter","img","isVideo","some","String","finalImages","startIndex","map","Promise","all","offset","handleImageRemove","_","i","clearAllImages"],"sourceRoot":"../../../src","sources":["hooks/useImageAttachment.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,OAAO;AAK7C,OAAOC,WAAW,MAAM,oBAAiB;AACzC,SAASC,OAAO,QAAQ,qBAAkB;AAC1C,SAASC,KAAK,QAAQ,yBAAgB;AACtC,SAASC,WAAW,EAAEC,iBAAiB,QAAQ,wBAAqB;AACpE,SAASC,kBAAkB,EAAEC,aAAa,QAAQ,2BAAwB;AAC1E,SAASC,cAAc,QAAQ,4BAAyB;AACxD,OAAOC,kBAAkB,MAAM,4BAAyB;AACxD,SAASC,MAAM,QAAQ,oBAAiB;AAoBxC,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAAgC;EAChE,MAAM,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGb,QAAQ,CAClD,EACF,CAAC;EACD,MAAM,CAACc,qBAAqB,EAAEC,wBAAwB,CAAC,GAAGf,QAAQ,CAAC,KAAK,CAAC;EAEzE,MAAMgB,iBAAiB,GAAGjB,WAAW,CACnC,CAACkB,KAAa,EAAEC,OAAsD,KAAK;IACzEL,iBAAiB,CAAEM,IAAI,IAAK;MAC1B,MAAMC,SAAS,GAAG,CAAC,GAAGD,IAAI,CAAC;MAC3B,IAAIC,SAAS,CAACH,KAAK,CAAC,EAAE;QACpBG,SAAS,CAACH,KAAK,CAAC,GAAG;UAAE,GAAGG,SAAS,CAACH,KAAK,CAAC;UAAE,GAAGC;QAAQ,CAAC;MACxD;MACA,OAAOE,SAAS;IAClB,CAAC,CAAC;EACJ,CAAC,EACD,EACF,CAAC;EAED,MAAMC,WAAW,GAAGtB,WAAW,CAC7B,OAAOkB,KAAa,EAAEK,KAAkB,KAAK;IAC3CN,iBAAiB,CAACC,KAAK,EAAE;MACvBM,WAAW,EAAE,IAAI;MACjBC,KAAK,EAAE,IAAI;MACXC,cAAc,EAAE;IAClB,CAAC,CAAC;IAEF,MAAMC,QAAQ,GAAGJ,KAAK,CAACK,IAAI,CAACC,UAAU,CAAC,SAAS,CAAC,GAC7CN,KAAK,CAACK,IAAI,CAACE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,GACjCP,KAAK,CAACK,IAAI;IAEd,MAAMG,QAAQ,GAAGR,KAAK,CAACQ,QAAQ,IAAI,WAAW;IAE9C,IAAI;MACF,MAAMC,aAAa,GAAG,MAAMvB,cAAc,CAACwB,eAAe,CACxD;QACEL,IAAI,EAAED,QAAQ;QACdI,QAAQ;QACRG,IAAI,EAAEX,KAAK,CAACW,IAAI,IAAI,CAAC;QACrBC,KAAK,EAAEZ,KAAK,CAACY,KAAK,IAAI,CAAC;QACvBC,MAAM,EAAEb,KAAK,CAACa,MAAM,IAAI,CAAC;QACzBC,IAAI,EAAEhC,WAAW,CAAC0B,QAAQ;MAC5B,CAAC,EACAO,QAAQ,IAAKrB,iBAAiB,CAACC,KAAK,EAAE;QAAEQ,cAAc,EAAEY;MAAS,CAAC,CACrE,CAAC;MAED,IAAI,CAACN,aAAa,EAAEO,GAAG,EAAE,MAAM,IAAIC,KAAK,CAAC,6BAA6B,CAAC;MAEvEvB,iBAAiB,CAACC,KAAK,EAAE;QACvBM,WAAW,EAAE,KAAK;QAClBE,cAAc,EAAE,GAAG;QACnBe,WAAW,EAAET,aAAa,CAACO;MAC7B,CAAC,CAAC;IACJ,CAAC,CAAC,OAAOd,KAAc,EAAE;MACvB,MAAMiB,GAAG,GACPjB,KAAK,YAAYe,KAAK,GAClBf,KAAK,EAAEkB,OAAO,GACdvC,KAAK,CAAC,0BAA0B,CAAC;MACvCa,iBAAiB,CAACC,KAAK,EAAE;QAAEM,WAAW,EAAE,KAAK;QAAEC,KAAK,EAAEiB;MAAI,CAAC,CAAC;MAC5DvC,OAAO,CAACyC,KAAK,CAACC,IAAI,CAAC;QACjBC,KAAK,EAAE1C,KAAK,CAAC,0BAA0B,CAAC;QACxCuC,OAAO,EAAEvC,KAAK,CAAC,oBAAoB,CAAC;QACpC2C,KAAK,EAAE;MACT,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CAAC9B,iBAAiB,CACpB,CAAC;EAED,MAAM+B,sBAAsB,GAAGhD,WAAW,CACxC,OAAOkB,KAAa,EAAEK,KAAkB,KAAK;IAC3C,IAAI,CAACjB,iBAAiB,CAACiB,KAAK,CAAC,EAAE;IAE/B,MAAM0B,KAAK,GAAG1B,KAAoB;IAClC,IAAI2B,aAAa,GACf,OAAOD,KAAK,CAACE,QAAQ,KAAK,QAAQ,GAAGF,KAAK,CAACE,QAAQ,GAAG,CAAC;IAEzD,IAAID,aAAa,IAAI,CAAC,IAAIA,aAAa,GAAG,OAAO,EAAE;MACjDA,aAAa,GAAG,IAAI;IACtB;;IAEA;IACA,MAAME,MAAM,GAAGC,IAAI,CAACC,GAAG,CACrBD,IAAI,CAACE,GAAG,CAAC,IAAI,EAAEF,IAAI,CAACG,KAAK,CAACN,aAAa,GAAG,IAAI,CAAC,CAAC,EAChDG,IAAI,CAACE,GAAG,CAAC,CAAC,EAAEL,aAAa,GAAG,IAAI,CAClC,CAAC;;IAED;IACA;IACA,MAAMO,QAAQ,GACZlC,KAAK,CAACQ,QAAQ,EAAED,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,SAASZ,KAAK,EAAE;IAE7D,MAAMwC,SAAS,GAAG,MAAMhD,kBAAkB,CAACiD,iBAAiB,CAACpC,KAAK,CAACK,IAAI,EAAE;MACvEgC,IAAI,EAAER,MAAM;MACZS,OAAO,EAAE,EAAE;MACXC,OAAO,EAAE,SAASL,QAAQ,IAAIM,IAAI,CAACC,GAAG,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI,CAACN,SAAS,EAAE;IAEhB,IAAI;MACF,MAAMO,iBAAiB,GAAG,MAAMxD,cAAc,CAACwB,eAAe,CAC5D;QACEL,IAAI,EAAE8B,SAAS,CAAC9B,IAAI;QACpBG,QAAQ,EAAE,SAAS0B,QAAQ,MAAM;QACjCvB,IAAI,EAAE,CAAC;QACPC,KAAK,EAAEuB,SAAS,CAACvB,KAAK,IAAI,GAAG;QAC7BC,MAAM,EAAEsB,SAAS,CAACtB,MAAM,IAAI,GAAG;QAC/BC,IAAI,EAAE;MACR,CAAC,EACD,MAAM,CAAC,CACT,CAAC;MAED,IAAI4B,iBAAiB,EAAE1B,GAAG,EAAE;QAC1BtB,iBAAiB,CAACC,KAAK,EAAE;UACvBgD,YAAY,EAAED,iBAAiB,CAAC1B,GAAG;UACnC4B,aAAa,EAAEF,iBAAiB,CAAC/B,IAAI,IAAI;QAC3C,CAAC,CAAC;MACJ;IACF,CAAC,CAAC,OAAOT,KAAc,EAAE;MACvB;MACA,IAAI2C,OAAO,EAAE;QACXC,OAAO,CAACC,IAAI,CAAC,wCAAwC,EAAE7C,KAAK,CAAC;MAC/D;IACF,CAAC,SAAS;MACRf,kBAAkB,CAAC6D,gBAAgB,CAACb,SAAS,CAAC9B,IAAI,CAAC,CAAC4C,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE;EACF,CAAC,EACD,CAACvD,iBAAiB,CACpB,CAAC;EAED,MAAMwD,iBAAiB,GAAGzE,WAAW,CACnC,OAAO0E,YAAqB,GAAG,IAAI,KAAK;IACtC,IAAI;MACF,MAAMC,MAAM,GAAG,MAAMzE,WAAW,CAAC0E,eAAe,CAACF,YAAY,CAAC;MAC9D,IAAI,CAACC,MAAM,IAAIA,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;MAEpC,MAAMC,aAAa,GAAIC,IAAiB,IAAK;QAC3C,MAAMC,OAAO,GAAG1E,iBAAiB,CAACyE,IAAI,CAAC,GACnCvE,aAAa,CAACyC,KAAK,GACnBzC,aAAa,CAACe,KAAK;
|
|
1
|
+
{"version":3,"names":["useCallback","useState","DeviceUtils","UIUtils","trans","getMimeType","isVideoFromPicker","UPLOAD_CONCURRENCY","UPLOAD_LIMITS","ImageUploadAPI","VideoThumbnailUtil","pLimit","useImageAttachment","selectedImages","setSelectedImages","isImagePreviewVisible","setIsImagePreviewVisible","updateImageStatus","index","updates","prev","newImages","uploadImage","image","isUploading","error","uploadProgress","filePath","path","startsWith","replace","filename","uploadedImage","uploadImageFile","size","width","height","mime","progress","url","Error","uploadedUrl","msg","message","toast","open","title","theme","generateVideoThumbnail","video","videoDuration","duration","timeMs","Math","min","max","floor","baseName","thumbnail","generateThumbnail","time","quality","cacheId","Date","now","uploadedThumbnail","thumbnailUrl","thumbnailSize","__DEV__","console","warn","cleanupThumbnail","catch","handleImageAttach","multipleMode","images","openImagePicker","length","isWithinLimit","item","maxSize","log","oversizedItems","filter","img","isVideo","some","String","finalImages","startIndex","map","Promise","all","offset","handleImageRemove","_","i","clearAllImages"],"sourceRoot":"../../../src","sources":["hooks/useImageAttachment.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -23,8 +23,16 @@ export { AttachmentPreview } from "./components/AttachmentPreview/index.js";
|
|
|
23
23
|
export { MediaViewerModal } from "./components/MediaViewerModal.js";
|
|
24
24
|
export { Inbox } from "./screens/inbox/index.js";
|
|
25
25
|
export { default as MediaViewerScreen } from "./screens/MediaView/index.js";
|
|
26
|
-
export
|
|
26
|
+
export * from "./screens/chat-detail/index.js";
|
|
27
|
+
|
|
28
|
+
// export type {
|
|
29
|
+
// PeerType,
|
|
30
|
+
// MessageItem,
|
|
31
|
+
// ConversationItem,
|
|
32
|
+
// } from '@droppii/openim-rn-client-sdk';
|
|
33
|
+
|
|
27
34
|
export { LoginStatus, MessageType } from '@droppii/openim-rn-client-sdk';
|
|
35
|
+
export * from "./screens/chat-detail/index.js";
|
|
28
36
|
export { registerUIUtils, UIUtils } from "./utils/UIUtils.js";
|
|
29
37
|
export { DFlowContext } from "./types/flows.js";
|
|
30
38
|
//# sourceMappingURL=index.js.map
|
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","
|
|
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,4BAAyB;AACvC,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;;AAErC;AACA;AACA;AACA;AACA;;AAEA,SAASC,WAAW,EAAEC,WAAW,QAAQ,+BAA+B;AACxE,cAAc,gCAAuB;AAerC,SAASC,eAAe,EAAEC,OAAO,QAAQ,oBAAiB;AAE1D,SAASC,YAAY,QAAQ,kBAAe","ignoreList":[]}
|
|
@@ -6,6 +6,7 @@ import { useConversationStore } from "../store/index.js";
|
|
|
6
6
|
import { useMessageStore } from "../store/message.js";
|
|
7
7
|
import { getAttachmentPriorityConfig } from "../config/attachment-priority.js";
|
|
8
8
|
import { allSettled } from "../utils/promise.js";
|
|
9
|
+
import { generateOfflinePushInfo } from "../hooks/message/useSendMessage.js";
|
|
9
10
|
export let AttachmentOrchestratorService;
|
|
10
11
|
(function (_AttachmentOrchestratorService) {
|
|
11
12
|
async function sendPreparedAttachments(attachments, uploadedUrls, options = {
|
|
@@ -219,7 +220,8 @@ export let AttachmentOrchestratorService;
|
|
|
219
220
|
const result = await OpenIMSDK.sendMessageNotOss({
|
|
220
221
|
recvID,
|
|
221
222
|
groupID,
|
|
222
|
-
message
|
|
223
|
+
message,
|
|
224
|
+
offlinePushInfo: generateOfflinePushInfo(message.contentType, '')
|
|
223
225
|
});
|
|
224
226
|
if (result) {
|
|
225
227
|
useMessageStore.getState().deleteOneMessage(message.clientMsgID);
|