Merge branch 'develop' into add/polls-improvements

Author: nuno-vieira

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### 🔄 Changed
 - Improves Poll voting UX by making it possible to tap on the whole option as well [#612](https://github.com/GetStream/stream-chat-swiftui/pull/612)
 ### 🐞 Fixed
+- Rare crash when accessing frame of the view [#607](https://github.com/GetStream/stream-chat-swiftui/pull/607)
+- `ChatChannelListView` navigation did not trigger when using a custom container and its body reloaded [#609](https://github.com/GetStream/stream-chat-swiftui/pull/609)
+- Channel was sometimes not marked as read when tapping the x on the unread message pill in the message list [#610](https://github.com/GetStream/stream-chat-swiftui/pull/610)
 - Fix the poll vote progress view not having full width when the Poll is closed [#612](https://github.com/GetStream/stream-chat-swiftui/pull/612)
 - Fix the last vote author not accurate in the channel preview [#612](https://github.com/GetStream/stream-chat-swiftui/pull/612)
 

Gemfile.lock

@@ -199,7 +199,7 @@ GEM
       fastlane
       pry
     fastlane-plugin-sonarcloud_metric_kit (0.2.1)
-    fastlane-plugin-stream_actions (0.3.63)
+    fastlane-plugin-stream_actions (0.3.70)
       xctest_list (= 1.2.1)
     fastlane-plugin-versioning (0.5.2)
     ffi (1.17.0)
@@ -306,7 +306,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.7)
@@ -427,7 +427,7 @@ DEPENDENCIES
   fastlane-plugin-create_xcframework
   fastlane-plugin-lizard
   fastlane-plugin-sonarcloud_metric_kit
-  fastlane-plugin-stream_actions (= 0.3.63)
+  fastlane-plugin-stream_actions (= 0.3.70)
   fastlane-plugin-versioning
   jazzy
   json

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -112,9 +112,7 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
                         GeometryReader { proxy in
                             Rectangle().fill(Color.clear)
                                 .onChange(of: computeFrame, perform: { _ in
-                                    DispatchQueue.main.async {
-                                        frame = proxy.frame(in: .global)
-                                    }
+                                    frame = proxy.frame(in: .global)
                                 })
                         }
                     )
@@ -347,9 +345,8 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
         showsMessageActions: Bool,
         showsBottomContainer: Bool = true
     ) {
-        computeFrame = true
+        computeFrame.toggle()
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            computeFrame = false
             triggerHapticFeedback(style: .medium)
             onLongPress(
                 MessageDisplayInfo(

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -301,7 +301,7 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                         _ = onJumpToMessage?(firstUnreadMessageId ?? .unknownMessageId)
                     },
                     onClose: {
-                        firstUnreadMessageId = nil
+                        chatClient.channelController(for: channel.cid).markRead()
                         unreadButtonDismissed = true
                     }
                 ) : nil

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift

@@ -16,10 +16,29 @@ public struct ChatChannelListView<Factory: ViewFactory>: View {
 
     private let viewFactory: Factory
     private let title: String
-    private var onItemTap: (ChatChannel) -> Void
+    private let customOnItemTap: ((ChatChannel) -> Void)?
     private var embedInNavigationView: Bool
     private var handleTabBarVisibility: Bool
-
+    
+    /// Creates a channel list view.
+    ///
+    /// - Parameters:
+    ///   - viewFactory: The view factory used for creating views used by the channel list.
+    ///   - viewModel: The view model instance providing the data. Default view model is created if nil.
+    ///   - channelListController: The channel list controller managing the list of channels used as a data souce for the view model. Default controller is created if nil.
+    ///   - title: A title used as the navigation bar title.
+    ///   - onItemTap: A closure for handling a tap on the channel item. Default closure updates the ``ChatChannelListViewModel/selectedChannel`` property in the view model.
+    ///   - selectedChannelId: The id of a channel to be opened after the initial channel list load.
+    ///   - handleTabBarVisibility: True, if TabBar visibility should be automatically updated.
+    ///   - embedInNavigationView: True, if the channel list view should be embedded in a navigation stack.
+    ///
+    /// Changing the instance of the passed in `viewModel` or `channelListController` does not have an effect without reloading the channel list view by assigning a custom identity. The custom identity should be refreshed when either of the passed in instances have been recreated.
+    /// ```swift
+    /// ChatChannelListView(
+    ///   viewModel: viewModel
+    /// )
+    /// .id(myCustomViewIdentity)
+    /// ```
     public init(
         viewFactory: Factory = DefaultViewFactory.shared,
         viewModel: ChatChannelListViewModel? = nil,
@@ -30,23 +49,25 @@ public struct ChatChannelListView<Factory: ViewFactory>: View {
         handleTabBarVisibility: Bool = true,
         embedInNavigationView: Bool = true
     ) {
-        let channelListVM = viewModel ?? ViewModelsFactory.makeChannelListViewModel(
-            channelListController: channelListController,
-            selectedChannelId: selectedChannelId
-        )
         _viewModel = StateObject(
-            wrappedValue: channelListVM
+            wrappedValue: viewModel ?? ViewModelsFactory.makeChannelListViewModel(
+                channelListController: channelListController,
+                selectedChannelId: selectedChannelId
+            )
         )
         self.viewFactory = viewFactory
         self.title = title
         self.handleTabBarVisibility = handleTabBarVisibility
         self.embedInNavigationView = embedInNavigationView
-        if let onItemTap = onItemTap {
-            self.onItemTap = onItemTap
-        } else {
-            self.onItemTap = { channel in
-                channelListVM.selectedChannel = channel.channelSelectionInfo
-            }
+        customOnItemTap = onItemTap
+    }
+    
+    var onItemTap: (ChatChannel) -> Void {
+        if let customOnItemTap {
+            return customOnItemTap
+        }
+        return { [weak viewModel] channel in
+            viewModel?.selectedChannel = channel.channelSelectionInfo
         }
     }
 

fastlane/Fastfile

@@ -190,8 +190,10 @@ lane :test_ui do |options|
     next if png_files.empty?
 
     # Discard all files apart from the snapshots
-    png_files.each { |png| sh("git add #{png}") || true }
-    sh('git restore .')
+    Dir.chdir('..') do
+      png_files.each { |png| sh("git add #{png}") || true }
+      sh('git restore .')
+    end
 
     pr_create(
       title: '[CI] Snapshots',

fastlane/Pluginfile

@@ -5,4 +5,4 @@
 gem 'fastlane-plugin-versioning'
 gem 'fastlane-plugin-sonarcloud_metric_kit'
 gem 'fastlane-plugin-create_xcframework'
-gem 'fastlane-plugin-stream_actions', '0.3.63'
+gem 'fastlane-plugin-stream_actions', '0.3.70'