resolving merge conflict

RoyalPineapple · RoyalPineapple · commit 58164f3ce463 · 2025-10-01T14:38:59.000+02:00
diff --git a/Example/SnapshotTests/ElementOrderTests.swift b/Example/SnapshotTests/ElementOrderTests.swift
@@ -24,43 +24,50 @@ final class ElementOrderTests: SnapshotTestCase {
     func testScatter() {
         let elementOrderViewController = ElementOrderViewController(configurations: .scatter)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testGrid() {
         let elementOrderViewController = ElementOrderViewController(configurations: .grid)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testContainerInElementStack() {
         let elementOrderViewController = ElementOrderViewController(configurations: .containerInElementStack)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testZeroSizedContainerInElementStack() {
         let elementOrderViewController = ElementOrderViewController(configurations: .zeroSizedContainerInElementStack)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testGroupedViewsInElementStack() {
         let elementOrderViewController = ElementOrderViewController(configurations: .groupedViewsInElementStack)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testUngroupedViewsInElementStack() {
         let elementOrderViewController = ElementOrderViewController(configurations: .ungroupedViewsInElementStack)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
     func testUngroupedViewsInAccessibleParent() {
         let elementOrderViewController = ElementOrderViewController(configurations: .ungroupedViewsInAccessibleParent)
         elementOrderViewController.view.frame = UIScreen.main.bounds
-        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: .init(showElementOrderMarkers: true))
+        let configuration = AccessibilitySnapshotConfiguration(viewRenderingMode: viewRenderingMode, includesElementOrder: .always)
+        SnapshotVerifyAccessibility(elementOrderViewController.view, snapshotConfiguration: configuration)
     }
 
 }
diff --git a/Sources/AccessibilitySnapshot/Core/AccessibilitySnapshotConfiguration.swift b/Sources/AccessibilitySnapshot/Core/AccessibilitySnapshotConfiguration.swift
@@ -36,11 +36,19 @@ public struct AccessibilitySnapshotConfiguration {
         ///  Defaults to `.whenOverridden`.
         public let activationPointDisplay: AccessibilityContentDisplayMode
         
+        
+        /// Controls when to show indicators for elements' accessibility order.
+        ///  Defaults to `.never`.
+        public let elementOrderDisplay: AccessibilityContentDisplayMode
+        
+        
         init(colors: [UIColor] = MarkerColors.defaultColors,
-             activationPointDisplay: AccessibilityContentDisplayMode = .whenOverridden
+             activationPointDisplay: AccessibilityContentDisplayMode = .whenOverridden,
+             elementOrderDisplay: AccessibilityContentDisplayMode = .never
         )  {
             self.colors = colors.isEmpty ? MarkerColors.defaultColors : colors
             self.activationPointDisplay = activationPointDisplay
+            self.elementOrderDisplay = elementOrderDisplay
         }
     }
     
@@ -71,11 +79,16 @@ public struct AccessibilitySnapshotConfiguration {
                 colorRenderingMode: ColorRenderingMode = .monochrome,
                 overlayColors: [UIColor] = MarkerColors.defaultColors,
                 activationPointDisplay: AccessibilityContentDisplayMode = .whenOverridden,
-                includesInputLabels: AccessibilityContentDisplayMode = .whenOverridden
+                includesInputLabels: AccessibilityContentDisplayMode = .whenOverridden,
+                includesElementOrder: AccessibilityContentDisplayMode = .never
                 ) {
         
         self.snapshot = Snapshot(viewRenderingMode:viewRenderingMode, colorMode: colorRenderingMode)
-        self.overlay = Overlay(colors: overlayColors.isEmpty ? MarkerColors.defaultColors : overlayColors, activationPointDisplay: activationPointDisplay)
+        
+        self.overlay = Overlay(colors: overlayColors.isEmpty ? MarkerColors.defaultColors : overlayColors,
+                               activationPointDisplay: activationPointDisplay,
+                               elementOrderDisplay: includesElementOrder)
+        
         self.legend = Legend(includesUserInputLabels: includesInputLabels)
     }
 }
diff --git a/Sources/AccessibilitySnapshot/Core/AccessibilitySnapshotView.swift b/Sources/AccessibilitySnapshot/Core/AccessibilitySnapshotView.swift
@@ -74,7 +74,6 @@ public final class AccessibilitySnapshotView: SnapshotAndLegendView {
     /// - parameter snapshotConfiguration: The configuration for the visual effects and markers applied to the snapshots.
     public init(
         containedView: UIView,
-        viewRenderingMode: ViewRenderingMode,
         snapshotConfiguration: AccessibilitySnapshotConfiguration
     ) {
         self.containedView = containedView
@@ -97,7 +96,7 @@ public final class AccessibilitySnapshotView: SnapshotAndLegendView {
     }
 
     override var minimumLegendWidth: CGFloat {
-        return LegendView.Metrics.minimumWidth
+        return ElementLegendView.Metrics.minimumWidth
     }
 
     // MARK: - Private Properties
@@ -160,12 +159,14 @@ public final class AccessibilitySnapshotView: SnapshotAndLegendView {
 
         var displayMarkers: [DisplayMarker] = []
         for (index, marker) in markers.enumerated() {
+            let elementIndex: Int? = markers.count > 1 ? index : nil
+            
             let color = snapshotConfiguration.overlay.colors[index % snapshotConfiguration.overlay.colors.count]
 
-            let legendView = LegendView(marker: marker, color: color, configuration: snapshotConfiguration.legend)
+            let legendView = ElementLegendView(marker: marker,
                                         elementIndex: elementIndex,
                                         color: color,
-                                        showUserInputLabels: snapshotConfiguration.showUserInputLabels)
+                                        configuration: snapshotConfiguration.legend)
             addSubview(legendView)
 
             let overlayView = OverlayView()
@@ -247,7 +248,7 @@ public final class AccessibilitySnapshotView: SnapshotAndLegendView {
 
         var marker: AccessibilityMarker
 
-        var legendView: LegendView
+        var legendView: ElementLegendView
 
         var overlayView: OverlayView
 
@@ -264,7 +265,6 @@ internal extension AccessibilitySnapshotView {
                 guard let markerView else { return }
                 markerView.sizeToFit()
                 let origin = markerPosition
-//                    .applying(CGAffineTransform(translationX: -(markerView.bounds.width / 2), y: -(markerView.bounds.height / 2 )))
                 markerView.frame = CGRect(origin: origin, size: markerView.frame.size)
             }
         }
diff --git a/Sources/AccessibilitySnapshot/Core/LegendView.swift b/Sources/AccessibilitySnapshot/Core/LegendView.swift
@@ -67,11 +67,11 @@ internal extension AccessibilitySnapshotView {
     }
     
     
-    final class LegendView: UIView {
+    final class ElementLegendView: UIView {
         
         // MARK: - Life Cycle
         
-        init(marker: AccessibilityMarker, color: UIColor, configuration: AccessibilitySnapshotConfiguration.Legend) {
+        init(marker: AccessibilityMarker, elementIndex: Int?, color: UIColor, configuration: AccessibilitySnapshotConfiguration.Legend) {
             self.hintLabel = marker.hint.map {
                 let label = UILabel()
                 label.text = $0
diff --git a/Sources/AccessibilitySnapshot/SnapshotTesting/SnapshotTesting+Accessibility.swift b/Sources/AccessibilitySnapshot/SnapshotTesting/SnapshotTesting+Accessibility.swift
@@ -68,7 +68,6 @@ extension Snapshotting where Value == UIView, Format == UIImage {
                     overlayColors: markerColors,
                     activationPointDisplay: activationPointDisplayMode,
                     includesInputLabels: showUserInputLabels ? .whenOverridden : .never
-                        useMonochromeSnapshot: useMonochromeSnapshot)
                 )
                
                 let containerView = AccessibilitySnapshotView(containedView: view, snapshotConfiguration: configuration)
diff --git a/Sources/AccessibilitySnapshot/iOSSnapshotTestCase/Swift/FBSnapshotTestCase+Accessibility.swift b/Sources/AccessibilitySnapshot/iOSSnapshotTestCase/Swift/FBSnapshotTestCase+Accessibility.swift
@@ -76,10 +76,6 @@ extension FBSnapshotTestCase {
         SnapshotVerifyAccessibility(view,
                                     identifier: identifier,
                                     snapshotConfiguration: configuration,
-                                        colors: markerColors,
-                                        activationPointDisplayMode: activationPointDisplayMode,
-                                        showUserInputLabels: showUserInputLabels,
-                                        useMonochromeSnapshot: useMonochromeSnapshot),
                                     suffixes: suffixes,
                                     file: file,
                                     line: line)
diff --git a/Sources/AccessibilitySnapshot/iOSSnapshotTestCase/Swift/FBSnapshotTestCase+SwiftUI.swift b/Sources/AccessibilitySnapshot/iOSSnapshotTestCase/Swift/FBSnapshotTestCase+SwiftUI.swift
@@ -74,9 +74,6 @@ extension FBSnapshotTestCase {
                                     size: size,
                                     identifier: identifier,
                                     snapshotConfiguration: configuration,
-                                                                 activationPointDisplayMode: activationPointDisplayMode,
-                                                                 showUserInputLabels: showUserInputLabels,
-                                                                 useMonochromeSnapshot: useMonochromeSnapshot),
                                     suffixes: suffixes,
                                     file: file,
                                     line: line)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ extension Snapshotting where Value == UIView, Format == UIImage {`
`68`	`68`	`overlayColors: markerColors,`
`69`	`69`	`activationPointDisplay: activationPointDisplayMode,`
`70`	`70`	`includesInputLabels: showUserInputLabels ? .whenOverridden : .never`
`71`		`- useMonochromeSnapshot: useMonochromeSnapshot)`
`72`	`71`	`)`
`73`	`72`
`74`	`73`	`let containerView = AccessibilitySnapshotView(containedView: view, snapshotConfiguration: configuration)`