mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
Add TimelineAccessibilityModifier
This commit is contained in:
committed by
Alfonso Grillo
parent
6ad7dc7641
commit
f7f3404312
@@ -0,0 +1,37 @@
|
||||
//
|
||||
// Copyright 2023 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
private struct TimelineAccessibilityModifier: ViewModifier {
|
||||
let timelineItem: RoomTimelineItemProtocol
|
||||
|
||||
@ViewBuilder
|
||||
func body(content: Content) -> some View {
|
||||
switch timelineItem {
|
||||
case is PollRoomTimelineItem, is VoiceMessageRoomTimelineItem:
|
||||
content
|
||||
default:
|
||||
content.accessibilityElement(children: .combine)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension View {
|
||||
func timelineAccessibility(_ timelineItem: RoomTimelineItemProtocol) -> some View {
|
||||
modifier(TimelineAccessibilityModifier(timelineItem: timelineItem))
|
||||
}
|
||||
}
|
||||
@@ -100,11 +100,14 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
|
||||
VStack(alignment: alignment, spacing: -3) {
|
||||
messageBubble
|
||||
.accessibilityRepresentation {
|
||||
VStack {
|
||||
VStack(spacing: 0) {
|
||||
Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
|
||||
// Workaround: fixes VoiceOver frames offset when children accessibility element aren't combined
|
||||
.frame(height: 0)
|
||||
messageBubble
|
||||
}
|
||||
}
|
||||
.timelineAccessibility(timelineItem)
|
||||
|
||||
if !timelineItem.properties.reactions.isEmpty {
|
||||
TimelineReactionsView(itemID: timelineItem.id,
|
||||
|
||||
@@ -64,6 +64,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
|
||||
|
||||
content()
|
||||
.layoutPriority(1)
|
||||
.timelineAccessibility(timelineItem)
|
||||
}
|
||||
.onTapGesture(count: 2) {
|
||||
context.send(viewAction: .displayEmojiPicker(itemID: timelineItem.id))
|
||||
|
||||
Reference in New Issue
Block a user