Skip to content

Implement importantForAccessibility="no-hide-descendants" #9898

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
chiaramooney merged 8 commits into from
Apr 29, 2022
Merged

Implement importantForAccessibility="no-hide-descendants" #9898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c735a11
Implement no-hide-accessibility
chiaramooney Apr 28, 2022
edba8dc
Change files
chiaramooney Apr 28, 2022
e97715e
Merge branch 'main' of https://github.com/microsoft/react-native-wind…
chiaramooney Apr 28, 2022
4bdd4c5
Fix Lint
chiaramooney Apr 28, 2022
df29030
Remove Unneeded Change
chiaramooney Apr 28, 2022
e959d13
Remove Unneeded Change
chiaramooney Apr 28, 2022
5beda8e
Fix Lint
chiaramooney Apr 28, 2022
0651bd2
Cover Touchables
chiaramooney Apr 28, 2022
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
7 changes: 7 additions & 0 deletions change/@office-iss-react-native-win32-2233ce57-16d8-4600-a96d-ce46a11cadde.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Implement no-hide-accessibility",
"packageName": "@office-iss/react-native-win32",
"email": "34109996+chiaramooney@users.noreply.github.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/react-native-windows-454d3cec-b8c1-4e81-b92a-0b747f9ab9ef.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Implement no-hide-accessibility",
"packageName": "react-native-windows",
"email": "34109996+chiaramooney@users.noreply.github.com",
"dependentChangeType": "patch"
}
32 changes: 32 additions & 0 deletions packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,26 @@ const View: React.AbstractComponent<
props.onKeyUpCapture && props.onKeyUpCapture(event);
};

// [Windows
const childrenWithImportantForAccessibility = children => {
return React.Children.map(children, child => {
if (React.isValidElement(child)) {
if (child.props.children) {
return React.cloneElement(child, {
accessible: false,
children: childrenWithImportantForAccessibility(
child.props.children,
),
});
} else {
return React.cloneElement(child, {accessible: false});
}
}
return child;
});
};
// Windows]

return (
// [Windows
// In core this is a TextAncestor.Provider value={false} See
Expand All @@ -94,6 +114,18 @@ const View: React.AbstractComponent<
onKeyDownCapture={_keyDownCapture}
onKeyUp={_keyUp}
onKeyUpCapture={_keyUpCapture}
// [Windows
accessible={
props.importantForAccessibility === 'no-hide-descendants'
? false
: props.accessible
}
children={
props.importantForAccessibility === 'no-hide-descendants'
? childrenWithImportantForAccessibility(props.children)
: props.children
}
// Windows]
/>
);
}}
Expand Down
32 changes: 32 additions & 0 deletions vnext/src/Libraries/Components/View/View.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,26 @@ const View: React.AbstractComponent<
props.onKeyUpCapture && props.onKeyUpCapture(event);
};

// [Windows
const childrenWithImportantForAccessibility = children => {
return React.Children.map(children, child => {
if (React.isValidElement(child)) {
if (child.props.children) {
return React.cloneElement(child, {
accessible: false,
children: childrenWithImportantForAccessibility(
child.props.children,
),
});
} else {
return React.cloneElement(child, {accessible: false});
}
}
return child;
});
};
// Windows]

return (
// [Windows
// In core this is a TextAncestor.Provider value={false} See
Expand All @@ -94,6 +114,18 @@ const View: React.AbstractComponent<
onKeyDownCapture={_keyDownCapture}
onKeyUp={_keyUp}
onKeyUpCapture={_keyUpCapture}
// [Windows
accessible={
props.importantForAccessibility === 'no-hide-descendants'
? false
: props.accessible
}
children={
props.importantForAccessibility === 'no-hide-descendants'
? childrenWithImportantForAccessibility(props.children)
: props.children
}
// Windows]
/>
);
}}
Expand Down