From fcaa7e42f13b43c4b87e350e84cd66c6b79bcfc1 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Wed, 27 Oct 2021 12:16:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A1=AE=E4=BF=9D=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E5=9B=A0=E4=B8=BA=E7=BB=84=E4=BB=B6=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=AF=BC=E8=87=B4=E7=9A=84=E9=87=8D=E7=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChatBox/ChatMessageList/VirtualizedList.tsx | 9 +++++---- .../DynamicVirtualizedList/DynamicSizeList.tsx | 8 ++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/web/src/components/ChatBox/ChatMessageList/VirtualizedList.tsx b/web/src/components/ChatBox/ChatMessageList/VirtualizedList.tsx index 8eb4bb67..dd023500 100644 --- a/web/src/components/ChatBox/ChatMessageList/VirtualizedList.tsx +++ b/web/src/components/ChatBox/ChatMessageList/VirtualizedList.tsx @@ -74,13 +74,14 @@ export const VirtualizedMessageList: React.FC = // } }; - const renderRow = ({ data, itemId, style }: any) => { - const index = findMessageIndexWithId(props.messages, itemId); // TODO: 这里是因为mattermost的动态列表传的id因此只能这边再用id找回,可以看看是否可以优化 + const renderRow = ({ data, itemId }: any) => { + const messages = props.messages; + const index = findMessageIndexWithId(messages, itemId); // TODO: 这里是因为mattermost的动态列表传的id因此只能这边再用id找回,可以看看是否可以优化 if (index === -1) { return
; } - const message = props.messages[index]; + const message = messages[index]; let showDate = true; let showAvatar = true; @@ -89,7 +90,7 @@ export const VirtualizedMessageList: React.FC = // 当不是第一条数据时 // 进行时间合并 - const prevMessage = props.messages[index - 1]; + const prevMessage = messages[index - 1]; if ( !shouldShowMessageTime( new Date(prevMessage.createdAt ?? ''), diff --git a/web/src/components/DynamicVirtualizedList/DynamicSizeList.tsx b/web/src/components/DynamicVirtualizedList/DynamicSizeList.tsx index 869ddae3..caef18d5 100644 --- a/web/src/components/DynamicVirtualizedList/DynamicSizeList.tsx +++ b/web/src/components/DynamicVirtualizedList/DynamicSizeList.tsx @@ -140,11 +140,7 @@ export interface OnScrollInfo { interface DynamicSizeListProps { canLoadMorePosts: () => void; - children: (info: { - data: any; - itemId: any; - style?: any; - }) => React.ReactElement; + children: (info: { data: any; itemId: any }) => React.ReactElement; height: number; initRangeToRender: number[]; initScrollToIndex: () => any; @@ -832,7 +828,7 @@ export default class DynamicSizeList extends PureComponent< isItemInLocalPosts || isLoader ) { - const item: React.ReactElement = createElement(children, { + const item: React.ReactElement = children({ data: itemData, itemId, });