Merge pull request #3 from jcook03266/Dev

Merge Dev to Master
jcook03266 · Jan 6, 2023 · b06bf56 · b06bf56
2 parents a06d38c + cc00f72
commit b06bf56
Showing 1 changed file with 17 additions and 34 deletions.
diff --git a/Sources/Sheathed-TextField-SwiftUI/Public/Views/SheathedTextField.swift b/Sources/Sheathed-TextField-SwiftUI/Public/Views/SheathedTextField.swift
@@ -134,46 +134,29 @@ public struct SheathedTextField: View {
             if !model.protected {
                 TextField(placeholderText,
                           text: model.boundTextEntry)
-                .foregroundColor(model.textFieldTextColor)
-                .textInputAutocapitalization(model.textInputAutocapitalization)
-                .textContentType(model.textContentType)
-                .keyboardType(model.keyboardType)
-                .disabled(!model.unsheathed)
-                .autocorrectionDisabled(model.autoCorrectionDisabled)
-                .focused($textFieldFocused)
-                .frame(width: textFieldSize.width,
-                       height: textFieldSize.height)
-                .padding([.leading],
-                         textFieldLeadingPadding)
-                .padding([.trailing],
-                         textFieldTrailingPadding)
-                .submitLabel(model.submitLabel)
-                .onSubmit {
-                    model.onSubmitAction?()
-                }
             }
             else {
                 SecureField(placeholderText,
                             text: model.boundTextEntry)
-                .foregroundColor(model.textFieldTextColor)
-                .textInputAutocapitalization(model.textInputAutocapitalization)
-                .textContentType(model.textContentType)
-                .keyboardType(model.keyboardType)
-                .disabled(!model.unsheathed)
-                .autocorrectionDisabled(model.autoCorrectionDisabled)
-                .focused($textFieldFocused)
-                .frame(width: textFieldSize.width,
-                       height: textFieldSize.height)
-                .padding([.leading],
-                         textFieldLeadingPadding)
-                .padding([.trailing],
-                         textFieldTrailingPadding)
-                .submitLabel(model.submitLabel)
-                .onSubmit {
-                    model.onSubmitAction?()
-                }
             }
         }
+        .foregroundColor(model.textFieldTextColor)
+        .textInputAutocapitalization(model.textInputAutocapitalization)
+        .textContentType(model.textContentType)
+        .keyboardType(model.keyboardType)
+        .disabled(!model.unsheathed)
+        .autocorrectionDisabled(model.autoCorrectionDisabled)
+        .focused($textFieldFocused)
+        .frame(width: textFieldSize.width,
+               height: textFieldSize.height)
+        .padding([.leading],
+                 textFieldLeadingPadding)
+        .padding([.trailing],
+                 textFieldTrailingPadding)
+        .submitLabel(model.submitLabel)
+        .onSubmit {
+            model.onSubmitAction?()
+        }
     }
 
     public var mainContainer: some View {