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.

Sign up for GitHub

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

Jump to bottom

[ASDisplayViewAccessibility] A few accessibility improvements #1812

Merged
merged 9 commits into from
May 6, 2020
Merged

[ASDisplayViewAccessibility] A few accessibility improvements #1812

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
36d3fe0
[ASDisplayViewAccessibility] A few accessibility improvements
rcancro May 5, 2020
bbbd4f8
fix tests
rcancro May 5, 2020
d3776b9
remove conditional in accessibility sort
rcancro May 5, 2020
666e9fc
try to fix the test on github
rcancro May 5, 2020
493ce02
comparator name change/ tweak test
rcancro May 5, 2020
8140403
just making the build run again.
rcancro May 5, 2020
c32f52a
again
rcancro May 6, 2020
3b2ba27
added new exp to configuartion.json and ASConfigurationsTests
rcancro May 6, 2020
cb8bd02
Huy’s comments
rcancro May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Source/Details/_ASDisplayViewAccessiblity.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@

#pragma mark - UIAccessibilityElement

static ASSortAccessibilityElementsComparator _userDefinedComparator = nil;
static ASSortAccessibilityElementsComparator currentAccessibilityComparator = nil;
static ASSortAccessibilityElementsComparator defaultComparator = nil;
rcancro marked this conversation as resolved.
Show resolved Hide resolved

void setUserDefinedAccessibilitySortComparator(ASSortAccessibilityElementsComparator userDefinedComparator) {
_userDefinedComparator = userDefinedComparator;
currentAccessibilityComparator = userDefinedComparator ?: defaultComparator;
}

/// Sort accessiblity elements first by y and than by x origin.
void SortAccessibilityElements(NSMutableArray *elements)
{
ASDisplayNodeCAssertNotNil(elements, @"Should pass in a NSMutableArray");

static ASSortAccessibilityElementsComparator defaultComparator = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
defaultComparator = ^NSComparisonResult(NSObject *a, NSObject *b) {
Expand All @@ -55,13 +56,13 @@ void SortAccessibilityElements(NSMutableArray *elements)
}
return (originA.y < originB.y) ? NSOrderedAscending : NSOrderedDescending;
};

if (!currentAccessibilityComparator) {
currentAccessibilityComparator = defaultComparator;
}
});

if (_userDefinedComparator) {
[elements sortUsingComparator:_userDefinedComparator];
} else {
[elements sortUsingComparator:defaultComparator];
}
[elements sortUsingComparator:currentAccessibilityComparator];
}

static CGRect ASAccessibilityFrameForNode(ASDisplayNode *node) {
Expand Down