2023-02-07 17:42:56 +00:00
|
|
|
import DesignSystem
|
2023-02-12 15:29:41 +00:00
|
|
|
import SwiftUI
|
2023-02-06 11:24:57 +00:00
|
|
|
|
|
|
|
extension TextView.Representable {
|
|
|
|
final class Coordinator: NSObject, UITextViewDelegate {
|
2023-09-16 12:15:03 +00:00
|
|
|
let textView: UIKitTextView
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
private var originalText: NSMutableAttributedString = .init()
|
|
|
|
private var text: Binding<NSMutableAttributedString>
|
Timeline & Timeline detail accessibility uplift (#1323)
* Improve accessibility of StatusPollView
Previously, this view did not provide the proper context to indicate that it represented a poll.
Now, we’ve added
- A container that will stay “Active poll” or “Poll results” when the cursor first hits one of the options;
- A prefix to say “Option X of Y” before each option;
- A Selected trait on the selected option(s), if present
- Consolidating and adding an `.updatesFrequently` trait to the footer view with the countdown.
* Add poll description in StatusRowView combinedAccessibilityLabel
This largely duplicates the logic in `StatusPollView`.
* Improve accessibility of media attachments
Previously, the media attachments without alt text would not show up in the consolidated `StatusRowView`, nor would they be meaningfully explained on the status detail screen.
Now, they are presented with their attachment type.
* Change accessibilityRepresentation of AppAcountsSelectorView
* Change Notifications tab title view accessibility representation to Menu
Previously it would present as a button
* Hide layout `Rectangle`s from accessibility
* Consolidate `StatusRowDetailView` accessibility representation
* Improve readability of Poll accessibility label
* Ensure poll options don’t present as interactive when the poll is finished
* Improve accessibility of StatusRowCardView
Previously, it would present as four separate elements, including an image without a description, all interactive, none with an interactive trait.
Now, it presents as a single element with the `.link` trait
* Improve accessibility of StatusRowHeaderView
Previously, it had no traits and no actions except inherited ones.
Now it presents as a button, triggering its primary action.
It also has custom actions corresponding to its context menu
* Avoid applying the StatusRowView custom actions to every view when contained
* Provide context for the application name
* Add pauses to StatusRowView combinedAccessibilityLabel
* Hide `TimelineView.scrollToTopView` from accessibility
* Set appropriate font style on Notification header
After the change the Text needed a `.headline` style to match the prior appearance.
* Fix bug in accessibilityRepresentation of TimelineView nav bar title
Previously, it would not display the proper label for .remoteLocal filter options.
* Ensure that pop-up button nav bar titles are interactive
* Ensure TextView responds to Environment.sizeCategory
This resolves #1309
* Fix button
---------
Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
2023-03-28 16:48:58 +00:00
|
|
|
private var sizeCategory: ContentSizeCategory
|
2023-02-06 11:24:57 +00:00
|
|
|
private var calculatedHeight: Binding<CGFloat>
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
var didBecomeFirstResponder = false
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
var getTextView: ((UITextView) -> Void)?
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
init(text: Binding<NSMutableAttributedString>,
|
|
|
|
calculatedHeight: Binding<CGFloat>,
|
Timeline & Timeline detail accessibility uplift (#1323)
* Improve accessibility of StatusPollView
Previously, this view did not provide the proper context to indicate that it represented a poll.
Now, we’ve added
- A container that will stay “Active poll” or “Poll results” when the cursor first hits one of the options;
- A prefix to say “Option X of Y” before each option;
- A Selected trait on the selected option(s), if present
- Consolidating and adding an `.updatesFrequently` trait to the footer view with the countdown.
* Add poll description in StatusRowView combinedAccessibilityLabel
This largely duplicates the logic in `StatusPollView`.
* Improve accessibility of media attachments
Previously, the media attachments without alt text would not show up in the consolidated `StatusRowView`, nor would they be meaningfully explained on the status detail screen.
Now, they are presented with their attachment type.
* Change accessibilityRepresentation of AppAcountsSelectorView
* Change Notifications tab title view accessibility representation to Menu
Previously it would present as a button
* Hide layout `Rectangle`s from accessibility
* Consolidate `StatusRowDetailView` accessibility representation
* Improve readability of Poll accessibility label
* Ensure poll options don’t present as interactive when the poll is finished
* Improve accessibility of StatusRowCardView
Previously, it would present as four separate elements, including an image without a description, all interactive, none with an interactive trait.
Now, it presents as a single element with the `.link` trait
* Improve accessibility of StatusRowHeaderView
Previously, it had no traits and no actions except inherited ones.
Now it presents as a button, triggering its primary action.
It also has custom actions corresponding to its context menu
* Avoid applying the StatusRowView custom actions to every view when contained
* Provide context for the application name
* Add pauses to StatusRowView combinedAccessibilityLabel
* Hide `TimelineView.scrollToTopView` from accessibility
* Set appropriate font style on Notification header
After the change the Text needed a `.headline` style to match the prior appearance.
* Fix bug in accessibilityRepresentation of TimelineView nav bar title
Previously, it would not display the proper label for .remoteLocal filter options.
* Ensure that pop-up button nav bar titles are interactive
* Ensure TextView responds to Environment.sizeCategory
This resolves #1309
* Fix button
---------
Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
2023-03-28 16:48:58 +00:00
|
|
|
sizeCategory: ContentSizeCategory,
|
2023-02-12 15:29:41 +00:00
|
|
|
getTextView: ((UITextView) -> Void)?)
|
|
|
|
{
|
2023-02-06 11:24:57 +00:00
|
|
|
textView = UIKitTextView()
|
|
|
|
textView.backgroundColor = .clear
|
|
|
|
textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
|
|
|
|
textView.isScrollEnabled = false
|
|
|
|
textView.textContainer.lineFragmentPadding = 0
|
|
|
|
textView.textContainerInset = .zero
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
self.text = text
|
|
|
|
self.calculatedHeight = calculatedHeight
|
Timeline & Timeline detail accessibility uplift (#1323)
* Improve accessibility of StatusPollView
Previously, this view did not provide the proper context to indicate that it represented a poll.
Now, we’ve added
- A container that will stay “Active poll” or “Poll results” when the cursor first hits one of the options;
- A prefix to say “Option X of Y” before each option;
- A Selected trait on the selected option(s), if present
- Consolidating and adding an `.updatesFrequently` trait to the footer view with the countdown.
* Add poll description in StatusRowView combinedAccessibilityLabel
This largely duplicates the logic in `StatusPollView`.
* Improve accessibility of media attachments
Previously, the media attachments without alt text would not show up in the consolidated `StatusRowView`, nor would they be meaningfully explained on the status detail screen.
Now, they are presented with their attachment type.
* Change accessibilityRepresentation of AppAcountsSelectorView
* Change Notifications tab title view accessibility representation to Menu
Previously it would present as a button
* Hide layout `Rectangle`s from accessibility
* Consolidate `StatusRowDetailView` accessibility representation
* Improve readability of Poll accessibility label
* Ensure poll options don’t present as interactive when the poll is finished
* Improve accessibility of StatusRowCardView
Previously, it would present as four separate elements, including an image without a description, all interactive, none with an interactive trait.
Now, it presents as a single element with the `.link` trait
* Improve accessibility of StatusRowHeaderView
Previously, it had no traits and no actions except inherited ones.
Now it presents as a button, triggering its primary action.
It also has custom actions corresponding to its context menu
* Avoid applying the StatusRowView custom actions to every view when contained
* Provide context for the application name
* Add pauses to StatusRowView combinedAccessibilityLabel
* Hide `TimelineView.scrollToTopView` from accessibility
* Set appropriate font style on Notification header
After the change the Text needed a `.headline` style to match the prior appearance.
* Fix bug in accessibilityRepresentation of TimelineView nav bar title
Previously, it would not display the proper label for .remoteLocal filter options.
* Ensure that pop-up button nav bar titles are interactive
* Ensure TextView responds to Environment.sizeCategory
This resolves #1309
* Fix button
---------
Co-authored-by: Thomas Ricouard <ricouard77@gmail.com>
2023-03-28 16:48:58 +00:00
|
|
|
self.sizeCategory = sizeCategory
|
2023-02-06 11:24:57 +00:00
|
|
|
self.getTextView = getTextView
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
super.init()
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
textView.delegate = self
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-07 17:42:56 +00:00
|
|
|
textView.font = Font.scaledBodyUIFont
|
|
|
|
textView.adjustsFontForContentSizeCategory = true
|
|
|
|
textView.autocapitalizationType = .sentences
|
|
|
|
textView.autocorrectionType = .yes
|
|
|
|
textView.isEditable = true
|
|
|
|
textView.isSelectable = true
|
|
|
|
textView.dataDetectorTypes = []
|
|
|
|
textView.allowsEditingTextAttributes = false
|
|
|
|
textView.returnKeyType = .default
|
|
|
|
textView.allowsEditingTextAttributes = true
|
2023-10-23 17:12:25 +00:00
|
|
|
if ProcessInfo.processInfo.isMacCatalystApp {
|
2023-09-18 12:30:24 +00:00
|
|
|
textView.inlinePredictionType = .no
|
|
|
|
}
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
self.getTextView?(textView)
|
|
|
|
}
|
2023-02-12 15:29:41 +00:00
|
|
|
|
|
|
|
func textViewDidBeginEditing(_: UITextView) {
|
2023-02-06 11:24:57 +00:00
|
|
|
originalText = text.wrappedValue
|
|
|
|
DispatchQueue.main.async {
|
|
|
|
self.recalculateHeight()
|
|
|
|
}
|
|
|
|
}
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
func textViewDidChange(_ textView: UITextView) {
|
|
|
|
DispatchQueue.main.async {
|
|
|
|
self.text.wrappedValue = NSMutableAttributedString(attributedString: textView.attributedText)
|
|
|
|
self.recalculateHeight()
|
|
|
|
}
|
|
|
|
}
|
2023-02-12 15:29:41 +00:00
|
|
|
|
|
|
|
func textView(_: UITextView, shouldChangeTextIn _: NSRange, replacementText _: String) -> Bool {
|
2023-09-16 12:15:03 +00:00
|
|
|
true
|
2023-02-06 11:24:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
extension TextView.Representable.Coordinator {
|
|
|
|
func update(representable: TextView.Representable) {
|
|
|
|
textView.keyboardType = representable.keyboard
|
|
|
|
recalculateHeight()
|
|
|
|
textView.setNeedsDisplay()
|
|
|
|
}
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
private func recalculateHeight() {
|
|
|
|
let newSize = textView.sizeThatFits(CGSize(width: textView.frame.width, height: .greatestFiniteMagnitude))
|
|
|
|
guard calculatedHeight.wrappedValue != newSize.height else { return }
|
2023-02-12 15:29:41 +00:00
|
|
|
|
2023-02-06 11:24:57 +00:00
|
|
|
DispatchQueue.main.async { // call in next render cycle.
|
|
|
|
self.calculatedHeight.wrappedValue = newSize.height
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|