diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js
index 4017d07..557cccd 100644
--- a/src/lib/msgUtils.js
+++ b/src/lib/msgUtils.js
@@ -13,6 +13,13 @@ export const replaceTemplateString = (str, replacements) => {
return result;
}
+
+const autoLinkText = (text) => {
+ let regex = /(https?:\/\/[^\s]+)/g;
+
+ let newText = text.replace(regex, '$1');
+ return newText;
+}
/**
*
// +8618777396951 lyj
@@ -37,6 +44,8 @@ export const sentMsgTypeMapped = {
...msg,
actionId: msg.id,
conversationid: msg.id.split('.')[0],
+ originText: (msg.text),
+ text: autoLinkText(msg.text),
...(msg.context
? {
reply: {
@@ -169,7 +178,7 @@ export const whatsappMsgTypeMapped = {
},
text: {
type: 'text',
- data: (msg) => ({ id: msg.wamid, text: msg.text.body }),
+ data: (msg) => ({ id: msg.wamid, text: autoLinkText(msg.text.body), originText: msg.text.body }),
renderForReply: (msg) => ({ id: msg.wamid, message: msg.text.body }),
},
image: {
diff --git a/src/views/Conversations/Components/InputComposer.jsx b/src/views/Conversations/Components/InputComposer.jsx
index 35f73a7..d5af10c 100644
--- a/src/views/Conversations/Components/InputComposer.jsx
+++ b/src/views/Conversations/Components/InputComposer.jsx
@@ -72,7 +72,7 @@ const InputBox = () => {
{referenceMsg.id && (
- {referenceMsg.senderName}{referenceMsg.text}
+ {referenceMsg.senderName}{referenceMsg.originText}
} size={'middle'} onClick={() => (setReferenceMsg({}))} />
)}
diff --git a/src/views/Conversations/Components/Messages.jsx b/src/views/Conversations/Components/Messages.jsx
index 7cf7749..0a5e5d2 100644
--- a/src/views/Conversations/Components/Messages.jsx
+++ b/src/views/Conversations/Components/Messages.jsx
@@ -1,11 +1,12 @@
import { useEffect, useState, useRef, useMemo } from 'react';
-import { Image, Spin } from 'antd';
+import { Image, Spin, Dropdown } from 'antd';
+import { DownOutlined } from '@ant-design/icons';
import { MessageBox } from 'react-chat-elements';
import useConversationStore from '@/stores/ConversationStore';
import { useShallow } from 'zustand/react/shallow';
const Messages = () => {
- const { currentConversation, setReferenceMsg, msgListLoading, } = useConversationStore();
+ const { currentConversation, setReferenceMsg, msgListLoading } = useConversationStore();
const activeMessages = useConversationStore(useShallow((state) => (currentConversation.sn ? state.activeConversations[currentConversation.sn] : [])));
const messagesList = useMemo(
@@ -25,9 +26,9 @@ const Messages = () => {
replyButton: ['text'].includes(message.whatsapp_msg_type) ? true : false,
}),
})),
- [activeMessages, currentConversation.sn]
+ [activeMessages]
);
- console.log('messagesList----------------------------------------------------', messagesList);
+ // console.log('messagesList----------------------------------------------------', messagesList);
const messagesEndRef = useRef(null);
useEffect(() => {
@@ -50,13 +51,38 @@ const Messages = () => {
return (
-
- {messagesList.map((message, index) => (
- setReferenceMsg(message)} onOpen={() => handlePreview(message)} />
- ))}
-
-
-
+
+ {messagesList.map((message, index) => (
+ // {
+ // domEvent.stopPropagation();
+ // switch (key) {
+ // case 'reply':
+ // return setReferenceMsg(message);
+
+ // default:
+ // return;
+ // }
+ // },
+ // }}
+ // trigger={['contextMenu']}
+ // >
+ setReferenceMsg(message)}
+ onOpen={() => handlePreview(message)}
+ {...(message.type === 'text' ? { text: } : {})}
+ />
+ //
+ ))}
+
+
+
+
);
};
diff --git a/src/views/Conversations/Conversations.css b/src/views/Conversations/Conversations.css
index 9873798..6a1adb1 100644
--- a/src/views/Conversations/Conversations.css
+++ b/src/views/Conversations/Conversations.css
@@ -15,3 +15,6 @@
background: linear-gradient(0deg,#00000014,#0000);
color: #00000073;
}
+.chatwindow-wrapper .rce-mbox-text:after{
+ content: none;
+}