Add isRequired logic

Author: Victor Kostin

ExampleApp/ExampleApp/UI/ContentScreen/ContentView.swift

@@ -20,28 +20,32 @@ struct ContentView: View {
         ) { proxy in
             FormField(
                 value: $viewModel.name,
-                rules: viewModel.nameValidationRules
+                rules: viewModel.nameValidationRules,
+                isRequired: true
             ) { failedRules in
                 TextInputField(title: "Name", text: $viewModel.name, failedRules: failedRules)
             }
             .disabled(viewModel.isLoading)
             FormField(
                 value: $viewModel.age,
-                rules: viewModel.ageValidationRules
+                rules: viewModel.ageValidationRules,
+                isRequired: false
             ) { failedRules in
                 TextInputField(title: "Age", text: $viewModel.age, failedRules: failedRules)
             }
             .disabled(viewModel.isLoading)
             FormField(
                 value: $viewModel.pass,
-                rules: viewModel.passValidationRules
+                rules: viewModel.passValidationRules,
+                isRequired: true
             ) { failedRules in
                 SecureInputField(title: "Password", text: $viewModel.pass, failedRules: failedRules)
             }
             .disabled(viewModel.isLoading)
             FormField(
                 value: $viewModel.confirmPass,
-                rules: viewModel.confirmPassValidationRules
+                rules: viewModel.confirmPassValidationRules,
+                isRequired: true
             ) { failedRules in
                 SecureInputField(title: "Confirm Password", text: $viewModel.confirmPass, failedRules: failedRules)
             }

README.md

@@ -67,7 +67,8 @@ struct ContentView: View {
         ) { proxy in
             FormField(
                 value: $name,
-                rules: [TextValidationRule.notEmpty(message: "Name field should no be empty")]
+                rules: [TextValidationRule.notEmpty(message: "Name field should no be empty")],
+                isRequired: true, // field parameter, necessary for correct determination of validity of all fields
             ) { failedRules in
                 MyField(title: "Name", text: $name, failedRules: failedRules)
             }

Sources/FormView/FormField.swift

@@ -12,7 +12,8 @@ public struct FormField<Content: View>: View {
     @ViewBuilder private let content: ([ValidationRule]) -> Content
 
     @State private var failedValidationRules: [ValidationRule] = []
-    private var isValid: Bool { failedValidationRules.isEmpty && value.isEmpty == false }
+    private var isValid: Bool { getValidationStatus() }
+    private var isRequired: Bool
 
     // Fields Focus
     @FocusState private var isFocused: Bool
@@ -27,9 +28,11 @@ public struct FormField<Content: View>: View {
     public init(
         value: Binding<String>,
         rules: [ValidationRule] = [],
+        isRequired: Bool,
         @ViewBuilder content: @escaping ([ValidationRule]) -> Content
     ) {
         self._value = value
+        self.isRequired = isRequired
         self.content = content
         self.validator = FieldValidator(rules: rules)
     }
@@ -95,8 +98,8 @@ public struct FormField<Content: View>: View {
 
                     if
                         validationBehaviour.contains(.onFieldFocus)
-                        && failedValidationRules.isEmpty
-                        && newValue == true
+                            && failedValidationRules.isEmpty
+                            && newValue == true
                     {
                         failedValidationRules = await validator.validate(
                             value: value,
@@ -107,4 +110,8 @@ public struct FormField<Content: View>: View {
                 }
             }
     }
+    
+    private func getValidationStatus() -> Bool {
+        isRequired ? failedValidationRules.isEmpty && value.isEmpty == false : failedValidationRules.isEmpty
+    }
 }