Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Show VoiceOver the switches of Tweaks and Terminal themselves on macOS 27

Țugui Dragoș6604d0e9e0ec
diff --git a/Peel/Views/RowSwitch.swift b/Peel/Views/RowSwitch.swift
new file mode 100644
index 00000000..987e00e4
--- /dev/null
+++ b/Peel/Views/RowSwitch.swift
@@ -0,0 +1,14 @@
+import SwiftUI
+
+@available(macOS 27, *)
+struct RowSwitch: View {
+ let title: Text
+ @Binding var isOn: Bool
+
+ var body: some View {
+ // An empty label rather than a hidden one: SwiftUI then shows VoiceOver AppKit's own switch rather than a
+ // stand-in, which leaves AppKit's switch outside the accessibility tree.
+ Toggle(isOn: $isOn) { Text(verbatim: "") }
+ .accessibilityLabel(title)
+ }
+}
diff --git a/Peel/Views/Terminal/TerminalRows.swift b/Peel/Views/Terminal/TerminalRows.swift
index 8865372d..c6f3defe 100644
--- a/Peel/Views/Terminal/TerminalRows.swift
+++ b/Peel/Views/Terminal/TerminalRows.swift
@@ -32,12 +32,17 @@ struct TerminalSwitchRow: View {
}
}
Spacer(minLength: 8)
- Toggle(isOn: isOn) { EmptyView() }
- .labelsHidden()
- .accessibilityRepresentation {
- Toggle(isOn: isOn) { Text(title) }
- }
- .disabled(isDisabled)
+ if #available(macOS 27, *) {
+ RowSwitch(title: Text(title), isOn: isOn)
+ .disabled(isDisabled)
+ } else {
+ Toggle(isOn: isOn) { EmptyView() }
+ .labelsHidden()
+ .accessibilityRepresentation {
+ Toggle(isOn: isOn) { Text(title) }
+ }
+ .disabled(isDisabled)
+ }
}
.padding(.vertical, 4)
}
diff --git a/Peel/Views/Tweaks/TweakDetailView.swift b/Peel/Views/Tweaks/TweakDetailView.swift
index 20df4804..a998db31 100644
--- a/Peel/Views/Tweaks/TweakDetailView.swift
+++ b/Peel/Views/Tweaks/TweakDetailView.swift
@@ -133,12 +133,17 @@ struct TweakRow: View {
get: { tweaks.isOn(tweak, state: state) },
set: { tweaks.set(tweak, on: $0) }
)
- Toggle(isOn: isOn) { EmptyView() }
- .labelsHidden()
- .accessibilityRepresentation {
- Toggle(isOn: isOn) { Text(tweak.words.title) }
- }
- .disabled(state.isManaged || !works)
+ if #available(macOS 27, *) {
+ RowSwitch(title: Text(tweak.words.title), isOn: isOn)
+ .disabled(state.isManaged || !works)
+ } else {
+ Toggle(isOn: isOn) { EmptyView() }
+ .labelsHidden()
+ .accessibilityRepresentation {
+ Toggle(isOn: isOn) { Text(tweak.words.title) }
+ }
+ .disabled(state.isManaged || !works)
+ }
case .folder:
// The folder row has no switch to turn off, so Put Back is how the user undoes Peel's change.
// It fades in and out, since it takes room in the row as it comes and goes.