-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Allow UIView subviews to be a part of Accessibility Tree #2111
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
e3391ff
3666ff0
b90a2e9
32f2a36
1d4d838
1503ad4
1a3ec29
ee481aa
86b55b9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
// swift-tools-version: 6.0 | ||
// The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
||
import PackageDescription | ||
|
||
let headersSearchPath: [CSetting] = [ | ||
.headerSearchPath("."), | ||
.headerSearchPath("Base"), | ||
.headerSearchPath("Debug"), | ||
.headerSearchPath("Details"), | ||
.headerSearchPath("Details/Transactions"), | ||
.headerSearchPath("Layout"), | ||
.headerSearchPath("Private"), | ||
.headerSearchPath("Private/Layout"), | ||
.headerSearchPath("TextExperiment/Component"), | ||
.headerSearchPath("TextExperiment/String"), | ||
.headerSearchPath("TextExperiment/Utility"), | ||
.headerSearchPath("TextKit"), | ||
.headerSearchPath("tvOS"), | ||
] | ||
|
||
let package = Package( | ||
name: "Texture", | ||
products: [ | ||
.library( | ||
name: "Texture", | ||
targets: ["Texture"] | ||
), | ||
], | ||
targets: [ | ||
.target( | ||
name: "Texture", | ||
path: "Source", | ||
publicHeadersPath: ".", | ||
cSettings: headersSearchPath | ||
) | ||
] | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
PODS: | ||
- iOSSnapshotTestCase/Core (8.0.0) | ||
- OCMock (3.9.4) | ||
|
||
DEPENDENCIES: | ||
- iOSSnapshotTestCase/Core (~> 8.0) | ||
- OCMock (~> 3.9) | ||
|
||
SPEC REPOS: | ||
trunk: | ||
- iOSSnapshotTestCase | ||
- OCMock | ||
|
||
SPEC CHECKSUMS: | ||
iOSSnapshotTestCase: a670511f9ee3829c2b9c23e6e68f315fd7b6790f | ||
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74 | ||
|
||
PODFILE CHECKSUM: 3b874fa5a23281754f91a64090a82ef01ee76cc7 | ||
|
||
COCOAPODS: 1.15.2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -220,6 +220,11 @@ static BOOL nodeIsHiddenFromAcessibility(ASDisplayNode *node) { | |
return node.isHidden || node.alpha == 0.0 || node.accessibilityElementsHidden; | ||
} | ||
|
||
/// returns YES if this view should be considered "hidden" from the screen reader. | ||
static BOOL viewIsHiddenFromAcessibility(UIView *view) { | ||
return view.isHidden || view.alpha == 0.0 || view.accessibilityElementsHidden; | ||
} | ||
|
||
/// Collect all accessibliity elements for a given view and view node | ||
static void CollectAccessibilityElements(ASDisplayNode *node, NSMutableArray *elements) | ||
{ | ||
|
@@ -302,6 +307,36 @@ static void CollectAccessibilityElements(ASDisplayNode *node, NSMutableArray *el | |
[elements addObject:subnode.view]; | ||
} | ||
} | ||
|
||
if (modalSubnode) { | ||
return; | ||
} | ||
|
||
NSArray *subviews = view.subviews; | ||
for (UIView *subview in subviews) { | ||
// If a view is is already added then skip it | ||
if ([elements containsObject:subview]) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We are looping over subviews and elements for each subview. It would be more efficient to put the elements in a set so lookup is O(1), or use a smart diff algorithm to get only the subviews not in elements and iterate over those.
|
||
continue; | ||
} | ||
|
||
// If a view is hidden or has an alpha of 0.0 we should not include it | ||
if (viewIsHiddenFromAcessibility(subview)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is cheaper than iterating over |
||
continue; | ||
} | ||
|
||
// If a subview is outside of the view's window, exclude it UNLESS it is a subview of an UIScrollView. | ||
// In this case UIKit will return the element even if it is outside of the window or the scrollView's visible rect (contentOffset + contentSize) | ||
CGRect viewInWindowCoords = [node convertRect:subview.frame toNode:nil]; | ||
if (!CGRectIntersectsRect(view.window.frame, viewInWindowCoords) && !recusivelyCheckSuperviewsForScrollView(view)) { | ||
continue; | ||
} | ||
|
||
if (subview.isAccessibilityElement) { | ||
[elements addObject:subview]; | ||
} else if (subview.accessibilityElementCount > 0) { | ||
[elements addObject:subview]; | ||
} | ||
} | ||
} | ||
|
||
@implementation _ASDisplayView (UIAccessibilityContainer) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a long complicated method. It is quite possible that in the future someone will add to it, likely at the end of the method. This early return could cause newly added logic to be skipped. To protect against that, I'd prefer you put your logic inside of an if and not early return: