Skip to content
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

Shadowsocks config: Prevent the clearing of the SingleChoiceList custom value field from clobbering its value #7252

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Shadowsocks config: Prevent the clearing of the SingleChoiceList custom value field from clobbering its value #7252

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
38 changes: 24 additions & 14 deletions ios/MullvadVPN/View controllers/Settings/SwiftUI components/SingleChoiceList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,12 @@ struct SingleChoiceList<Value>: View where Value: Equatable {
// this is not a valid value, so we fall back to the
// initial value, showing the invalid-value state if
// the field is not empty
if let initialValue {
// As `customValueIsFocused` takes a while to propagate, we
// only reset the field to the initial value if it was previously
// a custom value. Otherwise, blanking this field when the user
// has selected another field will cause the user's choice to be
// overridden.
if let initialValue, fromValue(value.wrappedValue) != nil {
value.wrappedValue = initialValue
}
customValueInputIsInvalid = !customValueInput.isEmpty
Expand Down Expand Up @@ -355,18 +360,23 @@ struct SingleChoiceList<Value>: View where Value: Equatable {
case three
case someNumber(Int)
}
return StatefulPreviewWrapper(ExampleValue.two) { SingleChoiceList(
title: "Test",
options: [.two, .three],
value: $0,
parseCustomValue: { Int($0).flatMap { $0 > 3 ? ExampleValue.someNumber($0) : nil } },
formatCustomValue: { if case let .someNumber(n) = $0 { "\(n)" } else { nil } },
customLabel: "Custom",
customPrompt: "Number",
customLegend: "The legend goes here",
customInputMinWidth: 120,
customInputMaxLength: 6,
customFieldMode: .numericText
)
return StatefulPreviewWrapper(ExampleValue.two) { value in
VStack {
let vs = "Value = \(value.wrappedValue)"
Text(vs)
SingleChoiceList(
title: "Test",
options: [.two, .three],
value: value,
parseCustomValue: { Int($0).flatMap { $0 > 3 ? ExampleValue.someNumber($0) : nil } },
formatCustomValue: { if case let .someNumber(n) = $0 { "\(n)" } else { nil } },
customLabel: "Custom",
customPrompt: "Number",
customLegend: "The legend goes here",
customInputMinWidth: 120,
customInputMaxLength: 6,
customFieldMode: .numericText
)
}
}
}
Loading