ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter consecutive newlines

Browse Source
This commit is contained in:
Isaac
2025-11-14 21:19:08 +08:00
parent 09ca26be9b
commit 888b12405b
3 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelComponent.swift
View File

@@ -182,6 +182,7 @@ public final class ChatTextInputPanelComponent: Component {
let insets: UIEdgeInsets
let maxHeight: CGFloat
let maxLength: Int?
let allowConsecutiveNewlines: Bool
let sendAction: (() -> Void)?
let sendContextAction: ((UIView, ContextGesture) -> Void)?
@@ -206,6 +207,7 @@ public final class ChatTextInputPanelComponent: Component {
insets: UIEdgeInsets,
maxHeight: CGFloat,
maxLength: Int?,
allowConsecutiveNewlines: Bool,
sendAction: (() -> Void)?,
sendContextAction: ((UIView, ContextGesture) -> Void)?
) {
@@ -229,6 +231,7 @@ public final class ChatTextInputPanelComponent: Component {
self.insets = insets
self.maxHeight = maxHeight
self.maxLength = maxLength
self.allowConsecutiveNewlines = allowConsecutiveNewlines
self.sendAction = sendAction
self.sendContextAction = sendContextAction
}
@@ -294,6 +297,9 @@ public final class ChatTextInputPanelComponent: Component {
if lhs.maxLength != rhs.maxLength {
return false
}
if lhs.allowConsecutiveNewlines != rhs.allowConsecutiveNewlines {
return false
}
if (lhs.sendAction == nil) != (rhs.sendAction == nil) {
return false
}
@@ -1013,6 +1019,8 @@ public final class ChatTextInputPanelComponent: Component {
}
}
panelNode.allowConsecutiveNewlines = component.allowConsecutiveNewlines
if let resetInputState = component.externalState.resetInputState {
component.externalState.resetInputState = nil
let _ = resetInputState

48
submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift
View File

@@ -407,6 +407,7 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
public var customSendIsDisabled: Bool = false
public var customInputTextMaxLength: Int?
public var customSwitchToKeyboard: (() -> Void)?
public var allowConsecutiveNewlines = true
private var starReactionButton: ComponentView<Empty>?
private var liveMicrophoneButton: ComponentView<Empty>?
@@ -4952,24 +4953,41 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
}
}
}
let string = NSMutableAttributedString(attributedString: editableTextNode.attributedText ?? NSAttributedString())
var textColor: UIColor = .black
var accentTextColor: UIColor = .blue
var baseFontSize: CGFloat = 17.0
if let presentationInterfaceState = self.presentationInterfaceState {
textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
if "".isEmpty {
baseFontSize = 17.0
}
}
let cleanReplacementString = textAttributedStringForStateText(context: context, stateText: NSAttributedString(string: cleanText), fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil, spoilersRevealed: self.spoilersRevealed, availableEmojis: (self.context?.animatedEmojiStickersValue.keys).flatMap(Set.init) ?? Set(), emojiViewProvider: self.emojiViewProvider, makeCollapsedQuoteAttachment: { text, attributes in
return ChatInputTextCollapsedQuoteAttachmentImpl(text: text, attributes: attributes)
})
string.replaceCharacters(in: range, with: cleanReplacementString)
var resetText = false
if cleanText != text {
let string = NSMutableAttributedString(attributedString: editableTextNode.attributedText ?? NSAttributedString())
var textColor: UIColor = .black
var accentTextColor: UIColor = .blue
var baseFontSize: CGFloat = 17.0
if let presentationInterfaceState = self.presentationInterfaceState {
textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
if "".isEmpty {
baseFontSize = 17.0
resetText = true
}
if !self.allowConsecutiveNewlines {
while string.string.range(of: "\n\n") != nil {
if let range = string.string.range(of: "\n\n") {
let rawRange = NSRange(range, in: string.string)
let firstNewline = string.attributedSubstring(from: NSRange(location: rawRange.location, length: 1))
string.replaceCharacters(in: rawRange, with: firstNewline)
resetText = true
}
}
let cleanReplacementString = textAttributedStringForStateText(context: context, stateText: NSAttributedString(string: cleanText), fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil, spoilersRevealed: self.spoilersRevealed, availableEmojis: (self.context?.animatedEmojiStickersValue.keys).flatMap(Set.init) ?? Set(), emojiViewProvider: self.emojiViewProvider, makeCollapsedQuoteAttachment: { text, attributes in
return ChatInputTextCollapsedQuoteAttachmentImpl(text: text, attributes: attributes)
})
string.replaceCharacters(in: range, with: cleanReplacementString)
}
if resetText {
self.textInputNode?.attributedText = string
self.textInputNode?.selectedRange = NSMakeRange(range.lowerBound + cleanReplacementString.length, 0)
self.updateTextNodeText(animated: true)