Skip to content

Preserve first responder position when children are replaced #52

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
arcticleo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve first responder position when children are replaced #52

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Sources/SwiftTUI/Controls/Control.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ class Control: LayerDrawing {

private var index: Int = 0

// Track the index of the first responder child to restore it after rebuilds
private var preferredFirstResponderIndex: Int?

var window: Window?
private(set) lazy var layer: Layer = makeLayer()

Expand All @@ -22,6 +25,23 @@ class Control: LayerDrawing {
children[i].index = i
}
if let window = root.window, window.firstResponder == nil {
// Try to restore first responder at the preferred index with decrement fallback
if let preferredIndex = preferredFirstResponderIndex {
var tryIndex = preferredIndex
while tryIndex >= 0 && tryIndex < children.count {
if let responder = children[tryIndex].firstSelectableElement {
window.firstResponder = responder
responder.becomeFirstResponder()
preferredFirstResponderIndex = nil // Clear after use
return
}
tryIndex -= 1
}
// If we exhausted all indices, clear the preference and fall through
preferredFirstResponderIndex = nil
}

// Fallback: use the newly added view's first selectable element
if let responder = view.firstSelectableElement {
window.firstResponder = responder
responder.becomeFirstResponder()
Expand All @@ -31,6 +51,9 @@ class Control: LayerDrawing {

func removeSubview(at index: Int) {
if children[index].isFirstResponder || root.window?.firstResponder?.isDescendant(of: children[index]) == true {
// Save the index before removing so we can try to restore it later
preferredFirstResponderIndex = index

root.window?.firstResponder?.resignFirstResponder()
root.window?.firstResponder = selectableElement(above: index) ?? selectableElement(below: index)
root.window?.firstResponder?.becomeFirstResponder()
Expand Down