Fix trailing space when entering poll options

This commit is contained in:
Peter 2018-12-19 03:34:33 +03:00
parent 59e2607e08
commit ea4b62939b
2 changed files with 11 additions and 11 deletions

View File

@ -161,15 +161,17 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode,
return false
}
if text.firstIndex(of: "\n") != nil {
let currentText = editableTextNode.attributedText?.string ?? ""
var updatedText = (currentText as NSString).replacingCharacters(in: range, with: text)
updatedText = updatedText.replacingOccurrences(of: "\n", with: " ")
if updatedText.count == 1 {
updatedText = ""
if text != "\n" {
let currentText = editableTextNode.attributedText?.string ?? ""
var updatedText = (currentText as NSString).replacingCharacters(in: range, with: text)
updatedText = updatedText.replacingOccurrences(of: "\n", with: " ")
if updatedText.count == 1 {
updatedText = ""
}
let updatedAttributedText = NSAttributedString(string: updatedText, font: Font.regular(17.0), textColor: item.theme.list.itemPrimaryTextColor)
self.textNode.attributedText = updatedAttributedText
self.editableTextNodeDidUpdateText(editableTextNode)
}
let updatedAttributedText = NSAttributedString(string: updatedText, font: Font.regular(17.0), textColor: item.theme.list.itemPrimaryTextColor)
self.textNode.attributedText = updatedAttributedText
self.editableTextNodeDidUpdateText(editableTextNode)
if let next = item.next {
next()
} else {

View File

@ -419,9 +419,7 @@ class ItemListControllerNode<Entry: ItemListNodeEntry>: ASDisplayNode, UIScrollV
}
}
}
if applied {
strongSelf.appliedFocusItemTag = focusItemTag
}
strongSelf.appliedFocusItemTag = focusItemTag
}
}