Skip to content

Preserve unset accessibilityState.selected in C++ props (#58599) #58599

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

Closed
crazeface wants to merge 1 commit into from
Closed

Preserve unset accessibilityState.selected in C++ props (#58599) #58599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions packages/react-native/Libraries/Components/Pressable/__tests__/Pressable-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
backgroundColor="rgba(0, 0, 255, 1)"
borderWidth="3"
height="50"
Expand All @@ -70,7 +70,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
backgroundColor="rgba(128, 128, 128, 1)"
/>,
);
Expand Down Expand Up @@ -134,7 +134,7 @@ describe('<Pressable>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -148,7 +148,7 @@ describe('<Pressable>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -164,7 +164,7 @@ describe('<Pressable>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
});

Expand All @@ -183,7 +183,7 @@ describe('<Pressable>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});
});
Expand All @@ -201,7 +201,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
/>,
);
});
Expand All @@ -223,7 +223,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
/>,
);
});
Expand All @@ -245,7 +245,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
/>,
);
});
Expand All @@ -270,7 +270,7 @@ describe('<Pressable>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}">
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}">
<rn-paragraph
allowFontScaling="true"
ellipsizeMode="tail"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/Components/Switch/__tests__/Switch-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('Switch', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-androidSwitch accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-androidSwitch accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand Down
10 changes: 5 additions & 5 deletions packages/react-native/Libraries/Components/Touchable/__tests__/TouchableHighlight-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ describe('<TouchableHighlight>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -303,7 +303,7 @@ describe('<TouchableHighlight>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -323,7 +323,7 @@ describe('<TouchableHighlight>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
});

Expand All @@ -343,7 +343,7 @@ describe('<TouchableHighlight>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -367,7 +367,7 @@ describe('<TouchableHighlight>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);

const element = nullthrows(elementRef.current);
Expand Down
12 changes: 6 additions & 6 deletions ...es/react-native/Libraries/Components/Touchable/__tests__/TouchableNativeFeedback-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(root.getRenderedOutput().toJSX()).toEqual(
<rn-view
accessible="true"
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
/>,
);
});
Expand All @@ -75,7 +75,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -93,7 +93,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -113,7 +113,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
});

Expand All @@ -133,7 +133,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -153,7 +153,7 @@ describe('<TouchableNativeFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}" />,
);
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/Libraries/Components/Touchable/__tests__/TouchableOpacity-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ describe('<TouchableOpacity>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -171,7 +171,7 @@ describe('<TouchableOpacity>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});
});
Expand Down
8 changes: 4 additions & 4 deletions ...s/react-native/Libraries/Components/Touchable/__tests__/TouchableWithoutFeedback-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('<TouchableWithoutFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -81,7 +81,7 @@ describe('<TouchableWithoutFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -101,7 +101,7 @@ describe('<TouchableWithoutFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
});

Expand All @@ -121,7 +121,7 @@ describe('<TouchableWithoutFeedback>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});
});
Expand Down
16 changes: 8 additions & 8 deletions packages/react-native/Libraries/Components/View/__tests__/View-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:None,busy:true,expanded:null}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:None,busy:true,expanded:null}" />,
);
});

Expand All @@ -866,7 +866,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:None,busy:true,expanded:null}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:None,busy:true,expanded:null}" />,
);
Fantom.runTask(() => {
root.render(<View accessible={true} />);
Expand All @@ -888,7 +888,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
});

Expand All @@ -900,7 +900,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:true,selected:false,checked:None,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:true,selected:null,checked:None,busy:false,expanded:null}" />,
);
Fantom.runTask(() => {
root.render(<View accessible={true} />);
Expand All @@ -922,7 +922,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:true}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:true}" />,
);
});

Expand All @@ -934,7 +934,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:true}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:true}" />,
);
Fantom.runTask(() => {
root.render(<View accessible={true} />);
Expand Down Expand Up @@ -990,7 +990,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
});

Expand All @@ -1002,7 +1002,7 @@ describe('<View>', () => {
expect(
root.getRenderedOutput({props: ['accessibilityState']}).toJSX(),
).toEqual(
<rn-view accessibilityState="{disabled:false,selected:false,checked:Checked,busy:false,expanded:null}" />,
<rn-view accessibilityState="{disabled:false,selected:null,checked:Checked,busy:false,expanded:null}" />,
);
Fantom.runTask(() => {
root.render(<View accessible={true} />);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/LogBox/UI/__tests__/__snapshots__/LogBoxButton-itest.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`LogBoxButton should render Pressable and pass through props 1`] = `
<rn-view
accessibilityState="{disabled:false,selected:false,checked:None,busy:false,expanded:null}"
accessibilityState="{disabled:false,selected:null,checked:None,busy:false,expanded:null}"
accessible="true"
backgroundColor="rgba(0, 0, 0, 1)"
>
Expand Down
Loading
Loading