Skip to content

Add confirm keyboard button on text fields/editors #22

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

Merged
prachigauriar merged 1 commit into from
Apr 13, 2026
Merged

Add confirm keyboard button on text fields/editors #22

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
32 changes: 20 additions & 12 deletions Sources/DevConfiguration/Editor/Config Variable Detail/ConfigVariableDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import SwiftUI
/// It is generic on its view model protocol, allowing tests to inject mock view models.
struct ConfigVariableDetailView<ViewModel: ConfigVariableDetailViewModeling>: View {
@State var viewModel: ViewModel
@FocusState private var isTextEditorFocused: Bool
@FocusState private var isEditorControlFocused: Bool


var body: some View {
Expand All @@ -26,7 +26,24 @@ struct ConfigVariableDetailView<ViewModel: ConfigVariableDetailViewModeling>: Vi
providerValuesSection
metadataSection
}
.onDisappear {
if isEditorControlFocused && viewModel.isOverrideTextValid {
viewModel.commitOverrideText()
}
}
.navigationTitle(viewModel.displayName)
.toolbar {
ToolbarItemGroup(placement: .keyboard) {
if isEditorControlFocused {
Spacer()
Button(role: .confirm) {
viewModel.commitOverrideText()
isEditorControlFocused = false
}
.disabled(!viewModel.isOverrideTextValid)
}
}
}
}
}

Expand Down Expand Up @@ -120,30 +137,21 @@ extension ConfigVariableDetailView {
VStack(alignment: .leading) {
Text(localizedStringResource("detailView.overrideSection.valueLabel"))
TextEditor(text: $viewModel.overrideText)
.focused($isTextEditorFocused)
.focused($isEditorControlFocused)
.font(.caption.monospaced())
.frame(minHeight: 100)
.border(viewModel.isOverrideTextValid ? Color.clear : Color.red)
.autocorrectionDisabled()
.textInputAutocapitalization(.never)
.keyboardType(.asciiCapable)

HStack {
Spacer()
Button(localizedStringResource("detailView.overrideSection.applyButton")) {
viewModel.commitOverrideText()
isTextEditorFocused = false
}
.buttonStyle(.bordered)
.disabled(!viewModel.isOverrideTextValid)
}
}
case .textField, .numberField, .decimalField:
LabeledContent(localizedStringResource("detailView.overrideSection.valueLabel")) {
TextField(
localizedStringResource("detailView.overrideSection.valueTextField"),
text: $viewModel.overrideText,
)
.focused($isEditorControlFocused)
.onSubmit { viewModel.commitOverrideText() }
.textFieldStyle(.plain)
.multilineTextAlignment(.trailing)
Expand Down
Loading