Merge pull request #198 from cashapp/entin/sub-pixel-activation-point

Allow sub-pixel differences from default activation point
cashapp · Jan 27, 2024 · ccee9fe · ccee9fe
2 parents 371921a + ada8279
commit ccee9fe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/...4/SnapshotTests.AccessibilitySnapshotTests/testButtonTraits_16_4_393x852@3x.png b/...4/SnapshotTests.AccessibilitySnapshotTests/testButtonTraits_16_4_393x852@3x.png
diff --git a/...es/_64/SnapshotTests.AccessibilitySnapshotTests/testTabBars_16_4_393x852@3x.png b/...es/_64/SnapshotTests.AccessibilitySnapshotTests/testTabBars_16_4_393x852@3x.png
diff --git a/...ges/_64/SnapshotTests.DefaultControlsTests/testStepperAtMin_16_4_393x852@3x.png b/...ges/_64/SnapshotTests.DefaultControlsTests/testStepperAtMin_16_4_393x852@3x.png
diff --git a/...ceImages/_64/SnapshotTests.DefaultControlsTests/testStepper_16_4_393x852@3x.png b/...ceImages/_64/SnapshotTests.DefaultControlsTests/testStepper_16_4_393x852@3x.png
diff --git a/Sources/AccessibilitySnapshot/Core/Swift/Classes/AccessibilityHierarchyParser.swift b/Sources/AccessibilitySnapshot/Core/Swift/Classes/AccessibilityHierarchyParser.swift
@@ -209,7 +209,10 @@ public final class AccessibilityHierarchyParser {
                 userInputLabels: userInputLabels,
                 shape: accessibilityShape(for: element.object, in: root),
                 activationPoint: root.convert(activationPoint, from: nil),
-                usesDefaultActivationPoint: (activationPoint == defaultActivationPoint(for: element.object)),
+                usesDefaultActivationPoint: activationPoint.approximatelyEquals(
+                    defaultActivationPoint(for: element.object),
+                    tolerance: 1 / (root.window?.screen ?? UIScreen.main).scale
+                ),
                 customActions: element.object.accessibilityCustomActions?.map { $0.name } ?? [],
                 accessibilityLanguage: element.object.accessibilityLanguage
             )
@@ -702,3 +705,13 @@ extension UIView {
     }
 
 }
+
+// MARK: -
+
+private extension CGPoint {
+
+    func approximatelyEquals(_ other: CGPoint, tolerance: CGFloat) -> Bool {
+        return abs(self.x - other.x) < tolerance && abs(self.y - other.y) < tolerance
+    }
+
+}