react-native-platform-components 1.4.0 → 1.6.0

package/ios/PCTextFieldView.swift

@@ -9,7 +9,7 @@ import UIKit
 /// saw, and a push older than the latest edit is dropped so a slow JS
 /// round-trip can't erase what was typed meanwhile.
 @objcMembers
-public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDelegate {
+public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDelegate, UIGestureRecognizerDelegate {
     // MARK: - Props (set from ObjC++)
 
     public var label: String = "" {
@@ -83,6 +83,21 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         didSet { if oldValue != multiline { rebuildInput() } }
     }
 
+    /// What the return key does: "submit" | "blurAndSubmit" | "newline";
+    /// "" keeps the defaults (a newline in multi-line fields, else blur and submit)
+    public var submitBehavior: String = ""
+
+    /// UITextInputPasswordRules descriptor; "" = none
+    public var passwordRules: String = "" {
+        didSet { if oldValue != passwordRules { applyTraits() } }
+    }
+
+    /// The keyboard toolbar's items (kind, itemId, title, systemItem, icon
+    /// fields, prominent, accessibilityLabel, testID); empty = no toolbar
+    public var keyboardToolbarItems: [NSDictionary] = [] {
+        didSet { if oldValue != keyboardToolbarItems { applyKeyboardToolbar() } }
+    }
+
     /// "enabled" | "disabled"
     public var interactivity: String = "enabled" {
         didSet { if oldValue != interactivity { applyEnabled() } }
@@ -155,7 +170,86 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         didSet { if oldValue != labelWidth { setNeedsLayout(); onNeedsRemeasure?() } }
     }
 
+    /// Test id of the inner input, where E2E drivers type (see PCTextField.mm)
+    public var inputTestID: String = "" {
+        didSet { if oldValue != inputTestID { applyAccessibility() } }
+    }
+
+    public var leadingIconTestID: String = "" {
+        didSet { if oldValue != leadingIconTestID { applyAccessories() } }
+    }
+
+    public var leadingIconSpokenLabel: String = "" {
+        didSet { if oldValue != leadingIconSpokenLabel { applyAccessories() } }
+    }
+
+    public var trailingIconTestID: String = "" {
+        didSet { if oldValue != trailingIconTestID { applyAccessories() } }
+    }
+
+    public var trailingIconSpokenLabel: String = "" {
+        didSet { if oldValue != trailingIconSpokenLabel { applyAccessories() } }
+    }
+
+    // Colors; nil keeps the system color
+    public var activeColor: UIColor? {
+        didSet { if oldValue != activeColor { applyBorderStyle(); applyColors() } }
+    }
+
+    public var outlineColor: UIColor? {
+        didSet { if oldValue != outlineColor { applyBorderStyle(); applyColors() } }
+    }
+
+    public var errorColor: UIColor? {
+        didSet { if oldValue != errorColor { applyColors() } }
+    }
+
+    public var containerColor: UIColor? {
+        didSet { if oldValue != containerColor { applyBorderStyle(); applyColors() } }
+    }
+
+    public var textColor: UIColor? {
+        didSet { if oldValue != textColor { applyColors() } }
+    }
+
+    public var placeholderTextColor: UIColor? {
+        didSet { if oldValue != placeholderTextColor { applyPlaceholder() } }
+    }
+
+    /// Cap on the Dynamic Type scale of every text; values below 1 mean no cap
+    public var maxFontSizeMultiplier: CGFloat = 0 {
+        didSet { if oldValue != maxFontSizeMultiplier { applyFonts(); applyAccessories() } }
+    }
+
+    /// "" | "left" | "center" | "right"
+    public var textAlign: String = "" {
+        didSet { if oldValue != textAlign { applyAlignment() } }
+    }
+
+    /// Multi-line height bounds in lines; 0 = unset
+    public var minLines: Int = 0 {
+        didSet { if oldValue != minLines { setNeedsLayout(); onNeedsRemeasure?() } }
+    }
+
+    public var maxLines: Int = 0 {
+        didSet { if oldValue != maxLines { setNeedsLayout(); onNeedsRemeasure?() } }
+    }
+
+    /// A non-editable field that reports presses, as a picker's anchor
+    public var pressable: Bool = false {
+        didSet { if oldValue != pressable { applyEnabled() } }
+    }
+
     private var leadingLabel: Bool { labelPlacement == "leading" && !label.isEmpty }
+
+    /// Whether the field acts as a button: pressable and not editable
+    private var actsAsButton: Bool { pressable && interactivity == "disabled" }
+
+    /// The rounded rect drawn here instead of by UIKit, whose border can't be colored
+    private var drawsBox: Bool {
+        (borderStyle.isEmpty || borderStyle == "roundedRect")
+            && (activeColor != nil || outlineColor != nil || containerColor != nil)
+    }
     private var leadingColumnWidth: CGFloat { labelWidth > 0 ? labelWidth : 100 }
     private let leadingSpacing: CGFloat = 8
 
@@ -164,7 +258,10 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     public var onChange: ((String, Int) -> Void)?
     public var onFocusChange: ((Bool, String) -> Void)?
     public var onSubmit: ((String) -> Void)?
+    public var onSelectionChange: ((Int, Int) -> Void)?
+    public var onKeyboardToolbarPress: ((String) -> Void)?
     public var onTrailingIconPress: (() -> Void)?
+    public var onPress: (() -> Void)?
 
     /// Called when content changed in a way that affects the height (a
     /// multi-line edit, an error message appearing), so the Fabric
@@ -181,10 +278,19 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     /// Whether a secure field is currently showing its text (password toggle)
     private var revealed = false
 
+    /// The selection JS last heard of, so a change is reported once. Changes
+    /// made from JS (text or selection) update it without an event.
+    private var lastReportedSelection = NSRange(location: NSNotFound, length: 0)
+    private var applyingFromJS = false
+
+    /// The toolbar above the keyboard, while there are toolbar items
+    private var keyboardToolbar: UIToolbar?
+    private var toolbarGeneration = 0
+
     // MARK: - Subviews
 
     private let captionLabel = UILabel()
-    private let textField = UITextField()
+    private let textField = PCInputTextField()
     private let textView = PCPlaceholderTextView()
     private let footerLabel = UILabel()
     private let counterLabel = UILabel()
@@ -193,7 +299,8 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     private var trailingIcon = PCButtonSupport.Icon.none
     private var leadingImage: UIImage?
     private var trailingImage: UIImage?
-    private var iconGeneration = 0
+    private var leadingIconGeneration = 0
+    private var trailingIconGeneration = 0
 
     // MARK: - Layout metrics
 
@@ -243,6 +350,14 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         addSubview(footerLabel)
         addSubview(counterLabel)
 
+        // Presses of a field that acts as a button; accessory buttons keep their own
+        pressRecognizer.addTarget(self, action: #selector(handlePress))
+        pressRecognizer.delegate = self
+        pressRecognizer.isEnabled = false
+        addGestureRecognizer(pressRecognizer)
+        textField.onActivate = { [weak self] in self?.activateAsButton() ?? false }
+        textView.onActivate = { [weak self] in self?.activateAsButton() ?? false }
+
         applyFonts()
         applyColors()
         applyBorderStyle()
@@ -252,6 +367,7 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         applyFooter()
         applyAccessories()
         applyAccessibility()
+        applyAlignment()
     }
 
     // MARK: - Text
@@ -279,6 +395,28 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         guard !text.isEmpty else { return }
         setTextInternal("", moveCursorToEnd: true)
         reportEdit()
+        lastReportedSelection = NSRange(location: NSNotFound, length: 0)
+        reportSelection()
+    }
+
+    /// A selection from JS, in UTF-16 offsets clamped to the text. Dropped
+    /// like a stale `setText` when the user has edited since `eventCount`.
+    public func setSelection(start: Int, end: Int, eventCount: Int) {
+        guard eventCount >= nativeEventCount else { return }
+        guard activeInput.markedTextRange == nil else { return }
+        let length = (text as NSString).length
+        let from = min(max(0, start), length)
+        let to = min(max(from, end), length)
+        let range = NSRange(location: from, length: to - from)
+        applyingFromJS = true
+        if multiline {
+            textView.selectedRange = range
+        } else if let startPosition = textField.position(from: textField.beginningOfDocument, offset: from),
+                  let endPosition = textField.position(from: startPosition, offset: to - from) {
+            textField.selectedTextRange = textField.textRange(from: startPosition, to: endPosition)
+        }
+        applyingFromJS = false
+        lastReportedSelection = currentSelection() ?? range
     }
 
     public func focus() {
@@ -289,28 +427,28 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         activeInput.resignFirstResponder()
     }
 
-    public func setLeadingIcon(type: String, name: String, uri: String, scale: CGFloat, tinted: Bool) {
-        let next = PCButtonSupport.Icon(type: type, name: name, uri: uri, scale: scale, tinted: tinted)
+    public func setLeadingIcon(type: String, name: String, request: String, uri: String, scale: CGFloat, tinted: Bool) {
+        let next = PCButtonSupport.Icon(type: type, name: name, uri: uri, scale: scale, tinted: tinted, request: request)
         guard next != leadingIcon else { return }
         leadingIcon = next
-        iconGeneration += 1
-        let generation = iconGeneration
+        leadingIconGeneration += 1
+        let generation = leadingIconGeneration
         leadingImage = PCButtonSupport.image(for: next) { [weak self] image in
-            guard let self, self.iconGeneration == generation else { return }
+            guard let self, self.leadingIconGeneration == generation else { return }
             self.leadingImage = image
             self.applyAccessories()
         }
         applyAccessories()
     }
 
-    public func setTrailingIcon(type: String, name: String, uri: String, scale: CGFloat, tinted: Bool) {
-        let next = PCButtonSupport.Icon(type: type, name: name, uri: uri, scale: scale, tinted: tinted)
+    public func setTrailingIcon(type: String, name: String, request: String, uri: String, scale: CGFloat, tinted: Bool) {
+        let next = PCButtonSupport.Icon(type: type, name: name, uri: uri, scale: scale, tinted: tinted, request: request)
         guard next != trailingIcon else { return }
         trailingIcon = next
-        iconGeneration += 1
-        let generation = iconGeneration
+        trailingIconGeneration += 1
+        let generation = trailingIconGeneration
         trailingImage = PCButtonSupport.image(for: next) { [weak self] image in
-            guard let self, self.iconGeneration == generation else { return }
+            guard let self, self.trailingIconGeneration == generation else { return }
             self.trailingImage = image
             self.applyAccessories()
         }
@@ -320,11 +458,14 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     /// Resets the text state for a recycled view.
     public func resetForRecycle() {
         blur()
+        leadingIconGeneration += 1
+        trailingIconGeneration += 1
         initialTextApplied = false
         autoFocusDone = false
         nativeEventCount = 0
         revealed = false
         setTextInternal("", moveCursorToEnd: true)
+        lastReportedSelection = NSRange(location: NSNotFound, length: 0)
     }
 
     private var activeInput: UIView & UITextInput {
@@ -332,6 +473,12 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     }
 
     private func setTextInternal(_ value: String, moveCursorToEnd: Bool) {
+        // The cursor moves with the text; JS knows, so there is no event
+        applyingFromJS = true
+        defer {
+            applyingFromJS = false
+            lastReportedSelection = currentSelection() ?? lastReportedSelection
+        }
         if multiline {
             let wasAtEnd = textView.selectedRange.location == (textView.text as NSString).length
             let cursor = textView.selectedRange.location
@@ -366,6 +513,31 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         onChange?(text, nativeEventCount)
     }
 
+    /// The selection in UTF-16 offsets, as JS strings count them.
+    private func currentSelection() -> NSRange? {
+        if multiline { return textView.selectedRange }
+        guard let range = textField.selectedTextRange else { return nil }
+        let start = textField.offset(from: textField.beginningOfDocument, to: range.start)
+        let end = textField.offset(from: textField.beginningOfDocument, to: range.end)
+        return NSRange(location: start, length: max(0, end - start))
+    }
+
+    private func reportSelection() {
+        guard !applyingFromJS, let selection = currentSelection(), selection != lastReportedSelection else { return }
+        lastReportedSelection = selection
+        onSelectionChange?(selection.location, selection.location + selection.length)
+    }
+
+    /// The return key: submits unless it inserts a newline, and blurs
+    /// unless submitBehavior is "submit". Returns whether it submitted.
+    private func handleReturn() -> Bool {
+        let behavior = submitBehavior.isEmpty ? (multiline ? "newline" : "blurAndSubmit") : submitBehavior
+        if multiline && behavior == "newline" { return false }
+        onSubmit?(text)
+        if behavior != "submit" { activeInput.resignFirstResponder() }
+        return true
+    }
+
     // MARK: - UITextField
 
     @objc private func fieldEditingChanged() {
@@ -387,17 +559,69 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         onFocusChange?(false, text)
     }
 
+    public func textFieldShouldBeginEditing(_ field: UITextField) -> Bool {
+        !actsAsButton
+    }
+
+    /// The clear button doesn't send .editingChanged on every iOS version;
+    /// report the cleared text once UIKit has applied it, unless it did.
+    public func textFieldShouldClear(_ field: UITextField) -> Bool {
+        DispatchQueue.main.async { [weak self] in
+            guard let self, (self.textField.text ?? "") != self.text else { return }
+            self.fieldEditingChanged()
+        }
+        return true
+    }
+
     public func textFieldShouldReturn(_ field: UITextField) -> Bool {
-        onSubmit?(text)
-        // Single-line fields blur on submit, as the core TextInput does by default
-        field.resignFirstResponder()
+        // Single-line fields blur on submit unless submitBehavior is
+        // "submit", as the core TextInput does
+        _ = handleReturn()
         return true
     }
 
+    public func textFieldDidChangeSelection(_ field: UITextField) {
+        reportSelection()
+    }
+
     public func textField(_ field: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         allowsChange(current: field.text ?? "", range: range, replacement: string, input: field)
     }
 
+    // MARK: - Press (a field acting as a button)
+
+    private let pressRecognizer = UITapGestureRecognizer()
+
+    @objc private func handlePress() {
+        guard actsAsButton else { return }
+        // Brief highlight, as a plain UIButton gives
+        activeInput.alpha = 0.5
+        UIView.animate(withDuration: 0.25, delay: 0.05, options: [.allowUserInteraction]) {
+            self.activeInput.alpha = 1
+        }
+        onPress?()
+    }
+
+    private func activateAsButton() -> Bool {
+        guard actsAsButton else { return false }
+        onPress?()
+        return true
+    }
+
+    public func gestureRecognizer(_ recognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        // The trailing icon and the password toggle handle their own taps
+        !(touch.view is PCAccessoryButton)
+    }
+
+    /// UITextField's own tap recognizers would otherwise take the tap (and
+    /// then find editing refused), leaving the press unreported
+    public func gestureRecognizer(
+        _ recognizer: UIGestureRecognizer,
+        shouldRecognizeSimultaneouslyWith other: UIGestureRecognizer
+    ) -> Bool {
+        recognizer === pressRecognizer
+    }
+
     // MARK: - UITextView
 
     public func textViewDidChange(_ view: UITextView) {
@@ -422,7 +646,15 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     }
 
     public func textView(_ view: UITextView, shouldChangeTextIn range: NSRange, replacementText string: String) -> Bool {
-        allowsChange(current: view.text ?? "", range: range, replacement: string, input: view)
+        // Return submits instead of inserting a newline, unless submitBehavior is "newline"
+        if string == "\n", view.markedTextRange == nil, handleReturn() {
+            return false
+        }
+        return allowsChange(current: view.text ?? "", range: range, replacement: string, input: view)
+    }
+
+    public func textViewDidChangeSelection(_ view: UITextView) {
+        reportSelection()
     }
 
     /// Enforces `maxLength` in UTF-16 units, like the core TextInput and the
@@ -437,7 +669,15 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     // MARK: - Props handling
 
     private func rebuildInput() {
-        let focused = activeInput.isFirstResponder
+        // `multiline` already has its new value in didSet, so activeInput
+        // points to the replacement. Read focus and selection from the old input.
+        let previousInput: UIView & UITextInput = multiline ? textField : textView
+        let focused = previousInput.isFirstResponder
+        let selection = previousInput.selectedTextRange.map { range in
+            let start = previousInput.offset(from: previousInput.beginningOfDocument, to: range.start)
+            let end = previousInput.offset(from: previousInput.beginningOfDocument, to: range.end)
+            return NSRange(location: start, length: max(0, end - start))
+        }
         textField.removeFromSuperview()
         textView.removeFromSuperview()
         if multiline {
@@ -456,7 +696,11 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         applyAccessories()
         applyEnabled()
         applyAccessibility()
+        applyAlignment()
         if focused { activeInput.becomeFirstResponder() }
+        if let selection {
+            setSelection(start: selection.location, end: NSMaxRange(selection), eventCount: nativeEventCount)
+        }
         setNeedsLayout()
         onNeedsRemeasure?()
     }
@@ -470,8 +714,18 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     }
 
     private func applyPlaceholder() {
-        textField.placeholder = placeholder.isEmpty ? nil : placeholder
+        if placeholder.isEmpty {
+            textField.placeholder = nil
+        } else if let placeholderTextColor {
+            textField.attributedPlaceholder = NSAttributedString(
+                string: placeholder,
+                attributes: [.foregroundColor: placeholderTextColor]
+            )
+        } else {
+            textField.placeholder = placeholder
+        }
         textView.placeholder = placeholder
+        textView.placeholderLabel.textColor = placeholderTextColor ?? .placeholderText
     }
 
     /// Supporting text, error message and counter below the field.
@@ -494,11 +748,33 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         onNeedsRemeasure?()
     }
 
+    /// A text style's font at the current text size, capped at
+    /// `maxFontSizeMultiplier` times its size at the default text size.
+    /// `base` replaces the style's own font (the `textStyle` font, given at
+    /// its default-size point size), scaled along the style's curve.
+    private func scaledFont(_ style: UIFont.TextStyle, base: UIFont? = nil) -> UIFont {
+        let font = base ?? .preferredFont(
+            forTextStyle: style,
+            compatibleWith: UITraitCollection(preferredContentSizeCategory: .large)
+        )
+        let metrics = UIFontMetrics(forTextStyle: style)
+        if maxFontSizeMultiplier >= 1 {
+            return metrics.scaledFont(
+                for: font,
+                maximumPointSize: font.pointSize * maxFontSizeMultiplier,
+                compatibleWith: traitCollection
+            )
+        }
+        return metrics.scaledFont(for: font, compatibleWith: traitCollection)
+    }
+
+    private var inputFont: UIFont { scaledFont(.body, base: textFont) }
+
     private func applyFonts() {
-        captionLabel.font = .preferredFont(forTextStyle: leadingLabel ? .body : .subheadline)
-        footerLabel.font = .preferredFont(forTextStyle: .footnote)
-        counterLabel.font = .preferredFont(forTextStyle: .footnote)
-        let inputFont = textFont ?? .preferredFont(forTextStyle: .body)
+        captionLabel.font = scaledFont(leadingLabel ? .body : .subheadline)
+        footerLabel.font = scaledFont(.footnote)
+        counterLabel.font = scaledFont(.footnote)
+        let inputFont = self.inputFont
         textField.font = inputFont
         textView.font = inputFont
         textView.placeholderLabel.font = inputFont
@@ -509,14 +785,33 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     private func applyColors() {
         let showsError = errorState == "error"
         let focused = activeInput.isFirstResponder
+        let error = errorColor ?? .systemRed
         captionLabel.textColor = showsError
-            ? .systemRed
-            : (leadingLabel ? .label : (focused ? tintColor : .secondaryLabel))
-        footerLabel.textColor = showsError ? .systemRed : .secondaryLabel
+            ? error
+            : (leadingLabel ? .label : (focused ? (activeColor ?? tintColor) : .secondaryLabel))
+        footerLabel.textColor = showsError ? error : .secondaryLabel
         counterLabel.textColor = showsError && maxLength > 0 && (text as NSString).length > maxLength
-            ? .systemRed
+            ? error
             : .secondaryLabel
-        textView.layer.borderColor = (showsError ? UIColor.systemRed : UIColor.systemGray4).cgColor
+
+        // The outline of the text view and of a field whose box is drawn here
+        let outline: UIColor
+        if showsError {
+            outline = error
+        } else if focused {
+            outline = activeColor ?? outlineColor ?? .systemGray4
+        } else {
+            outline = outlineColor ?? .systemGray4
+        }
+        let resolved = outline.resolvedColor(with: traitCollection).cgColor
+        textView.layer.borderColor = resolved
+        textField.layer.borderColor = drawsBox ? resolved : nil
+
+        // Cursor and selection
+        textField.tintColor = activeColor
+        textView.tintColor = activeColor
+        textField.textColor = textColor ?? .label
+        textView.textColor = textColor ?? .label
     }
 
     private func applyBorderStyle() {
@@ -527,28 +822,69 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         case "bezel": style = .bezel
         default: style = .roundedRect
         }
-        textField.borderStyle = style
+        // UIKit's rounded rect can't take colors; draw its look instead
+        let drawsBox = self.drawsBox
+        textField.borderStyle = drawsBox ? .none : style
+        textField.layer.borderWidth = drawsBox ? 1 : 0
+        textField.layer.cornerRadius = drawsBox ? 5 : 0
+        textField.textInsets = drawsBox ? UIEdgeInsets(top: 0, left: 7, bottom: 0, right: 7) : .zero
+        if drawsBox {
+            textField.backgroundColor = containerColor ?? .systemBackground
+        } else {
+            textField.backgroundColor = style == .none ? containerColor : nil
+        }
         // The text view mirrors the rounded-rect field
         let bordered = style != .none
         textView.layer.borderWidth = bordered ? 1 : 0
         textView.layer.cornerRadius = style == .roundedRect ? 5 : 0
-        textView.backgroundColor = bordered ? .systemBackground : .clear
+        textView.backgroundColor = containerColor ?? (bordered ? .systemBackground : .clear)
+        applyColors()
         setNeedsLayout()
         onNeedsRemeasure?()
     }
 
     private func applyEnabled() {
         let enabled = interactivity != "disabled"
-        textField.isEnabled = enabled
+        let button = actsAsButton
+        // A field acting as a button keeps its enabled look; editing is
+        // refused in textFieldShouldBeginEditing and presses come from the
+        // gesture recognizer
+        textField.isEnabled = enabled || button
         textView.isEditable = enabled
         textView.isUserInteractionEnabled = enabled
-        textView.alpha = enabled ? 1 : 0.5
+        textView.alpha = enabled || button ? 1 : 0.5
+        pressRecognizer.isEnabled = button
+        if button, activeInput.isFirstResponder { blur() }
+        applyAccessibility()
     }
 
     private func applyAccessibility() {
         let spoken = spokenLabel.isEmpty ? (label.isEmpty ? nil : label) : spokenLabel
         textField.accessibilityLabel = spoken
         textView.accessibilityLabel = spoken
+        let id = inputTestID.isEmpty ? nil : inputTestID
+        textField.accessibilityIdentifier = id
+        textView.accessibilityIdentifier = id
+        for input in [textField as UIView, textView] {
+            if actsAsButton {
+                input.accessibilityTraits.insert(.button)
+            } else {
+                input.accessibilityTraits.remove(.button)
+            }
+        }
+    }
+
+    private func applyAlignment() {
+        let alignment: NSTextAlignment
+        switch textAlign {
+        case "left": alignment = .left
+        case "center": alignment = .center
+        case "right": alignment = .right
+        default: alignment = .natural
+        }
+        textField.textAlignment = alignment
+        textView.textAlignment = alignment
+        textView.placeholderLabel.textAlignment = alignment
     }
 
     private func applyTraits() {
@@ -571,6 +907,7 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         input.isSecureTextEntry = secureTextEntry && !revealed
         input.textContentType = PCTextFieldView.contentType(autoComplete)
         input.keyboardAppearance = PCTextFieldView.keyboardAppearance(keyboardAppearance)
+        input.passwordRules = passwordRules.isEmpty ? nil : UITextInputPasswordRules(descriptor: passwordRules)
         input.smartQuotesType = PCTextFieldView.smartQuotesType(smartQuotes)
         input.smartDashesType = PCTextFieldView.smartDashesType(smartDashes)
         input.smartInsertDeleteType = PCTextFieldView.smartInsertDeleteType(smartInsertDelete)
@@ -592,6 +929,7 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         input.isSecureTextEntry = secureTextEntry && !revealed
         input.textContentType = PCTextFieldView.contentType(autoComplete)
         input.keyboardAppearance = PCTextFieldView.keyboardAppearance(keyboardAppearance)
+        input.passwordRules = passwordRules.isEmpty ? nil : UITextInputPasswordRules(descriptor: passwordRules)
         input.smartQuotesType = PCTextFieldView.smartQuotesType(smartQuotes)
         input.smartDashesType = PCTextFieldView.smartDashesType(smartDashes)
         input.smartInsertDeleteType = PCTextFieldView.smartInsertDeleteType(smartInsertDelete)
@@ -604,6 +942,102 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         }
     }
 
+    /// The keyboard toolbar: a `UIToolbar` as the input's
+    /// `inputAccessoryView`, with the given buttons, flexible spaces and a
+    /// Done button that dismisses the keyboard.
+    private func applyKeyboardToolbar() {
+        toolbarGeneration += 1
+        if keyboardToolbarItems.isEmpty {
+            keyboardToolbar = nil
+        } else {
+            let toolbar = keyboardToolbar ?? UIToolbar(frame: CGRect(x: 0, y: 0, width: 320, height: 44))
+            toolbar.items = keyboardToolbarItems.map { toolbarItem(from: $0) }
+            toolbar.sizeToFit()
+            keyboardToolbar = toolbar
+        }
+        textField.inputAccessoryView = keyboardToolbar
+        textView.inputAccessoryView = keyboardToolbar
+        if activeInput.isFirstResponder {
+            activeInput.reloadInputViews()
+        }
+    }
+
+    private func toolbarItem(from spec: NSDictionary) -> UIBarButtonItem {
+        let kind = spec["kind"] as? String ?? "button"
+        if kind == "flexibleSpace" {
+            return .flexibleSpace()
+        }
+        let itemId = spec["itemId"] as? String ?? ""
+        let title = spec["title"] as? String ?? ""
+        let spokenLabel = spec["accessibilityLabel"] as? String ?? ""
+        let testID = spec["testID"] as? String ?? ""
+        let action: UIAction
+        if kind == "done" {
+            action = UIAction { [weak self] _ in self?.blur() }
+        } else {
+            action = UIAction { [weak self] _ in self?.onKeyboardToolbarPress?(itemId) }
+        }
+
+        let item: UIBarButtonItem
+        let systemItem = kind == "done" && title.isEmpty
+            ? UIBarButtonItem.SystemItem.done
+            : PCTextFieldView.toolbarSystemItem(spec["systemItem"] as? String ?? "")
+        let icon = PCButtonSupport.Icon(dictionary: spec as? [String: Any] ?? [:])
+        if let systemItem {
+            item = UIBarButtonItem(systemItem: systemItem, primaryAction: action)
+        } else if icon.isPresent {
+            item = UIBarButtonItem(title: nil, image: nil, primaryAction: action, menu: nil)
+            // The title is what VoiceOver reads for an icon button
+            item.accessibilityLabel = title.isEmpty ? nil : title
+            let generation = toolbarGeneration
+            item.image = PCButtonSupport.image(for: icon) { [weak self, weak item] image in
+                guard let self, self.toolbarGeneration == generation else { return }
+                item?.image = image
+            }
+        } else {
+            item = UIBarButtonItem(title: title, image: nil, primaryAction: action, menu: nil)
+        }
+        if (spec["prominent"] as? String) == "true" {
+            PCTextFieldView.makeProminent(item)
+        }
+        if !spokenLabel.isEmpty {
+            item.accessibilityLabel = spokenLabel
+        }
+        item.accessibilityIdentifier = testID.isEmpty ? nil : testID
+        return item
+    }
+
+    /// The prominent style: tinted glass on iOS 26, bold before
+    private static func makeProminent(_ item: UIBarButtonItem) {
+        #if compiler(>=6.2)
+        if #available(iOS 26.0, *) {
+            item.style = .prominent
+            return
+        }
+        #endif
+        item.style = .done
+    }
+
+    private static func toolbarSystemItem(_ value: String) -> UIBarButtonItem.SystemItem? {
+        switch value {
+        case "done": return .done
+        case "cancel": return .cancel
+        case "save": return .save
+        case "add": return .add
+        case "edit": return .edit
+        case "close": return .close
+        case "search": return .search
+        case "compose": return .compose
+        case "reply": return .reply
+        case "action": return .action
+        case "camera": return .camera
+        case "trash": return .trash
+        case "undo": return .undo
+        case "redo": return .redo
+        default: return nil
+        }
+    }
+
     /// Prefix and suffix labels, icons, the clear button and the password
     /// toggle. Single-line only: a text view has no accessory views.
     private func applyAccessories() {
@@ -612,7 +1046,10 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         textField.leftViewMode = .never
         textField.rightViewMode = .never
 
-        if let leading = accessoryView(image: leadingImage, tinted: leadingIcon.tinted, text: prefix, action: nil) {
+        if let leading = accessoryView(
+            image: leadingImage, tinted: leadingIcon.tinted, text: prefix, action: nil,
+            testID: leadingIconTestID, spokenLabel: leadingIconSpokenLabel
+        ) {
             textField.leftView = leading
             textField.leftViewMode = .always
         }
@@ -630,7 +1067,12 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
             trailingAction = nil
         }
         let trailingTinted = trailingImage != nil ? trailingIcon.tinted : true
-        if let trailing = accessoryView(image: trailingImageForSlot, tinted: trailingTinted, text: suffix, action: trailingAction) {
+        let customTrailing = trailingImage != nil
+        if let trailing = accessoryView(
+            image: trailingImageForSlot, tinted: trailingTinted, text: suffix, action: trailingAction,
+            testID: customTrailing ? trailingIconTestID : "",
+            spokenLabel: customTrailing ? trailingIconSpokenLabel : ""
+        ) {
             textField.rightView = trailing
             textField.rightViewMode = .always
         }
@@ -646,7 +1088,10 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
     }
 
     /// A label and/or an image button for the field's left or right slot.
-    private func accessoryView(image: UIImage?, tinted: Bool, text: String, action: (() -> Void)?) -> UIView? {
+    private func accessoryView(
+        image: UIImage?, tinted: Bool, text: String, action: (() -> Void)?,
+        testID: String, spokenLabel: String
+    ) -> UIView? {
         guard image != nil || !text.isEmpty else { return nil }
         let stack = UIStackView()
         stack.axis = .horizontal
@@ -656,7 +1101,7 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         stack.layoutMargins = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
 
         if let image {
-            let config = UIImage.SymbolConfiguration(textStyle: .body)
+            let config = UIImage.SymbolConfiguration(font: inputFont)
             if let action {
                 let button = PCAccessoryButton(type: .system)
                 button.setImage(image.applyingSymbolConfiguration(config) ?? image, for: .normal)
@@ -664,19 +1109,25 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
                 button.action = action
                 button.accessibilityLabel = passwordToggle && trailingImage == nil
                     ? (revealed ? "Hide password" : "Show password")
-                    : nil
+                    : (spokenLabel.isEmpty ? nil : spokenLabel)
+                button.accessibilityIdentifier = testID.isEmpty ? nil : testID
                 stack.addArrangedSubview(button)
             } else {
                 let imageView = UIImageView(image: image.applyingSymbolConfiguration(config) ?? image)
                 imageView.tintColor = tinted ? .secondaryLabel : nil
                 imageView.contentMode = .scaleAspectFit
+                imageView.accessibilityIdentifier = testID.isEmpty ? nil : testID
+                if !spokenLabel.isEmpty {
+                    imageView.isAccessibilityElement = true
+                    imageView.accessibilityLabel = spokenLabel
+                }
                 stack.addArrangedSubview(imageView)
             }
         }
         if !text.isEmpty {
             let label = UILabel()
             label.text = text
-            label.font = textFont ?? .preferredFont(forTextStyle: .body)
+            label.font = inputFont
             label.textColor = .secondaryLabel
             label.adjustsFontForContentSizeCategory = true
             stack.addArrangedSubview(label)
@@ -718,6 +1169,7 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         super.traitCollectionDidChange(previousTraitCollection)
         if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory {
             applyFonts()
+            applyAccessories()
         }
         if previousTraitCollection?.hasDifferentColorAppearance(comparedTo: traitCollection) == true {
             applyColors()
@@ -731,6 +1183,8 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         var inputHeight: CGFloat
         var footerHeight: CGFloat
         var leading: Bool
+        /// A multi-line field past maxLines scrolls its text
+        var inputScrolls: Bool
         var total: CGFloat {
             var height = leading ? max(inputHeight, captionHeight) : inputHeight
             if captionHeight > 0 && !leading { height += captionHeight + 6 }
@@ -748,10 +1202,21 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         let captionHeight = label.isEmpty ? 0 : ceil(captionLabel.font.lineHeight)
         let fieldWidth = max(1, width - fieldOffset())
 
-        let inputHeight: CGFloat
+        var inputHeight: CGFloat
+        var inputScrolls = false
         if multiline {
-            let fitted = textView.sizeThatFits(CGSize(width: fieldWidth, height: .greatestFiniteMagnitude))
-            inputHeight = max(singleLineMinHeight, ceil(fitted.height))
+            let fitted = ceil(textView.sizeThatFits(CGSize(width: fieldWidth, height: .greatestFiniteMagnitude)).height)
+            inputHeight = max(singleLineMinHeight, fitted)
+            let lineHeight = inputFont.lineHeight
+            let chrome = textViewInsets.top + textViewInsets.bottom
+            if minLines > 0 {
+                inputHeight = max(inputHeight, ceil(lineHeight * CGFloat(minLines) + chrome))
+            }
+            if maxLines > 0 {
+                let cap = max(singleLineMinHeight, ceil(lineHeight * CGFloat(maxLines) + chrome))
+                inputScrolls = fitted > cap
+                inputHeight = min(inputHeight, cap)
+            }
         } else {
             let fitted = textField.sizeThatFits(CGSize(width: fieldWidth, height: .greatestFiniteMagnitude))
             inputHeight = max(singleLineMinHeight, ceil(fitted.height))
@@ -769,7 +1234,13 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
             let counterHeight = counterLabel.isHidden ? 0 : ceil(counterLabel.font.lineHeight)
             footerHeight = max(messageHeight, counterHeight)
         }
-        return Metrics(captionHeight: captionHeight, inputHeight: inputHeight, footerHeight: footerHeight, leading: leadingLabel)
+        return Metrics(
+            captionHeight: captionHeight,
+            inputHeight: inputHeight,
+            footerHeight: footerHeight,
+            leading: leadingLabel,
+            inputScrolls: inputScrolls
+        )
     }
 
     public override func layoutSubviews() {
@@ -779,6 +1250,9 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         let x = fieldOffset()
         let fieldWidth = max(0, width - x)
         var y: CGFloat = 0
+        if multiline, textView.isScrollEnabled != m.inputScrolls {
+            textView.isScrollEnabled = m.inputScrolls
+        }
 
         if m.leading {
             // Label column and field side by side, centred on the taller one
@@ -874,28 +1348,59 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
         }
     }
 
+    /// React Native autoComplete values onto text content types, as the
+    /// core TextInput maps them, plus the names it leaves out. Values with no
+    /// iOS equivalent, and unknown ones, give no content type.
     private static func contentType(_ value: String) -> UITextContentType? {
         switch value {
-        case "username": return .username
-        case "password": return .password
-        case "new-password": return .newPassword
-        case "one-time-code": return .oneTimeCode
+        case "username", "username-new": return .username
+        case "password", "current-password": return .password
+        case "new-password", "password-new": return .newPassword
+        case "one-time-code", "sms-otp", "email-otp", "2fa-app-otp": return .oneTimeCode
         case "email": return .emailAddress
         case "name": return .name
-        case "given-name": return .givenName
-        case "family-name": return .familyName
-        case "tel": return .telephoneNumber
-        case "street-address": return .fullStreetAddress
+        case "given-name", "name-given": return .givenName
+        case "family-name", "name-family": return .familyName
+        case "additional-name", "name-middle": return .middleName
+        case "honorific-prefix", "name-prefix": return .namePrefix
+        case "honorific-suffix", "name-suffix": return .nameSuffix
+        case "nickname": return .nickname
+        case "organization": return .organizationName
+        case "organization-title": return .jobTitle
+        case "tel", "tel-national", "tel-device": return .telephoneNumber
+        case "street-address", "postal-address": return .fullStreetAddress
+        case "address-line1": return .streetAddressLine1
+        case "address-line2", "postal-address-extended": return .streetAddressLine2
+        case "postal-address-locality": return .addressCity
+        case "postal-address-region": return .addressState
+        case "postal-address-dependent-locality": return .sublocality
         case "postal-code": return .postalCode
-        case "country": return .countryName
+        case "country", "postal-address-country": return .countryName
         case "cc-number": return .creditCardNumber
-        case "cc-exp":
-            if #available(iOS 17.0, *) { return .creditCardExpiration }
-            return nil
-        case "cc-csc":
-            if #available(iOS 17.0, *) { return .creditCardSecurityCode }
-            return nil
         case "url": return .URL
+        case "flight-number": return .flightNumber
+        default:
+            if #available(iOS 17.0, *) { return contentType17(value) }
+            return nil
+        }
+    }
+
+    @available(iOS 17.0, *)
+    private static func contentType17(_ value: String) -> UITextContentType? {
+        switch value {
+        case "cc-exp": return .creditCardExpiration
+        case "cc-exp-month": return .creditCardExpirationMonth
+        case "cc-exp-year": return .creditCardExpirationYear
+        case "cc-csc": return .creditCardSecurityCode
+        case "cc-name": return .creditCardName
+        case "cc-given-name": return .creditCardGivenName
+        case "cc-middle-name": return .creditCardMiddleName
+        case "cc-family-name": return .creditCardFamilyName
+        case "cc-type": return .creditCardType
+        case "birthdate-full": return .birthdate
+        case "birthdate-day": return .birthdateDay
+        case "birthdate-month": return .birthdateMonth
+        case "birthdate-year": return .birthdateYear
         default: return nil
         }
     }
@@ -955,10 +1460,51 @@ public final class PCTextFieldView: UIView, UITextFieldDelegate, UITextViewDeleg
 
 // MARK: - Helpers
 
+/// The single-line input: insets for the box the field view draws, and
+/// VoiceOver activation for a field acting as a button.
+final class PCInputTextField: UITextField {
+    var textInsets: UIEdgeInsets = .zero {
+        didSet { if oldValue != textInsets { setNeedsLayout() } }
+    }
+
+    /// Returns true when it handled the activation
+    var onActivate: (() -> Bool)?
+
+    private func inset(_ rect: CGRect) -> CGRect {
+        // Accessory views bring their own margins
+        let left = leftView == nil ? textInsets.left : 0
+        let right = rightView == nil ? textInsets.right : 0
+        return rect.inset(by: UIEdgeInsets(top: textInsets.top, left: left, bottom: textInsets.bottom, right: right))
+    }
+
+    override func textRect(forBounds bounds: CGRect) -> CGRect {
+        inset(super.textRect(forBounds: bounds))
+    }
+
+    override func editingRect(forBounds bounds: CGRect) -> CGRect {
+        inset(super.editingRect(forBounds: bounds))
+    }
+
+    override func placeholderRect(forBounds bounds: CGRect) -> CGRect {
+        inset(super.placeholderRect(forBounds: bounds))
+    }
+
+    override func accessibilityActivate() -> Bool {
+        onActivate?() == true || super.accessibilityActivate()
+    }
+}
+
 /// A `UITextView` with a placeholder, drawn where the text starts.
 final class PCPlaceholderTextView: UITextView {
     let placeholderLabel = UILabel()
 
+    /// Returns true when it handled the activation
+    var onActivate: (() -> Bool)?
+
+    override func accessibilityActivate() -> Bool {
+        onActivate?() == true || super.accessibilityActivate()
+    }
+
     var placeholder: String = "" {
         didSet {
             placeholderLabel.text = placeholder