Skip to content

Commit 117790e

Browse files
restauranttdyongxu
andauthored
fix: 🐛 [IOSSDKBUG-453]FilterFeedbackBar border unselect color (SAP#895)
* fix: 🐛 [IOSSDKBUG-453]FilterFeedbackBar border unselect color * fix: 🐛 [IOSSDKBUG-453]FilterFeedbackBar border unselect color --------- Co-authored-by: dyongxu <[email protected]>
1 parent 51c9aea commit 117790e

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+Style.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public struct DefaultFilterFeedbackBarStyle: FilterFeedbackBarStyle {
4949
let maxWidth: CGFloat
5050

5151
/// :nodoc:
52-
public init(font: Font = .system(.body), foregroundColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, strokeColorUnselected: Color = .preferredColor(.separator), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38, maxWidth: CGFloat = 0) {
52+
public init(font: Font = .system(.body), foregroundColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, foregroundColorUnselected: Color = .preferredColor(.tertiaryLabel), fillColorSelected: Color = Color.clear, fillColorUnselected: Color = .preferredColor(.tertiaryFill), strokeColorSelected: Color = DefaultFilterFeedbackBarForegroundColor, strokeColorUnselected: Color = .preferredColor(.separatorOpaque), cornerRadius: CGFloat = 10, spacing: CGFloat = 6, padding: CGFloat = 8, borderWidth: CGFloat = 1, minHeight: CGFloat = 38, maxWidth: CGFloat = 0) {
5353
self.font = font
5454
self.foregroundColorSelected = foregroundColorSelected
5555
self.foregroundColorUnselected = foregroundColorUnselected

Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterMenuItemContainer.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ extension _SortFilterMenuItemContainer: View {
2424
HStack(spacing: 10) {
2525
if self.fullCFGButton.position == .leading {
2626
FullCFGMenuItem(items: self.$_items, onUpdate: self.onUpdate)
27+
.accessibilityElement()
28+
.accessibilityLabel(self.fullCFGButton.name ?? "")
29+
.accessibilityIdentifier(self.fullCFGButton.name ?? "")
30+
.accessibility(addTraits: .isButton)
2731
}
2832
ForEach(0 ..< self._items.count, id: \.self) { r in
2933
ForEach(0 ..< self._items[r].count, id: \.self) { c in
@@ -34,21 +38,25 @@ extension _SortFilterMenuItemContainer: View {
3438
.accessibilityElement()
3539
.accessibilityLabel(self._items[r][c].picker.label)
3640
.accessibilityIdentifier(self._items[r][c].picker.name)
41+
.accessibility(addTraits: .isButton)
3742
case .filterfeedback:
3843
FilterFeedbackMenuItem(item: Binding<SortFilterItem.PickerItem>(get: { self._items[r][c].filterfeedback }, set: { self._items[r][c].filterfeedback = $0 }), onUpdate: self.onUpdate)
3944
.accessibilityElement()
4045
.accessibilityLabel(self._items[r][c].filterfeedback.label)
4146
.accessibilityIdentifier(self._items[r][c].filterfeedback.name)
47+
.accessibility(addTraits: .isButton)
4248
case .switch:
4349
SwitchMenuItem(item: Binding<SortFilterItem.SwitchItem>(get: { self._items[r][c].switch }, set: { self._items[r][c].switch = $0 }), onUpdate: self.onUpdate)
4450
.accessibilityElement()
4551
.accessibilityLabel(self.switchItemAccessibilityLabel(switchItem: self._items[r][c].switch))
4652
.accessibilityIdentifier(self._items[r][c].switch.name)
53+
.accessibility(addTraits: .isButton)
4754
case .slider:
4855
SliderMenuItem(item: Binding<SortFilterItem.SliderItem>(get: { self._items[r][c].slider }, set: { self._items[r][c].slider = $0 }), onUpdate: self.onUpdate)
4956
.accessibilityElement()
5057
.accessibilityLabel(self._items[r][c].slider.label)
5158
.accessibilityIdentifier(self._items[r][c].slider.name)
59+
.accessibility(addTraits: .isButton)
5260
case .datetime:
5361
DateTimeMenuItem(item: Binding<SortFilterItem.DateTimeItem>(get: { self._items[r][c].datetime }, set: { self._items[r][c].datetime = $0 }), onUpdate: self.onUpdate)
5462
.accessibilityElement()
@@ -59,12 +67,17 @@ extension _SortFilterMenuItemContainer: View {
5967
.accessibilityElement()
6068
.accessibilityLabel(self._items[r][c].stepper.label)
6169
.accessibilityIdentifier(self._items[r][c].stepper.name)
70+
.accessibility(addTraits: .isButton)
6271
}
6372
}
6473
}
6574
}
6675
if self.fullCFGButton.position == .trailing {
6776
FullCFGMenuItem(items: self.$_items, onUpdate: self.onUpdate)
77+
.accessibilityElement()
78+
.accessibilityLabel(self.fullCFGButton.name ?? "")
79+
.accessibilityIdentifier(self.fullCFGButton.name ?? "")
80+
.accessibility(addTraits: .isButton)
6881
}
6982
}
7083
}

0 commit comments

Comments
 (0)