Merge pull request #86 from kishikawakatsumi/submit

guard submit
kishikawakatsumi · Jul 27, 2024 · b80fa0e · b80fa0e
2 parents b3afd68 + d9a0b67
commit b80fa0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Examples/FileBrowser/FileBrowser (iOS)/ConnectServerView.swift b/Examples/FileBrowser/FileBrowser (iOS)/ConnectServerView.swift
@@ -17,6 +17,10 @@ struct ConnectServerView: View {
   @State private var username: String
   @State private var password: String
 
+  private var canSubmit: Bool {
+    !server.isEmpty && !username.isEmpty && !password.isEmpty
+  }
+
   @FocusState
   private var focusedField: FocusedField?
 
@@ -98,7 +102,7 @@ struct ConnectServerView: View {
             submit()
           }
           .frame(maxWidth: .infinity)
-          .disabled(server.isEmpty || username.isEmpty || password.isEmpty)
+          .disabled(!canSubmit)
         }
       }
       .navigationTitle("Connect to Server")
@@ -113,6 +117,7 @@ struct ConnectServerView: View {
         focusedField = .server
       }
       .onSubmit {
+        guard canSubmit else { return }
         submit()
       }
       .alert(isPresented: $presentAlert) {

diff --git a/Examples/FileBrowser/FileBrowser (iOS)/ConnectServiceView.swift b/Examples/FileBrowser/FileBrowser (iOS)/ConnectServiceView.swift
@@ -11,7 +11,11 @@ struct ConnectServiceView: View {
 
   @State private var username: String
   @State private var password: String
-
+
+  private var canSubmit: Bool {
+    !username.isEmpty && !password.isEmpty
+  }
+
   @FocusState
   private var focusedField: FocusedField?
 
@@ -60,7 +64,7 @@ struct ConnectServiceView: View {
             submit()
           }
           .frame(maxWidth: .infinity)
-          .disabled(username.isEmpty || password.isEmpty)
+          .disabled(!canSubmit)
         }
       }
       .navigationTitle("Connect to Server")
@@ -75,6 +79,7 @@ struct ConnectServiceView: View {
         focusedField = .username
       }
       .onSubmit {
+        guard canSubmit else { return }
         submit()
       }
       .alert(isPresented: $presentAlert) {