Revert "Merge branch 'bugfix/PRODDEF-24073' into 'release/11_4_0'"

This reverts merge request !1062
This commit is contained in:
Pfeil, Scott Robert 2024-03-15 21:08:11 +00:00
parent 51315abf49
commit e1f248875e
2 changed files with 5 additions and 9 deletions

View File

@ -43,6 +43,7 @@
addSubview(label)
label.text = ""
checkbox.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
checkboxBottomConstraint = layoutMarginsGuide.bottomAnchor.constraint(equalTo: checkbox.bottomAnchor)
@ -63,8 +64,9 @@
bottomLabelConstraint.isActive = true
alignCheckbox(.center)
isAccessibilityElement = false
accessibilityElements = [checkbox, label]
isAccessibilityElement = true
accessibilityHint = checkbox.accessibilityHint
accessibilityTraits = checkbox.accessibilityTraits
observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
self?.updateAccessibilityLabel()
}
@ -137,9 +139,6 @@
open func updateAccessibilityLabel() {
checkbox.updateAccessibilityLabel()
if let text = label.text {
checkbox.accessibilityLabel?.append(", \(text)")
}
accessibilityLabel = [checkbox.accessibilityLabel, label.text].compactMap { $0 }.joined(separator: ",")
}
}

View File

@ -209,9 +209,6 @@ public typealias ActionBlock = () -> ()
if let newFont = UIFont(name: fontName, size: fontSize ?? standardFontSize) {
font = newFont
}
} else if let fontSize = viewModel.fontSize {
standardFontSize = fontSize
font = textStyle.font.withSize(fontSize)
}
if let color = viewModel.textColor {