-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Accessibility and UIA Support for XAML Fabric implementation #15466
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
Open
protikbiswas100
wants to merge
6
commits into
microsoft:main
Choose a base branch
from
protikbiswas100:user/protikbiswas100/15325-accessibility
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9a3dd3d
accessibility and UIA support
0b9a7f2
adding lint and formatting fix
d973ebb
adding accessibility and UIA support for XAML fabric
7275ba0
Change files
11cdc69
Merge branch 'main' into user/protikbiswas100/15325-accessibility
protikbiswas100 9623af8
Merge branch 'main' into user/protikbiswas100/15325-accessibility
protikbiswas100 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
7 changes: 7 additions & 0 deletions
7
change/react-native-windows-0b14d2b4-ff2a-4e94-95f7-bc04edf1a1e4.json
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "adding accessibility and UIA support for XAML fabric", | ||
| "packageName": "react-native-windows", | ||
| "email": "[email protected]", | ||
| "dependentChangeType": "patch" | ||
| } |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -125,6 +125,27 @@ bool ContentIslandComponentView::focusable() const noexcept { | |
| return true; | ||
| } | ||
|
|
||
| facebook::react::Tag ContentIslandComponentView::hitTest( | ||
| facebook::react::Point pt, | ||
| facebook::react::Point &localPt, | ||
| bool ignorePointerEvents) const noexcept { | ||
| facebook::react::Point ptLocal{pt.x - m_layoutMetrics.frame.origin.x, pt.y - m_layoutMetrics.frame.origin.y}; | ||
|
|
||
| // Check if the point is within the bounds of this ContentIslandComponentView. | ||
| // This ensures that hit tests correctly return this view's tag for UIA purposes, | ||
|
Contributor
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. Is this function ("hitTest") only called for UIA, or can it be called for other reasons?
Contributor
Author
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. hitTest is called for multiple purposes, not just UIA:
|
||
| // even when the actual content (XAML buttons, etc.) is hosted in the ContentIsland. | ||
| auto props = viewProps(); | ||
| if ((ignorePointerEvents || props->pointerEvents == facebook::react::PointerEventsMode::Auto || | ||
| props->pointerEvents == facebook::react::PointerEventsMode::BoxOnly) && | ||
| ptLocal.x >= 0 && ptLocal.x <= m_layoutMetrics.frame.size.width && ptLocal.y >= 0 && | ||
| ptLocal.y <= m_layoutMetrics.frame.size.height) { | ||
| localPt = ptLocal; | ||
| return Tag(); | ||
| } | ||
|
|
||
| return -1; | ||
| } | ||
|
|
||
| // Helper to convert a FocusNavigationDirection to a FocusNavigationReason. | ||
| winrt::Microsoft::UI::Input::FocusNavigationReason GetFocusNavigationReason( | ||
| winrt::Microsoft::ReactNative::FocusNavigationDirection direction) noexcept { | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
Is it possible there's a scale or other transform that needs to be applied?
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.
Yes, this is a valid concern. The hitTest method should consider the scale/transform. Looking at the ViewComponentView::hitTest implementation, it correctly handles the origin offset