Skip to content

Commit 098bbd6

Browse files
okwasniewskiokwasniewski
committed
chore: sync with upstream
1 parent f3c6159 commit 098bbd6

File tree

6 files changed

+64
-61
lines changed

6 files changed

+64
-61
lines changed

‎packages/out-of-tree-platforms/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dist"
2020
],
2121
"devDependencies": {
22-
"metro-resolver": "^0.81.0-alpha.0"
22+
"metro-resolver": "^0.81.0"
2323
},
2424
"engines": {
2525
"node": ">=18"

‎packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ - (UIView *)viewWithModuleName:(NSString *)moduleName
157157
surfaceHostingProxyRootView.backgroundColor = [UIColor clearColor];
158158
#else
159159
surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
160+
#endif
160161
if (_configuration.customizeRootView != nil) {
161162
_configuration.customizeRootView(surfaceHostingProxyRootView);
162163
}

‎packages/react-native/React/Base/RCTUtils.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ BOOL RCTRunningInAppExtension(void)
610610
}
611611

612612
UIScene *sceneToUse = foregroundActiveScene ? foregroundActiveScene : foregroundInactiveScene;
613+
UIWindowScene *windowScene = (UIWindowScene *)sceneToUse;
613614

614615
#if TARGET_OS_VISION
615616
// Ornaments are supported only on visionOS.

‎packages/react-native/React/Views/ScrollView/RCTScrollView.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,13 @@ - (void)_keyboardWillChangeFrame:(NSNotification *)notification
339339
// Text field active region is below visible area with keyboard - update diff to bring into view
340340
contentDiff = endFrame.origin.y - focusEnd;
341341
} else {
342+
#if !TARGET_OS_VISION
342343
UIView *inputAccessoryView = _firstResponderViewOutsideScrollView.inputAccessoryView;
343344
if (inputAccessoryView) {
344345
// Text input view is within the inputAccessoryView.
345346
contentDiff = endFrame.origin.y - beginFrame.origin.y;
346347
}
348+
#endif
347349
}
348350
} else if (endFrame.origin.y <= beginFrame.origin.y) {
349351
// Keyboard opened for other reason

‎packages/rn-tester/Podfile.lock‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ PODS:
369369
- React-Core/RCTWindowManagerHeaders (0.77.0-main):
370370
- glog
371371
- hermes-engine
372-
- RCT-Folly (= 2024.01.01.00)
372+
- RCT-Folly (= 2024.11.18.00)
373373
- RCTDeprecation
374374
- React-Core/Default
375375
- React-cxxreact
@@ -386,7 +386,7 @@ PODS:
386386
- React-Core/RCTXRHeaders (0.77.0-main):
387387
- glog
388388
- hermes-engine
389-
- RCT-Folly (= 2024.01.01.00)
389+
- RCT-Folly (= 2024.11.18.00)
390390
- RCTDeprecation
391391
- React-Core/Default
392392
- React-cxxreact
@@ -1379,7 +1379,6 @@ PODS:
13791379
- React-RuntimeHermes
13801380
- React-runtimescheduler
13811381
- React-utils
1382-
- ReactCodegen
13831382
- ReactCommon
13841383
- React-RCTBlob (0.77.0-rc.0):
13851384
- DoubleConversion
@@ -1394,7 +1393,6 @@ PODS:
13941393
- React-NativeModulesApple
13951394
- React-RCTFBReactNativeSpec
13961395
- React-RCTNetwork
1397-
- ReactCodegen
13981396
- ReactCommon
13991397
- React-RCTFabric (0.77.0-rc.0):
14001398
- glog
@@ -1437,7 +1435,6 @@ PODS:
14371435
- React-NativeModulesApple
14381436
- React-RCTFBReactNativeSpec
14391437
- React-RCTNetwork
1440-
- ReactCodegen
14411438
- ReactCommon
14421439
- React-RCTLinking (0.77.0-rc.0):
14431440
- React-Core/RCTLinkingHeaders (= 0.77.0-rc.0)
@@ -1989,79 +1986,82 @@ SPEC CHECKSUMS:
19891986
SPEC CHECKSUMS:
19901987
boost: 0ac7fe9a9f61c6f246ffefca62b8cf6881bb6a38
19911988
DoubleConversion: f7fa6cd0e0828f5833892ea28ae96a3acdeff239
1989+
fast_float: f1512ca9d9f004b52208225c9937514f30b4cead
19921990
FBLazyVector: 9b50889b4273f520fae2ed2ebe880064e69c8b44
1993-
fmt: 674b64b86904477182dae486599deae56eeb68cb
1994-
glog: 438fa7943ec8a863e4ab0ee055e672692a18032e
1995-
hermes-engine: 775af0e51d28a1eb6f0f0fae4c9e3e5faaeec881
1996-
MyNativeView: f677179d1d15d5fd70a5e0e731d4e255145a6d90
1997-
NativeCxxModuleExample: 183990f7d80a2f7c611bdbc259d53d2ac67e5a04
1991+
fmt: 6c48ee647edf40d51600972027924b7e4ee78654
1992+
glog: 66ec8c64b4120e1f67730f01a0ab7d9cc80c6ab4
1993+
hermes-engine: 42e1ad7f31ac56ca6ff1e65b22331fc285b476a6
1994+
MyNativeView: 8d7b406e8122e23c48fd2a36b08d15d5e4b5b8db
1995+
NativeCxxModuleExample: aebea0ad91d9a69e76866198108086c14ae3bc09
19981996
OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc
1999-
OSSLibraryExample: 88dec58bce24674206d8a2787c7569792b0d1e09
2000-
RCT-Folly: 9d7c63d5cd4256a6df3e158b60ed0db4e3d5a70a
1997+
OSSLibraryExample: 0c009f38484abae880b1753b847740334200cfdc
1998+
RCT-Folly: 7b9fe96301ac92b4ca1ee3d7962ba4be256dfc82
20011999
RCTDeprecation: 66e972d6c7d69301a8b6400676f93b48fcacbd71
20022000
RCTRequired: 2938162d9e7bdc92ecbc11551eab8288c4b2bb1a
20032001
RCTTypeSafety: 58fd712a02c25b1f097813f76fa47abccc6d9fae
20042002
React: de0d7eaeca9d94e7676b3a3447990a5c8757c416
20052003
React-callinvoker: 62a1a0495f5853bc2d14cdee4920dd542b7d192d
2006-
React-Core: 6cfc75403060605f0aadce1c172280136c9647e0
2007-
React-CoreModules: 7a3b172a320dacf31f7a1c7f15752a232b9eb083
2008-
React-cxxreact: 95f9b94c93c0173ddb7928bd6ba59e38f5af09c5
2004+
React-Core: ac85451509c8b676b951ca82c5cb35546b4c5162
2005+
React-CoreModules: 84eec89883668aee84db649f657da28c9a7be791
2006+
React-cxxreact: 9a599141c18a5465c2b5dcc0552dbe9a1d40cb8e
20092007
React-debug: 79b03bd3509641aa949261c7fc948fbab2ebb7bc
2010-
React-defaultsnativemodule: a2f7e9d43308e6e698f19991a31beea06b85d6b8
2011-
React-domnativemodule: 4ffa5efcb4ce97556b8bbc61c9a00547b7025f31
2012-
React-Fabric: 41c1a3a418966524242dacc35d33c829117b1902
2013-
React-FabricComponents: ddbb03dc4da65eacd7f573c71e193c7938859ce7
2014-
React-FabricImage: 95dc041ccdc4cdcfc301f8f1bcc47926c5868aad
2008+
React-defaultsnativemodule: fac30bd967348e8b729c69d78d4020a24b4cbb73
2009+
React-domnativemodule: bb6da437695744bfd5e517d2333a7863754028d1
2010+
React-Fabric: d7fb85c9789d9380ec03763376bf617b2261454a
2011+
React-FabricComponents: e089d97a444d454ee7f39325673cea3e55961d96
2012+
React-FabricImage: 48f65816e43b3bd172890cf495984086bcf24417
20152013
React-featureflags: 1059165a17f14710c0f2551da701775d7226a4a0
2016-
React-featureflagsnativemodule: 6725d332aa84e888205a4132b3d8a4663f6c9b6b
2017-
React-graphics: ac0b00a1d589910728534a4466817c8e2c5e7389
2018-
React-hermes: c7b6a943ed1b946b1ac4fff37ae8a7cda01f5e72
2019-
React-idlecallbacksnativemodule: fa38da39da97000a165a6b04868fab55d3e0fdcf
2020-
React-ImageManager: 465d008db1b2bf1355ba2d04fc68b80df033ad0a
2021-
React-jserrorhandler: 2ee3d4485d954d3b8b4e57811373d625f6043657
2022-
React-jsi: 0bf2f09e9b524c755ddd019130a2dd1c8c734f08
2023-
React-jsiexecutor: d9c2d8e866a02b282c9d1cc001a83a77fe764741
2024-
React-jsinspector: 68dad0b81cc01009a51b893b19b9a35196a40205
2014+
React-featureflagsnativemodule: 5040d7b95ae99db0840c17d34f4a9b8d6f983cf2
2015+
React-graphics: fe4dd67f00ac8f99655ecec1c439d1ef5bb8f712
2016+
React-hermes: 29e03a89b0b58db3006cbd18317501e8e1345b44
2017+
React-idlecallbacksnativemodule: 7a9324331cae9299c1a82b6b394086c923402474
2018+
React-ImageManager: a6ea544eca491457f1dd0ed99b492563b49818cf
2019+
React-jserrorhandler: 69bd5c27ce70ea620dcbd35c6c6fb6c6e4ea3ac9
2020+
React-jsi: 31fe59d0dec2dee7cb7944b23c1a9f48edafefbe
2021+
React-jsiexecutor: 9a3780351eb9823ab02f9a3c1582b1a3c4bf8e13
2022+
React-jsinspector: 68ffee3cab6c602863f0c33c8f96d3a087d4f5b0
20252023
React-jsitracing: a22278858e1f933968cdcd1a9dee2f637337814b
20262024
React-logger: 1d6f52353aa1905adb637d1b9dacd0f0d32f7dba
20272025
React-Mapbuffer: 63faf8a468b232fb80dda453780c1336648dc623
2028-
React-microtasksnativemodule: 860373377813c537806e3db3e1e5867b6a600a36
2026+
React-microtasksnativemodule: 04e6618ffe59926ce1eeddcfe40dd3e29ec6454a
20292027
React-nativeconfig: 34356ecc618e138f765ea5b9567926cdef172c4a
2030-
React-NativeModulesApple: e3a48ae879b2d2d77edc94696abbb7b5edee32e1
2031-
React-perflogger: 136af915fc6d8cb2dc41525f088270763fc41062
2032-
React-performancetimeline: 5500973c0c4ff4eb2a4734791929c1f14626b4e9
2028+
React-NativeModulesApple: 00c972d627a9297de8510b149fc21a9ab4a53032
2029+
React-perflogger: 95db70b5e90646d8a3d8d8a358739927c38a1412
2030+
React-performancetimeline: 330c25431539321936b265f13042f45fed8fca69
20332031
React-RCTActionSheet: d9452aab84282469cbf03c0e77989832305bc083
2034-
React-RCTAnimation: 47e5f86af142310582ca0600c13e1111b85f2790
2035-
React-RCTAppDelegate: 2c55842aae1c8e49d82c69661405b4f722ddd895
2036-
React-RCTBlob: b9758840bf11a596e6adfabc307b517b82ef4eb7
2037-
React-RCTFabric: 8409df839609882ba681df36d5656613b17f44dd
2038-
React-RCTImage: 33c65d07d48f074263f23882abb799ba1901b897
2039-
React-RCTLinking: 0af6f02ef51de54f794b98262d5d06918a9ced02
2040-
React-RCTNetwork: 02b0e193244fe7d6f25f557ddaf92634377c7e43
2041-
React-RCTPushNotification: 2f64b745aa7539bf23b73597d11c35ce05c1ea35
2042-
React-RCTSettings: 47385309dd40ec1f71c9c533338cfa9cc3bcdc1f
2032+
React-RCTAnimation: 352836cbbf39e4b93a28ed05da25524a882a5c50
2033+
React-RCTAppDelegate: 8962d71a429607140a428530d23b6f498c3816c8
2034+
React-RCTBlob: 5c7ac84054c84943888318857a1d70aded9ecfa0
2035+
React-RCTFabric: d5e77148ae763c26dbb41c77aadaddbc09a56210
2036+
React-RCTFBReactNativeSpec: f33e253830303bc7f70d899ffa96988f51ae682b
2037+
React-RCTImage: 6e5d4a055cb2e2979d7275a392b534b192d177af
2038+
React-RCTLinking: 9aebf2b18766187224f3b9e8a6cc03711eb24cef
2039+
React-RCTNetwork: b248b449ac3e34aea416d988bba1ce177000953c
2040+
React-RCTPushNotification: 5c231b76f96ae6bd85dbc39c0d383fa5c200e38e
2041+
React-RCTSettings: 1320f2f03a37405c05a3d730f0ecd0561dd8c84d
20432042
React-RCTSwiftExtensions: 823573c791982558f894d588b5587396a57df182
2044-
React-RCTTest: 18ce1d59c61e01036dbdd50f4848f9639c4ce3c1
2043+
React-RCTTest: 67442e476af3371f204e7da354bba3eb43564828
20452044
React-RCTText: f56fec58cf42b5437470d42976452564295b6b91
2046-
React-RCTVibration: d4ecbbb48adecc37bbf43839c29baedd0520df60
2047-
React-RCTWindowManager: 29988b402b1ab5be7e291cb69e315620aa7116b9
2048-
React-RCTXR: 50463d549a7188f1d4f05752902e2b6c6d84523e
2045+
React-RCTVibration: 58e4c8368c6e9e335fee6dab32b6cfc7525533a0
2046+
React-RCTWindowManager: 0f239003b80da6227618a73d6e33528c62502b73
2047+
React-RCTXR: 94a7b710874d64b33539dde2bdb98b88c531ff2d
20492048
React-rendererconsistency: 822e990cad99ce4b8ab4ecccf7105618804dbbae
2050-
React-rendererdebug: 316b2437167d52151ae6d597d31fe30e149e87da
2049+
React-rendererdebug: f134327e585acd08461a0012f1c397bf4c243fb4
20512050
React-rncore: b1b575f33e980d5c0ab41c7bd79d00bb0a01ee47
2052-
React-RuntimeApple: d33d20a2139a65d920eed13f0748b1258cc05aac
2053-
React-RuntimeCore: 61311ee52a2f95d5794f7e1972db3df22416e7a0
2051+
React-RuntimeApple: 3a6e884ea379a8e310d9ac2034ec423411d49338
2052+
React-RuntimeCore: 8b352ed2e15b9f3a65da03b9adda69eaec0c0b01
20542053
React-runtimeexecutor: 46b1b00d4ee088a4656c7ef9e1b0e496318a1a6a
2055-
React-RuntimeHermes: 870a5e47ff71f445e44bf7c76e726b00da7ac5d3
2056-
React-runtimescheduler: e96c424ed832bdfa0660ff2a1bba247b7333e840
2054+
React-RuntimeHermes: a508ef0303457a19e86488f36a264ebb2d299a19
2055+
React-runtimescheduler: 1155b1b5d76e68f25d686a559f92169ede07513e
20572056
React-timing: b28b9743e3b2e8efbd2e3b4c12d97d52a3c0d218
2058-
React-utils: b0215ef4eb60b818f9fec7eb6c979ad286aab41a
2059-
ReactCodegen: c044e396d3e5e127a40d785a0b600448c0f9929d
2060-
ReactCommon: e03c4081dc50b26046f8f96cf715ad80826f8995
2061-
ReactCommon-Samples: 6401099d4afc986191f1832f3eba4a9371bde693
2062-
ScreenshotManager: d8e23a8d56a8dc6027d4d79198d971531b01f58e
2057+
React-utils: d0cbd5b21cb1c48fdaccd03001f9c12666d938cb
2058+
ReactAppDependencyProvider: 133e2bcc805badc3051dfd8fdec926f27d97e90f
2059+
ReactCodegen: 48216a818127323da10644b05ab15a2a83d926c3
2060+
ReactCommon: 06bbe7024f0615fadfd596af0ec899fcad6c3b25
2061+
ReactCommon-Samples: 56a75a5add6e6deb60db6585de20a2567d7d1350
2062+
ScreenshotManager: 529e07eedcda3539aefd99896c95c21d2a09cf04
20632063
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2064-
Yoga: a2d99fac85cc4f01f06951ef6e9a13dc97df4b8b
2064+
Yoga: 8e4ee34acb0cb6588533531d374854562d82adba
20652065

20662066
PODFILE CHECKSUM: ecf8d73b0aefca76e0e218d8845b105ea9282718
20672067

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
08E25EBE4A584CD7B70FBB1E /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D74056A5352F0925816E50E0 /* libPods-RNTester.a */; };
1110
0EA618032BE537D3001875EF /* RNTesterBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0EA618022BE537D3001875EF /* RNTesterBundle.bundle */; };
1211
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1312
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
13+
32323A4ED7ABC8085D9FF545 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63C6B5E1C2465D85E9BDB6E5 /* libPods-RNTesterIntegrationTests.a */; };
1414
383889DA23A7398900D06C3E /* RCTConvert_UIColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */; };
1515
3D2AFAF51D646CF80089D1A3 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* [email protected] */; };
1616
5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; };
@@ -218,7 +218,7 @@
218218
files = (
219219
E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */,
220220
E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */,
221-
111FD3845C7358250C2702B6 /* libPods-RNTesterIntegrationTests.a in Frameworks */,
221+
32323A4ED7ABC8085D9FF545 /* libPods-RNTesterIntegrationTests.a in Frameworks */,
222222
);
223223
runOnlyForDeploymentPostprocessing = 0;
224224
};
@@ -572,7 +572,6 @@
572572
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */,
573573
8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */,
574574
0EA618032BE537D3001875EF /* RNTesterBundle.bundle in Resources */,
575-
F0D621C32BBB9E38005960AC /* PrivacyInfo.xcprivacy in Resources */,
576575
3D2AFAF51D646CF80089D1A3 /* [email protected] in Resources */,
577576
A2010DDF3B41C3E3D3A6B19C /* PrivacyInfo.xcprivacy in Resources */,
578577
);

0 commit comments

Comments
 (0)