one 2.0.0-beta.142.1 → 2.0.0-beta.145.1

package/ios/Generated/OneNativeSecureFieldView.swift

@@ -45,8 +45,10 @@ private final class SecureFieldModel: ObservableObject {
     if syncStateId != 0 { OneNativeSyncRegistry.set(Int32(syncStateId), value: value as NSObject) }
     onChange?(value, controlled.eventCount, controlled.revision)
   }
+  var hasNativeFocus = false
   var onFocusChange: ((Bool, Int, Int) -> Void)?
   func changeFocus(_ value: Bool) {
+    hasNativeFocus = value
     guard active, !disabled, controlledFocus.value != value else { return }
     controlledFocus.change(value)
     onFocusChange?(value, controlledFocus.eventCount, controlledFocus.revision)
@@ -59,13 +61,14 @@ private final class SecureFieldModel: ObservableObject {
     onSubmit?(submitCount)
   }
 }
-@objcMembers public final class OneNativeSecureFieldView: UIView, OneNativeComposable {
+@objcMembers public final class OneNativeSecureFieldView: UIView, OneNativeComposable, OneNativeFocusedContent {
   public var onSDKEvent: ((String, String) -> Void)?
 
   public var onChange: ((String, Int, Int) -> Void)?
   public var onFocusChange: ((Bool, Int, Int) -> Void)?
   public var onSubmit: ((Int) -> Void)?
   private var model = SecureFieldModel()
+  @nonobjc var containsComposedFocus: Bool { model.hasNativeFocus }
   public var onHeight: ((CGFloat) -> Void)?
   private var controller: OneNativeHostingController<OneNativeMeasuredStandalone<SecureFieldContent>>?
   public override init(frame: CGRect) { super.init(frame: frame) }

package/ios/Generated/OneNativeTextEditorView.swift

@@ -41,19 +41,22 @@ private final class TextEditorModel: ObservableObject {
     if syncStateId != 0 { OneNativeSyncRegistry.set(Int32(syncStateId), value: value as NSObject) }
     onChange?(value, controlled.eventCount, controlled.revision)
   }
+  var hasNativeFocus = false
   var onFocusChange: ((Bool, Int, Int) -> Void)?
   func changeFocus(_ value: Bool) {
+    hasNativeFocus = value
     guard active, !disabled, controlledFocus.value != value else { return }
     controlledFocus.change(value)
     onFocusChange?(value, controlledFocus.eventCount, controlledFocus.revision)
   }
 }
-@objcMembers public final class OneNativeTextEditorView: UIView, OneNativeComposable {
+@objcMembers public final class OneNativeTextEditorView: UIView, OneNativeComposable, OneNativeFocusedContent {
   public var onSDKEvent: ((String, String) -> Void)?
 
   public var onChange: ((String, Int, Int) -> Void)?
   public var onFocusChange: ((Bool, Int, Int) -> Void)?
   private var model = TextEditorModel()
+  @nonobjc var containsComposedFocus: Bool { model.hasNativeFocus }
   private var controller: OneNativeHostingController<OneNativeStandalone<TextEditorContent>>?
   public override init(frame: CGRect) { super.init(frame: frame) }
   required init?(coder: NSCoder) { fatalError("init(coder:) is unavailable") }

package/ios/Generated/OneNativeTextFieldView.swift

@@ -46,8 +46,10 @@ private final class TextFieldModel: ObservableObject {
     if syncStateId != 0 { OneNativeSyncRegistry.set(Int32(syncStateId), value: value as NSObject) }
     onChange?(value, controlled.eventCount, controlled.revision)
   }
+  var hasNativeFocus = false
   var onFocusChange: ((Bool, Int, Int) -> Void)?
   func changeFocus(_ value: Bool) {
+    hasNativeFocus = value
     guard active, !disabled, controlledFocus.value != value else { return }
     controlledFocus.change(value)
     onFocusChange?(value, controlledFocus.eventCount, controlledFocus.revision)
@@ -60,13 +62,14 @@ private final class TextFieldModel: ObservableObject {
     onSubmit?(submitCount)
   }
 }
-@objcMembers public final class OneNativeTextFieldView: UIView, OneNativeComposable {
+@objcMembers public final class OneNativeTextFieldView: UIView, OneNativeComposable, OneNativeFocusedContent {
   public var onSDKEvent: ((String, String) -> Void)?
 
   public var onChange: ((String, Int, Int) -> Void)?
   public var onFocusChange: ((Bool, Int, Int) -> Void)?
   public var onSubmit: ((Int) -> Void)?
   private var model = TextFieldModel()
+  @nonobjc var containsComposedFocus: Bool { model.hasNativeFocus }
   public var onHeight: ((CGFloat) -> Void)?
   private var controller: OneNativeHostingController<OneNativeMeasuredStandalone<TextFieldContent>>?
   public override init(frame: CGRect) { super.init(frame: frame) }

package/ios/OneNativeComposition.swift

@@ -30,6 +30,12 @@ extension OneNativeComposable {
   public func propagateActive(_ active: Bool) {}
 }
 
+// composed controls render in their parent's host, so their own uiview cannot
+// resign the rendered field. this receipt identifies the subtree being removed.
+protocol OneNativeFocusedContent: AnyObject {
+  var containsComposedFocus: Bool { get }
+}
+
 // standalone, a control fills the Fabric view it was given. composed, it must take its
 // ideal size so the host can measure a stack of them, so the fill lives here rather than
 // inside the generated content.
@@ -119,7 +125,7 @@ final class OneNativeSchemeBridge: ObservableObject {
 // container it wraps them in, which it supplies at init. a container is composable
 // itself, so containers nest.
 @objcMembers public class OneNativeContainerView: UIView, OneNativeComposable,
-  OneNativeCompositionParent
+  OneNativeCompositionParent, OneNativeFocusedContent
 {
   private let wrap: (OneNativeChildren, Bool) -> AnyView
   private let published = OneNativeChildren()
@@ -132,6 +138,21 @@ final class OneNativeSchemeBridge: ObservableObject {
 
   public var compositionActive: Bool { active }
 
+  @nonobjc var containsComposedFocus: Bool {
+    childViews.contains { ($0 as? OneNativeFocusedContent)?.containsComposedFocus == true }
+  }
+
+  @nonobjc private var compositionHost: UIView? {
+    if let parent = compositionParent as? OneNativeContainerView { return parent.compositionHost }
+    return (compositionParent as? UIView) ?? controller?.viewIfLoaded
+  }
+
+  @nonobjc private func resignComposedFocus(in child: UIView) {
+    guard (child as? OneNativeFocusedContent)?.containsComposedFocus == true else { return }
+    // keyboard layout must run while the focused row still belongs to the host.
+    compositionHost?.endEditing(true)
+  }
+
   @nonobjc init(wrap: @escaping (OneNativeChildren, _ standalone: Bool) -> AnyView) {
     self.wrap = wrap
     super.init(frame: .zero)
@@ -180,6 +201,7 @@ final class OneNativeSchemeBridge: ObservableObject {
   public func refreshRow(for child: UIView) {
     guard let index = childViews.firstIndex(where: { $0 === child }),
       let composable = child as? OneNativeComposable else { return }
+    resignComposedFocus(in: child)
     let identity = rowIdentity(for: child)
     identity.revision += 1
     published.items[index] = OneNativeComposedChild(
@@ -192,6 +214,7 @@ final class OneNativeSchemeBridge: ObservableObject {
 
   public func removeChild(_ child: UIView) {
     guard let index = childViews.firstIndex(where: { $0 === child }) else { return }
+    resignComposedFocus(in: child)
     childViews.remove(at: index)
     guard let composable = child as? OneNativeComposable else {
       preconditionFailure("One Native container child lost its composition capability")
@@ -229,6 +252,7 @@ final class OneNativeSchemeBridge: ObservableObject {
   }
 
   public func reset() {
+    resignComposedFocus(in: self)
     compositionParent = nil
     propagateActive(false)
     for child in childViews { (child as? OneNativeComposable)?.decompose() }

package/ios/OneNativeContainerSlotView.swift

@@ -33,9 +33,19 @@ private struct SlotContent: View {
 }
 
 @objcMembers
-public final class OneNativeContainerSlotView: UIView, OneNativeComposable {
+public final class OneNativeContainerSlotView: UIView, OneNativeComposable, OneNativeFocusedContent {
   private let model = SlotModel()
 
+  @nonobjc var containsComposedFocus: Bool {
+    guard let content = model.content, content.window != nil else { return false }
+    var pending = [content]
+    while let view = pending.popLast() {
+      if view.isFirstResponder { return true }
+      pending.append(contentsOf: view.subviews)
+    }
+    return false
+  }
+
   public var content: UIView? {
     get { model.content }
     set { model.content = newValue }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "2.0.0-beta.142.1",
+  "version": "2.0.0-beta.145.1",
   "description": "One is a React framework for web, iOS, and Android apps.",
   "license": "BSD-3-Clause",
   "sideEffects": [
@@ -209,18 +209,18 @@
     "@react-navigation/native-stack": "8.0.0-alpha.52",
     "@react-navigation/routers": "8.0.0-alpha.17",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "2.0.0-beta.142.1",
-    "@vxrn/compiler": "2.0.0-beta.142.1",
-    "@vxrn/resolve": "2.0.0-beta.142.1",
-    "@vxrn/tslib-lite": "2.0.0-beta.142.1",
-    "@vxrn/use-isomorphic-layout-effect": "2.0.0-beta.142.1",
-    "@vxrn/utils": "2.0.0-beta.142.1",
-    "@vxrn/vite-plugin-metro": "2.0.0-beta.142.1",
+    "@vxrn/color-scheme": "2.0.0-beta.145.1",
+    "@vxrn/compiler": "2.0.0-beta.145.1",
+    "@vxrn/resolve": "2.0.0-beta.145.1",
+    "@vxrn/tslib-lite": "2.0.0-beta.145.1",
+    "@vxrn/use-isomorphic-layout-effect": "2.0.0-beta.145.1",
+    "@vxrn/utils": "2.0.0-beta.145.1",
+    "@vxrn/vite-plugin-metro": "2.0.0-beta.145.1",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "2.0.0-beta.142.1",
+    "create-vxrn": "2.0.0-beta.145.1",
     "escape-string-regexp": "^5.0.0",
     "fast-deep-equal": "^3.1.3",
     "fast-glob": "^3.3.3",
@@ -242,7 +242,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "2.0.0-beta.142.1",
+    "vxrn": "2.0.0-beta.145.1",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"