Skip to content

Commit 55fcc70

Browse files
authored
Merge pull request #734 from woocommerce/issue/728-keyboard-note-error
Hide the keyboard when attempting to commit a note to the backend.
2 parents 8ce4872 + 68895a5 commit 55fcc70

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

WooCommerce/Classes/ViewRelated/Orders/NewNoteViewController.swift

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class NewNoteViewController: UIViewController {
3737

3838
override func viewDidAppear(_ animated: Bool) {
3939
super.viewDidAppear(animated)
40-
tableView.firstSubview(ofType: UITextView.self)?.becomeFirstResponder()
40+
showKeyboard()
4141
}
4242

4343
override func viewWillDisappear(_ animated: Bool) {
@@ -50,7 +50,7 @@ class NewNoteViewController: UIViewController {
5050
}
5151

5252
@objc func addButtonTapped() {
53-
switchRightButtonToProgressIndicator()
53+
configureForCommittingNote()
5454

5555
WooAnalytics.shared.track(.orderNoteAddButtonTapped)
5656
WooAnalytics.shared.track(.orderNoteAdd, withProperties: ["parent_id": viewModel.order.orderID,
@@ -63,7 +63,7 @@ class NewNoteViewController: UIViewController {
6363
WooAnalytics.shared.track(.orderNoteAddFailed, withError: error)
6464

6565
self?.displayErrorNotice()
66-
self?.switchRightButtonToAddButton()
66+
self?.configureForEditingNote()
6767
return
6868
}
6969
WooAnalytics.shared.track(.orderNoteAddSuccess)
@@ -257,7 +257,8 @@ private extension NewNoteViewController {
257257
navigationItem.rightBarButtonItem?.isEnabled = false
258258
}
259259

260-
func switchRightButtonToProgressIndicator() {
260+
func configureForCommittingNote() {
261+
hideKeyboard()
261262
configureRightButtonItemAsSpinner()
262263
navigationItem.rightBarButtonItem?.isEnabled = false
263264
}
@@ -272,10 +273,18 @@ private extension NewNoteViewController {
272273
navigationItem.setRightBarButton(rightBarButton, animated: true)
273274
}
274275

275-
func switchRightButtonToAddButton() {
276+
func configureForEditingNote() {
276277
configureRightButtonItemAsAdd()
277278
navigationItem.rightBarButtonItem?.isEnabled = true
278279
}
280+
281+
func showKeyboard() {
282+
tableView.firstSubview(ofType: UITextView.self)?.becomeFirstResponder()
283+
}
284+
285+
func hideKeyboard() {
286+
tableView.firstSubview(ofType: UITextView.self)?.resignFirstResponder()
287+
}
279288
}
280289

281290
// MARK: - Constants

0 commit comments

Comments
 (0)