Fixed a bug with channel list refreshing after deeplinking

martinmitrevski · martinmitrevski · commit ccf540a6ffc5 · 2022-07-22T15:58:14.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Upcoming
 
-### 🔄 Changed
+### 🐞 Fixed
+- Fixed a bug with channel list refreshing after deeplinking
 
 # [4.19.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.19.0)
 _July 21, 2022_
diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelDeepLink.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelDeepLink.swift
diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListView.swift
@@ -51,18 +51,11 @@ public struct ChatChannelListView<Factory: ViewFactory>: View {
                 } else if viewModel.channels.isEmpty {
                     viewFactory.makeNoChannelsView()
                 } else {
-                    ZStack {
-                        ChannelDeepLink(
-                            deeplinkChannel: $viewModel.deeplinkChannel,
-                            channelDestination: viewFactory.makeChannelDestination()
-                        )
-                        
-                        ChatChannelListContentView(
-                            viewFactory: viewFactory,
-                            viewModel: viewModel,
-                            onItemTap: onItemTap
-                        )
-                    }
+                    ChatChannelListContentView(
+                        viewFactory: viewFactory,
+                        viewModel: viewModel,
+                        onItemTap: onItemTap
+                    )
                 }
             }
             .onDisappear(perform: {
diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListViewModel.swift
@@ -77,12 +77,6 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
         }
     }
 
-    @Published public var deeplinkChannel: ChannelSelectionInfo? {
-        willSet {
-            hideTabBar = newValue != nil
-        }
-    }
-
     @Published public var swipedChannelId: String?
     @Published public var channelAlertType: ChannelAlertType? {
         didSet {
@@ -254,7 +248,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     // MARK: - private
     
     private func handleChannelListChanges(_ controller: ChatChannelListController) {
-        if selectedChannel != nil || !searchText.isEmpty || deeplinkChannel != nil {
+        if selectedChannel != nil || !searchText.isEmpty {
             queuedChannelsChanges = controller.channels
             updateChannelsIfNeeded()
         } else {
@@ -269,7 +263,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
                 for: channelId,
                 messageOrdering: .topToBottom
             )
-            deeplinkChannel = chatController.channel?.channelSelectionInfo
+            selectedChannel = chatController.channel?.channelSelectionInfo
             self.selectedChannelId = nil
         }
     }
@@ -369,17 +363,17 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     }
     
     private func setInitialChannelIfSplitView() {
-        if isIPad && deeplinkChannel == nil {
+        if isIPad && selectedChannel == nil {
             selectedChannel = channels.first?.channelSelectionInfo
         }
     }
     
     private func handleChannelAppearance() {
-        if !queuedChannelsChanges.isEmpty && selectedChannel == nil && deeplinkChannel == nil {
+        if !queuedChannelsChanges.isEmpty && selectedChannel == nil {
             channels = queuedChannelsChanges
         } else if !queuedChannelsChanges.isEmpty {
             handleQueuedChanges()
-        } else if queuedChannelsChanges.isEmpty && (selectedChannel != nil || deeplinkChannel != nil) {
+        } else if queuedChannelsChanges.isEmpty && selectedChannel != nil {
             if selectedChannel?.injectedChannelInfo == nil {
                 selectedChannel?.injectedChannelInfo = InjectedChannelInfo(unreadCount: 0)
             }
@@ -395,7 +389,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     }
     
     private func handleQueuedChanges() {
-        let selected = selectedChannel != nil ? selectedChannel?.channel : deeplinkChannel?.channel
+        let selected = selectedChannel?.channel
         var index: Int?
         var temp = Array(queuedChannelsChanges)
         for i in 0..<temp.count {
diff --git a/StreamChatSwiftUI.xcodeproj/project.pbxproj b/StreamChatSwiftUI.xcodeproj/project.pbxproj
@@ -168,7 +168,6 @@
 		8465FDC22746A95700AF091E /* ChatChannelNavigatableListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD532746A95600AF091E /* ChatChannelNavigatableListItem.swift */; };
 		8465FDC32746A95700AF091E /* ChatChannelListHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD542746A95700AF091E /* ChatChannelListHeader.swift */; };
 		8465FDC42746A95700AF091E /* ChatChannelListScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD552746A95700AF091E /* ChatChannelListScreen.swift */; };
-		8465FDC52746A95700AF091E /* ChatChannelDeepLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD562746A95700AF091E /* ChatChannelDeepLink.swift */; };
 		8465FDC62746A95700AF091E /* ChannelHeaderLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD572746A95700AF091E /* ChannelHeaderLoader.swift */; };
 		8465FDC72746A95700AF091E /* ChatChannelListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD582746A95700AF091E /* ChatChannelListViewModel.swift */; };
 		8465FDC82746A95700AF091E /* ChatChannelListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FD592746A95700AF091E /* ChatChannelListItem.swift */; };
@@ -558,7 +557,6 @@
 		8465FD532746A95600AF091E /* ChatChannelNavigatableListItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelNavigatableListItem.swift; sourceTree = "<group>"; };
 		8465FD542746A95700AF091E /* ChatChannelListHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelListHeader.swift; sourceTree = "<group>"; };
 		8465FD552746A95700AF091E /* ChatChannelListScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelListScreen.swift; sourceTree = "<group>"; };
-		8465FD562746A95700AF091E /* ChatChannelDeepLink.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelDeepLink.swift; sourceTree = "<group>"; };
 		8465FD572746A95700AF091E /* ChannelHeaderLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChannelHeaderLoader.swift; sourceTree = "<group>"; };
 		8465FD582746A95700AF091E /* ChatChannelListViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelListViewModel.swift; sourceTree = "<group>"; };
 		8465FD592746A95700AF091E /* ChatChannelListItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatChannelListItem.swift; sourceTree = "<group>"; };
@@ -1217,7 +1215,6 @@
 				8465FD4E2746A95600AF091E /* ChatChannelHelperViews.swift */,
 				8465FD502746A95600AF091E /* DefaultChannelActions.swift */,
 				8465FD522746A95600AF091E /* NoChannelsView.swift */,
-				8465FD562746A95700AF091E /* ChatChannelDeepLink.swift */,
 				8465FD572746A95700AF091E /* ChannelHeaderLoader.swift */,
 				8465FD4F2746A95600AF091E /* MoreChannelActionsView.swift */,
 				8465FD5B2746A95700AF091E /* MoreChannelActionsViewModel.swift */,
@@ -1790,7 +1787,6 @@
 				8492975227B156D100A8EEB0 /* SlowModeView.swift in Sources */,
 				84AB7B242773528300631A10 /* CommandsContainerView.swift in Sources */,
 				8465FDB72746A95700AF091E /* ChatMessageReactionAppeareance.swift in Sources */,
-				8465FDC52746A95700AF091E /* ChatChannelDeepLink.swift in Sources */,
 				8465FDBF2746A95700AF091E /* DefaultChannelActions.swift in Sources */,
 				8465FD772746A95700AF091E /* FileAttachmentPreview.swift in Sources */,
 				8465FD862746A95700AF091E /* MessageComposerViewModel.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,6 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- @Published public var deeplinkChannel: ChannelSelectionInfo? {`
`81`		`- willSet {`
`82`		`- hideTabBar = newValue != nil`
`83`		`- }`
`84`		`- }`
`85`		`-`
`86`	`80`	`@Published public var swipedChannelId: String?`
`87`	`81`	`@Published public var channelAlertType: ChannelAlertType? {`
`88`	`82`	`didSet {`
`@@ -254,7 +248,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`254`	`248`	`// MARK: - private`
`255`	`249`
`256`	`250`	`private func handleChannelListChanges(_ controller: ChatChannelListController) {`
`257`		`- if selectedChannel != nil \|\| !searchText.isEmpty \|\| deeplinkChannel != nil {`
	`251`	`+ if selectedChannel != nil \|\| !searchText.isEmpty {`
`258`	`252`	`queuedChannelsChanges = controller.channels`
`259`	`253`	`updateChannelsIfNeeded()`
`260`	`254`	`} else {`
`@@ -269,7 +263,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`269`	`263`	`for: channelId,`
`270`	`264`	`messageOrdering: .topToBottom`
`271`	`265`	`)`
`272`		`- deeplinkChannel = chatController.channel?.channelSelectionInfo`
	`266`	`+ selectedChannel = chatController.channel?.channelSelectionInfo`
`273`	`267`	`self.selectedChannelId = nil`
`274`	`268`	`}`
`275`	`269`	`}`
`@@ -369,17 +363,17 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`369`	`363`	`}`
`370`	`364`
`371`	`365`	`private func setInitialChannelIfSplitView() {`
`372`		`- if isIPad && deeplinkChannel == nil {`
	`366`	`+ if isIPad && selectedChannel == nil {`
`373`	`367`	`selectedChannel = channels.first?.channelSelectionInfo`
`374`	`368`	`}`
`375`	`369`	`}`
`376`	`370`
`377`	`371`	`private func handleChannelAppearance() {`
`378`		`- if !queuedChannelsChanges.isEmpty && selectedChannel == nil && deeplinkChannel == nil {`
	`372`	`+ if !queuedChannelsChanges.isEmpty && selectedChannel == nil {`
`379`	`373`	`channels = queuedChannelsChanges`
`380`	`374`	`} else if !queuedChannelsChanges.isEmpty {`
`381`	`375`	`handleQueuedChanges()`
`382`		`- } else if queuedChannelsChanges.isEmpty && (selectedChannel != nil \|\| deeplinkChannel != nil) {`
	`376`	`+ } else if queuedChannelsChanges.isEmpty && selectedChannel != nil {`
`383`	`377`	`if selectedChannel?.injectedChannelInfo == nil {`
`384`	`378`	`selectedChannel?.injectedChannelInfo = InjectedChannelInfo(unreadCount: 0)`
`385`	`379`	`}`
`@@ -395,7 +389,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`395`	`389`	`}`
`396`	`390`
`397`	`391`	`private func handleQueuedChanges() {`
`398`		`- let selected = selectedChannel != nil ? selectedChannel?.channel : deeplinkChannel?.channel`
	`392`	`+ let selected = selectedChannel?.channel`
`399`	`393`	`var index: Int?`
`400`	`394`	`var temp = Array(queuedChannelsChanges)`
`401`	`395`	`for i in 0..<temp.count {`