Skip to content

Fix button labels #2

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
taka-2120 merged 2 commits into from
Feb 21, 2025
Merged

Fix button labels #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d375b1f
fix: set cancel role to No button
taka-2120 Feb 21, 2025
1954800
fix: apply localized label
taka-2120 Feb 21, 2025
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
4 changes: 2 additions & 2 deletions Sources/AlertPresentable/AlertController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class AlertController {
/// On tap, close the alert.
///
public static var no: Self {
.init(label: String(localized: String.LocalizationValue("no"), bundle: .module))
.init(label: String(localized: String.LocalizationValue("no"), bundle: .module), role: .cancel)
}

///
Expand All @@ -103,7 +103,7 @@ public class AlertController {
/// - parameter action: The custom action which is fired when the button was tapped just before close the alert.
///
public static func no(action: @escaping () -> Void) -> Self {
.init(label: String(localized: String.LocalizationValue("no"), bundle: .module), action: action)
.init(label: String(localized: String.LocalizationValue("no"), bundle: .module), role: .cancel, action: action)
}

///
Expand Down
4 changes: 3 additions & 1 deletion Sources/AlertPresentable/View+Alert.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ private struct CommonAlert: ViewModifier {
content
.alert(alertController.title, isPresented: $alertController.isPresented) {
ForEach(alertController.actions) { action in
Button(action.label, role: action.role) {
Button(role: action.role) {
if let action = action.action {
action()
return
}
alertController.isPresented = false
} label: {
Text(action.label)
}
}
} message: {
Expand Down