From 4852b0067dbbe50ff3b9030506349c655ed6f376 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 5 Mar 2024 00:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE:=20=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/ChatWindow.jsx        |  6 +-
 .../Conversations/Components/Messages.jsx     | 76 ++++++++++---------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/views/Conversations/ChatWindow.jsx b/src/views/Conversations/ChatWindow.jsx
index edd93ae..227ec0a 100644
--- a/src/views/Conversations/ChatWindow.jsx
+++ b/src/views/Conversations/ChatWindow.jsx
@@ -50,10 +50,8 @@ const ChatWindow = () => {
               {/* <Button type='text' icon={<ReloadOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className='' title='最新消息记录' /> */}
               <Button type='text' icon={collapsedRight ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className=' rounded-none rounded-r' />
             </Header>
-            <Content className="flex-grow bg-whatsapp-bg" >
-              <div className='h-full overflow-y-auto'>
-                <Messages />
-              </div>
+            <Content className="flex-grow bg-whatsapp-bg relative" >
+              <Messages />
             </Content>
             <Footer className='ant-layout-sider-light p-0'>
               <InputComposer />
diff --git a/src/views/Conversations/Components/Messages.jsx b/src/views/Conversations/Components/Messages.jsx
index d57bf27..89a1b22 100644
--- a/src/views/Conversations/Components/Messages.jsx
+++ b/src/views/Conversations/Components/Messages.jsx
@@ -1,5 +1,5 @@
 import { useEffect, useState, useRef, useMemo, memo, createRef, forwardRef } from 'react';
-import { Image, Spin, Dropdown, Button } from 'antd';
+import { Image, Spin, Dropdown, Button, Affix } from 'antd';
 import { DownOutlined } from '@ant-design/icons';
 import { MessageBox } from 'react-chat-elements';
 import useConversationStore from '@/stores/ConversationStore';
@@ -7,7 +7,7 @@ import { useShallow } from 'zustand/react/shallow';
 import { Emoji } from 'emoji-picker-react';
 import { olog } from '@/utils/utils';
 
-const Messages = () => {
+const Messages = ({ ...props }) => {
   // const currentConversation = useConversationStore(useShallow((state) => state.currentConversation));
   const setReferenceMsg = useConversationStore(useShallow((state) => state.setReferenceMsg));
   const msgListLoading = useConversationStore(useShallow((state) => state.msgListLoading));
@@ -17,9 +17,9 @@ const Messages = () => {
   const scrollToMessage = (id, index) => {
     const _i = index || activeMessages.findIndex((msg) => msg.id === id);
     if (_i >= 0) {
-      messageRefs.current[_i].current.scrollIntoView({ behavior: "smooth", block: "center" });
+      messageRefs.current[_i].current.scrollIntoView({ behavior: 'smooth', block: 'center' });
     }
-  }
+  };
 
   useEffect(() => {
     if (activeMessages.length > 0) {
@@ -30,6 +30,12 @@ const Messages = () => {
   const messageRefs = useRef([]);
   messageRefs.current = activeMessages.map((_, i) => messageRefs.current[i] ?? createRef());
 
+  const referance = useRef(null);
+  const toBottom = (e) => {
+    if (!referance) return;
+    referance.current.scrollTop = referance.current.scrollHeight;
+  };
+
   const [previewVisible, setPreviewVisible] = useState(false);
   const [previewSrc, setPreviewSrc] = useState();
   const onPreviewClose = () => {
@@ -44,7 +50,7 @@ const Messages = () => {
         return false;
 
       case 'file':
-        window.open(msg.data.uri, "_blank", "noopener,noreferrer")
+        window.open(msg.data.uri, '_blank', 'noopener,noreferrer');
         return false;
 
       default:
@@ -52,8 +58,8 @@ const Messages = () => {
     }
   };
 
-  const RenderText = memo(function renderText({str}) {
-    const parts = str.split(/(https?:\/\/[^\s]+|\p{Emoji_Presentation})/gmu).filter(s => s !== '');
+  const RenderText = memo(function renderText({ str }) {
+    const parts = str.split(/(https?:\/\/[^\s]+|\p{Emoji_Presentation})/gmu).filter((s) => s !== '');
     // const parts = str.split(/(https?:\/\/[^\s]+|\p{Emoji}\uFE0F?|\b\d+\b)/gu);
     return (
       <>
@@ -62,8 +68,7 @@ const Messages = () => {
           if (/\p{Emoji_Presentation}/u.test(part)) {
             const code = [...part].map((e) => e.codePointAt(0).toString(16)).join(`-`);
             return <Emoji key={`${part}${index}${code}`} unified={code} size={24} emojiStyle={'apple'} />;
-          } else
-          if (/https?:\/\/[\S]+/gi.test(part)) {
+          } else if (/https?:\/\/[\S]+/gi.test(part)) {
             return (
               <a href={part} target='_blank' key={`${part}${index}`} rel='noreferrer'>
                 {part}
@@ -86,25 +91,26 @@ const Messages = () => {
   ));
 
   return (
-    <div>
-      <Spin spinning={msgListLoading} tip={'正在读取...'} wrapperClassName='pt-8 '>
-        {activeMessages.map((message, index) => (
-          // <Dropdown
-          //   key={message.id}
-          //   menu={{
-          //     items: [{ label: '回复', key: 'reply', disabled: !['text'].includes(message.whatsapp_msg_type) }],
-          //     onClick: ({ key, domEvent }) => {
-          //       domEvent.stopPropagation();
-          //       switch (key) {
-          //         case 'reply':
-          //           return setReferenceMsg(message);
+    <div className='relative h-full overflow-y-auto flex'>
+      <div className='relative overflow-y-auto block flex-1' ref={referance}>
+        <Spin spinning={msgListLoading} tip={'正在读取...'} wrapperClassName='pt-8 relative'>
+          {activeMessages.map((message, index) => (
+            // <Dropdown
+            //   key={message.id}
+            //   menu={{
+            //     items: [{ label: '回复', key: 'reply', disabled: !['text'].includes(message.whatsapp_msg_type) }],
+            //     onClick: ({ key, domEvent }) => {
+            //       domEvent.stopPropagation();
+            //       switch (key) {
+            //         case 'reply':
+            //           return setReferenceMsg(message);
 
-          //         default:
-          //           return;
-          //       }
-          //     },
-          //   }}
-          //   trigger={['contextMenu']}>
+            //         default:
+            //           return;
+            //       }
+            //     },
+            //   }}
+            //   trigger={['contextMenu']}>
             <MessageBoxWithRef
               ref={messageRefs.current[index]}
               key={message.id}
@@ -119,20 +125,20 @@ const Messages = () => {
                 ? {
                     styles: { backgroundColor: '#ccd4ae' },
                     notchStyle: { fill: '#ccd4ae' },
-                    replyButton: ['text'].includes(message.whatsapp_msg_type) && message.status !== 'failed' ? true : false,
+                    replyButton: ['text', 'document', 'image'].includes(message.whatsapp_msg_type) && message.status !== 'failed' ? true : false,
                     className: 'whatsappme-container whitespace-pre-wrap',
                   }
                 : {
-                    replyButton: ['text'].includes(message.whatsapp_msg_type) ? true : false,
+                    replyButton: ['text', 'document', 'image'].includes(message.whatsapp_msg_type) ? true : false,
                     className: 'whitespace-pre-wrap',
                   })}
             />
-          // </Dropdown>
-        ))}
-
-      </Spin>
-
-      <Image src={null} preview={{ visible: previewVisible, src: previewSrc, onClose: onPreviewClose }} />
+            // </Dropdown>
+          ))}
+        </Spin>
+        <Image src={null} preview={{ visible: previewVisible, src: previewSrc, onClose: onPreviewClose }} />
+      </div>
+      <Button onClick={toBottom} shape={'circle'} className=' absolute bottom-1 right-4' icon={<DownOutlined />} />
     </div>
   );
 };