Fixed a bug with canceled backswipe

martinmitrevski · martinmitrevski · commit a98789f9f0c5 · 2022-07-11T23:19:18.000+02:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift
@@ -139,6 +139,8 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
         .onChange(of: presentationMode.wrappedValue, perform: { newValue in
             if newValue.isPresented == false {
                 viewModel.onViewDissappear()
+            } else {
+                viewModel.setActive()
             }
         })
         .background(
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift
@@ -216,7 +216,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
     }
     
     public func onViewAppear() {
-        isActive = true
+        setActive()
         messages = channelDataSource.messages
         checkNameChange()
     }
@@ -225,6 +225,10 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
         isActive = false
     }
     
+    public func setActive() {
+        isActive = true
+    }
+    
     // MARK: - private
     
     private func checkForNewMessages(index: Int) {

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {`
`139`	`139`	`.onChange(of: presentationMode.wrappedValue, perform: { newValue in`
`140`	`140`	`if newValue.isPresented == false {`
`141`	`141`	`viewModel.onViewDissappear()`
	`142`	`+ } else {`
	`143`	`+ viewModel.setActive()`
`142`	`144`	`}`
`143`	`145`	`})`
`144`	`146`	`.background(`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`public func onViewAppear() {`
`219`		`- isActive = true`
	`219`	`+ setActive()`
`220`	`220`	`messages = channelDataSource.messages`
`221`	`221`	`checkNameChange()`
`222`	`222`	`}`
`@@ -225,6 +225,10 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {`
`225`	`225`	`isActive = false`
`226`	`226`	`}`
`227`	`227`
	`228`	`+ public func setActive() {`
	`229`	`+ isActive = true`
	`230`	`+ }`
	`231`	`+`
`228`	`232`	`// MARK: - private`
`229`	`233`
`230`	`234`	`private func checkForNewMessages(index: Int) {`