Skip to content

Commit eba0afc

Browse files
Integrate 81.5 to 81 stable (#15470)
* Integrate 81.5 * resolve conflicts * lint issue fix * Change to 0.81.5 versions manually * updated lock file * Change files * Override SwitchNativeComponent * Update codegen version * updated View snapshot * Revert changes of Meta and lint fix * update snapshots
1 parent 372114a commit eba0afc

File tree

42 files changed

+6547
-6571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+6547
-6571
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate 81.5",
4+
"packageName": "@office-iss/react-native-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate 81.5",
4+
"packageName": "@react-native-windows/automation-channel",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Integrate 81.5",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/@office-iss/react-native-win32-tester/overrides.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.81.0-rc.0",
8+
"baseVersion": "0.81.5",
99
"overrides": [
1010
{
1111
"type": "patch",

packages/@office-iss/react-native-win32-tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"peerDependencies": {
2020
"@office-iss/react-native-win32": "0.81.0-preview.5",
2121
"react": "19.1.0",
22-
"react-native": "0.81.0"
22+
"react-native": "0.81.5"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "0.81.0-preview.5",
@@ -30,7 +30,7 @@
3030
"@types/node": "^22.14.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.81.0-rc.0",
33+
"react-native": "0.81.5",
3434
"react-native-platform-override": "0.81.0-preview.10",
3535
"typescript": "5.0.4"
3636
},

packages/@office-iss/react-native-win32/.flowconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
.*/*[.]macos.js
66
.*/*[.]windesktop.js
77

8+
; Ignore all flow directory contents in node_modules
9+
.*/flow/.*
10+
811
; Ignore fb_internal modules
912
<PROJECT_ROOT>/packages/react-native/src/fb_internal/.*
1013

packages/@office-iss/react-native-win32/overrides.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.81.0-rc.0",
10+
"baseVersion": "0.81.5",
1111
"overrides": [
1212
{
1313
"type": "derived",
@@ -114,7 +114,7 @@
114114
"type": "derived",
115115
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
116116
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
117-
"baseHash": "b6289ef53abc941f6f0aed50f80d3852b6682215"
117+
"baseHash": "6ead80870e2e165d1f5ea0fa48f2c6c647ccfa5b"
118118
},
119119
{
120120
"type": "patch",
@@ -177,7 +177,7 @@
177177
"type": "patch",
178178
"file": "src-win/Libraries/Components/View/View.win32.js",
179179
"baseFile": "packages/react-native/Libraries/Components/View/View.js",
180-
"baseHash": "83a4fc8e982845619abb121bb860ad63366260c7"
180+
"baseHash": "455c75f23e4fc099376cc8cc37016ac1fa09ed66"
181181
},
182182
{
183183
"type": "derived",

packages/@office-iss/react-native-win32/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
"@react-native-community/cli-platform-android": "17.0.0",
3131
"@react-native-community/cli-platform-ios": "17.0.0",
3232
"@react-native/assets": "1.0.0",
33-
"@react-native/assets-registry": "0.81.0",
34-
"@react-native/codegen": "0.81.0",
35-
"@react-native/community-cli-plugin": "0.81.0",
36-
"@react-native/gradle-plugin": "0.81.0",
37-
"@react-native/js-polyfills": "0.81.0",
38-
"@react-native/normalize-colors": "0.81.0",
39-
"@react-native/virtualized-lists": "0.81.0",
33+
"@react-native/assets-registry": "0.81.5",
34+
"@react-native/codegen": "0.81.5",
35+
"@react-native/community-cli-plugin": "0.81.5",
36+
"@react-native/gradle-plugin": "0.81.5",
37+
"@react-native/js-polyfills": "0.81.5",
38+
"@react-native/normalize-colors": "0.81.5",
39+
"@react-native/virtualized-lists": "0.81.5",
4040
"abort-controller": "^3.0.0",
4141
"anser": "^1.4.9",
4242
"ansi-regex": "^5.0.0",
@@ -72,7 +72,7 @@
7272
"devDependencies": {
7373
"@babel/core": "^7.25.2",
7474
"@babel/eslint-parser": "^7.25.1",
75-
"@react-native/metro-config": "0.81.0",
75+
"@react-native/metro-config": "0.81.5",
7676
"@rnw-scripts/babel-react-native-config": "0.0.0",
7777
"@rnw-scripts/eslint-config": "1.2.37",
7878
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.41",
@@ -88,14 +88,14 @@
8888
"just-scripts": "^1.3.3",
8989
"prettier": "2.8.8",
9090
"react": "19.1.0",
91-
"react-native": "0.81.0-rc.0",
91+
"react-native": "0.81.5",
9292
"react-native-platform-override": "0.81.0-preview.10",
9393
"typescript": "5.0.4"
9494
},
9595
"peerDependencies": {
9696
"@types/react": "^19.1.0",
9797
"react": "^19.1.0",
98-
"react-native": "0.81.0"
98+
"react-native": "0.81.5"
9999
},
100100
"beachball": {
101101
"defaultNpmTag": "preview",

packages/@office-iss/react-native-win32/src-win/Libraries/Components/TextInput/TextInput.win32.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,9 @@ function InternalTextInput(props: TextInputProps): React.Node {
721721
props.onKeyUpCapture && props.onKeyUpCapture(event);
722722
};
723723

724+
const _accessibilityLabel =
725+
props?.['aria-label'] ?? props?.accessibilityLabel;
726+
724727
let _accessibilityState;
725728
if (
726729
accessibilityState != null ||
@@ -789,6 +792,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
789792
{...otherProps}
790793
{...eventHandlers}
791794
acceptDragAndDropTypes={props.experimental_acceptDragAndDropTypes}
795+
accessibilityLabel={_accessibilityLabel}
792796
accessibilityErrorMessage={accessibilityErrorMessage}
793797
accessibilityState={_accessibilityState}
794798
accessible={accessible}
@@ -853,6 +857,7 @@ function InternalTextInput(props: TextInputProps): React.Node {
853857
{...otherProps}
854858
{...colorProps}
855859
{...eventHandlers}
860+
accessibilityLabel={_accessibilityLabel}
856861
accessibilityErrorMessage={accessibilityErrorMessage}
857862
accessibilityState={_accessibilityState}
858863
accessibilityLabelledBy={_accessibilityLabelledBy}

packages/@react-native-windows/automation-channel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"just-scripts": "^1.3.2",
3333
"prettier": "2.8.8",
3434
"react": "19.1.0",
35-
"react-native": "0.81.0-rc.0",
35+
"react-native": "0.81.5",
3636
"react-native-windows": "0.81.0-preview.10",
3737
"typescript": "5.0.4"
3838
},

0 commit comments

Comments
 (0)