From c626dfffd0fc21de31178ef2c468d592609932a7 Mon Sep 17 00:00:00 2001 From: Paullo9 Date: Thu, 5 Nov 2026 13:22:52 +0100 Subject: [PATCH] fix: the typed-k and factors sheets keep their fields' and buttons' identifiers The sheets' identifier sat on a plain VStack, so SwiftUI put it on every child and hid edx.typedK.source, edx.typedK.done, edx.factors.source and edx.factors.done. Each sheet is now one container element (as edx.room), whose children keep theirs. Fixes #73. Done: the sheets' children are findable. Next: mac4DSTEM's EDSJourney asserts them once this ships. Co-Authored-By: Claude Opus 5.5 --- Sources/ShellSpectroscopy/EDX/EDXFactorsSheet.swift | 3 +++ Sources/ShellSpectroscopy/EDX/EDXTypedKSheet.swift | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Sources/ShellSpectroscopy/EDX/EDXFactorsSheet.swift b/Sources/ShellSpectroscopy/EDX/EDXFactorsSheet.swift index 3bba86f..5e13379 100644 --- a/Sources/ShellSpectroscopy/EDX/EDXFactorsSheet.swift +++ b/Sources/ShellSpectroscopy/EDX/EDXFactorsSheet.swift @@ -85,6 +85,9 @@ struct EDXFactorsSheet: View { } .padding(20) .frame(width: EDXLayout.factorsSheetWidth) + // A container of its own (as `edx.room`): without it the identifier lands on every child and hides theirs + // (`.source`, `.done`), MacEMUI#73. + .accessibilityElement(children: .contain) .accessibilityIdentifier("edx.factors") } } diff --git a/Sources/ShellSpectroscopy/EDX/EDXTypedKSheet.swift b/Sources/ShellSpectroscopy/EDX/EDXTypedKSheet.swift index e8588ed..a679ab7 100644 --- a/Sources/ShellSpectroscopy/EDX/EDXTypedKSheet.swift +++ b/Sources/ShellSpectroscopy/EDX/EDXTypedKSheet.swift @@ -66,6 +66,9 @@ struct EDXTypedKSheet: View { } .padding(20) .frame(width: EDXLayout.typedKSheetWidth) + // A container of its own (as `edx.room`): without it the identifier lands on every child and hides theirs + // (`.source`, `.done`), MacEMUI#73. + .accessibilityElement(children: .contain) .accessibilityIdentifier("edx.typedK") }