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

Visibility matching on SLElement #232

Closed
wants to merge 2 commits into from
Closed

Visibility matching on SLElement #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67f933
Added matchOnlyIfVisible property to SLElement to control matching be…
plantpurecode Jul 10, 2014
c37e7bc
slRecursiveAccessibilityDescription should flag hidden elements
plantpurecode Jul 10, 2014
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
9 changes: 9 additions & 0 deletions Sources/Classes/UIAutomation/User Interface Elements/NSObject+SLAccessibilityDescription.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,18 @@ - (NSString *)slAccessibilityDescription {
if ([traitNames count]) {
[properties addObject:[NSString stringWithFormat:@"traits = (%@)", [traitNames componentsJoinedByString:@", "]]];
}

if (self.isAccessibilityElement) {
[properties addObject:@"accessibilityElement = YES"];
}

if ([self respondsToSelector:@selector(isHidden)]) {
BOOL hidden = [(UIView *)self isHidden];
if (hidden) {
[properties addObject:@"hidden = YES"];
}
}

return [NSString stringWithFormat:@"<%@>", [properties componentsJoinedByString:@"; "]];
}

Expand Down
5 changes: 5 additions & 0 deletions Sources/Classes/UIAutomation/User Interface Elements/SLElement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@
*/
- (void)logElement;

/**
Controls whether an element is only matched when it is not hidden.
*/
@property (nonatomic, assign) BOOL matchOnlyIfVisible;

@end


Expand Down
7 changes: 7 additions & 0 deletions Sources/Classes/UIAutomation/User Interface Elements/SLElement.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ - (BOOL)matchesObject:(NSObject *)object
NSAssert(_matchesObject, @"matchesObject called on %@, which has no _matchesObject predicate", self);
BOOL matchesObject = _matchesObject(object);

// Non-UIView objects are assumed to be "not hidden"
if (self.matchOnlyIfVisible) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'd want to use -[NSObject slAccessibilityIsVisible], and check all objects, here--there are a bunch of reasons why objects, including non-views, might not be visible from both the user's and UIAutomation's perspectives.

(Making this change would cause matchOnlyIfVisible to fail in non-portrait orientations (#135), but would be generally more robust. It would be nice if you could fall back to UIAElement.isVisible as does -[SLElement isVisible] but I'm not sure how you'd do that given that matching takes place on the main thread.)

if ([object respondsToSelector:@selector(isHidden)]) {
matchesObject = matchesObject && ![(UIView *)object isHidden];
}
}

return (matchesObject && [object willAppearInAccessibilityHierarchy]);
}

Expand Down