zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

fix: custom emoji picker not cancel when switch input. resolve #199

This commit is contained in:
CMK 2021-07-06 17:06:39 +08:00
parent d61a9b315f
commit 888d2a1408
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mastodon/Scene/Compose/ComposeViewController.swift
View File

@ -809,7 +809,11 @@ extension ComposeViewController: ComposeToolbarViewDelegate {
} }
func composeToolbarView(_ composeToolbarView: ComposeToolbarView, pollButtonDidPressed sender: UIButton) { func composeToolbarView(_ composeToolbarView: ComposeToolbarView, pollButtonDidPressed sender: UIButton) {
// toggle poll composing state
viewModel.isPollComposing.value.toggle() viewModel.isPollComposing.value.toggle()
// cancel custom picker input
viewModel.isCustomEmojiComposing.value = false
// setup initial poll option if needs // setup initial poll option if needs
if viewModel.isPollComposing.value, viewModel.pollOptionAttributes.value.isEmpty { if viewModel.isPollComposing.value, viewModel.pollOptionAttributes.value.isEmpty {
@ -831,6 +835,9 @@ extension ComposeViewController: ComposeToolbarViewDelegate {
} }
func composeToolbarView(_ composeToolbarView: ComposeToolbarView, contentWarningButtonDidPressed sender: UIButton) { func composeToolbarView(_ composeToolbarView: ComposeToolbarView, contentWarningButtonDidPressed sender: UIButton) {
// cancel custom picker input
viewModel.isCustomEmojiComposing.value = false
// restore first responder for text editor when content warning dismiss // restore first responder for text editor when content warning dismiss
if viewModel.isContentWarningComposing.value { if viewModel.isContentWarningComposing.value {
if contentWarningEditorTextView()?.isFirstResponder == true { if contentWarningEditorTextView()?.isFirstResponder == true {