Fix WKWebView Accessibility by ZevEisenberg · Pull Request #1955 · TextureGroup/Texture · GitHub
Skip to content

Fix WKWebView Accessibility #1955

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

Merged
garrettmoon merged 7 commits into from
Feb 3, 2021
Merged

Fix WKWebView Accessibility #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee94fd3
Return nil instead of empty array when no accessibility elements are …
ZevEisenberg Jan 26, 2021
a4e923b
Use nullability annotations to fix static analyzer warnings.
ZevEisenberg Jan 27, 2021
33e7961
Add UI test target.
ZevEisenberg Jan 27, 2021
403af66
Add UI test to make sure web view stays accessible.
ZevEisenberg Jan 27, 2021
976f74d
Revert "Add UI test to make sure web view stays accessible."
ZevEisenberg Feb 2, 2021
36f0d90
Revert "Add UI test target."
ZevEisenberg Feb 2, 2021
f565a0d
Add unit test to make sure accessibility elements are correct when a …
ZevEisenberg Feb 2, 2021
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
4 changes: 4 additions & 0 deletions AsyncDisplayKit.xcodeproj/project.pbxproj
View file
Open in desktop
12 changes: 7 additions & 5 deletions Source/Details/_ASDisplayViewAccessiblity.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ @implementation _ASDisplayView (UIAccessibilityContainer)

#pragma mark - UIAccessibility

- (void)setAccessibilityElements:(NSArray *)accessibilityElements
- (void)setAccessibilityElements:(nullable NSArray *)accessibilityElements
{
ASDisplayNodeAssertMainThread();
// While it looks very strange to ignore the accessibilyElements param and set _accessibilityElements to nil, it is actually on purpose.
Expand All @@ -331,7 +331,7 @@ - (void)setAccessibilityElements:(NSArray *)accessibilityElements
_accessibilityElements = nil;
}

- (NSArray *)accessibilityElements
- (nullable NSArray *)accessibilityElements
{
ASDisplayNodeAssertMainThread();

Expand All @@ -352,7 +352,7 @@ - (NSArray *)accessibilityElements

@implementation ASDisplayNode (AccessibilityInternal)

- (NSArray *)accessibilityElements
- (nullable NSArray *)accessibilityElements
{
// NSObject implements the informal accessibility protocol. This means that all ASDisplayNodes already have an accessibilityElements
// property. If an ASDisplayNode subclass has explicitly set the property, let's use that instead of traversing the node tree to try
Expand All @@ -364,12 +364,14 @@ - (NSArray *)accessibilityElements

if (!self.isNodeLoaded) {
ASDisplayNodeFailAssert(@"Cannot access accessibilityElements since node is not loaded");
return @[];
return nil;
}
NSMutableArray *accessibilityElements = [[NSMutableArray alloc] init];
CollectAccessibilityElements(self, accessibilityElements);
SortAccessibilityElements(accessibilityElements);
return accessibilityElements;
// If we did not find any accessibility elements, return nil instead of empty array. This allows a WKWebView within the node
// to participate in accessibility.
return accessibilityElements.count == 0 ? nil : accessibilityElements;
}

@end
Expand Down
2 changes: 1 addition & 1 deletion Source/Private/ASDisplayNode+FrameworkPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ NS_INLINE UIAccessibilityTraits ASInteractiveAccessibilityTraitsMask() {
}

@interface ASDisplayNode (AccessibilityInternal)
- (NSArray *)accessibilityElements;
- (nullable NSArray *)accessibilityElements;
@end;

@interface UIView (ASDisplayNodeInternal)
Expand Down
29 changes: 29 additions & 0 deletions Tests/ASDisplayViewAccessibilityTests.mm
View file
Open in desktop