Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX - Add accessibility identifier to dataCard elements #347

Merged
merged 11 commits into from
Mar 26, 2024
Merged
24 changes: 12 additions & 12 deletions Sources/Mistica/Components/Cards/DataCard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -154,48 +154,48 @@ public extension DataCard {

var headlineIdentifier: String? {
get {
cardBaseView.contentView.headlineTagView.accessibilityIdentifier
cardBaseView.contentView.headlineIdentifier
}
set {
cardBaseView.contentView.headlineTagView.accessibilityIdentifier = newValue
cardBaseView.contentView.headlineIdentifier = newValue
if newValue == nil {
cardBaseView.contentView.headlineTagView.accessibilityIdentifier = DataCardAccessibilityIdentifiers.headline.rawValue
cardBaseView.contentView.headlineIdentifier = DataCardAccessibilityIdentifiers.headline.rawValue
}
}
}

var titleIdentifier: String? {
get {
cardBaseView.contentView.titleLabel.accessibilityIdentifier
cardBaseView.contentView.titleIdentifier
}
set {
cardBaseView.contentView.titleLabel.accessibilityIdentifier = newValue
cardBaseView.contentView.titleIdentifier = newValue
if newValue == nil {
cardBaseView.contentView.titleLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.title.rawValue
cardBaseView.contentView.titleIdentifier = DataCardAccessibilityIdentifiers.title.rawValue
}
}
}

var subtitleIdentifier: String? {
get {
cardBaseView.contentView.subtitleLabel.accessibilityIdentifier
cardBaseView.contentView.subtitleIdentifier
}
set {
cardBaseView.contentView.subtitleLabel.accessibilityIdentifier = newValue
cardBaseView.contentView.subtitleIdentifier = newValue
if newValue == nil {
cardBaseView.contentView.subtitleLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.subtitle.rawValue
cardBaseView.contentView.subtitleIdentifier = DataCardAccessibilityIdentifiers.subtitle.rawValue
}
}
}

var descriptionIdentifier: String? {
get {
cardBaseView.contentView.descriptionLabel.accessibilityIdentifier
cardBaseView.contentView.descriptionIdentifier
}
set {
cardBaseView.contentView.descriptionLabel.accessibilityIdentifier = newValue
cardBaseView.contentView.descriptionIdentifier = newValue
if newValue == nil {
cardBaseView.contentView.descriptionLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.description.rawValue
cardBaseView.contentView.descriptionIdentifier = DataCardAccessibilityIdentifiers.description.rawValue
}
}
}
Expand Down
48 changes: 48 additions & 0 deletions Sources/Mistica/Components/Cards/Internals/CardCommonContent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,54 @@ extension CardCommonContent {
descriptionLabel.topSpacing = newValue
}
}

var headlineIdentifier: String? {
get {
headlineTagView.accessibilityIdentifier
}
set {
headlineTagView.accessibilityIdentifier = newValue
if newValue == nil {
headlineTagView.accessibilityIdentifier = DataCardAccessibilityIdentifiers.headline.rawValue
}
}
}

var titleIdentifier: String? {
get {
titleLabel.accessibilityIdentifier
}
set {
titleLabel.accessibilityIdentifier = newValue
if newValue == nil {
titleLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.title.rawValue
}
}
}

var subtitleIdentifier: String? {
get {
subtitleLabel.accessibilityIdentifier
}
set {
subtitleLabel.accessibilityIdentifier = newValue
if newValue == nil {
subtitleLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.subtitle.rawValue
}
}
}

var descriptionIdentifier: String? {
get {
descriptionLabel.accessibilityIdentifier
}
set {
descriptionLabel.accessibilityIdentifier = newValue
if newValue == nil {
descriptionLabel.accessibilityIdentifier = DataCardAccessibilityIdentifiers.description.rawValue
}
}
}
}

// MARK: Private
Expand Down
9 changes: 9 additions & 0 deletions Sources/Mistica/Utils/Views/StackViewContentItem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,13 @@ class StackViewContentItem<Element: UIView>: UIStackView {
item[keyPath: keyPath] = newValue
}
}

override var accessibilityIdentifier: String? {
get {
item.accessibilityIdentifier
}
set {
item.accessibilityIdentifier = newValue
}
}
}