Merge pull request #524 from Infomaniak/refactor-threadView

fix(ThreadView): Flickering + scrollTo last message
Infomaniak · Jan 25, 2023 · e7df553 · e7df553
2 parents ad5f2a3 + 7f5a17b
commit e7df553
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 10 deletions.
diff --git a/Mail/Views/Thread/MessageListView.swift b/Mail/Views/Thread/MessageListView.swift
@@ -0,0 +1,41 @@
+/*
+ Infomaniak Mail - iOS App
+ Copyright (C) 2022 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import MailCore
+import SwiftUI
+import MailResources
+
+struct MessageListView: View {
+    @State var messages: [Message]
+
+    var body: some View {
+        LazyVStack(spacing: 0) {
+            ForEach(messages, id: \.uid) { message in
+                let isMessageExpanded = ((messages.last?.uid == message.uid) && !message.isDraft) || !message.seen
+                MessageView(message: message, isMessageExpanded: isMessageExpanded)
+                    .padding(.horizontal, messages.count > 1 ? 8 : 0)
+            }
+        }
+    }
+}
+
+struct MessageListView_Previews: PreviewProvider {
+    static var previews: some View {
+        MessageListView(messages: [])
+    }
+}
diff --git a/Mail/Views/Thread/MessageView.swift b/Mail/Views/Thread/MessageView.swift
@@ -29,6 +29,8 @@ struct MessageView: View {
     @State var isHeaderExpanded = false
     @State var isMessageExpanded: Bool
 
+    @State private var htmlLoaded = false
+
     init(message: Message, isMessageExpanded: Bool = false) {
         self.message = message
         self.isMessageExpanded = isMessageExpanded

diff --git a/Mail/Views/Thread/ThreadView.swift b/Mail/Views/Thread/ThreadView.swift
@@ -86,16 +86,9 @@ struct ThreadView: View {
                     .padding(.horizontal, 16)
                     .background(MailResourcesAsset.backgroundColor.swiftUiColor)
 
-                LazyVStack(spacing: 0) {
-                    ForEach(messages.indices, id: \.self) { index in
-                        let isMessageExpanded = ((index == messages.count - 1) && !messages[index].isDraft) || !messages[index]
-                            .seen
-                        MessageView(message: messages[index], isMessageExpanded: isMessageExpanded)
-                            .padding(.horizontal, messages.count > 1 ? 8 : 0)
-                    }
-                }
-                .padding(.top, 8)
-                .background(threadBackground)
+                MessageListView(messages: messages)
+                    .padding(.top, 8)
+                    .background(threadBackground)
             }
         }
         .coordinateSpace(name: "scrollView")