Skip to content

Fixed an issue where the message field was scrollable even when no text was entered #6228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naoki-deva wants to merge 1 commit into
base: main
Choose a base branch
from
+42 −3
Open

Fixed an issue where the message field was scrollable even when no text was entered #6228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions Signal/ConversationView/ConversationInputTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class ConversationInputTextView: BodyRangesTextView {

private lazy var placeholderView = UILabel()
private var placeholderConstraints: [NSLayoutConstraint]?
private static let scrollThreshold: CGFloat = 1

weak var inputTextViewDelegate: ConversationInputTextViewDelegate?
weak var textViewToolbarDelegate: ConversationTextViewToolbarDelegate?
Expand All @@ -44,6 +45,7 @@ class ConversationInputTextView: BodyRangesTextView {
scrollIndicatorInsets = UIEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)

isScrollEnabled = true
alwaysBounceVertical = true
scrollsToTop = false
isUserInteractionEnabled = true

Expand Down Expand Up @@ -126,21 +128,57 @@ class ConversationInputTextView: BodyRangesTextView {
}

override var font: UIFont? {
didSet { placeholderView.font = font }
didSet {
placeholderView.font = font
updateVerticalScrollingState()
}
}

override var contentInset: UIEdgeInsets {
didSet { ensurePlaceholderConstraints() }
didSet {
ensurePlaceholderConstraints()
updateVerticalScrollingState()
}
}

override var textContainerInset: UIEdgeInsets {
didSet { ensurePlaceholderConstraints() }
didSet {
ensurePlaceholderConstraints()
updateVerticalScrollingState()
}
}

override func setMessageBody(_ messageBody: MessageBody?, txProvider: ((DBReadTransaction) -> Void) -> Void) {
super.setMessageBody(messageBody, txProvider: txProvider)
updatePlaceholderVisibility()
updateTextContainerInset()
updateVerticalScrollingState()
}

override func layoutSubviews() {
super.layoutSubviews()

updateVerticalScrollingState()
}

private func updateVerticalScrollingState() {
guard bounds.width > 0, bounds.height > 0 else { return }

let fittingSize = sizeThatFits(CGSize(width: bounds.width, height: .greatestFiniteMagnitude))
let needsVerticalScroll = fittingSize.height - bounds.height > Self.scrollThreshold

if isScrollEnabled != needsVerticalScroll {
isScrollEnabled = needsVerticalScroll
alwaysBounceVertical = needsVerticalScroll
}

normalizeContentOffsetIfNeeded()
}

private func normalizeContentOffsetIfNeeded() {
let targetOffset = CGPoint(x: -adjustedContentInset.left, y: -adjustedContentInset.top)
guard contentOffset != targetOffset else { return }
setContentOffset(targetOffset, animated: false)
}

var pasteboardHasPossibleAttachment: Bool {
Expand Down Expand Up @@ -217,6 +255,7 @@ class ConversationInputTextView: BodyRangesTextView {

inputTextViewDelegate?.textViewDidChange(self)
textViewToolbarDelegate?.textViewDidChange(self)
updateVerticalScrollingState()
}

override func textViewDidChangeSelection(_ textView: UITextView) {
Expand Down