feat: use IndexedKey to track list index

This commit is contained in:
Gordon Hayes
2021-09-08 17:24:17 +02:00
parent 311b109994
commit 265c0d0637
@@ -467,9 +467,9 @@ class _MessageListViewState extends State<MessageListView> {
reverse: widget.reverse, reverse: widget.reverse,
itemCount: messages.length, itemCount: messages.length,
findChildIndexCallback: (Key key) { findChildIndexCallback: (Key key) {
final String data = (key as ValueKey).value; final indexedKey = key as IndexedKey;
final index = final index = messages.indexWhere(
messages.indexWhere((element) => element.id == data); (element) => element.id == indexedKey.value);
return ((index + 2) * 2) - 1; return ((index + 2) * 2) - 1;
}, },
@@ -600,9 +600,10 @@ class _MessageListViewState extends State<MessageListView> {
messages, messages,
streamChannel!, streamChannel!,
i - 2, i - 2,
i,
); );
} else { } else {
messageWidget = buildMessage(message, messages, i - 2); messageWidget = buildMessage(message, messages, i - 2, i);
} }
return messageWidget; return messageWidget;
}, },
@@ -824,11 +825,13 @@ class _MessageListViewState extends State<MessageListView> {
List<Message> messages, List<Message> messages,
StreamChannelState streamChannel, StreamChannelState streamChannel,
int index, int index,
int buildItemIndex,
) { ) {
final messageWidget = buildMessage(message, messages, index); final messageWidget =
buildMessage(message, messages, index, buildItemIndex);
return VisibilityDetector( return VisibilityDetector(
key: ValueKey<String>(message.id), key: IndexedKey(message.id, buildItemIndex),
onVisibilityChanged: (visibility) { onVisibilityChanged: (visibility) {
final isVisible = visibility.visibleBounds != Rect.zero; final isVisible = visibility.visibleBounds != Rect.zero;
if (isVisible) { if (isVisible) {
@@ -920,12 +923,13 @@ class _MessageListViewState extends State<MessageListView> {
return defaultMessageWidget; return defaultMessageWidget;
} }
Widget buildMessage(Message message, List<Message> messages, int index) { Widget buildMessage(
Message message, List<Message> messages, int index, int buildItemIndex) {
if ((message.type == 'system' || message.type == 'error') && if ((message.type == 'system' || message.type == 'error') &&
message.text?.isNotEmpty == true) { message.text?.isNotEmpty == true) {
return widget.systemMessageBuilder?.call(context, message) ?? return widget.systemMessageBuilder?.call(context, message) ??
SystemMessage( SystemMessage(
key: ValueKey<String>(message.id), key: IndexedKey(message.id, buildItemIndex),
message: message, message: message,
onMessageTap: (message) { onMessageTap: (message) {
if (widget.onSystemMessageTap != null) { if (widget.onSystemMessageTap != null) {
@@ -1005,7 +1009,7 @@ class _MessageListViewState extends State<MessageListView> {
members.firstWhereOrNull((e) => e.user!.id == currentUser!.id); members.firstWhereOrNull((e) => e.user!.id == currentUser!.id);
Widget messageWidget = MessageWidget( Widget messageWidget = MessageWidget(
key: ValueKey<String>(message.id), key: IndexedKey(message.id, buildItemIndex),
message: message, message: message,
reverse: isMyMessage, reverse: isMyMessage,
showReactions: !message.isDeleted, showReactions: !message.isDeleted,