Merge pull request #32 from oversizedev/develop

Fix PageView and Select
oversizedev · Jul 15, 2023 · d30c15b · d30c15b
2 parents 1644563 + 0b5c220
commit d30c15b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Sources/OversizeUI/Controls/PageView/PageView.swift b/Sources/OversizeUI/Controls/PageView/PageView.swift
@@ -44,10 +44,10 @@ public struct PageView<Content, LeadingBar, TrailingBar, TopToolbar, TitleLabel>
     }
 
     public var body: some View {
-        ScrollViewOffset(offset: $offset) {
+        ScrollViewOffset(offset: $offset, coordinateSpace: .named("Page")) {
             content
         }
-        .frame(maxWidth: .infinity, alignment: .leading)
+        .frame(maxWidth: .infinity, alignment: .center)
         .background(background.ignoresSafeArea())
         .safeAreaInset(edge: .top) { header }
         .onChange(of: offset) { offset in
@@ -57,6 +57,7 @@ public struct PageView<Content, LeadingBar, TrailingBar, TopToolbar, TitleLabel>
                 }
             }
         }
+        .coordinateSpace(name: "Page")
     }
 
     @ViewBuilder

diff --git a/Sources/OversizeUI/Controls/Select/Select.swift b/Sources/OversizeUI/Controls/Select/Select.swift
@@ -6,7 +6,7 @@
 import SwiftUI
 
 // swiftlint:disable all
-public struct Select<Element, Content, Selection, Actions, ContentUnavailable: View>: View
+public struct Select<Element: Equatable, Content, Selection, Actions, ContentUnavailable: View>: View
     where
     Content: View,
     Actions: View,
@@ -80,7 +80,6 @@ public struct Select<Element, Content, Selection, Actions, ContentUnavailable: V
             )
             .headline(.medium)
             .foregroundColor(.onSurfaceHighEmphasis)
-
             .sheet(isPresented: $showModal) {
                 #if os(iOS)
                 if #available(iOS 16.0, *) {
@@ -99,6 +98,16 @@ public struct Select<Element, Content, Selection, Actions, ContentUnavailable: V
                     showModal = state
                 }
             }
+            .onAppear {
+                let selctedValue = selection
+                var index = 0
+                for dataValue in data {
+                    if selctedValue == dataValue {
+                        selectedIndex = index
+                    }
+                    index += 1
+                }
+            }
         }
     }
 
@@ -206,7 +215,6 @@ struct Select_Preview: PreviewProvider {
                     Text(selected)
                 }
             }
-
             .padding()
         }
     }