@craft-native/ios 0.0.296 → 0.0.299

package/README.md

@@ -157,7 +157,7 @@ and linear gradients are applied by UIKit with the same style keys as Android;
 `elevation` remains Android-specific. Gradient layers follow the native view's
 bounds and corners through layout changes.
 
-The opt-in `native` renderer hosts compiled `.stx` screens in JavaScriptCore and renders their `View`, `SafeAreaView`, `KeyboardAvoidingView`, `StatusBar`, `RefreshControl`, `Text`, `Button`, `Link`, `Checkbox`, `TextInput`, `Picker`, `DatePicker`, `Switch`, `Slider`, `ActivityIndicator`, `Icon`, `Image`, `ImageBackground`, `Video`, `Map`, `Svg`, `G`, `SvgText`, `ScrollView`, `SectionList`, and recycling `FlatList` nodes as UIKit controls. `StatusBar` and `RefreshControl` are screen/scroll utility nodes rather than visible children. `Map` uses MapKit for trail polylines and marker taps; its overlays carry flat latitude/longitude `geometry` arrays, `strokeWidth` is expressed in logical points, and the camera supports controlled `region`, one-time `initialRegion`, and `fitToBounds`. `Svg` is a DOM-free drawing surface; grouped `G` and `SvgText` nodes are painted inside it. `Icon` uses SF Symbols with the shared symbol/name contract and accessibility metadata. `SectionList` uses the same native scroll host for ordinary `.stx` slot children; grouped section data should use `FlatList` until the section-data protocol is available. `FlatList` uses `UICollectionView` with stable keyed rows, incremental diffs, grids, horizontal and inverted layouts, list chrome, and end-reached pagination. Native views support `onLayout` callbacks with point-based frame measurements that refresh after safe-area or orientation changes. Flex items support `flex`, `flexGrow`, `flexShrink`, and numeric `flexBasis` for main-axis space distribution. Native screens also expose the versioned capability bridge: JSON storage and SQLite survive relaunch, lifecycle and deep-link events are scoped to the top route, and local notifications use `UNUserNotificationCenter`. Enable each capability in `craft.config.json`; disabled calls preserve Craft's `CAPABILITY_DISABLED` rejection code and every request has deterministic timeout/cancellation behavior. The default remains `web`; existing iOS apps are unchanged. `Checkbox` supports controlled `checked`/`value`, indeterminate state, and boolean `onValueChange`; `Picker` renders `<select>`/`<option>` values with `onValueChange` or `onChange`; `DatePicker` emits local date/time values plus ISO and millisecond `timestamp` fields; `Switch` supports state-aware `trackColor`, `thumbColor`, and iOS `ios_backgroundColor`; `Slider` supports track/thumb tint props and `step` snapping; `Image` reports load lifecycle events and structured failures; `Video` uses an `AVPlayerViewController` attached to the native screen for URI playback, native controls, and route-safe teardown. `craft.navigation.setOptions` also accepts a `tabAccessory` destination beside the tab pill; it uses an app-local `path`, `title`, `symbol`, optional `badge`, and `accessibilityLabel`, and `null` clears it. The portable component, capability, list, style, image-source, event, accessibility, and reconciliation behavior is specified in the [Native STX guide](../../docs/guides/native-stx.md).
+The opt-in `native` renderer hosts compiled `.stx` screens in JavaScriptCore and renders their `View`, `SafeAreaView`, `KeyboardAvoidingView`, `StatusBar`, `RefreshControl`, `Text`, `Button`, `Link`, `Checkbox`, `TextInput`, `Picker`, `SegmentedControl`, `DatePicker`, `Switch`, `Slider`, `ActivityIndicator`, `Icon`, `Image`, `ImageBackground`, `Video`, `Map`, `Svg`, `G`, `SvgText`, `ScrollView`, `SectionList`, and recycling `FlatList` nodes as UIKit controls. `StatusBar` and `RefreshControl` are screen/scroll utility nodes rather than visible children. `Map` uses MapKit for trail polylines and marker taps; its overlays carry flat latitude/longitude `geometry` arrays, `strokeWidth` is expressed in logical points, and the camera supports controlled `region`, one-time `initialRegion`, and `fitToBounds`. `Svg` is a DOM-free drawing surface; grouped `G` and `SvgText` nodes are painted inside it. `Icon` uses SF Symbols with the shared symbol/name contract and accessibility metadata. `SectionList` uses the same native scroll host for ordinary `.stx` slot children; grouped section data should use `FlatList` until the section-data protocol is available. `FlatList` uses `UICollectionView` with stable keyed rows, incremental diffs, grids, horizontal and inverted layouts, list chrome, and end-reached pagination. Native views support `onLayout` callbacks with point-based frame measurements that refresh after safe-area or orientation changes. Flex items support `flex`, `flexGrow`, `flexShrink`, and numeric `flexBasis` for main-axis space distribution. Native screens also expose the versioned capability bridge: JSON storage and SQLite survive relaunch, lifecycle and deep-link events are scoped to the top route, and local notifications use `UNUserNotificationCenter`. Enable each capability in `craft.config.json`; disabled calls preserve Craft's `CAPABILITY_DISABLED` rejection code and every request has deterministic timeout/cancellation behavior. The default remains `web`; existing iOS apps are unchanged. `Checkbox` supports controlled `checked`/`value`, indeterminate state, and boolean `onValueChange`; `Picker` renders `<select>`/`<option>` values with `onValueChange` or `onChange`; `DatePicker` emits local date/time values plus ISO and millisecond `timestamp` fields; `Switch` supports state-aware `trackColor`, `thumbColor`, and iOS `ios_backgroundColor`; `Slider` supports track/thumb tint props and `step` snapping; `Image` reports load lifecycle events and structured failures; `Video` uses an `AVPlayerViewController` attached to the native screen for URI playback, native controls, and route-safe teardown. `craft.navigation.setOptions` also accepts a `tabAccessory` destination beside the tab pill; it uses an app-local `path`, `title`, `symbol`, optional `badge`, and `accessibilityLabel`, and `null` clears it. The portable component, capability, list, style, image-source, event, accessibility, and reconciliation behavior is specified in the [Native STX guide](../../docs/guides/native-stx.md).
 
 `FlatList` rows are authored as keyed `:for` child rows in native STX; the
 maintained protocol does not serialize `data`/`renderItem` callbacks.
@@ -1305,3 +1305,22 @@ nativeFonts: {
 
 The iOS project registers the files through `UIAppFonts`. Android loads bundled
 typefaces from assets. Both work offline; a missing file fails the build.
+
+### Platform selection, clear fields and sheets
+
+`SegmentedControl` takes `items: [{value, label, disabled?}]` and a controlled
+`value`, and emits `onValueChange` with `{value, index}`. iOS uses UIKit's
+`UISegmentedControl`; Android uses a horizontal native `RadioGroup` with
+selected segments. Reconciliation does not emit a user selection.
+
+`TextInput.clearButtonMode` is `never`, `while-editing`, `unless-editing` or
+`always`. The native clear affordance emits a single text edit carrying
+`{text: '', clear: true}`; Android also exposes a TalkBack clear action.
+
+`Modal` accepts `presentationStyle: 'pageSheet' | 'formSheet'` with
+`sheetDetents: ['medium', 'large']`, `selectedDetent` and `grabberVisible`.
+iOS presents a real `UISheetPresentationController`, including system pan
+and detents; Android sizes its native bottom panel to the selected detent
+without an extra dependency. Omitting presentationStyle keeps the existing
+full-screen overlay. A native sheet's close request still belongs to its
+owner, which sets visible to false.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.296",
+  "version": "0.0.299",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftNativeActions.swift

@@ -42,7 +42,7 @@ enum CraftNativeActions {
     static func capabilities(config: CraftConfig) -> [String] {
         // `speech`, `audio` (background sound) and `eventStream` (a fetch read
         // as it arrives) need nothing the app has to declare.
-        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking", "badge", "animation", "viewFocus", "viewMeasure", "viewReparent", "viewNonModalPresentation"]
+        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking", "badge", "animation", "viewFocus", "viewMeasure", "viewReparent", "viewNonModalPresentation", "nativePlatformControls"]
         values.append("storageCompareAndSet")
         values.append("storageSetIfAbsent")
         values.append("viewScroll")

package/templates/CraftNativeScreen.swift

@@ -2578,6 +2578,7 @@ extension UIView {
         var responder: UIResponder? = next
         while let current = responder {
             if let screen = current as? CraftNativeScreenController { return screen }
+            if let sheet = current as? CraftNativeSheetController { return sheet.screen }
             responder = current.next
         }
         return nil
@@ -3976,13 +3977,141 @@ private final class CraftNativeImageBackgroundView: UIImageView {
     }
 }
 
-private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
+private final class CraftNativeSegmentElement: UIAccessibilityElement {
+    weak var control: CraftNativeSegmentedControl?
+    let index: Int
+    init(control: CraftNativeSegmentedControl, index: Int) {
+        self.control = control
+        self.index = index
+        super.init(accessibilityContainer: control)
+    }
+    override func accessibilityActivate() -> Bool {
+        guard let control, control.isEnabled, control.values.indices.contains(index), control.isEnabledForSegment(at: index) else { return false }
+        if control.selectedSegmentIndex != index {
+            control.selectedSegmentIndex = index
+            control.sendActions(for: .valueChanged)
+        }
+        return true
+    }
+}
+
+private final class CraftNativeSegmentedControl: UISegmentedControl {
+    var values: [String] = []
+    private var segments: [CraftNativeSegmentElement] = []
+    override var accessibilityElements: [Any]? {
+        get { segments }
+        set { /* The native segments, not the labelled group, own activation. */ }
+    }
+    func configureAccessibility(items: [[String: Any]]) {
+        if segments.count != items.count { segments = items.indices.map { CraftNativeSegmentElement(control: self, index: $0) } }
+        for (index, item) in items.enumerated() {
+            segments[index].accessibilityLabel = item["spoken"] as? String ?? item["label"] as? String ?? values[index]
+        }
+        refreshAccessibilityState()
+        setNeedsLayout()
+    }
+    func refreshAccessibilityState() {
+        for (index, segment) in segments.enumerated() {
+            segment.accessibilityTraits = [.button]
+            if selectedSegmentIndex == index { segment.accessibilityTraits.insert(.selected) }
+            if !isEnabled || !isEnabledForSegment(at: index) { segment.accessibilityTraits.insert(.notEnabled) }
+        }
+    }
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        guard !segments.isEmpty else { return }
+        let width = bounds.width / CGFloat(segments.count)
+        for (index, segment) in segments.enumerated() {
+            let visualIndex = effectiveUserInterfaceLayoutDirection == .rightToLeft ? segments.count - index - 1 : index
+            segment.accessibilityFrameInContainerSpace = CGRect(x: CGFloat(visualIndex) * width, y: 0, width: width, height: bounds.height)
+        }
+    }
+}
+
+private final class CraftNativeSheetController: UIViewController {
+    weak var screen: CraftNativeScreenController?
+    weak var content: CraftNativeFlowView?
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        content?.frame = view.bounds.inset(by: view.safeAreaInsets)
+    }
+}
+
+private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate, UISheetPresentationControllerDelegate {
     let contentStack = CraftNativeFlowView()
     private let blocker = UIView()
     private let backdropTap = UITapGestureRecognizer()
     private var renderedVisible = false
     private var animationGeneration = 0
     var onRequestClose: ((String) -> Void)?
+    weak var sheetPresenter: CraftNativeScreenController?
+    var presentationStyle = "overFullScreen"
+    var sheetDetents: [String] = ["medium", "large"]
+    var selectedDetent: String?
+    var grabberVisible = true
+    private var sheetController: CraftNativeSheetController?
+    var isPresentedAsSheet: Bool { sheetController != nil }
+
+    private func configureSheet(_ controller: CraftNativeSheetController) {
+        controller.isModalInPresentation = onRequestClose == nil
+        guard let sheet = controller.sheetPresentationController else { return }
+        let choices = sheetDetents.filter { $0 == "medium" || $0 == "large" }
+        let values = choices.isEmpty ? ["large"] : Array(Set(choices)).sorted { $0 == "medium" && $1 == "large" }
+        sheet.detents = values.map { $0 == "medium" ? .medium() : .large() }
+        sheet.prefersGrabberVisible = grabberVisible
+        if let selectedDetent, values.contains(selectedDetent) {
+            sheet.selectedDetentIdentifier = selectedDetent == "medium" ? .medium : .large
+        }
+        sheet.delegate = self
+    }
+
+    private func restoreSheetContent(_ controller: CraftNativeSheetController) {
+        guard sheetController === controller else { return }
+        contentStack.removeFromSuperview()
+        addSubview(contentStack)
+        sheetController = nil
+        setNeedsLayout()
+    }
+
+    private func setSheetVisible(_ visible: Bool, animated: Bool) {
+        renderedVisible = visible
+        isHidden = true // UIKit owns the scrim, safe area, grabber and pan.
+        guard visible else {
+            guard let controller = sheetController else { return }
+            controller.view.endEditing(true)
+            controller.dismiss(animated: animated) { [weak self, weak controller] in
+                guard let self, let controller else { return }
+                self.restoreSheetContent(controller)
+                if self.renderedVisible { self.setSheetVisible(true, animated: animated) }
+            }
+            return
+        }
+        if let controller = sheetController { configureSheet(controller); return }
+        // A newly rendered modal is attached to its screen after this pass.
+        DispatchQueue.main.async { [weak self] in
+            guard let self, self.renderedVisible, self.sheetController == nil,
+                  let presenter = self.sheetPresenter, presenter.view.window != nil else { return }
+            let controller = CraftNativeSheetController()
+            controller.screen = presenter
+            controller.modalPresentationStyle = self.presentationStyle == "formSheet" ? .formSheet : .pageSheet
+            controller.view.backgroundColor = .systemBackground
+            self.contentStack.removeFromSuperview()
+            controller.view.addSubview(self.contentStack)
+            controller.content = self.contentStack
+            self.sheetController = controller
+            self.configureSheet(controller)
+            var top: UIViewController = presenter
+            while let presented = top.presentedViewController { top = presented }
+            top.present(controller, animated: animated)
+        }
+    }
+
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        guard let controller = presentationController.presentedViewController as? CraftNativeSheetController else { return }
+        restoreSheetContent(controller)
+        renderedVisible = false
+        onRequestClose?("swipe")
+    }
 
     var transparent = false {
         didSet { blocker.backgroundColor = transparent ? .clear : UIColor.black.withAlphaComponent(0.32) }
@@ -4020,6 +4149,10 @@ private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
     /// press bookkeeping once turned that off for a view with no handler of
     /// its own, and a shown modal let every tap through to the screen behind.
     func setVisible(_ visible: Bool, opacity: CGFloat, animationType: String?) {
+        if blocksBackground && (presentationStyle == "pageSheet" || presentationStyle == "formSheet") {
+            setSheetVisible(visible, animated: animationType != "none")
+            return
+        }
         if visible { isUserInteractionEnabled = true }
         if renderedVisible == visible && isHidden == !visible {
             if visible, alpha != opacity { alpha = opacity }
@@ -4072,6 +4205,12 @@ private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
     }
 
     func resetForTeardown() {
+        renderedVisible = false
+        sheetPresenter = nil
+        if let controller = sheetController {
+            controller.dismiss(animated: false)
+            restoreSheetContent(controller)
+        }
         craftScreenController?.forgetFocusedInput(in: self)
         endEditing(true)
         animationGeneration += 1
@@ -4133,6 +4272,7 @@ private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
     override func layoutSubviews() {
         super.layoutSubviews()
         blocker.frame = bounds
+        guard sheetController == nil else { return }
         // The scrim covers the whole screen; what the modal holds stays
         // clear of the bars and the home indicator it is drawn over.
         contentStack.frame = bounds.inset(by: UIEdgeInsets(top: contentInsets.top, left: 0, bottom: contentInsets.bottom, right: 0))
@@ -5895,7 +6035,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     @discardableResult
     func handleBackForModal() -> Bool {
         let modal = view.subviews.reversed().compactMap { $0 as? CraftNativeModalView }.first {
-            !$0.isHidden && $0.alpha > 0.01 && ($0.blocksBackground || $0.dismissOnOutsideTap)
+            ($0.isPresentedAsSheet || (!$0.isHidden && $0.alpha > 0.01)) && ($0.blocksBackground || $0.dismissOnOutsideTap)
         }
         guard let modal else { return false }
         let hasHandler = modal.onRequestClose != nil
@@ -7957,6 +8097,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 textMaxLengths.removeValue(forKey: fieldId)
             }
             field.delegate = self
+            switch props["clearButtonMode"] as? String {
+            case "while-editing": field.clearButtonMode = .whileEditing
+            case "unless-editing": field.clearButtonMode = .unlessEditing
+            case "always": field.clearButtonMode = .always
+            default: field.clearButtonMode = .never
+            }
             (field as? CraftNativeTextField)?.padding = paddingInsets(style)
             field.textColor = color(style["color"]) ?? .label
             field.font = textFont(style, default: .systemFont(ofSize: 16))
@@ -7977,7 +8123,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if field.isEnabled != desiredEnabled { field.isEnabled = desiredEnabled }
             applyAutofill(to: field, props: props)
             if let value = props["value"] as? String {
-                updateField(field, value: value)
+                updateField(field, value: value, acknowledged: (props["mostRecentEventCount"] as? NSNumber)?.intValue)
             } else if previous?.view !== field {
                 updateField(field, value: inputDrafts[current.identity] ?? props["defaultValue"] as? String)
             }
@@ -7989,6 +8135,27 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if props["autoFocus"] as? Bool == true, !field.isFirstResponder {
                 DispatchQueue.main.async { _ = field.becomeFirstResponder() }
             }
+        case "SegmentedControl":
+            let control = result as! CraftNativeSegmentedControl
+            let items = props["items"] as? [[String: Any]] ?? []
+            let labels = items.map { $0["label"] as? String ?? craftNativePickerValue($0["value"]) ?? "" }
+            // UIKit owns the segments; only rebuild when the choices change.
+            // Setting a controlled value never dispatches valueChanged.
+            if control.numberOfSegments != labels.count || labels.enumerated().contains(where: { control.titleForSegment(at: $0.offset) != $0.element }) {
+                control.removeAllSegments()
+                for (index, label) in labels.enumerated() { control.insertSegment(withTitle: label, at: index, animated: false) }
+            }
+            control.values = items.map { $0["value"] as? String ?? craftNativePickerValue($0["value"]) ?? "" }
+            for (index, item) in items.enumerated() { control.setEnabled(item["disabled"] as? Bool != true, forSegmentAt: index) }
+            let selected = props["value"] as? String ?? craftNativePickerValue(props["value"]) ?? props["selectedValue"] as? String ?? craftNativePickerValue(props["selectedValue"])
+            control.selectedSegmentIndex = control.values.firstIndex(where: { $0 == selected }) ?? UISegmentedControl.noSegment
+            control.isEnabled = props["disabled"] as? Bool != true
+            control.selectedSegmentTintColor = color(props["tintColor"])
+            let titleAttributes: [NSAttributedString.Key: Any]? = color(style["color"]).map { [.foregroundColor: $0] }
+            control.setTitleTextAttributes(titleAttributes, for: .normal)
+            control.setTitleTextAttributes(titleAttributes, for: .selected)
+            control.configureAccessibility(items: items)
+            updateHandler(nonEmptyHandler(events["onValueChange"]) ?? nonEmptyHandler(events["onChange"]), for: control)
         case "Picker":
             let picker = result as! UIPickerView
             let itemOptions = (props["items"] as? [[String: Any]])?.compactMap { item -> (value: String, label: String)? in
@@ -8051,6 +8218,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "Modal":
             let modal = result as! CraftNativeModalView
             let focusBeforeContent = firstResponder(in: rootStack) ?? lastFocusedInput
+            modal.sheetPresenter = self
+            modal.presentationStyle = props["presentationStyle"] as? String ?? "overFullScreen"
+            modal.sheetDetents = props["sheetDetents"] as? [String] ?? ["medium", "large"]
+            modal.selectedDetent = props["selectedDetent"] as? String
+            modal.grabberVisible = props["grabberVisible"] as? Bool != false
+            modal.onRequestClose = nonEmptyHandler(events["onRequestClose"]).map { handler in
+                { [weak self] reason in self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["reason": reason]]) }
+            }
             modal.transparent = props["transparent"] as? Bool == true
             modal.blocksBackground = props["nonModal"] as? Bool != true
             modal.dismissOnOutsideTap = props["dismissOnOutsideTap"] as? Bool == true
@@ -8124,7 +8299,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 toggle.onTintColor = color(track["true"])
                 toggle.tintColor = color(track["false"])
             } else {
-                toggle.onTintColor = nil
+                toggle.onTintColor = color(style["color"])
                 toggle.tintColor = nil
             }
             toggle.thumbTintColor = color(props["thumbColor"])
@@ -8162,7 +8337,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             }
             indicator.indicatorScale = scale
             applyTransform(style["transform"], to: indicator)
-            indicator.color = color(props["color"]) ?? .tintColor
+            indicator.color = color(props["color"]) ?? color(style["color"]) ?? .tintColor
             indicator.hidesWhenStopped = props["hidesWhenStopped"] as? Bool ?? true
             if props["animating"] as? Bool == false {
                 indicator.stopAnimating()
@@ -8335,7 +8510,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             reconcileChildren(children, in: stack, parent: current, path: path, style: style)
         }
         updateLongPressHandler(props["disabled"] as? Bool == true ? nil : events["onLongPress"], for: result)
-        if type != "Button" && type != "Link" && type != "Checkbox" && type != "TextInput" && type != "Picker" && type != "DatePicker" && type != "Modal" && type != "Switch" && type != "Slider" && type != "ActivityIndicator" && type != "StatusBar" && type != "RefreshControl" && type != "Map" {
+        if type != "Button" && type != "Link" && type != "Checkbox" && type != "TextInput" && type != "Picker" && type != "SegmentedControl" && type != "DatePicker" && type != "Modal" && type != "Switch" && type != "Slider" && type != "ActivityIndicator" && type != "StatusBar" && type != "RefreshControl" && type != "Map" {
             let disabled = props["disabled"] as? Bool == true
             updatePressHandler(disabled ? nil : nonEmptyHandler(events["onPress"]) ?? nonEmptyHandler(events["onClick"]), for: result)
             updatePressFeedback(
@@ -8391,6 +8566,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             field.addTarget(self, action: #selector(textBlurred(_:)), for: .editingDidEnd)
             field.addTarget(self, action: #selector(textSubmitted(_:)), for: .editingDidEndOnExit)
             return field
+        case "SegmentedControl":
+            let control = CraftNativeSegmentedControl()
+            control.addTarget(self, action: #selector(segmentChanged(_:)), for: .valueChanged)
+            return control
         case "Picker":
             let picker = UIPickerView()
             picker.dataSource = self
@@ -8457,6 +8636,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "link": return "Link"
         case "checkbox": return "Checkbox"
         case "textinput", "input": return "TextInput"
+        case "segmentedcontrol", "segmented-control": return "SegmentedControl"
         case "picker", "select": return "Picker"
         case "datepicker", "date-picker", "date": return "DatePicker"
         case "modal": return "Modal"
@@ -8806,6 +8986,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         submitHandlers.removeValue(forKey: id)
         inputIdentities.removeValue(forKey: id)
         unechoedText.removeValue(forKey: id)
+        inputEventCounts.removeValue(forKey: id)
         if node.type == "TextInput" && !preservingInputDrafts { inputDrafts.removeValue(forKey: node.identity) }
         longPressHandlers.removeValue(forKey: id)
         textMaxLengths.removeValue(forKey: id)
@@ -9023,19 +9204,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
     }
 
-    /// Text a field sent its script that the script has not echoed back yet,
-    /// while the script runs on its own thread: a value that matches an older
-    /// one is the script catching up, not a new value, and applying it would
-    /// undo what was typed since.
+    /// Legacy runtimes echo values without a revision. Keep their bounded
+    /// history on either script thread; bridge delivery may still be delayed.
     private var unechoedText: [ObjectIdentifier: [String]] = [:]
+    private var inputEventCounts: [ObjectIdentifier: Int] = [:]
 
-    private func noteSentText(_ text: String, for view: UIView) {
-        guard CraftNativeScriptThread.isBackground else { return }
+    @discardableResult
+    private func noteSentText(_ text: String, for view: UIView) -> Int {
         let id = ObjectIdentifier(view)
+        let count = (inputEventCounts[id] ?? 0) + 1
+        inputEventCounts[id] = count
         var sent = unechoedText[id] ?? []
         sent.append(text)
         if sent.count > 32 { sent.removeFirst(sent.count - 32) }
         unechoedText[id] = sent
+        return count
     }
 
     /// Whether `value` is a stale echo of text the view has moved past: it
@@ -9053,9 +9236,18 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         return later > 0
     }
 
-    private func updateField(_ field: UITextField, value: String?) {
+    private func acceptsText(_ value: String, for view: UIView, acknowledged: Int?) -> Bool {
+        if let acknowledged, acknowledged >= 0 {
+            guard acknowledged >= (inputEventCounts[ObjectIdentifier(view)] ?? 0) else { return false }
+            unechoedText.removeValue(forKey: ObjectIdentifier(view))
+            return true // A current explicit reset may equal an older edit.
+        }
+        return !isStaleEcho(value, for: view)
+    }
+
+    private func updateField(_ field: UITextField, value: String?, acknowledged: Int? = nil) {
         guard let value = value, field.markedTextRange == nil else { return }
-        if isStaleEcho(value, for: field) || field.text == value { return }
+        if !acceptsText(value, for: field, acknowledged: acknowledged) || field.text == value { return }
         let selection = field.selectedTextRange
         let start = selection.map { field.offset(from: field.beginningOfDocument, to: $0.start) }
         let end = selection.map { field.offset(from: field.beginningOfDocument, to: $0.end) }
@@ -9067,9 +9259,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
     }
 
-    private func updateTextView(_ textView: UITextView, value: String?) {
+    private func updateTextView(_ textView: UITextView, value: String?, acknowledged: Int? = nil) {
         guard let value = value, textView.markedTextRange == nil else { return }
-        if isStaleEcho(value, for: textView) || textView.text == value { return }
+        if !acceptsText(value, for: textView, acknowledged: acknowledged) || textView.text == value { return }
         let selection = textView.selectedTextRange
         let start = selection.map { textView.offset(from: textView.beginningOfDocument, to: $0.start) }
         let end = selection.map { textView.offset(from: textView.beginningOfDocument, to: $0.end) }
@@ -9132,7 +9324,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             craftTextView.placeholderColor = color(props["placeholderTextColor"])
             craftTextView.placeholderFont = textView.font
         }
-        updateTextView(textView, value: (props["value"] as? String) ?? defaultValue)
+        updateTextView(textView, value: (props["value"] as? String) ?? defaultValue, acknowledged: (props["mostRecentEventCount"] as? NSNumber)?.intValue)
         if textView.markedTextRange == nil {
             let attributes = inputTextAttributes(style, font: textView.font ?? .systemFont(ofSize: 16), alignment: textView.textAlignment)
             let styled = NSAttributedString(string: textView.text ?? "", attributes: attributes)
@@ -9836,7 +10028,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let controlledVideo = type == "Video" && (props["controls"] as? Bool) == true
         // UIPickerView exposes adjustable component wheels. Making the
         // picker itself a leaf hides those wheels and their selected values.
-        let container = ["ScrollView", "FlatList", "SectionList", "Picker"].contains(type)
+        let container = ["ScrollView", "FlatList", "SectionList", "Picker", "SegmentedControl"].contains(type)
             || ["tablist", "radiogroup", "list", "menu", "menubar", "toolbar"].contains(role ?? "")
             || controlledVideo
         view.isAccessibilityElement = !container && role != "none" && (view.accessibilityLabel != nil || role != nil || ["Text", "Button", "Link", "Checkbox", "Image", "ImageBackground", "Video", "TextInput", "Picker", "DatePicker", "Switch", "Slider"].contains(type))
@@ -9939,6 +10131,18 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// Return on a `returnKeyType="next"` field the screen does not handle
     /// itself (no `@submit`) goes to the next field down the screen, keeping
     /// the keyboard up. Every other Return ends editing and fires `@submit`.
+    func textFieldShouldClear(_ textField: UITextField) -> Bool {
+        guard textField.isEnabled else { return false }
+        textField.text = ""
+        let id = ObjectIdentifier(textField)
+        inputIdentities[id].map { inputDrafts[$0] = "" }
+        let eventCount = noteSentText("", for: textField)
+        if let handler = handlers[id] {
+            send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": "", "clear": true, "eventCount": eventCount]])
+        }
+        return false // The model receives exactly one edit, including lazy models.
+    }
+
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         guard textField.returnKeyType == .next, submitHandlers[ObjectIdentifier(textField)] == nil,
               let next = inputAfter(textField) else { return true }
@@ -9985,8 +10189,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         (textView as? CraftNativeTextView)?.refreshPlaceholder()
         keepCaretVisible(in: textView)
         guard let handler = handlers[id] else { return }
-        noteSentText(textView.text ?? "", for: textView)
-        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": textView.text ?? ""]])
+        let eventCount = noteSentText(textView.text ?? "", for: textView)
+        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": textView.text ?? "", "eventCount": eventCount]])
     }
 
     func textViewDidChangeSelection(_ textView: UITextView) {
@@ -10042,14 +10246,22 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         inputIdentities[id].map { inputDrafts[$0] = sender.text ?? "" }
         let focused = sender.isFirstResponder ? sender : firstResponder(in: rootStack)
         guard let handler = handlers[id] else { return }
-        noteSentText(sender.text ?? "", for: sender)
-        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": sender.text ?? ""]])
+        let eventCount = noteSentText(sender.text ?? "", for: sender)
+        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": sender.text ?? "", "eventCount": eventCount]])
         restoreFocus(focused)
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self, weak focused] in
             self?.restoreFocus(focused)
         }
     }
 
+    @objc private func segmentChanged(_ sender: CraftNativeSegmentedControl) {
+        let index = sender.selectedSegmentIndex
+        guard sender.isEnabled, sender.values.indices.contains(index), sender.isEnabledForSegment(at: index),
+              let handler = handlers[ObjectIdentifier(sender)] else { return }
+        sender.refreshAccessibilityState()
+        send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["value": sender.values[index], "index": index]])
+    }
+
     @objc private func switchChanged(_ sender: UISwitch) {
         let id = ObjectIdentifier(sender)
         switchUserValues[id] = sender.isOn