Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Bitkit/Extensions/TextEditor+DismissOnReturn.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import SwiftUI

private struct DismissKeyboardOnReturnModifier: ViewModifier {
@Binding var text: String
var isFocused: FocusState<Bool>.Binding

func body(content: Content) -> some View {
content
.onChange(of: text) { newValue in
guard isFocused.wrappedValue else { return }
if newValue.last == "\n" {
text = newValue.trimmingCharacters(in: .whitespacesAndNewlines)
isFocused.wrappedValue = false
}
}
}
}

extension View {
func dismissKeyboardOnReturn(text: Binding<String>, isFocused: FocusState<Bool>.Binding) -> some View {
modifier(DismissKeyboardOnReturnModifier(text: text, isFocused: isFocused))
}
}
5 changes: 2 additions & 3 deletions Bitkit/Views/Wallets/Receive/ReceiveEdit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ struct ReceiveEdit: View {
.scrollContentBackground(.hidden)
.padding(EdgeInsets(top: -8, leading: -5, bottom: -5, trailing: -5))
.frame(minHeight: 30, maxHeight: 50)
.onSubmit {
isNoteEditorFocused = false
}
.dismissKeyboardOnReturn(text: $note, isFocused: $isNoteEditorFocused)
.accessibilityValue(note)
.accessibilityIdentifier("ReceiveNote")
}
.padding()
Expand Down
3 changes: 3 additions & 0 deletions Bitkit/Views/Wallets/Send/SendEnterManuallyView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ struct SendEnterManuallyView: View {
.font(.custom(Fonts.bold, size: 22))
.foregroundColor(.textPrimary)
.accentColor(.brandAccent)
.submitLabel(.done)
.dismissKeyboardOnReturn(text: $text, isFocused: $isTextEditorFocused)
.accessibilityValue(text)
.accessibilityIdentifier("RecipientInput")
}
.background(Color.white06)
Expand Down
Loading