codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed setting focus on start on iOS 14

This commit is contained in:
dankito 2020-10-05 01:43:52 +02:00
parent 270f1c6c34
commit de46d60416
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/BankingiOSApp/BankingiOSApp/ui/UIKit/UIKitSearchBar.swift
View File

@ -7,7 +7,7 @@ struct UIKitSearchBar : UIViewRepresentable {
private var placeholder: String private var placeholder: String
private var focusOnStart = false @State private var focusOnStart = false
private var returnKeyType: UIReturnKeyType = .search private var returnKeyType: UIReturnKeyType = .search
@ -25,7 +25,7 @@ struct UIKitSearchBar : UIViewRepresentable {
_text = text _text = text
self.placeholder = placeholder self.placeholder = placeholder
self.focusOnStart = focusOnStart self._focusOnStart = State(initialValue: focusOnStart)
self.returnKeyType = returnKeyType self.returnKeyType = returnKeyType
self.hideKeyboardOnReturnKeyPress = hideKeyboardOnReturnKeyPress self.hideKeyboardOnReturnKeyPress = hideKeyboardOnReturnKeyPress
@ -58,6 +58,14 @@ struct UIKitSearchBar : UIViewRepresentable {
func updateUIView(_ uiView: UISearchBar, context: UIViewRepresentableContext<UIKitSearchBar>) { func updateUIView(_ uiView: UISearchBar, context: UIViewRepresentableContext<UIKitSearchBar>) {
uiView.text = text uiView.text = text
if focusOnStart {
// on iOS 14 calling .focus() in makeUIView() doesn't work -> do it here and reset focusOnStart property
DispatchQueue.main.async {
focusOnStart = false
}
uiView.focus()
}
} }
func makeCoordinator() -> Cordinator { func makeCoordinator() -> Cordinator {

18
ui/BankingiOSApp/BankingiOSApp/ui/UIKit/UIKitTextField.swift
View File

@ -16,7 +16,7 @@ struct UIKitTextField: UIViewRepresentable {
private var isPasswordField: Bool = false private var isPasswordField: Bool = false
private var focusOnStart = false @State private var focusOnStart = false
private var focusNextTextFieldOnReturnKeyPress = false private var focusNextTextFieldOnReturnKeyPress = false
@Binding private var focusTextField: Bool @Binding private var focusTextField: Bool
@ -45,7 +45,7 @@ struct UIKitTextField: UIViewRepresentable {
self.isPasswordField = isPasswordField self.isPasswordField = isPasswordField
self.focusOnStart = focusOnStart self._focusOnStart = State(initialValue: focusOnStart)
self.focusNextTextFieldOnReturnKeyPress = focusNextTextFieldOnReturnKeyPress self.focusNextTextFieldOnReturnKeyPress = focusNextTextFieldOnReturnKeyPress
self._focusTextField = focusTextField self._focusTextField = focusTextField
self.isFocusedChanged = isFocusedChanged self.isFocusedChanged = isFocusedChanged
@ -82,10 +82,6 @@ struct UIKitTextField: UIViewRepresentable {
Self.NextTagId = Self.NextTagId + 1 // unbelievable, there's no ++ operator Self.NextTagId = Self.NextTagId + 1 // unbelievable, there's no ++ operator
textField.tag = Self.NextTagId textField.tag = Self.NextTagId
if focusOnStart {
textField.focus()
}
textField.textAlignment = textAlignment textField.textAlignment = textAlignment
return textField return textField
@ -93,7 +89,15 @@ struct UIKitTextField: UIViewRepresentable {
func updateUIView(_ uiView: UITextField, context: UIViewRepresentableContext<UIKitTextField>) { func updateUIView(_ uiView: UITextField, context: UIViewRepresentableContext<UIKitTextField>) {
uiView.text = text uiView.text = text
if focusOnStart {
// on iOS 14 calling .focus() in makeUIView() doesn't work -> do it here and reset focusOnStart property
DispatchQueue.main.async {
focusOnStart = false
}
uiView.focus()
}
if focusTextField { if focusTextField {
DispatchQueue.main.async { // in very few cases focusTextField gets called during view update resulting in 'undefined behavior' -> async() fixes this DispatchQueue.main.async { // in very few cases focusTextField gets called during view update resulting in 'undefined behavior' -> async() fixes this
uiView.focus() uiView.focus()