From 15cfcc5143f28950e928862ddca5f068381720da Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 18 May 2021 10:36:03 +0200
Subject: [PATCH] fix: .copy and export reactionIcons

---
 .../lib/src/stream_chat_theme.dart            | 19 ++++++++++---------
 .../lib/stream_chat_flutter.dart              |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
index c5646753..97363df7 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
@@ -175,17 +175,18 @@ class StreamChatThemeData {
   }) =>
       StreamChatThemeData.raw(
         channelListHeaderTheme:
-            channelListHeaderTheme ?? this.channelListHeaderTheme,
-        textTheme: textTheme ?? this.textTheme,
-        colorTheme: colorTheme ?? this.colorTheme,
-        primaryIconTheme: primaryIconTheme ?? this.primaryIconTheme,
+            this.channelListHeaderTheme.merge(channelListHeaderTheme),
+        textTheme: this.textTheme.merge(textTheme),
+        colorTheme: this.colorTheme.merge(colorTheme),
+        primaryIconTheme: this.primaryIconTheme.merge(primaryIconTheme),
         defaultChannelImage: defaultChannelImage ?? this.defaultChannelImage,
         defaultUserImage: defaultUserImage ?? this.defaultUserImage,
-        channelPreviewTheme: channelPreviewTheme ?? this.channelPreviewTheme,
-        channelTheme: channelTheme ?? this.channelTheme,
-        ownMessageTheme: ownMessageTheme ?? this.ownMessageTheme,
-        otherMessageTheme: otherMessageTheme ?? this.otherMessageTheme,
-        messageInputTheme: messageInputTheme ?? this.messageInputTheme,
+        channelPreviewTheme:
+            this.channelPreviewTheme.merge(channelPreviewTheme),
+        channelTheme: this.channelTheme.merge(channelTheme),
+        ownMessageTheme: this.ownMessageTheme.merge(ownMessageTheme),
+        otherMessageTheme: this.otherMessageTheme.merge(otherMessageTheme),
+        messageInputTheme: this.messageInputTheme.merge(messageInputTheme),
         reactionIcons: reactionIcons ?? this.reactionIcons,
       );
 
diff --git a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart
index eb35c69b..62bfd299 100644
--- a/packages/stream_chat_flutter/lib/stream_chat_flutter.dart
+++ b/packages/stream_chat_flutter/lib/stream_chat_flutter.dart
@@ -24,6 +24,7 @@ export 'src/message_search_list_view.dart';
 export 'src/message_text.dart';
 export 'src/message_widget.dart';
 export 'src/option_list_tile.dart';
+export 'src/reaction_icon.dart';
 export 'src/reaction_picker.dart';
 export 'src/sending_indicator.dart';
 export 'src/stream_chat.dart';