Skip to content

Commit 6efa6bf

Browse files
YajurGvmoroz
andauthored
Integrate RN Nightly 10/16 (#12532)
* Change files * testing 10/10 * fixed change files * fixed include * yoga fix * integrated 10/12 * uimanager changes * integrate 10/13 * disabled prop change * integrate 10/14 * integrate 10/15 * integrate 10/16 * fixed formatting 10/16 * lint fix * cherry-pick 'Implement JSI native state support' * Use static_pointer_cast instead of dynamic_pointer_cast * Fix x86 tests * fix merge * fix merge * add hasNativeState change --------- Co-authored-by: Vladimir Morozov <[email protected]>
1 parent 6fe7a66 commit 6efa6bf

File tree

74 files changed

+1067
-825
lines changed

Some content is hidden

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

74 files changed

+1067
-825
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": "testing integration",
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": "patch",
3+
"comment": "testing integration",
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": "testing integration",
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.73.0-nightly-20231002-0371014a3",
8+
"baseVersion": "0.74.0-nightly-20231016-44660019e",
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.0.0-canary.222",
2121
"react": "18.0.0",
22-
"react-native": "0.73.0-nightly-20231002-0371014a3"
22+
"react-native": "0.74.0-nightly-20231016-44660019e"
2323
},
2424
"devDependencies": {
2525
"@office-iss/react-native-win32": "^0.0.0-canary.222",
@@ -30,7 +30,7 @@
3030
"@types/node": "^18.0.0",
3131
"eslint": "^8.19.0",
3232
"just-scripts": "^1.3.3",
33-
"react-native": "0.73.0-nightly-20231002-0371014a3",
33+
"react-native": "0.74.0-nightly-20231016-44660019e",
3434
"react-native-platform-override": "^1.9.17",
3535
"typescript": "^4.9.5"
3636
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,4 @@ untyped-import
147147
untyped-type-import
148148

149149
[version]
150-
^0.217.2
150+
^0.218.0

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"**/__snapshots__/**",
88
"src/rntypes/**"
99
],
10-
"baseVersion": "0.73.0-nightly-20231002-0371014a3",
10+
"baseVersion": "0.74.0-nightly-20231016-44660019e",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "f44aee31438c1225f42664e9359e72272c08bb1d"
16+
"baseHash": "671a34717020278b7888dafa3b4fa88375e3d29b"
1717
},
1818
{
1919
"type": "derived",
@@ -112,7 +112,7 @@
112112
"type": "derived",
113113
"file": "src/Libraries/Components/ScrollView/ScrollView.win32.js",
114114
"baseFile": "packages/react-native/Libraries/Components/ScrollView/ScrollView.js",
115-
"baseHash": "87a276aff215fedb38d7ced5d9aef61224ebe0c2"
115+
"baseHash": "6e3e4933173d1f910232f3f46602e2f525127eb5"
116116
},
117117
{
118118
"type": "platform",
@@ -130,7 +130,7 @@
130130
"type": "derived",
131131
"file": "src/Libraries/Components/TextInput/TextInput.win32.js",
132132
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
133-
"baseHash": "0a0b60aee76438543e8f2e62d48849d5c33753bd"
133+
"baseHash": "4431d2d4ea39a5ce9b9fad8ed22c7896b77ca9d2"
134134
},
135135
{
136136
"type": "patch",
@@ -170,7 +170,7 @@
170170
"type": "derived",
171171
"file": "src/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
172172
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
173-
"baseHash": "fa5b3198efddd86eca7965aa90104408ed53fbbf"
173+
"baseHash": "2082604bf871d04091717d7808ebf0b2355fc8ae"
174174
},
175175
{
176176
"type": "platform",
@@ -194,7 +194,7 @@
194194
"type": "patch",
195195
"file": "src/Libraries/Components/View/View.win32.js",
196196
"baseFile": "packages/react-native/Libraries/Components/View/View.js",
197-
"baseHash": "f25ca9bd8f25d1dd05d98d40946a41b19fac87f1"
197+
"baseHash": "d621a2fb669bbc2fc0657db1233c9a930a073fba"
198198
},
199199
{
200200
"type": "derived",
@@ -252,7 +252,7 @@
252252
"type": "derived",
253253
"file": "src/Libraries/Image/Image.win32.js",
254254
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
255-
"baseHash": "ead4aaa048a5ae0186d3f8ade054b970a2115a3a",
255+
"baseHash": "bccd20ad47baa18b187bd8eb92b7627135be29fd",
256256
"issue": 4320
257257
},
258258
{
@@ -410,7 +410,7 @@
410410
"type": "patch",
411411
"file": "src/Libraries/ReactNative/PaperUIManager.win32.js",
412412
"baseFile": "packages/react-native/Libraries/ReactNative/PaperUIManager.js",
413-
"baseHash": "64504c716b2c64116d1ec74702ce7754fa651c6f"
413+
"baseHash": "d5bbe5273211e4f39e6468f0c90ec42e5fe0a9c0"
414414
},
415415
{
416416
"type": "derived",
@@ -434,7 +434,7 @@
434434
"type": "patch",
435435
"file": "src/Libraries/StyleSheet/StyleSheet.win32.js",
436436
"baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
437-
"baseHash": "e73098e3a22f8f74328e0a9f387839bb03322bb6"
437+
"baseHash": "7c42da708bc5cf4e3135ae81a45dddae48e0bfec"
438438
},
439439
{
440440
"type": "derived",
@@ -493,13 +493,13 @@
493493
"type": "derived",
494494
"file": "src/Libraries/Utilities/NativePlatformConstantsWin.js",
495495
"baseFile": "packages/react-native/Libraries/Utilities/NativePlatformConstantsIOS.js",
496-
"baseHash": "77a07a52a5d20150d5596574e251aba1b767a9cd"
496+
"baseHash": "d618776f5251597b9fa13c55be27e09f3ceccdf3"
497497
},
498498
{
499499
"type": "derived",
500500
"file": "src/Libraries/Utilities/Platform.flow.win32.js",
501501
"baseFile": "packages/react-native/Libraries/Utilities/Platform.flow.js",
502-
"baseHash": "c0a203e8d15f99ff00edaab6c4a40a49606a99f0"
502+
"baseHash": "48e0b6dd625aa58347266a362eb404ddd47b59d4"
503503
},
504504
{
505505
"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,20 +30,20 @@
3030
"@react-native-community/cli-platform-android": "12.0.0-alpha.15",
3131
"@react-native-community/cli-platform-ios": "12.0.0-alpha.15",
3232
"@react-native/assets": "1.0.0",
33-
"@react-native/assets-registry": "0.73.0-nightly-20231002-0371014a3",
34-
"@react-native/codegen": "0.73.0-nightly-20231002-0371014a3",
35-
"@react-native/community-cli-plugin": "0.73.0-nightly-20231002-0371014a3",
36-
"@react-native/gradle-plugin": "0.73.0-nightly-20231002-0371014a3",
37-
"@react-native/js-polyfills": "0.73.0-nightly-20231002-0371014a3",
33+
"@react-native/assets-registry": "0.74.0-nightly-20231016-44660019e",
34+
"@react-native/codegen": "0.74.0-nightly-20231016-44660019e",
35+
"@react-native/community-cli-plugin": "0.74.0-nightly-20231016-44660019e",
36+
"@react-native/gradle-plugin": "0.74.0-nightly-20231016-44660019e",
37+
"@react-native/js-polyfills": "0.74.0-nightly-20231016-44660019e",
3838
"@react-native/metro-config": "^0.73.0",
39-
"@react-native/normalize-colors": "0.73.0-nightly-20231002-0371014a3",
40-
"@react-native/virtualized-lists": "0.73.0-nightly-20231002-0371014a3",
39+
"@react-native/normalize-colors": "0.74.0-nightly-20231016-44660019e",
40+
"@react-native/virtualized-lists": "0.74.0-nightly-20231016-44660019e",
4141
"abort-controller": "^3.0.0",
4242
"anser": "^1.4.9",
4343
"ansi-regex": "^5.0.0",
4444
"art": "^0.10.0",
4545
"base64-js": "^1.5.1",
46-
"deprecated-react-native-prop-types": "4.2.1",
46+
"deprecated-react-native-prop-types": "^5.0.0",
4747
"event-target-shim": "^5.0.1",
4848
"flow-enums-runtime": "^0.0.6",
4949
"invariant": "^2.2.4",
@@ -85,13 +85,13 @@
8585
"just-scripts": "^1.3.3",
8686
"prettier": "^2.4.1",
8787
"react": "18.2.0",
88-
"react-native": "0.73.0-nightly-20231002-0371014a3",
88+
"react-native": "0.74.0-nightly-20231016-44660019e",
8989
"react-native-platform-override": "^1.9.17",
9090
"typescript": "^4.9.5"
9191
},
9292
"peerDependencies": {
9393
"react": "18.2.0",
94-
"react-native": "0.73.0-nightly-20231002-0371014a3"
94+
"react-native": "0.74.0-nightly-20231016-44660019e"
9595
},
9696
"beachball": {
9797
"defaultNpmTag": "canary",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,6 @@ export type Props = $ReadOnly<{|
546546
* When true, the scroll view stops on multiples of the scroll view's size
547547
* when scrolling. This can be used for horizontal pagination. The default
548548
* value is false.
549-
*
550-
* Note: Vertical pagination is not supported on Android.
551549
*/
552550
pagingEnabled?: ?boolean,
553551
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ type DataDetectorTypesType =
148148
| 'link'
149149
| 'address'
150150
| 'calendarEvent'
151+
| 'trackingNumber'
152+
| 'flightNumber'
153+
| 'lookupSuggestion'
151154
| 'none'
152155
| 'all';
153156

0 commit comments

Comments
 (0)