converted to use real time rotor
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
3b9f43d1fd
commit
de2171aedb
@ -23,41 +23,12 @@ extension CustomRotorable {
|
|||||||
accessibilityCustomRotors = (accessibilityCustomRotors ?? []).filter { $0.name != name }
|
accessibilityCustomRotors = (accessibilityCustomRotors ?? []).filter { $0.name != name }
|
||||||
|
|
||||||
//create new rotor
|
//create new rotor
|
||||||
let newRotor = AccessibilityCustomRotor(with: name, for: trait, rootView: self.view)
|
let newRotor = UIAccessibilityCustomRotor(name: name) { [weak self] predicate in
|
||||||
|
guard let self else { return nil }
|
||||||
|
|
||||||
//append rotor
|
let views = self.view.accessibleElements(with: trait)
|
||||||
accessibilityCustomRotors?.append(newRotor)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Loads all of the custom rotors for the screen.
|
guard !views.isEmpty else { return nil }
|
||||||
public func loadCustomRotors() {
|
|
||||||
customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class AccessibilityCustomRotor: UIAccessibilityCustomRotor {
|
|
||||||
var views: [UIView]?
|
|
||||||
var trait: UIAccessibilityTraits
|
|
||||||
weak var rootView: UIView?
|
|
||||||
|
|
||||||
init (with name: String, for trait: UIAccessibilityTraits, rootView: UIView){
|
|
||||||
self.rootView = rootView
|
|
||||||
self.trait = trait
|
|
||||||
super.init(name: name, itemSearch: { _ in return nil })
|
|
||||||
self.updateSearch()
|
|
||||||
}
|
|
||||||
|
|
||||||
func updateSearch() {
|
|
||||||
itemSearchBlock = { [weak self] predicate in
|
|
||||||
|
|
||||||
guard let self, let rootView = self.rootView else { return nil }
|
|
||||||
|
|
||||||
//create the view accessibleElements cache if it doesn't exist
|
|
||||||
if self.views == nil {
|
|
||||||
self.views = rootView.accessibleElements(with: trait)
|
|
||||||
}
|
|
||||||
|
|
||||||
guard let views = self.views, !views.isEmpty else { return nil }
|
|
||||||
|
|
||||||
let currentIndex = views.firstIndex(where: { $0 === predicate.currentItem.targetElement })
|
let currentIndex = views.firstIndex(where: { $0 === predicate.currentItem.targetElement })
|
||||||
let count = views.count
|
let count = views.count
|
||||||
@ -88,6 +59,14 @@ private class AccessibilityCustomRotor: UIAccessibilityCustomRotor {
|
|||||||
|
|
||||||
return UIAccessibilityCustomRotorItemResult(targetElement: views[nextIndex], targetRange: nil)
|
return UIAccessibilityCustomRotorItemResult(targetElement: views[nextIndex], targetRange: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//append rotor
|
||||||
|
accessibilityCustomRotors?.append(newRotor)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Loads all of the custom rotors for the screen.
|
||||||
|
public func loadCustomRotors() {
|
||||||
|
customRotors.forEach { addCustomRotor(with: $0.name, for: $0.trait) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user