fix: 🐛 simultaneous gesture is not triggered in voice over

SAP · Sep 25, 2023 · 979e47b · 979e47b
1 parent 08d3757
commit 979e47b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/Sources/FioriSwiftUICore/Utils/View+Extensions.swift b/Sources/FioriSwiftUICore/Utils/View+Extensions.swift
@@ -3,10 +3,16 @@ import SwiftUI
 
 extension View {
     func onSimultaneousTapGesture(count: Int = 1, perform action: @escaping () -> Void) -> some View {
-        self.simultaneousGesture(TapGesture(count: count).onEnded {
+        self.accessibilitySimultaneousGesture(TapGesture(count: count).onEnded {
             action()
         })
     }
+
+    // In order to fix an issue where the simultaneous gesture is not activated in voice over.
+    func accessibilitySimultaneousGesture<T>(_ gesture: T, including mask: GestureMask = .all) -> some View where T: Gesture {
+        simultaneousGesture(gesture, including: mask)
+            .accessibilityElement()
+    }
 }
 
 extension View {
@@ -16,27 +22,4 @@ extension View {
             Alert(title: configuration.title, message: configuration.message_, primaryButton: .default(configuration.action.label_, action: configuration.action.didSelect ?? {}), secondaryButton: .cancel(configuration.secondaryAction.label_, action: configuration.secondaryAction.didSelect ?? {}))
         }
     }
-
-    // Cause problem generating xcframework in SAPFiori
-//    @ViewBuilder
-//    func alert(configuration: AlertConfiguration, isPresented: Binding<Bool>) -> some View {
-//        #if swift(>=5.5)
-//            if #available(iOS 15, macOS 12, *) {
-//                self.alert(configuration.title, isPresented: isPresented) {
-//                    Button(action: configuration.action.didSelect ?? {}, label: { configuration.action.label })
-//                    Button(role: .cancel, action: configuration.secondaryAction.didSelect ?? {}, label: { configuration.secondaryAction.label })
-//                } message: {
-//                    configuration.message
-//                }
-//            } else {
-//                self.alert(isPresented: isPresented) {
-//                    Alert(title: configuration.title, message: configuration.message_, primaryButton: .default(configuration.action.label_, action: configuration.action.didSelect ?? {}), secondaryButton: .cancel(configuration.secondaryAction.label_, action: configuration.secondaryAction.didSelect ?? {}))
-//                }
-//            }
-//        #else
-//            self.alert(isPresented: isPresented) {
-//                Alert(title: configuration.title, message: configuration.message_, primaryButton: .default(configuration.action.label_, action: configuration.action.didSelect ?? {}), secondaryButton: .cancel(configuration.secondaryAction.label_, action: configuration.secondaryAction.didSelect ?? {}))
-//            }
-//        #endif
-//    }
 }
diff --git a/Sources/FioriSwiftUICore/Views/SignatureCaptureView+View.swift b/Sources/FioriSwiftUICore/Views/SignatureCaptureView+View.swift
@@ -78,7 +78,7 @@ extension SignatureCaptureView: View {
                     .padding(.bottom, 11)
                 Spacer()
                 cancelAction
-                    .simultaneousGesture(
+                    .accessibilitySimultaneousGesture(
                         TapGesture()
                             .onEnded { _ in
                                 clear()
@@ -140,7 +140,7 @@ extension SignatureCaptureView: View {
             if self.isEditing {
                 HStack {
                     clearAction
-                        .simultaneousGesture(
+                        .accessibilitySimultaneousGesture(
                             TapGesture()
                                 .onEnded { _ in
                                     clear()
@@ -150,7 +150,7 @@ extension SignatureCaptureView: View {
                         .frame(minWidth: 44, minHeight: 44)
                     Spacer()
                     saveAction
-                        .simultaneousGesture(
+                        .accessibilitySimultaneousGesture(
                             TapGesture()
                                 .onEnded { _ in
                                     isSaved = true
@@ -162,7 +162,7 @@ extension SignatureCaptureView: View {
                 .padding(.top, 8)
             } else if (_signatureImage != nil && !isReenterTapped) || fullSignatureImage != nil {
                 restartAction
-                    .simultaneousGesture(
+                    .accessibilitySimultaneousGesture(
                         TapGesture()
                             .onEnded { _ in
                                 UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
@@ -209,7 +209,7 @@ extension SignatureCaptureView: View {
                 ZStack {
                     Color.preferredColor(.quaternaryFill).cornerRadius(10)
                     startAction
-                        .simultaneousGesture(
+                        .accessibilitySimultaneousGesture(
                             TapGesture()
                                 .onEnded { _ in
                                     UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)