code improvement

element-hq · Jul 24, 2023 · b8a96ff · b8a96ff
1 parent 2c4a95e
commit b8a96ff
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
@@ -17,7 +17,6 @@
 import Combine
 import SwiftUI
 
-import OrderedCollections
 import SwiftUIIntrospect
 
 struct TimelineView: View {
@@ -40,22 +39,20 @@ struct TimelineView: View {
                     .hidden()
                     .frame(height: 0)
 
-                VStack(spacing: 0) {
-                    ForEach(viewState.timelineIDs.reversed(), id: \.self) { id in
-                        if let viewModel = viewState.itemsDictionary[id] {
-                            RoomTimelineItemView(viewModel: viewModel)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                                .scaleEffect(x: 1, y: -1)
-                                .padding(timelineStyle.rowInsets)
-                        }
+                LazyVStack(spacing: 0) {
+                    ForEach(viewState.itemViewModels.reversed()) { viewModel in
+                        RoomTimelineItemView(viewModel: viewModel)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                            .padding(timelineStyle.rowInsets)
+                            .scaleEffect(x: 1, y: -1)
                     }
                 }
             }
             .introspect(.scrollView, on: .iOS(.v16)) { scrollView in
                 guard scrollView != scrollViewAdapter.scrollView else { return }
                 scrollViewAdapter.scrollView = scrollView
             }
-            .animation(.elementDefault, value: viewState.timelineIDs)
+            .animation(.elementDefault, value: viewState.itemViewModels)
             .scaleEffect(x: 1, y: -1)
             .onReceive(scrollViewAdapter.didScroll) { _ in
                 guard let scrollView = scrollViewAdapter.scrollView else {