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

fix: inputAssistantItem duplicate setup issue

This commit is contained in:
CMK 2022-02-17 16:35:22 +08:00
parent 8f2e789183
commit 10eae495e4
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,14 +684,15 @@ extension ComposeViewController {
// keyboard shortcutBar // keyboard shortcutBar
private func setupInputAssistantItem(item: UITextInputAssistantItem) { private func setupInputAssistantItem(item: UITextInputAssistantItem) {
let groups = [UIBarButtonItemGroup(barButtonItems: [ let barButtonItems = [
composeToolbarView.mediaBarButtonItem, composeToolbarView.mediaBarButtonItem,
composeToolbarView.pollBarButtonItem, composeToolbarView.pollBarButtonItem,
composeToolbarView.contentWarningBarButtonItem, composeToolbarView.contentWarningBarButtonItem,
composeToolbarView.visibilityBarButtonItem, composeToolbarView.visibilityBarButtonItem,
], representativeItem: nil)] ]
let group = UIBarButtonItemGroup(barButtonItems: barButtonItems, representativeItem: nil)
item.trailingBarButtonGroups = groups item.trailingBarButtonGroups = [group]
} }
private func configureToolbarDisplay(keyboardHasShortcutBar: Bool) { private func configureToolbarDisplay(keyboardHasShortcutBar: Bool) {
@ -769,15 +770,6 @@ extension ComposeViewController: UITextViewDelegate {
setupInputAssistantItem(item: textView.inputAssistantItem) setupInputAssistantItem(item: textView.inputAssistantItem)
return true return true
} }
func textViewDidBeginEditing(_ textView: UITextView) {
switch textView {
case textEditorView.textView:
setupInputAssistantItem(item: textView.inputAssistantItem)
default:
assertionFailure()
}
}
func textViewDidChange(_ textView: UITextView) { func textViewDidChange(_ textView: UITextView) {
switch textView { switch textView {