Fixed a bug with updates in the navigation bar typing

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift

@@ -33,11 +33,11 @@ public struct DefaultChatChannelHeader: ToolbarContent {
             VStack(spacing: 2) {
                 Text(channelNamer(channel, currentUserId) ?? "")
                     .font(fonts.bodyBold)
-                if !channel.currentlyTypingUsersFiltered(currentUserId: chatClient.currentUserId).isEmpty
+                if !channel.currentlyTypingUsersFiltered(currentUserId: currentUserId).isEmpty
                     && utils.typingIndicatorPlacement == .navigationBar {
                     HStack {
                         TypingIndicatorView()
-                        SubtitleText(text: channel.typingIndicatorString)
+                        SubtitleText(text: channel.typingIndicatorString(currentUserId: currentUserId))
                     }
                 } else {
                     Text(channel.onlineInfoText(currentUserId: currentUserId))

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -283,6 +283,13 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
         if type != channelHeaderType {
             channelHeaderType = type
+        } else if type == .typingIndicator {
+            // Toolbar is not updated when new user starts typing.
+            // Therefore, we shortly update the state to regular to trigger an update.
+            channelHeaderType = .regular
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+                self?.channelHeaderType = .typingIndicator
+            }
         }
     }
 }

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -149,7 +149,7 @@ struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
             if !channel.currentlyTypingUsersFiltered(currentUserId: chatClient.currentUserId).isEmpty
                 && utils.typingIndicatorPlacement == .bottomOverlay {
                 TypingIndicatorBottomView(
-                    typingIndicatorString: channel.typingIndicatorString
+                    typingIndicatorString: channel.typingIndicatorString(currentUserId: chatClient.currentUserId)
                 )
             }
         }

Sources/StreamChatSwiftUI/ChatChannel/Utils/ChatChannelExtensions.swift

@@ -34,8 +34,8 @@ extension ChatChannel {
         }
     }
 
-    var typingIndicatorString: String {
-        let typingUsers = Array(currentlyTypingUsers)
+    func typingIndicatorString(currentUserId: UserId?) -> String {
+        let typingUsers = currentlyTypingUsersFiltered(currentUserId: currentUserId)
         if let user = typingUsers.first(where: { user in user.name != nil }), let name = user.name {
             return L10n.MessageList.TypingIndicator.users(name, typingUsers.count - 1)
         } else {

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListItem.swift

@@ -87,7 +87,7 @@ public struct ChatChannelListItem: View {
         } else if !channel.currentlyTypingUsersFiltered(
             currentUserId: chatClient.currentUserId
         ).isEmpty {
-            return channel.typingIndicatorString
+            return channel.typingIndicatorString(currentUserId: chatClient.currentUserId)
         } else if let latestMessage = channel.latestMessages.first {
             return "\(latestMessage.author.name ?? latestMessage.author.id): \(latestMessage.textContent ?? latestMessage.text)"
         } else {

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelExtensions_Tests.swift

@@ -26,7 +26,7 @@ class ChatChannelExtensions_Tests: XCTestCase {
         let channel = ChatChannel.mockDMChannel()
 
         // When
-        let typingIndicatorString = channel.typingIndicatorString
+        let typingIndicatorString = channel.typingIndicatorString(currentUserId: nil)
 
         // Then
         XCTAssert(typingIndicatorString == "Someone is typing")
@@ -42,7 +42,7 @@ class ChatChannelExtensions_Tests: XCTestCase {
         )
 
         // When
-        let typingIndicatorString = channel.typingIndicatorString
+        let typingIndicatorString = channel.typingIndicatorString(currentUserId: nil)
 
         // Then
         XCTAssert(typingIndicatorString == "Martin is typing")
@@ -61,7 +61,7 @@ class ChatChannelExtensions_Tests: XCTestCase {
         )
 
         // When
-        let typingIndicatorString = channel.typingIndicatorString
+        let typingIndicatorString = channel.typingIndicatorString(currentUserId: nil)
 
         // Then
         XCTAssert(