Merge pull request #2046 from Skyscanner/bellagio/LMN-1597-fix-image-…

…grid-scroll-position [LMN1597][BpkImageGalleryGrid] Fix switching reset scroll view position
Skyscanner · Aug 15, 2024 · a2586cc · a2586cc
2 parents 9a801db + 577047e
commit a2586cc
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/Backpack-SwiftUI/ImageGalleryGrid/Classes/ImageGalleryGridContentView.swift b/Backpack-SwiftUI/ImageGalleryGrid/Classes/ImageGalleryGridContentView.swift
@@ -36,21 +36,26 @@ struct ImageGalleryGridContentView<Categories: View, GridImageView: View, Slides
             header
             VStack(spacing: 12) {
                 categories()
-                TwoRowGrid(
-                    items: gridImages
-                ) { item, index in
-                    item.content()
-                        .aspectRatio(contentMode: .fill)
-                        .clipped()
-                        .frame(height: itemHeightInGrid)
-                        .accessibilityAddTraits(.isButton)
-                        .onTapGesture {
-                            imageTapped(selectedCategoryIndex, index)
-                            imageIndexInCategory = index
-                            isSlideshowPresented.toggle()
-                        }
+                ScrollViewReader { proxy in
+                    TwoRowGrid(
+                        items: gridImages
+                    ) { item, index in
+                        item.content()
+                            .aspectRatio(contentMode: .fill)
+                            .clipped()
+                            .frame(height: itemHeightInGrid)
+                            .accessibilityAddTraits(.isButton)
+                            .onTapGesture {
+                                imageTapped(selectedCategoryIndex, index)
+                                imageIndexInCategory = index
+                                isSlideshowPresented.toggle()
+                            }
+                            .onChange(of: selectedCategoryIndex) { _ in
+                                proxy.scrollTo(0)
+                            }
+                    }
+                    .padding(.horizontal, .lg)
                 }
-                .padding(.horizontal, .lg)
             }
             .padding(.bottom, .base)
         }