From 65f63c0fb3570b689e37b9854a58f0520b0bdcc1 Mon Sep 17 00:00:00 2001
From: Marc Hidalgo <marc@theleftbit.com>
Date: Mon, 30 Sep 2024 10:43:29 +0200
Subject: [PATCH] Remove scrollViewReader

---
 .../Views/InfiniteVerticalScrollView.swift    | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/Sources/BSWInterfaceKit/SwiftUI/Views/InfiniteVerticalScrollView.swift b/Sources/BSWInterfaceKit/SwiftUI/Views/InfiniteVerticalScrollView.swift
index 980dccfb..66dc68c0 100644
--- a/Sources/BSWInterfaceKit/SwiftUI/Views/InfiniteVerticalScrollView.swift
+++ b/Sources/BSWInterfaceKit/SwiftUI/Views/InfiniteVerticalScrollView.swift
@@ -103,33 +103,32 @@ public struct InfiniteVerticalScrollView<Item: Identifiable & Sendable, ItemView
             }
         }
     }
-
+    
     public var body: some View {
-        ScrollViewReader { proxy in
-            ScrollView(.vertical) {
-                if direction == .upwards, phase.isPaging {
-                    ProgressView()
-                }
-
-                LazyVStack(alignment: alignment, spacing: spacing, pinnedViews: pinnedViews) {
-                    ForEach(items) { item in
-                        itemViewBuilder(item)
-                            .id(item.id)
-                    }
-                }
-                .scrollTargetLayout()
-                
-                if direction == .downwards, phase.isPaging {
-                    ProgressView()
+        ScrollView(.vertical) {
+            if direction == .upwards, phase.isPaging {
+                ProgressView()
+            }
+            
+            LazyVStack(alignment: alignment, spacing: spacing, pinnedViews: pinnedViews) {
+                ForEach(items) { item in
+                    itemViewBuilder(item)
+                        .id(item.id)
                 }
             }
-            .scrollPosition(
-                id: $scrollPositionItemID,
-                anchor: (direction == .downwards) ? .bottom : .top
-            )
-            .defaultScrollAnchor((direction == .downwards) ? .top : .bottom)
-            .scrollDismissesKeyboard(.interactively)
+            .scrollTargetLayout()
+            
+            if direction == .downwards, phase.isPaging {
+                ProgressView()
+            }
         }
+        .scrollPosition(
+            id: $scrollPositionItemID,
+            anchor: (direction == .downwards) ? .bottom : .top
+        )
+        .defaultScrollAnchor((direction == .downwards) ? .top : .bottom)
+        .scrollDismissesKeyboard(.interactively)
+        
         .onChange(of: scrollPositionItemID) { oldValue, newValue in
             if let newValue, newValue == anchorItemID, phase == .idle {
                 self.phase = .paging(fromItem: newValue)
@@ -144,13 +143,13 @@ public struct InfiniteVerticalScrollView<Item: Identifiable & Sendable, ItemView
                 withAnimation {
                     self.phase = areThereMorePages ? .idle : .noMorePages
                 } completion: {
+                    self.scrollPositionItemID = itemID
                     switch direction {
                     case .downwards:
                         self.items.append(contentsOf: newItems)
                     case .upwards:
                         self.items.insert(contentsOf: newItems, at: 0)
                     }
-                    self.scrollPositionItemID = itemID
                 }
             } catch {
                 self.phase = .idle