fix: Fixing DatePicker and SignUpContent issues (#37)

Author: sebaland

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.0.5 (2023-08-31)
+
+### Bug Fixes
+- Fixing required Sign Up attributes being displayed as optionals
+- Fixing Sign Up fields not being populated when providing a `signUpContent`
+- Fixing DatePicker being interactable while invisible, plus not displaying previous dates.
+
 ## 1.0.4 (2023-08-22)
 ### Bug Fixes
 - Adding missing label when displaying a `.custom()` Sign Up field.

Sources/Authenticator/Authenticator.swift

@@ -310,6 +310,10 @@ public struct Authenticator<LoadingContent: View,
             confirmResetPasswordContent
         case .signUp:
             signUpContent
+                .onAppear {
+                    guard let state = signUpState, state.fields.isEmpty else { return }
+                    state.configure(with: viewModifiers.signUpFields)
+                }
         case .confirmSignUp:
             confirmSignUpContent
         case .verifyUser:
@@ -337,6 +341,10 @@ public struct Authenticator<LoadingContent: View,
             contentState.configure(with: state)
         }
     }
+    
+    private var signUpState: SignUpState? {
+        contentStates.allObjects.compactMap({ $0 as? SignUpState }).first
+    }
 }
 
 extension Authenticator {

Sources/Authenticator/Constants/ComponentInformation.swift

@@ -8,6 +8,6 @@
 import Foundation
 
 public class ComponentInformation {
-    public static let version = "1.0.4"
+    public static let version = "1.0.5"
     public static let name = "amplify-ui-swift-authenticator"
 }

Sources/Authenticator/Views/Primitives/DatePicker.swift

@@ -39,6 +39,10 @@ struct DatePicker: View {
             using: FieldValidators.none
         )
         self.validator.value = text
+        if let selectedDate = formatter.date(from: text.wrappedValue) {
+            self._selectedDate = .init(wrappedValue: selectedDate)
+            self._actualDate = .init(wrappedValue: selectedDate)
+        }
     }
 
 #if os(iOS)
@@ -88,6 +92,7 @@ struct DatePicker: View {
 
             createDatePicker(style: .graphical)
                 .frame(height: isShowingDatePicker ? nil : 0, alignment: .top)
+                .disabled(!isShowingDatePicker)
                 .clipped()
         }
     }
@@ -149,6 +154,7 @@ struct DatePicker: View {
         .onChange(of: selectedDate) { date in
             updateDate(date)
         }
+        .environment(\.timeZone, timeZone)
         .padding([.top, .bottom], theme.components.field.padding)
     }
 
@@ -203,13 +209,12 @@ struct DatePicker: View {
         guard let date = actualDate else {
             return placeholder
         }
-
-        return date.formatted(
-            .dateTime
-                .day()
-                .month()
-                .year()
-        )
+        
+        return date.formatted(Date.FormatStyle(
+            date: .abbreviated,
+            time: .omitted,
+            timeZone: timeZone
+        ))
     }
 
     private var placeholderColor: Color {
@@ -227,4 +232,8 @@ struct DatePicker: View {
             return theme.colors.border.error
         }
     }
+    
+    private var timeZone: TimeZone {
+        TimeZone(secondsFromGMT: 0) ?? TimeZone.current
+    }
 }