fix(ios): align Quick Question composer and selection
TestFlight / Build and upload (push) Successful in 2m12s

This commit is contained in:
2026-11-17 19:55:02 -08:00
parent 7333fe03e7
commit 557775af45
2 changed files with 155 additions and 136 deletions
@@ -1,7 +1,6 @@
import MarkdownUI
import Observation
import SwiftUI
import UIKit
struct SybilQuickQuestionView: View {
@Bindable var viewModel: SybilViewModel
@@ -9,6 +8,8 @@ struct SybilQuickQuestionView: View {
@Environment(\.dismiss) private var dismiss
@FocusState private var promptFocused: Bool
@State private var promptSelection: TextSelection?
@State private var autoSelectedFocusRequest: Int?
private var hasAnswerContent: Bool {
!viewModel.quickQuestionMessages.isEmpty || viewModel.quickQuestionError != nil
@@ -31,7 +32,16 @@ struct SybilQuickQuestionView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(SybilTheme.backgroundGradient)
.preferredColorScheme(.dark)
.onChange(of: promptFocused) { _, isFocused in
guard isFocused else {
return
}
selectInitialPromptIfNeeded(for: focusRequest)
}
.task(id: focusRequest) {
promptFocused = false
promptSelection = nil
autoSelectedFocusRequest = nil
try? await Task.sleep(for: .milliseconds(260))
guard !Task.isCancelled else {
return
@@ -40,6 +50,30 @@ struct SybilQuickQuestionView: View {
}
}
private func selectInitialPromptIfNeeded(for request: Int) {
guard autoSelectedFocusRequest != request else {
return
}
autoSelectedFocusRequest = request
let initialPrompt = viewModel.quickQuestionPrompt
guard !initialPrompt.isEmpty else {
return
}
// Let SwiftUI apply focus before publishing the selection update.
Task { @MainActor in
await Task.yield()
guard promptFocused,
focusRequest == request,
viewModel.quickQuestionPrompt == initialPrompt
else {
return
}
promptSelection = TextSelection(range: initialPrompt.startIndex..<initialPrompt.endIndex)
}
}
private var header: some View {
HStack {
Image(systemName: "sparkles")
@@ -93,29 +127,18 @@ struct SybilQuickQuestionView: View {
private var composer: some View {
VStack(alignment: .leading, spacing: 10) {
HStack(alignment: .bottom, spacing: 10) {
QuickQuestionTextField(
SybilPromptField(
placeholder: "Ask anything...",
text: Binding(
get: { viewModel.quickQuestionPrompt },
set: { viewModel.updateQuickQuestionPrompt($0) }
),
focused: Binding(
get: { promptFocused },
set: { promptFocused = $0 }
),
focusRequest: focusRequest,
focused: $promptFocused,
selection: $promptSelection,
axis: .vertical,
submit: submitQuestion
)
.focused($promptFocused)
.font(.sybil(.body))
.padding(.horizontal, 12)
.padding(.vertical, 10)
.frame(maxWidth: .infinity, minHeight: 40, alignment: .leading)
.background(
RoundedRectangle(cornerRadius: 12)
.fill(SybilTheme.composerGradient)
.opacity(0.98)
)
.accessibilityIdentifier("quick-question-prompt")
SybilPromptSendButton(canSend: viewModel.canSendQuickQuestion, submit: submitQuestion)
.accessibilityLabel("Ask quick question")
@@ -219,112 +242,6 @@ struct SybilQuickQuestionView: View {
}
private final class QuickQuestionNativeTextField: UITextField {
var wantsFirstResponder = false {
didSet {
updateFirstResponder()
}
}
override func didMoveToWindow() {
super.didMoveToWindow()
updateFirstResponder()
}
private func updateFirstResponder() {
guard window != nil else {
return
}
if wantsFirstResponder && !isFirstResponder {
becomeFirstResponder()
} else if !wantsFirstResponder && isFirstResponder {
resignFirstResponder()
}
}
}
private struct QuickQuestionTextField: UIViewRepresentable {
var placeholder: String
@Binding var text: String
@Binding var focused: Bool
var focusRequest: Int
var submit: () -> Void
func makeUIView(context: Context) -> QuickQuestionNativeTextField {
SybilFontRegistry.registerIfNeeded()
let textField = QuickQuestionNativeTextField()
textField.delegate = context.coordinator
textField.addTarget(context.coordinator, action: #selector(Coordinator.textDidChange(_:)), for: .editingChanged)
textField.placeholder = placeholder
let baseFont = UIFont(name: "Inter", size: 17) ?? UIFont.systemFont(ofSize: 17)
textField.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: baseFont)
textField.adjustsFontForContentSizeCategory = true
textField.textColor = UIColor(SybilTheme.text)
textField.backgroundColor = .clear
textField.borderStyle = .none
textField.autocapitalizationType = .sentences
textField.autocorrectionType = .yes
textField.returnKeyType = .send
textField.keyboardAppearance = .dark
textField.accessibilityIdentifier = "quick-question-prompt"
textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
return textField
}
func updateUIView(_ textField: QuickQuestionNativeTextField, context: Context) {
context.coordinator.parent = self
if textField.text != text {
textField.text = text
}
textField.wantsFirstResponder = focused
}
func makeCoordinator() -> Coordinator {
Coordinator(parent: self)
}
@MainActor
final class Coordinator: NSObject, UITextFieldDelegate {
var parent: QuickQuestionTextField
private var lastSelectedFocusRequest: Int?
init(parent: QuickQuestionTextField) {
self.parent = parent
}
@objc func textDidChange(_ textField: UITextField) {
parent.text = textField.text ?? ""
}
func textFieldDidBeginEditing(_ textField: UITextField) {
parent.focused = true
guard lastSelectedFocusRequest != parent.focusRequest else {
return
}
lastSelectedFocusRequest = parent.focusRequest
guard let text = textField.text, !text.isEmpty,
let range = textField.textRange(
from: textField.beginningOfDocument,
to: textField.endOfDocument
)
else {
return
}
textField.selectedTextRange = range
}
func textFieldDidEndEditing(_ textField: UITextField) {
parent.focused = false
}
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
parent.submit()
return false
}
}
}
private struct QuickQuestionPickerPill: View {
var title: String