@droppii-org/chat-mobile 0.2.40 → 0.2.42
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/core/useChatListener.js +3 -10
- package/lib/module/core/useChatListener.js.map +1 -1
- package/lib/module/hooks/message/useSendMessage.js +0 -3
- package/lib/module/hooks/message/useSendMessage.js.map +1 -1
- package/lib/module/store/message.js +33 -0
- package/lib/module/store/message.js.map +1 -1
- package/lib/module/utils/toastFlashMessage.js +4 -1
- package/lib/module/utils/toastFlashMessage.js.map +1 -1
- package/lib/typescript/src/core/useChatListener.d.ts.map +1 -1
- package/lib/typescript/src/hooks/message/useSendMessage.d.ts.map +1 -1
- package/lib/typescript/src/store/message.d.ts.map +1 -1
- package/lib/typescript/src/utils/toastFlashMessage.d.ts +1 -0
- package/lib/typescript/src/utils/toastFlashMessage.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/core/useChatListener.ts +3 -18
- package/src/hooks/message/useSendMessage.ts +0 -2
- package/src/store/message.ts +34 -0
- package/src/utils/toastFlashMessage.ts +6 -0
|
@@ -5,12 +5,11 @@ import { useCallback, useEffect } from 'react';
|
|
|
5
5
|
import { useConversationStore } from "../store/conversation.js";
|
|
6
6
|
import { ToastFlashMessage } from "../utils/toastFlashMessage.js";
|
|
7
7
|
import { useUserStore } from "../store/user.js";
|
|
8
|
-
import { getLastMessageText
|
|
8
|
+
import { getLastMessageText } from "../utils/messageUtils.js";
|
|
9
9
|
import { useChatContext } from "../context/index.js";
|
|
10
10
|
import isEmpty from 'lodash/isEmpty';
|
|
11
11
|
import { markMessageRevoked, useMessageStore } from "../store/message.js";
|
|
12
12
|
import { syncPinnedMessagesOnEvent } from "../hooks/message/usePinMessage.js";
|
|
13
|
-
const MAX_TOAST_FILE_NAME_LENGTH = 40;
|
|
14
13
|
export const useChatListener = () => {
|
|
15
14
|
const updateOneMessage = useMessageStore(state => state.updateOneMessage);
|
|
16
15
|
const currentUserId = useUserStore(s => s.user?.userID);
|
|
@@ -36,18 +35,12 @@ export const useChatListener = () => {
|
|
|
36
35
|
continue;
|
|
37
36
|
}
|
|
38
37
|
const latestMsg = JSON.parse(conversation.latestMsg || '{}');
|
|
39
|
-
const
|
|
40
|
-
...latestMsg,
|
|
41
|
-
fileElem: {
|
|
42
|
-
...latestMsg.fileElem,
|
|
43
|
-
fileName: truncateMiddle(latestMsg.fileElem.fileName, MAX_TOAST_FILE_NAME_LENGTH)
|
|
44
|
-
}
|
|
45
|
-
} : latestMsg;
|
|
46
|
-
const lastMessageText = getLastMessageText(messageForToast, currentUserId, conversation);
|
|
38
|
+
const lastMessageText = getLastMessageText(latestMsg, currentUserId, conversation);
|
|
47
39
|
ToastFlashMessage.show({
|
|
48
40
|
key: conversation.conversationID,
|
|
49
41
|
title: conversation.showName || 'New Message',
|
|
50
42
|
body: lastMessageText,
|
|
43
|
+
ellipsizeMiddle: latestMsg.contentType === MessageType.FileMessage,
|
|
51
44
|
onPress: () => {
|
|
52
45
|
ToastFlashMessage.hide(conversation.conversationID);
|
|
53
46
|
onPressFlashMessage?.(conversation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OpenIMSDK","MessageReceiveOptType","MessageType","OpenIMEvent","useCallback","useEffect","useConversationStore","ToastFlashMessage","useUserStore","getLastMessageText","
|
|
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":"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","ignoreList":[]}
|
|
@@ -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":"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
|
|
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,SAASC,iCAAiC,QAAQ,6BAA0B;AAC5E,SAASC,kBAAkB,EAAEC,eAAe,QAAQ,wBAAqB;AACzE,OAAOC,IAAI,MAAM,mBAAmB;AAKpC,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,GAAGnB,cAAc,CAAC,CAAC,CAACmB,eAAe;EACxD,MAAMC,cAAc,GAAGhB,eAAe,CAAEiB,KAAK,IAAKA,KAAK,CAACD,cAAc,CAAC;EACvE,MAAME,gBAAgB,GAAGlB,eAAe,CAAEiB,KAAK,IAAKA,KAAK,CAACC,gBAAgB,CAAC;EAC3E,MAAMC,gBAAgB,GAAGnB,eAAe,CAAEiB,KAAK,IAAKA,KAAK,CAACE,gBAAgB,CAAC;EAC3E,MAAM;IAAEC,aAAa;IAAEC;EAAiB,CAAC,GAAGxB,oBAAoB,CAAC,CAAC;EAElE,MAAMyB,YAAY,GAAGlC,WAAW,CAC9B,OACEe,OAAoB,EACpBC,MAAc,EACdC,OAAe,EACfC,iBAAiC,EACjCC,SAAiB,KACd;IACHS,cAAc,CAAC;MAAE,GAAGb,OAAO;MAAEoB,MAAM,EAAEhC,aAAa,CAACiC;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,MAAMlC,SAAS,CAACmC,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,EAAEhC,aAAa,CAACwC;MAAO,CAAC,CAAC;IAChE;EACF,CAAC,EACD,CAACf,cAAc,EAAEE,gBAAgB,EAAEC,gBAAgB,CACrD,CAAC;EAED,MAAMU,WAAW,GAAGzC,WAAW,CAC7B,OAAO;IACLmB,SAAS;IACTyB,WAAW;IACXC,IAAI;IACJC;EAMF,CAAC,KAAK;IACJ,MAAM;MAAEC,MAAM,EAAE/B,MAAM;MAAEC;IAAQ,CAAC,GAC/BhB,oBAAoB,CAAC+C,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAACjC,MAAM,IAAI,CAACC,OAAO,EAAE;IAEzB,MAAMiC,WAA0B,GAAG,EAAE;IAErC,MAAMC,OAAO,GAAG,CAAC,CAAChC,SAAS,IAAIA,SAAS,CAACiC,IAAI,CAAC,CAAC,KAAK,EAAE;IACtD,MAAMC,UAAU,GAAG,CAAC,CAACT,WAAW,EAAEU,GAAG;;IAErC;IACA,IAAIH,OAAO,EAAE;MACX,MAAMI,IAAI,GAAGJ,OAAO,GAAG9C,WAAW,CAACc,SAAS,CAAC,GAAG,EAAE;MAClD,MAAMqC,YAAY,GAAGD,IAAI,CAACE,MAAM,GAAG,CAAC,IAAIJ,UAAU;MAClD,IAAItC,OAA2B,GAAG,IAAI;MAEtC,IAAIiB,aAAa,EAAE;QACjBjB,OAAO,GAAG,MAAM2C,mBAAmB,CAAC;UAClCC,IAAI,EAAExC,SAAS,IAAI,EAAE;UACrBJ,OAAO,EAAEiB;QACX,CAAC,CAAC;QACFC,gBAAgB,CAAC2B,SAAS,CAAC;MAC7B,CAAC,MAAM,IAAIJ,YAAY,EAAE;QACvBzC,OAAO,GAAG,MAAM8C,oBAAoB,CAAC1C,SAAS,IAAI,EAAE,EAAEoC,IAAI,CAAC;MAC7D,CAAC,MAAM,IAAIJ,OAAO,EAAE;QAClBpC,OAAO,GAAG,MAAM+C,iBAAiB,CAAC3C,SAAS,CAAC;MAC9C;MAEA,IAAI,CAACJ,OAAO,EAAE;MACdmC,WAAW,CAACa,IAAI,CAAChD,OAAO,CAAC;IAC3B;;IAEA;IACA,IAAI+B,aAAa,EAAE;MACjB,IAAIkB,UAA2B,GAAG;QAChCC,IAAI,EAAE5C,IAAI,CAACC,SAAS,CAACwB,aAAa,CAACmB,IAAI,CAAC;QACxCC,SAAS,EAAEpB,aAAa,CAACqB,IAAI;QAC7BC,WAAW,EACTtB,aAAa,EAAEqB,IAAI,KAAK5D,iBAAiB,CAAC8D,KAAK,GAC3CvB,aAAa,EAAEmB,IAAI,EAAEK,SAAS,GAC9B;MACR,CAAC;MACD,MAAMvD,OAAO,GAAG,MAAMwD,mBAAmB,CAACP,UAAU,CAAC;MACrD,IAAI,CAACjD,OAAO,EAAE;MACdmC,WAAW,CAACa,IAAI,CAAChD,OAAO,CAAC;IAC3B;IAEA,KAAK,MAAMA,OAAO,IAAImC,WAAW,EAAE;MACjC,MAAMhC,iBAAiC,GAAG;QACxCS,eAAe;QACfiB,WAAW;QACXC;MACF,CAAC;MAED,MAAMX,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,MAAMuC,YAAY,GAAGxE,WAAW,CAC9B,MAAOe,OAAoB,IAAK;IAC9B,MAAM;MAAEgC,MAAM,EAAE/B,MAAM;MAAEC;IAAQ,CAAC,GAC/BhB,oBAAoB,CAAC+C,QAAQ,CAAC,CAAC,CAACC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,IAAI,CAACjC,MAAM,IAAI,CAACC,OAAO,EAAE;IAEzBa,gBAAgB,CAAC;MAAE,GAAGf,OAAO;MAAEoB,MAAM,EAAEhC,aAAa,CAACiC;IAAQ,CAAC,CAAC;;IAE/D;IACA;IACA,MAAMqC,YAAY,GAChB,CACErE,WAAW,CAACsE,cAAc,EAC1BtE,WAAW,CAACuE,YAAY,EACxBvE,WAAW,CAACwE,WAAW,EACvBxE,WAAW,CAACyE,YAAY,CACzB,CACDC,QAAQ,CAAC/D,OAAO,CAACU,WAAW,CAAC;IAE/B,MAAMsD,MAAM,GAAG;MACb/D,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,GAAGiC,YAAY,GACrB,MAAMnE,SAAS,CAAC0E,iBAAiB,CAACD,MAAM,CAAC,GACzC,MAAMzE,SAAS,CAACmC,WAAW,CACzB3B,eAAe,CACbC,OAAO,EACPC,MAAM,IAAI,EAAE,EACZC,OAAO,IAAI,EAAE,EACbI,IAAI,CAAC4D,KAAK,CAAClE,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,EAAEhC,aAAa,CAACwC;MAAO,CAAC,CAAC;IAChE;EACF,CAAC,EACD,CAACf,cAAc,EAAEE,gBAAgB,EAAEC,gBAAgB,CACrD,CAAC;EAED,MAAMmD,aAAa,GAAGlF,WAAW,CAAC,MAAOe,OAAoB,IAAK;IAChE,MAAMoE,cAAc,GAAGlF,oBAAoB,CACxC+C,QAAQ,CAAC,CAAC,CACVC,sBAAsB,CAAC,CAAC,EAAEkC,cAAc;IAC3C,IAAI,CAACA,cAAc,EAAE,MAAM,IAAIC,KAAK,CAAC,wBAAwB,CAAC;IAE9D,MAAM9E,SAAS,CAAC4E,aAAa,CAAC;MAC5BC,cAAc;MACdzC,WAAW,EAAE3B,OAAO,CAAC2B;IACvB,CAAC,CAAC;IAEF/B,kBAAkB,CAACI,OAAO,CAAC2B,WAAW,CAAC;EACzC,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO;IACLD,WAAW;IACX+B,YAAY;IACZU;EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAM1D,uBAAuB,GAAGA,CACrCC,WAAwB,EACxBN,SAAiB,KACd;EACH,MAAMkE,gBAAgB,GAAGpF,oBAAoB,EACzC+C,QAAQ,GAAG,CAAC,EACZC,sBAAsB,CAAC,CAAC;EAC5B,MAAMqC,cAAc,GAAGpF,YAAY,CAAC8C,QAAQ,CAAC,CAAC,CAACuC,IAAI,EAAExC,MAAM,IAAI,EAAE;EACjE,MAAMyC,KAAK,GAAGH,gBAAgB,EAAEI,QAAQ,IAAI,SAAS;EACrD,MAAMC,IAAI,GAAGhF,iCAAiC,CAACe,WAAW,EAAEN,SAAS,CAAC;EACtE,OAAO;IACLqE,KAAK;IACLE,IAAI;IACJtE,EAAE,EAAEC,IAAI,CAACC,SAAS,CAAC;MACjBqE,IAAI,EAAEN,gBAAgB,EAAEO,OAAO,IAAI,EAAE;MACrCC,cAAc,EAAER,gBAAgB,EAAEF,cAAc,IAAI,EAAE;MACtDG,cAAc;MACdE,KAAK;MACLE;IACF,CAAC,CAAC;IACFI,YAAY,EAAE,SAAS;IACvBC,aAAa,EAAE;EACjB,CAAC;AACH,CAAC;AAED,OAAO,MAAMjC,iBAAiB,GAAG,MAAOH,IAAY,IAAK;EACvD,IAAIqC,WAAW,GAAG,MAAM1F,SAAS,CAACwD,iBAAiB,CAACH,IAAI,EAAE9C,IAAI,CAACoF,EAAE,CAAC,CAAC,CAAC,CACjEC,IAAI,CAAEjC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDkC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9B/D,OAAO,CAACgE,KAAK,CAAC,mBAAmB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACnD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOL,WAAW;AACpB,CAAC;AAED,OAAO,MAAMnC,oBAAoB,GAAG,MAAAA,CAAOF,IAAY,EAAEJ,IAAc,KAAK;EAC1E,IAAIgD,cAAc,GAAG,MAAMjG,SAAS,CAACuD,oBAAoB,CACvDF,IAAI,EACJJ,IAAI,EACJ1C,IAAI,CAACoF,EAAE,CAAC,CACV,CAAC,CACEC,IAAI,CAAEjC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDkC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9B/D,OAAO,CAACgE,KAAK,CAAC,sBAAsB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACtD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOE,cAAc;AACvB,CAAC;AAED,OAAO,MAAMhC,mBAAmB,GAAG,MAAOQ,MAAuB,IAAK;EACpE,IAAIjC,aAAa,GAAG,MAAMxC,SAAS,CAACiE,mBAAmB,CAACQ,MAAM,EAAElE,IAAI,CAACoF,EAAE,CAAC,CAAC,CAAC,CACvEC,IAAI,CAAEjC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDkC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9B/D,OAAO,CAACgE,KAAK,CAAC,sBAAsB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACtD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOvD,aAAa;AACtB,CAAC;AAED,OAAO,MAAMY,mBAAmB,GAAG,MAAOqB,MAAsB,IAAK;EACnE,IAAI/C,aAAa,GAAG,MAAM1B,SAAS,CAACkG,kBAAkB,CAACzB,MAAM,EAAElE,IAAI,CAACoF,EAAE,CAAC,CAAC,CAAC,CACtEC,IAAI,CAAEjC,IAAI,IAAK;IACd,OAAOA,IAAI;EACb,CAAC,CAAC,CACDkC,KAAK,CAAC,CAAC;IAAEC,OAAO;IAAEC;EAAO,CAAC,KAAK;IAC9B/D,OAAO,CAACgE,KAAK,CAAC,qBAAqB,EAAEF,OAAO,EAAEC,MAAM,CAAC;IACrD,OAAO,IAAI;EACb,CAAC,CAAC;EACJ,OAAOrE,aAAa;AACtB,CAAC","ignoreList":[]}
|
|
@@ -50,5 +50,38 @@ export const markMessageRevoked = clientMsgID => {
|
|
|
50
50
|
clientMsgID,
|
|
51
51
|
contentType: MessageType.RevokeMessage
|
|
52
52
|
});
|
|
53
|
+
revokeQuotedReferences(clientMsgID);
|
|
54
|
+
};
|
|
55
|
+
const revokeQuotedReferences = clientMsgID => {
|
|
56
|
+
const {
|
|
57
|
+
messages,
|
|
58
|
+
updateOneMessage
|
|
59
|
+
} = useMessageStore.getState();
|
|
60
|
+
messages.forEach(msg => {
|
|
61
|
+
if (msg.quoteElem?.quoteMessage?.clientMsgID === clientMsgID) {
|
|
62
|
+
updateOneMessage({
|
|
63
|
+
clientMsgID: msg.clientMsgID,
|
|
64
|
+
quoteElem: {
|
|
65
|
+
...msg.quoteElem,
|
|
66
|
+
quoteMessage: {
|
|
67
|
+
...msg.quoteElem.quoteMessage,
|
|
68
|
+
contentType: MessageType.RevokeMessage
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
if (msg.atTextElem?.quoteMessage?.clientMsgID === clientMsgID) {
|
|
74
|
+
updateOneMessage({
|
|
75
|
+
clientMsgID: msg.clientMsgID,
|
|
76
|
+
atTextElem: {
|
|
77
|
+
...msg.atTextElem,
|
|
78
|
+
quoteMessage: {
|
|
79
|
+
...msg.atTextElem.quoteMessage,
|
|
80
|
+
contentType: MessageType.RevokeMessage
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
});
|
|
53
86
|
};
|
|
54
87
|
//# sourceMappingURL=message.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["create","MessageType","mergeMessages","useMessageStore","set","get","messages","hasMoreEarlier","hasMoreNewer","setMessages","hasMore","pushNewMessage","message","state","updateOneMessage","tmpList","idx","findIndex","msg","clientMsgID","deleteOneMessage","filter","reset","markMessageRevoked","alreadyRevoked","getState","some","contentType","RevokeMessage"],"sourceRoot":"../../../src","sources":["store/message.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,SAAS;AAChC,SAASC,WAAW,QAAQ,+BAA+B;AAG3D,SAASC,aAAa,QAAQ,qBAAkB;AAEhD,OAAO,MAAMC,eAAe,GAAGH,MAAM,CAAe,CAAC,CAAC,CAACI,GAAG,EAAEC,GAAG,MAAM;EACnEC,QAAQ,EAAE,EAAE;EACZC,cAAc,EAAE,KAAK;EACrBC,YAAY,EAAE,KAAK;EAEnBC,WAAW,EAAEA,CAACH,QAAQ,EAAEI,OAAO,KAAK;IAClCN,GAAG,CAAC;MAAEE,QAAQ;MAAEC,cAAc,EAAEG;IAAQ,CAAC,CAAC;EAC5C,CAAC;EAEDC,cAAc,EAAGC,OAAoB,IAAK;IACxCR,GAAG,CAAES,KAAK,KAAM;MACdP,QAAQ,EAAEJ,aAAa,CAACW,KAAK,CAACP,QAAQ,EAAE,CAACM,OAAO,CAAC;IACnD,CAAC,CAAC,CAAC;EACL,CAAC;EAEDE,gBAAgB,EAAGF,OAAO,IAAK;IAC7B,MAAMG,OAAO,GAAG,CAAC,GAAGV,GAAG,CAAC,CAAC,CAACC,QAAQ,CAAC;IACnC,MAAMU,GAAG,GAAGD,OAAO,CAACE,SAAS,CAC1BC,GAAG,IAAKA,GAAG,CAACC,WAAW,KAAKP,OAAO,CAACO,WACvC,CAAC;IACD,IAAIH,GAAG,GAAG,CAAC,EAAE;IACbD,OAAO,CAACC,GAAG,CAAC,GAAG;MAAE,GAAGD,OAAO,CAACC,GAAG,CAAE;MAAE,GAAGJ;IAAQ,CAAC;IAC/CR,GAAG,CAAC;MAAEE,QAAQ,EAAES;IAAQ,CAAC,CAAC;EAC5B,CAAC;EAEDK,gBAAgB,EAAGD,WAAmB,IAAK;IACzCf,GAAG,CAAES,KAAK,KAAM;MACdP,QAAQ,EAAEO,KAAK,CAACP,QAAQ,CAACe,MAAM,CAAEH,GAAG,IAAKA,GAAG,CAACC,WAAW,KAAKA,WAAW;IAC1E,CAAC,CAAC,CAAC;EACL,CAAC;EAEDG,KAAK,EAAEA,CAAA,KAAM;IACXlB,GAAG,CAAC;MACFE,QAAQ,EAAE,EAAE;MACZC,cAAc,EAAE,KAAK;MACrBC,YAAY,EAAE;IAChB,CAAC,CAAC;EACJ;AACF,CAAC,CAAC,CAAC;AAEH,OAAO,MAAMe,kBAAkB,GAAIJ,WAAmB,IAAK;EACzD,MAAMK,cAAc,GAAGrB,eAAe,CACnCsB,QAAQ,CAAC,CAAC,CACVnB,QAAQ,CAACoB,IAAI,CACXR,GAAG,IACFA,GAAG,CAACC,WAAW,KAAKA,WAAW,IAC/BD,GAAG,CAACS,WAAW,KAAK1B,WAAW,CAAC2B,aACpC,CAAC;EACH,IAAIJ,cAAc,EAAE;EAEpBrB,eAAe,CACZsB,QAAQ,CAAC,CAAC,CACVX,gBAAgB,CAAC;IAAEK,WAAW;IAAEQ,WAAW,EAAE1B,WAAW,CAAC2B;EAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"names":["create","MessageType","mergeMessages","useMessageStore","set","get","messages","hasMoreEarlier","hasMoreNewer","setMessages","hasMore","pushNewMessage","message","state","updateOneMessage","tmpList","idx","findIndex","msg","clientMsgID","deleteOneMessage","filter","reset","markMessageRevoked","alreadyRevoked","getState","some","contentType","RevokeMessage","revokeQuotedReferences","forEach","quoteElem","quoteMessage","atTextElem"],"sourceRoot":"../../../src","sources":["store/message.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -12,7 +12,10 @@ const displayToast = params => {
|
|
|
12
12
|
text2: params.body,
|
|
13
13
|
onPress: params.onPress,
|
|
14
14
|
onHide: advanceQueue,
|
|
15
|
-
visibilityTime: VISIBILITY_TIME_MS
|
|
15
|
+
visibilityTime: VISIBILITY_TIME_MS,
|
|
16
|
+
text2Props: params.ellipsizeMiddle ? {
|
|
17
|
+
ellipsizeMode: 'middle'
|
|
18
|
+
} : {}
|
|
16
19
|
});
|
|
17
20
|
};
|
|
18
21
|
function advanceQueue() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Toast","currentKey","queue","VISIBILITY_TIME_MS","displayToast","params","key","show","type","text1","title","text2","body","onPress","onHide","advanceQueue","visibilityTime","next","shift","ToastFlashMessage","queuedIndex","findIndex","item","push","hide","index","splice"],"sourceRoot":"../../../src","sources":["utils/toastFlashMessage.ts"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,4BAA4B;
|
|
1
|
+
{"version":3,"names":["Toast","currentKey","queue","VISIBILITY_TIME_MS","displayToast","params","key","show","type","text1","title","text2","body","onPress","onHide","advanceQueue","visibilityTime","text2Props","ellipsizeMiddle","ellipsizeMode","next","shift","ToastFlashMessage","queuedIndex","findIndex","item","push","hide","index","splice"],"sourceRoot":"../../../src","sources":["utils/toastFlashMessage.ts"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,4BAA4B;AAU9C,IAAIC,UAAyB,GAAG,IAAI;AACpC,MAAMC,KAA+B,GAAG,EAAE;AAE1C,MAAMC,kBAAkB,GAAG,IAAI;AAE/B,MAAMC,YAAY,GAAIC,MAA8B,IAAK;EACvDJ,UAAU,GAAGI,MAAM,CAACC,GAAG;EACvBN,KAAK,CAACO,IAAI,CAAC;IACTC,IAAI,EAAE,MAAM;IACZC,KAAK,EAAEJ,MAAM,CAACK,KAAK;IACnBC,KAAK,EAAEN,MAAM,CAACO,IAAI;IAClBC,OAAO,EAAER,MAAM,CAACQ,OAAO;IACvBC,MAAM,EAAEC,YAAY;IACpBC,cAAc,EAAEb,kBAAkB;IAClCc,UAAU,EAAEZ,MAAM,CAACa,eAAe,GAC9B;MACEC,aAAa,EAAE;IACjB,CAAC,GACD,CAAC;EACP,CAAC,CAAC;AACJ,CAAC;AAED,SAASJ,YAAYA,CAAA,EAAG;EACtB,MAAMK,IAAI,GAAGlB,KAAK,CAACmB,KAAK,CAAC,CAAC;EAC1B,IAAI,CAACD,IAAI,EAAE;IACTnB,UAAU,GAAG,IAAI;IACjB;EACF;EACAG,YAAY,CAACgB,IAAI,CAAC;AACpB;AAEA,OAAO,MAAME,iBAAiB,GAAG;EAC/Bf,IAAI,EAAGF,MAA8B,IAAK;IACxC,IAAIA,MAAM,CAACC,GAAG,KAAKL,UAAU,EAAE;MAC7BG,YAAY,CAACC,MAAM,CAAC;MACpB;IACF;IAEA,MAAMkB,WAAW,GAAGrB,KAAK,CAACsB,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACnB,GAAG,KAAKD,MAAM,CAACC,GAAG,CAAC;IACtE,IAAIiB,WAAW,KAAK,CAAC,CAAC,EAAE;MACtBrB,KAAK,CAACqB,WAAW,CAAC,GAAGlB,MAAM;MAC3B;IACF;IAEA,IAAIJ,UAAU,KAAK,IAAI,EAAE;MACvBG,YAAY,CAACC,MAAM,CAAC;IACtB,CAAC,MAAM;MACLH,KAAK,CAACwB,IAAI,CAACrB,MAAM,CAAC;IACpB;EACF,CAAC;EACDsB,IAAI,EAAGrB,GAAW,IAAK;IACrB,IAAIA,GAAG,KAAKL,UAAU,EAAE;MACtBD,KAAK,CAAC2B,IAAI,CAAC,CAAC;MACZ1B,UAAU,GAAG,IAAI;MACjBc,YAAY,CAAC,CAAC;IAChB,CAAC,MAAM;MACL,MAAMa,KAAK,GAAG1B,KAAK,CAACsB,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACnB,GAAG,KAAKA,GAAG,CAAC;MACzD,IAAIsB,KAAK,KAAK,CAAC,CAAC,EAAE;QAChB1B,KAAK,CAAC2B,MAAM,CAACD,KAAK,EAAE,CAAC,CAAC;MACxB;IACF;EACF;AACF,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useChatListener.d.ts","sourceRoot":"","sources":["../../../../src/core/useChatListener.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useChatListener.d.ts","sourceRoot":"","sources":["../../../../src/core/useChatListener.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,eAAe,YA4I3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACX,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAiB,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG3E,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAerE,eAAO,MAAM,cAAc;oEA0CpB;QACD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,YAAY,CAAC;QAC3B,IAAI,CAAC,EAAE,2BAA2B,CAAC;QACnC,aAAa,CAAC,EAAE,oBAAoB,CAAC;KACtC;4BAmEe,WAAW;6BA8CqB,WAAW;
|
|
1
|
+
{"version":3,"file":"useSendMessage.d.ts","sourceRoot":"","sources":["../../../../../src/hooks/message/useSendMessage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACX,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAiB,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG3E,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,kBAAkB,CAAC;AAM1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAerE,eAAO,MAAM,cAAc;oEA0CpB;QACD,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,YAAY,CAAC;QAC3B,IAAI,CAAC,EAAE,2BAA2B,CAAC;QACnC,aAAa,CAAC,EAAE,oBAAoB,CAAC;KACtC;4BAmEe,WAAW;6BA8CqB,WAAW;CAmB9D,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,aAAa,WAAW,EACxB,WAAW,MAAM,KAoBZ,WACN,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,MAAM,MAAM,iBAUnD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,MAAM,MAAM,EAAE,MAAM,MAAM,EAAE,iBActE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,QAAQ,eAAe,iBAUhE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,QAAQ,cAAc,iBAU/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/store/message.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD,eAAO,MAAM,eAAe,2EAsCzB,CAAC;AAEJ,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/store/message.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGlD,eAAO,MAAM,eAAe,2EAsCzB,CAAC;AAEJ,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,SAerD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toastFlashMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/toastFlashMessage.ts"],"names":[],"mappings":"AAEA,UAAU,sBAAsB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;
|
|
1
|
+
{"version":3,"file":"toastFlashMessage.d.ts","sourceRoot":"","sources":["../../../../src/utils/toastFlashMessage.ts"],"names":[],"mappings":"AAEA,UAAU,sBAAsB;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAiCD,eAAO,MAAM,iBAAiB;mBACb,sBAAsB;gBAkBzB,MAAM;CAYnB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@droppii-org/chat-mobile",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.42",
|
|
4
4
|
"description": "Droppii chat mobile",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
@@ -107,6 +107,7 @@
|
|
|
107
107
|
"eslint-plugin-prettier": "^5.5.5",
|
|
108
108
|
"jest": "^30.3.0",
|
|
109
109
|
"lefthook": "^2.1.4",
|
|
110
|
+
"patch-package": "^8.0.0",
|
|
110
111
|
"prettier": "^3.8.1",
|
|
111
112
|
"react-native": "^0.86.0",
|
|
112
113
|
"react-native-blob-util": "^0.24.10",
|
|
@@ -12,14 +12,12 @@ import { useCallback, useEffect } from 'react';
|
|
|
12
12
|
import { useConversationStore } from '../store/conversation';
|
|
13
13
|
import { ToastFlashMessage } from '../utils/toastFlashMessage';
|
|
14
14
|
import { useUserStore } from '../store/user';
|
|
15
|
-
import { getLastMessageText
|
|
15
|
+
import { getLastMessageText } from '../utils/messageUtils';
|
|
16
16
|
import { useChatContext } from '../context';
|
|
17
17
|
import isEmpty from 'lodash/isEmpty';
|
|
18
18
|
import { markMessageRevoked, useMessageStore } from '../store/message';
|
|
19
19
|
import { syncPinnedMessagesOnEvent } from '../hooks/message/usePinMessage';
|
|
20
20
|
|
|
21
|
-
const MAX_TOAST_FILE_NAME_LENGTH = 40;
|
|
22
|
-
|
|
23
21
|
export const useChatListener = () => {
|
|
24
22
|
const updateOneMessage = useMessageStore((state) => state.updateOneMessage);
|
|
25
23
|
const currentUserId = useUserStore((s) => s.user?.userID);
|
|
@@ -55,22 +53,8 @@ export const useChatListener = () => {
|
|
|
55
53
|
const latestMsg: MessageItem = JSON.parse(
|
|
56
54
|
conversation.latestMsg || '{}'
|
|
57
55
|
);
|
|
58
|
-
const messageForToast =
|
|
59
|
-
latestMsg.contentType === MessageType.FileMessage &&
|
|
60
|
-
latestMsg.fileElem?.fileName
|
|
61
|
-
? {
|
|
62
|
-
...latestMsg,
|
|
63
|
-
fileElem: {
|
|
64
|
-
...latestMsg.fileElem,
|
|
65
|
-
fileName: truncateMiddle(
|
|
66
|
-
latestMsg.fileElem.fileName,
|
|
67
|
-
MAX_TOAST_FILE_NAME_LENGTH
|
|
68
|
-
),
|
|
69
|
-
},
|
|
70
|
-
}
|
|
71
|
-
: latestMsg;
|
|
72
56
|
const lastMessageText = getLastMessageText(
|
|
73
|
-
|
|
57
|
+
latestMsg,
|
|
74
58
|
currentUserId,
|
|
75
59
|
conversation
|
|
76
60
|
);
|
|
@@ -78,6 +62,7 @@ export const useChatListener = () => {
|
|
|
78
62
|
key: conversation.conversationID,
|
|
79
63
|
title: conversation.showName || 'New Message',
|
|
80
64
|
body: lastMessageText,
|
|
65
|
+
ellipsizeMiddle: latestMsg.contentType === MessageType.FileMessage,
|
|
81
66
|
onPress: () => {
|
|
82
67
|
ToastFlashMessage.hide(conversation.conversationID);
|
|
83
68
|
onPressFlashMessage?.(conversation);
|
package/src/store/message.ts
CHANGED
|
@@ -57,4 +57,38 @@ export const markMessageRevoked = (clientMsgID: string) => {
|
|
|
57
57
|
useMessageStore
|
|
58
58
|
.getState()
|
|
59
59
|
.updateOneMessage({ clientMsgID, contentType: MessageType.RevokeMessage });
|
|
60
|
+
|
|
61
|
+
revokeQuotedReferences(clientMsgID);
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const revokeQuotedReferences = (clientMsgID: string) => {
|
|
65
|
+
const { messages, updateOneMessage } = useMessageStore.getState();
|
|
66
|
+
|
|
67
|
+
messages.forEach((msg) => {
|
|
68
|
+
if (msg.quoteElem?.quoteMessage?.clientMsgID === clientMsgID) {
|
|
69
|
+
updateOneMessage({
|
|
70
|
+
clientMsgID: msg.clientMsgID,
|
|
71
|
+
quoteElem: {
|
|
72
|
+
...msg.quoteElem,
|
|
73
|
+
quoteMessage: {
|
|
74
|
+
...msg.quoteElem.quoteMessage,
|
|
75
|
+
contentType: MessageType.RevokeMessage,
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (msg.atTextElem?.quoteMessage?.clientMsgID === clientMsgID) {
|
|
82
|
+
updateOneMessage({
|
|
83
|
+
clientMsgID: msg.clientMsgID,
|
|
84
|
+
atTextElem: {
|
|
85
|
+
...msg.atTextElem,
|
|
86
|
+
quoteMessage: {
|
|
87
|
+
...msg.atTextElem.quoteMessage,
|
|
88
|
+
contentType: MessageType.RevokeMessage,
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
});
|
|
60
94
|
};
|
|
@@ -4,6 +4,7 @@ interface ShowFlashMessageParams {
|
|
|
4
4
|
key: string;
|
|
5
5
|
title: string;
|
|
6
6
|
body?: string;
|
|
7
|
+
ellipsizeMiddle?: boolean;
|
|
7
8
|
onPress?: () => void;
|
|
8
9
|
}
|
|
9
10
|
|
|
@@ -21,6 +22,11 @@ const displayToast = (params: ShowFlashMessageParams) => {
|
|
|
21
22
|
onPress: params.onPress,
|
|
22
23
|
onHide: advanceQueue,
|
|
23
24
|
visibilityTime: VISIBILITY_TIME_MS,
|
|
25
|
+
text2Props: params.ellipsizeMiddle
|
|
26
|
+
? {
|
|
27
|
+
ellipsizeMode: 'middle',
|
|
28
|
+
}
|
|
29
|
+
: {},
|
|
24
30
|
});
|
|
25
31
|
};
|
|
26
32
|
|