Skip to content

Commit 9333857

Browse files
committed
Update SwitchToggleStyle
1 parent 9be7f06 commit 9333857

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Sources/OpenSwiftUI/View/LabelContent/AccessibilityLabeledContent.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ enum AccessibilityLabeledContentPresentation {
3434

3535
struct AccessibilityCombinedLabeledContent: ViewInputBoolFlag {}
3636

37+
extension View {
38+
func accessibilityLabeledContent() -> some View {
39+
input(AccessibilityCombinedLabeledContent.self)
40+
}
41+
}
3742

3843
// MARK: - AccessibilityLabeledContentContentModifier [WIP]
3944

Sources/OpenSwiftUI/View/Toggle/SwitchToggleStyle.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,16 @@ public struct SwitchToggleStyle: ToggleStyle {
7171
LabeledContent {
7272
Switch(_isOn: configuration.$isOn, tint: tint, thumbTint: placementTint[.switchThumb], font: font)
7373
.fixedSize()
74-
// .contentShape(Capsule())
75-
// .accessibilityLabel
76-
// .gesture
74+
.modifier(
75+
_EnvironmentKeyWritingModifier(keyPath: \.controlSize, value: controlSize)
76+
.requiring(GroupedFormStyleContext.self)
77+
)
78+
// TODO: TopAlignedFormValueKey
7779
} label: {
7880
configuration.label
79-
}.listLabeledContentPrefersHorizontalLayout()
81+
}
82+
.listLabeledContentPrefersHorizontalLayout()
83+
.accessibilityLabeledContent()
8084
#elseif os(macOS)
8185
// FIXME
8286
Switch(_isOn: configuration.$isOn, tint: tint, font: font, _acceptsFirstMouse: .init(\.acceptsFirstMouse))

0 commit comments

Comments
 (0)