-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
A11y for scrollnode #1188
Merged
Merged
A11y for scrollnode #1188
Changes from 33 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 2918ea0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 9c42266
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 329f35f
Fix to make rangeMode update in right time
wsdwsd0829 5f8b7ec
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 d87bb11
merge master from upstream
wsdwsd0829 269c2ab
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 24c1ce8
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 233169e
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b19f90d
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b50cec4
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b75a5f3
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 64b46e0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 5fabc1e
remove uncessary assert
wsdwsd0829 3d5b84b
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 098b978
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 77eefd6
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 0310ed7
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 0b886de
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 a63d438
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 06e18a1
Fix collection cell editing bug for iOS 9 & 10
wsdwsd0829 918434d
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 41d3680
Revert "Fix collection cell editing bug for iOS 9 & 10"
wsdwsd0829 34833a3
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 8d82d21
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 f02d47c
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 dfe9123
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 1a6298c
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 820bc11
Add a11y support for ASSCrollNode.
wsdwsd0829 462f825
Changelog
wsdwsd0829 4bd3754
Clean up.
wsdwsd0829 df78e3d
fix braces
wsdwsd0829 55b2b1b
Merge branch 'master' into a11y-for-scrollnode
wsdwsd0829 fb91a89
add test
wsdwsd0829 d8e1d58
merge upstream
wsdwsd0829 df0e6e0
merge Changelog
wsdwsd0829 1a91b7a
disable for ci
wsdwsd0829 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,7 +131,7 @@ static void CollectUIAccessibilityElementsForNode(ASDisplayNode *node, ASDisplay | |
}); | ||
} | ||
|
||
static void CollectAccessibilityElementsForContainer(ASDisplayNode *container, _ASDisplayView *view, NSMutableArray *elements) { | ||
static void CollectAccessibilityElementsForContainer(ASDisplayNode *container, UIView *view, NSMutableArray *elements) { | ||
UIAccessibilityElement *accessiblityElement = [ASAccessibilityElement accessibilityElementWithContainer:view node:container containerNode:container]; | ||
|
||
NSMutableArray<ASAccessibilityElement *> *labeledNodes = [[NSMutableArray alloc] init]; | ||
|
@@ -195,7 +195,7 @@ static void CollectAccessibilityElementsForContainer(ASDisplayNode *container, _ | |
} | ||
|
||
/// Collect all accessibliity elements for a given view and view node | ||
static void CollectAccessibilityElementsForView(_ASDisplayView *view, NSMutableArray *elements) | ||
static void CollectAccessibilityElementsForView(UIView *view, NSMutableArray *elements) | ||
{ | ||
ASDisplayNodeCAssertNotNil(elements, @"Should pass in a NSMutableArray"); | ||
|
||
|
@@ -258,17 +258,27 @@ - (NSArray *)accessibilityElements | |
if (viewNode == nil) { | ||
return @[]; | ||
} | ||
|
||
if (_accessibilityElements == nil) { | ||
NSMutableArray *accessibilityElements = [[NSMutableArray alloc] init]; | ||
CollectAccessibilityElementsForView(self, accessibilityElements); | ||
SortAccessibilityElements(accessibilityElements); | ||
_accessibilityElements = accessibilityElements; | ||
_accessibilityElements = [viewNode accessibilityElements]; | ||
} | ||
|
||
return _accessibilityElements; | ||
} | ||
|
||
@end | ||
|
||
@implementation ASDisplayNode (AccessibilityInternal) | ||
|
||
- (NSArray *)accessibilityElements { | ||
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. Braces on new line |
||
if (!self.isNodeLoaded) { | ||
ASDisplayNodeFailAssert(@"Cannot access accessibilityElements since node is not loaded"); | ||
return @[]; | ||
} | ||
NSMutableArray *accessibilityElements = [[NSMutableArray alloc] init]; | ||
CollectAccessibilityElementsForView(self.view, accessibilityElements); | ||
SortAccessibilityElements(accessibilityElements); | ||
return accessibilityElements; | ||
} | ||
|
||
@end | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Braces on newline