Skip to content

Realign view.js #15310

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
merged 6 commits into from
Nov 5, 2025
Merged

Realign view.js #15310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
690aade
Realign View.js with upstream
acoates-ms Nov 5, 2025
0f8d110
Change files
acoates-ms Nov 5, 2025
0e75a19
Merge remote-tracking branch 'upstream/main' into realignView.js
acoates-ms Nov 5, 2025
8757527
fix
acoates-ms Nov 5, 2025
906a393
fix
acoates-ms Nov 5, 2025
5be4113
update snapshots
acoates-ms Nov 5, 2025
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/react-native-windows-d2576e88-05d8-4466-8174-cde30184796a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Realign View.js with upstream",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
16 changes: 16 additions & 0 deletions packages/e2e-test-app-fabric/test/__snapshots__/AccessibilityTest.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ exports[`Accessibility Tests Accessibility data for Label and Level 1`] = `
"HeadingLevel": 80052,
"Level": 2,
"LocalizedControlType": "text",
"Name": "A hint for the red box.",
},
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "A hint for the red box.",
"TestId": "accessibility-base-view-2",
},
},
Expand Down Expand Up @@ -44,10 +46,12 @@ exports[`Accessibility Tests Accessibility data for Label,Level and Hint 1`] = `
"ItemType": "comment",
"Level": 1,
"LocalizedControlType": "text",
"Name": "A blue box",
},
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "A blue box",
"TestId": "accessibility-base-view-1",
},
},
Expand Down Expand Up @@ -219,6 +223,7 @@ exports[`Accessibility Tests Elements can set accessibilityState:selected to fal
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Selectable item 1",
"__Children": [
{
"AutomationId": "",
Expand All @@ -232,6 +237,7 @@ exports[`Accessibility Tests Elements can set accessibilityState:selected to fal
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selectable item 1",
"TestId": "Selectable item 1",
},
"__Children": [
Expand Down Expand Up @@ -275,6 +281,7 @@ exports[`Accessibility Tests Elements can set accessibilityState:selected to tru
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Selectable item 1",
"SelectionItemPattern.IsSelected": true,
"__Children": [
{
Expand All @@ -289,6 +296,7 @@ exports[`Accessibility Tests Elements can set accessibilityState:selected to tru
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selectable item 1",
"TestId": "Selectable item 1",
},
"__Children": [
Expand Down Expand Up @@ -331,6 +339,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
"AutomationId": "selection-container",
"ControlType": 50026,
"LocalizedControlType": "group",
"Name": "Selection Container",
"SelectionPattern.CanSelectMultiple": true,
"SelectionPattern.IsSelectionRequired": true,
"__Children": [
Expand All @@ -345,6 +354,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Selectable item 1",
"__Children": [
{
"AutomationId": "",
Expand All @@ -360,6 +370,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Selectable item 2",
"__Children": [
{
"AutomationId": "",
Expand All @@ -375,6 +386,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Selectable item 3",
"__Children": [
{
"AutomationId": "",
Expand All @@ -392,6 +404,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selection Container",
"TestId": "selection-container",
},
"__Children": [
Expand All @@ -408,6 +421,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selectable item 1",
"TestId": "Selectable item 1",
},
"__Children": [
Expand All @@ -420,6 +434,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selectable item 2",
"TestId": "Selectable item 2",
},
"__Children": [
Expand All @@ -432,6 +447,7 @@ exports[`Accessibility Tests Selectable items must have a Selection Container. E
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Selectable item 3",
"TestId": "Selectable item 3",
},
"__Children": [
Expand Down
26 changes: 26 additions & 0 deletions packages/e2e-test-app-fabric/test/__snapshots__/ButtonComponentTest.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ exports[`Button Tests Buttons can be disabled 1`] = `
"ControlType": 50000,
"IsEnabled": false,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -21,6 +22,7 @@ exports[`Button Tests Buttons can be disabled 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "disabled_button",
},
"__Children": [
Expand Down Expand Up @@ -154,6 +156,7 @@ exports[`Button Tests Buttons can have accessibility labels 1`] = `
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -167,6 +170,7 @@ exports[`Button Tests Buttons can have accessibility labels 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "accessibilityLabel_button",
},
"__Children": [
Expand Down Expand Up @@ -301,6 +305,7 @@ exports[`Button Tests Buttons can have accessibility props 1`] = `
"HelpText": "Submit Button",
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -314,6 +319,7 @@ exports[`Button Tests Buttons can have accessibility props 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "accessibility_props",
},
"__Children": [
Expand Down Expand Up @@ -429,6 +435,7 @@ exports[`Button Tests Buttons can have accessibility states 1`] = `
"ControlType": 50000,
"IsEnabled": false,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -443,6 +450,7 @@ exports[`Button Tests Buttons can have accessibility states 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "accessibilityState_button",
},
"__Children": [
Expand Down Expand Up @@ -576,6 +584,7 @@ exports[`Button Tests Buttons can have custom colors 1`] = `
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to cancel your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -589,6 +598,7 @@ exports[`Button Tests Buttons can have custom colors 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to cancel your application!",
"TestId": "cancel_button",
},
"__Children": [
Expand Down Expand Up @@ -721,6 +731,7 @@ exports[`Button Tests Buttons can have custom focusable and accessible props 1`]
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "accessible_false_button",
},
"__Children": [
Expand Down Expand Up @@ -836,6 +847,7 @@ exports[`Button Tests Buttons can have custom focusable and accessible props 2`]
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -849,6 +861,7 @@ exports[`Button Tests Buttons can have custom focusable and accessible props 2`]
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "focusable_false_button",
},
"__Children": [
Expand Down Expand Up @@ -963,6 +976,7 @@ exports[`Button Tests Buttons can have custom focusable and accessible props 3`]
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "accessible_focusable_false_button",
},
"__Children": [
Expand Down Expand Up @@ -1083,6 +1097,7 @@ exports[`Button Tests Buttons can have flexbox styling 1`] = `
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to cancel your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1098,6 +1113,7 @@ exports[`Button Tests Buttons can have flexbox styling 1`] = `
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1119,6 +1135,7 @@ exports[`Button Tests Buttons can have flexbox styling 1`] = `
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to cancel your application!",
"TestId": "two_cancel_button",
},
"__Children": [
Expand All @@ -1135,6 +1152,7 @@ exports[`Button Tests Buttons can have flexbox styling 1`] = `
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "two_submit_button",
},
"__Children": [
Expand Down Expand Up @@ -1407,6 +1425,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to cancel your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1422,6 +1441,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to save your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1437,6 +1457,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1458,6 +1479,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to cancel your application!",
"TestId": "three_cancel_button",
},
"__Children": [
Expand All @@ -1474,6 +1496,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to save your application!",
"TestId": "three_save_button",
},
"__Children": [
Expand All @@ -1490,6 +1513,7 @@ exports[`Button Tests Buttons can have flexbox styling with three buttons 1`] =
{
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "three_submit_button",
},
"__Children": [
Expand Down Expand Up @@ -1874,6 +1898,7 @@ exports[`Button Tests Buttons have default styling 1`] = `
"ControlType": 50000,
"IsKeyboardFocusable": true,
"LocalizedControlType": "button",
"Name": "Press to submit your application!",
"__Children": [
{
"AutomationId": "",
Expand All @@ -1887,6 +1912,7 @@ exports[`Button Tests Buttons have default styling 1`] = `
"Component Tree": {
"Type": "Microsoft.ReactNative.Composition.ViewComponentView",
"_Props": {
"AccessibilityLabel": "Press to submit your application!",
"TestId": "button_default_styling",
},
"__Children": [
Expand Down
Loading
Loading