Skip to content

Commit c4a1c78

Browse files
committed
chore: sync with upstream
1 parent acc1699 commit c4a1c78

File tree

3 files changed

+499
-278
lines changed

3 files changed

+499
-278
lines changed

packages/react-native/React/CoreModules/RCTDeviceInfo.mm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ - (void)initialize
6161
name:UIApplicationDidChangeStatusBarOrientationNotification
6262
object:nil];
6363

64+
[[NSNotificationCenter defaultCenter] addObserver:self
65+
selector:@selector(interfaceFrameDidChange)
66+
name:UIDeviceOrientationDidChangeNotification
67+
object:nil];
68+
#endif
6469
_currentInterfaceDimensions = [self _exportedDimensions];
6570

6671
[[NSNotificationCenter defaultCenter] addObserver:self
@@ -77,10 +82,6 @@ - (void)initialize
7782
selector:@selector(interfaceFrameDidChange)
7883
name:RCTWindowFrameDidChangeNotification
7984
object:nil];
80-
[[NSNotificationCenter defaultCenter] addObserver:self
81-
selector:@selector(interfaceFrameDidChange)
82-
name:UIDeviceOrientationDidChangeNotification
83-
object:nil];
8485

8586
// TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
8687
// The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
@@ -111,6 +112,7 @@ - (void)_cleanupObservers
111112
[[NSNotificationCenter defaultCenter] removeObserver:self
112113
name:UIApplicationDidChangeStatusBarOrientationNotification
113114
object:nil];
115+
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
114116
#endif
115117
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidBecomeActiveNotification object:nil];
116118

@@ -120,7 +122,6 @@ - (void)_cleanupObservers
120122

121123
[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
122124

123-
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
124125
}
125126

126127
static BOOL RCTIsIPhoneNotched()

packages/rn-tester/Podfile.lock

Lines changed: 135 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,27 @@ PODS:
5858
- ReactCommon/turbomodule/core
5959
- Yoga
6060
- OCMock (3.9.2)
61+
- OSSLibraryExample (0.0.1):
62+
- DoubleConversion
63+
- glog
64+
- hermes-engine
65+
- RCT-Folly (= 2024.01.01.00)
66+
- RCTRequired
67+
- RCTTypeSafety
68+
- React-Core
69+
- React-debug
70+
- React-Fabric
71+
- React-featureflags
72+
- React-graphics
73+
- React-ImageManager
74+
- React-NativeModulesApple
75+
- React-RCTFabric
76+
- React-rendererdebug
77+
- React-utils
78+
- ReactCodegen
79+
- ReactCommon/turbomodule/bridging
80+
- ReactCommon/turbomodule/core
81+
- Yoga
6182
- RCT-Folly (2024.01.01.00):
6283
- boost
6384
- DoubleConversion
@@ -459,6 +480,7 @@ PODS:
459480
- React-Fabric/imagemanager (= 1000.0.0)
460481
- React-Fabric/leakchecker (= 1000.0.0)
461482
- React-Fabric/mounting (= 1000.0.0)
483+
- React-Fabric/observers (= 1000.0.0)
462484
- React-Fabric/scheduler (= 1000.0.0)
463485
- React-Fabric/telemetry (= 1000.0.0)
464486
- React-Fabric/templateprocessor (= 1000.0.0)
@@ -929,6 +951,47 @@ PODS:
929951
- React-runtimescheduler
930952
- React-utils
931953
- ReactCommon/turbomodule/core
954+
- React-Fabric/observers (1000.0.0):
955+
- DoubleConversion
956+
- fmt (= 9.1.0)
957+
- glog
958+
- hermes-engine
959+
- RCT-Folly/Fabric (= 2024.01.01.00)
960+
- RCTRequired
961+
- RCTTypeSafety
962+
- React-Core
963+
- React-cxxreact
964+
- React-debug
965+
- React-Fabric/observers/events (= 1000.0.0)
966+
- React-featureflags
967+
- React-graphics
968+
- React-jsi
969+
- React-jsiexecutor
970+
- React-logger
971+
- React-rendererdebug
972+
- React-runtimescheduler
973+
- React-utils
974+
- ReactCommon/turbomodule/core
975+
- React-Fabric/observers/events (1000.0.0):
976+
- DoubleConversion
977+
- fmt (= 9.1.0)
978+
- glog
979+
- hermes-engine
980+
- RCT-Folly/Fabric (= 2024.01.01.00)
981+
- RCTRequired
982+
- RCTTypeSafety
983+
- React-Core
984+
- React-cxxreact
985+
- React-debug
986+
- React-featureflags
987+
- React-graphics
988+
- React-jsi
989+
- React-jsiexecutor
990+
- React-logger
991+
- React-rendererdebug
992+
- React-runtimescheduler
993+
- React-utils
994+
- ReactCommon/turbomodule/core
932995
- React-Fabric/scheduler (1000.0.0):
933996
- DoubleConversion
934997
- fmt (= 9.1.0)
@@ -940,11 +1003,13 @@ PODS:
9401003
- React-Core
9411004
- React-cxxreact
9421005
- React-debug
1006+
- React-Fabric/observers/events
9431007
- React-featureflags
9441008
- React-graphics
9451009
- React-jsi
9461010
- React-jsiexecutor
9471011
- React-logger
1012+
- React-performancetimeline
9481013
- React-rendererdebug
9491014
- React-runtimescheduler
9501015
- React-utils
@@ -1194,6 +1259,9 @@ PODS:
11941259
- ReactCommon/turbomodule/bridging
11951260
- ReactCommon/turbomodule/core
11961261
- React-perflogger (1000.0.0)
1262+
- React-performancetimeline (1000.0.0):
1263+
- RCT-Folly (= 2024.01.01.00)
1264+
- React-cxxreact
11971265
- React-RCTActionSheet (1000.0.0):
11981266
- React-Core/RCTActionSheetHeaders (= 1000.0.0)
11991267
- React-RCTAnimation (1000.0.0):
@@ -1258,6 +1326,7 @@ PODS:
12581326
- React-jsi
12591327
- React-jsinspector
12601328
- React-nativeconfig
1329+
- React-performancetimeline
12611330
- React-RCTImage
12621331
- React-RCTText
12631332
- React-rendererconsistency
@@ -1515,6 +1584,7 @@ DEPENDENCIES:
15151584
- MyNativeView (from `NativeComponentExample`)
15161585
- NativeCxxModuleExample (from `NativeCxxModuleExample`)
15171586
- OCMock (from `https://github.com/erikdoe/ocmock.git`, tag `v3.9.2`)
1587+
- OSSLibraryExample (from `../react-native-test-library`)
15181588
- RCT-Folly (from `../react-native/third-party-podspecs/RCT-Folly.podspec`)
15191589
- RCT-Folly/Fabric (from `../react-native/third-party-podspecs/RCT-Folly.podspec`)
15201590
- RCTDeprecation (from `../react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
@@ -1546,6 +1616,7 @@ DEPENDENCIES:
15461616
- React-nativeconfig (from `../react-native/ReactCommon`)
15471617
- React-NativeModulesApple (from `../react-native/ReactCommon/react/nativemodule/core/platform/ios`)
15481618
- React-perflogger (from `../react-native/ReactCommon/reactperflogger`)
1619+
- React-performancetimeline (from `../react-native/ReactCommon/react/performance/timeline`)
15491620
- React-RCTActionSheet (from `../react-native/Libraries/ActionSheetIOS`)
15501621
- React-RCTAnimation (from `../react-native/Libraries/NativeAnimation`)
15511622
- React-RCTAppDelegate (from `../react-native/Libraries/AppDelegate`)
@@ -1599,6 +1670,8 @@ EXTERNAL SOURCES:
15991670
OCMock:
16001671
:git: https://github.com/erikdoe/ocmock.git
16011672
:tag: v3.9.2
1673+
OSSLibraryExample:
1674+
:path: "../react-native-test-library"
16021675
RCT-Folly:
16031676
:podspec: "../react-native/third-party-podspecs/RCT-Folly.podspec"
16041677
RCTDeprecation:
@@ -1657,6 +1730,8 @@ EXTERNAL SOURCES:
16571730
:path: "../react-native/ReactCommon/react/nativemodule/core/platform/ios"
16581731
React-perflogger:
16591732
:path: "../react-native/ReactCommon/reactperflogger"
1733+
React-performancetimeline:
1734+
:path: "../react-native/ReactCommon/react/performance/timeline"
16601735
React-RCTActionSheet:
16611736
:path: "../react-native/Libraries/ActionSheetIOS"
16621737
React-RCTAnimation:
@@ -1728,74 +1803,76 @@ CHECKOUT OPTIONS:
17281803
SPEC CHECKSUMS:
17291804
boost: 05bdc81cadfb5bf1b574e4147039ca12db7598f9
17301805
DoubleConversion: 26c660c8d88372cca1a67f8101d2d962a7064361
1731-
FBLazyVector: 44e9591822f3f6fbfee6a023ff981586745b3c24
1806+
FBLazyVector: 20a1fdd8d2cbe90bcc44f93087d133b92de6d8dd
17321807
fmt: 5d9ffa7ccba126c08b730252123601d514652320
17331808
glog: 4f05d17aa39a829fee878689fc9a41af587fabba
1734-
hermes-engine: b52dca118a868da694dec15a5bb0fe7729b5b0ee
1809+
hermes-engine: 88f7cede71a7d2f4f381191a7f8da010266b0fe3
17351810
MyNativeView: 285c6f70650ff53a276f7086047921e617a4d0e3
17361811
NativeCxxModuleExample: 1cd42853b5ec241c6b5e70f2dd4bbc26feb97b39
17371812
OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc
1813+
OSSLibraryExample: d718b079a7ff6bb417fdbb6d98d58b9081b07b88
17381814
RCT-Folly: 38265df22721cd15cc13ba692c23a52cceaf3752
17391815
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
1740-
RCTRequired: 1dbd23afd556cec4aea4d80dfef24a23b69f005e
1741-
RCTTypeSafety: 5c52cfada68f78d853afd52688d2c319e517274b
1742-
React: 585970bb2b3cda6b6e03503e06ee7aca38bdceee
1743-
React-callinvoker: e98293c9054a8509da0cdf26c7139f89f808436f
1744-
React-Core: 4c661c4fcfd2607aa8bc0a24c002f2d971c1a83c
1745-
React-CoreModules: 642dd2a5a192c13ebc62fa42edf7fc0df27a9d6a
1746-
React-cxxreact: a8dea264c8a02e9378adfa50076eb3b9672e53e1
1747-
React-debug: cfc3d2d9cc519131a80a77022405a3a2f42e2c66
1748-
React-domnativemodule: 4ddf0f28f401750ac0b646f6f4c7dc7a2bbb9f73
1749-
React-Fabric: 8a926551427463111c4ead24eeae3bb315cc5e1d
1750-
React-FabricImage: 981164876a008387f34c318043de4b5ca8beac66
1751-
React-featureflags: 4cbd444490d6d7562ec10cf60ecb9625120e8170
1752-
React-featureflagsnativemodule: d2badc831c96196261cf0dfae32add436c449b43
1753-
React-graphics: 7e459e0a093c9547dc6cc7381dfe8f51cd01e013
1754-
React-hermes: 4b3eee961c1f001a9286eb2a2aee2e61d799fa61
1755-
React-ImageManager: 08426c5367392c5e2cd6abde7c36b6ea562af46c
1756-
React-jserrorhandler: 6284fa148e4ce8553c5764ae974ad75cf7b1d42e
1757-
React-jsi: 18230103204ebcdef2e3c5b60ec442815706a965
1758-
React-jsiexecutor: 34a44649bb14e72c029099c88ff473127aac81bc
1759-
React-jsinspector: c511a9d6df885d302d8a08c712a05084f2b3a935
1760-
React-jsitracing: dbe143cc99f01a1cf7f3054f7e92ce6f7ab3cdf5
1761-
React-logger: 47867261904011cb21a44192fe4ed1c6e252af19
1762-
React-Mapbuffer: 17436630c9b3db92b1a3ed8569cdca18d889efb1
1763-
React-microtasksnativemodule: 0d66d7c95659f79ce865778f7a55ee920aa3ce2c
1764-
React-nativeconfig: ed0c95a522b5d88aeddc442b1a36facf8313df3f
1765-
React-NativeModulesApple: 604cf8bb2ddaa50c17376f7d6663720cc2885d6d
1766-
React-perflogger: 2cd9a2639214183f04db641dd8c69969076f1ee9
1767-
React-RCTActionSheet: 465cff87f6e303a5f3a240ad1c589dfb54966566
1768-
React-RCTAnimation: 0cae88ca1af67fb2b7212ca236ce6f395a1707db
1769-
React-RCTAppDelegate: 3d362ce275b70a6661d384f5c8ce44da88b95801
1770-
React-RCTBlob: 9f0858c8b3f0e3869688a2e3f651aeaeefa21c26
1771-
React-RCTFabric: ed7948a8861f2ac6e28b002e0df60c19c0c95759
1772-
React-RCTImage: de0c1472c19d3288e3ed87d78fa2138940e605bf
1773-
React-RCTLinking: 866bb54d19acc11521961a871d2ed1112a412c3f
1774-
React-RCTNetwork: 6f5f1c0caf117bb22b9eb6a2f7537175c26b088a
1775-
React-RCTPushNotification: ad91244c6780866abc3411472aa0406742f1e8bc
1776-
React-RCTSettings: 68f28356fd73af550b294171ffdd7aa2e1e99148
1777-
React-RCTSwiftExtensions: d69766ebad61ac6f0b4a286029934dffbde9396f
1778-
React-RCTTest: 52d00e08b78df7a21b46079044cd8b0d0e0ffc77
1779-
React-RCTText: 0a2272f67a66f857909d9918793541e88d469b2a
1780-
React-RCTVibration: b3abaf46cf9cf5645184090a822ac7c3d10d7138
1781-
React-RCTWindowManager: 1d8be2077ae421fffc02d5eb68de57be83366170
1782-
React-RCTXR: bf2aff9137e9a1ce3c92c4203da8a96400ba05be
1783-
React-rendererconsistency: 25bb58f88027dd1d53de2aaa6e00cd9e42c4e681
1784-
React-rendererdebug: 881911377b2f28409bfa84121e854e60849c7be3
1785-
React-rncore: 69d68ca51a0aca2c68e039856a1be8a9b63d3162
1786-
React-RuntimeApple: cc9a6d98480bc829433ecc277dbdf4342666db10
1787-
React-RuntimeCore: 549729778f2c12b151c1ed9e8081dfccb9656754
1788-
React-runtimeexecutor: d301f0ccb976f191a419f176500349172a81d320
1789-
React-RuntimeHermes: 760fb51ec1e0f14f2df04154a1a6d3dacd8db98f
1790-
React-runtimescheduler: 5ca2d91f1523dea17ff8edd23563f6be94881102
1791-
React-utils: 7777e8bff0797972fe0d0130e8079e9618b2d62b
1816+
RCTRequired: 00494a336aaaa6c1109b14b743a8d10e7b0c2bd9
1817+
RCTTypeSafety: 63604e5d7ef46f7369ad1788ca0cda718d255fea
1818+
React: 876fe87b85c282432c0c2ae00252e27461f6ced1
1819+
React-callinvoker: 98796ddbd5a3543d345bc136690bacb8a23f9889
1820+
React-Core: 63872cd3efa26f21938739cedd4dc9bec7e97e57
1821+
React-CoreModules: 01078f1172a7d8d82ac6753410f0b7d788ab4fc5
1822+
React-cxxreact: 8633649f350792bee9cedaa7bbe71484d383d222
1823+
React-debug: c506ac2dc1640f5fa0d95da3dc0a7688fb22140f
1824+
React-domnativemodule: 37862eb36b630700fca07ea4b027997c00bd3e58
1825+
React-Fabric: c70e5559e7bac97a31319ddf00cab1b1226686e9
1826+
React-FabricImage: fa1db3fbd4107b4f626c1d5624bdeaf6f6b82c6f
1827+
React-featureflags: 32e2b1fb6496035691bf3d3965616b815bd55fcf
1828+
React-featureflagsnativemodule: 9d3c4102b0096fd24b2ecf87e6f339c7202c0d9d
1829+
React-graphics: 5a154901931e0aab99ecdc0630953fbc8f9b2bf6
1830+
React-hermes: a0f03b5acb27f663dc47d52d53e980787e5417d6
1831+
React-ImageManager: d17060f58f4d5d7bf5ae56c41ce34ba9a7c40800
1832+
React-jserrorhandler: b8d76ca95c49917dc963aa89e2746294381d93d9
1833+
React-jsi: ba43e2ac228494f059a86719868e86c9c0e7cf3a
1834+
React-jsiexecutor: b1facd6e7b3ddff34161985514f0baa52ff55508
1835+
React-jsinspector: 3640998c809441819da62448c0bfcdc4c0592c3c
1836+
React-jsitracing: 8bb4ab9ff1cff693fc65d41eb418e6cb4c9ad45e
1837+
React-logger: a6335bd4fcd8f023b314ec6dc62676479d4f8ef5
1838+
React-Mapbuffer: 8d98bcaf7a75ac34403ff7c8dbd0dc390d3b3648
1839+
React-microtasksnativemodule: c8a74eb41a33ccd529b8bff1e1b51b9fd31f9edd
1840+
React-nativeconfig: 8fd70eb6406983bf320ab0188a4900b2c765e109
1841+
React-NativeModulesApple: 9942d312039b3d88054c984fa93e323692bb82db
1842+
React-perflogger: 4ffd983a14ade06ba3a1f6dc26fbcba7014822ce
1843+
React-performancetimeline: ed71b96015ca099496589873541ef4aa55e9ee0f
1844+
React-RCTActionSheet: 66937112f6e9f498c7abe8e035394bdb400e1bd3
1845+
React-RCTAnimation: 69c14926abec814c849041b6c3e76434659d5677
1846+
React-RCTAppDelegate: a489b9abc03183b6dd5977b3530914df52e272b2
1847+
React-RCTBlob: d48308febe87bece656a028bdb4854a87b53205b
1848+
React-RCTFabric: fbc48720d2afec9dcafd42225efd29f73c9005a8
1849+
React-RCTImage: cc97c9b14b6edfe8235f8a420a6a3b065e774ff5
1850+
React-RCTLinking: 5db903231ad4b74092dd3756e8072c885dc80289
1851+
React-RCTNetwork: e36c2f362c57e60c81e3804d19070bef83b2c518
1852+
React-RCTPushNotification: 55f45eb5586929de0a88b208078c9ed5da7c2283
1853+
React-RCTSettings: 62ada0ce694424908911bb890e358c47f316cb7a
1854+
React-RCTSwiftExtensions: f9d344375f3f6f16ff54eaf410b5398b4e0d7e0d
1855+
React-RCTTest: 8e4b84206d32d19f075e19f6d7ea0414fd61f33a
1856+
React-RCTText: 5fc77435975eb893a31768a60bbf8d50fee7cb00
1857+
React-RCTVibration: 7fd6e3678358d344a2925b3986aa944009cf5110
1858+
React-RCTWindowManager: 87709575ed6e4029ab98863216abf028ae55b211
1859+
React-RCTXR: 811bd032f249f0733ef62f5ade336cc4c7a7484c
1860+
React-rendererconsistency: f63d7b458d5c1904f82469a9a7a08b159018f922
1861+
React-rendererdebug: a84a1458a247a5dd71b38634c66ef24571974193
1862+
React-rncore: f2739d92f22e100669e1854c7bb2abc6141c64ce
1863+
React-RuntimeApple: 4ec65837beb278d7f4d3039b60eddf5cb10aa701
1864+
React-RuntimeCore: 238d5717e645c77610828f2353e9b5463860a467
1865+
React-runtimeexecutor: 62fa7e2e2fd9c94ff769fc63716bfc83bfe825e1
1866+
React-RuntimeHermes: 0b696a2b82c5ec7a629ecd5ab770c8ba47d21207
1867+
React-runtimescheduler: b422db72df40fb64d401020a96868b07538c065a
1868+
React-utils: 9df75db69a844bd4b02c9c870ce031b8d3c1f0c3
17921869
ReactCodegen: 2fa2bfb8df604e5bbf2462cf3cced313c3131b96
1793-
ReactCommon: 7674e0d857a0925deee7d2a543820c379dbeaa3d
1794-
ReactCommon-Samples: 0c049cc26890a8d6cc6dc984039f29d1dc5dd741
1870+
ReactCommon: 22b022d658690344f911165e55515b7f39767ee3
1871+
ReactCommon-Samples: baa4dd0274cf744b2492ca862bb49ee4527e74fc
17951872
ScreenshotManager: 662151998cf5859591e72c76ceb9ebc6d04b425b
17961873
SocketRocket: 0ba3e799f983d2dfa878777017659ef6c866e5c6
1797-
Yoga: 9397352c9f304a2aff32fa597de7536cd4a45268
1874+
Yoga: 1480c9031576334f4521691e044f3bd9c929cc5d
17981875

1799-
PODFILE CHECKSUM: 7e999b8158f1055609ef4491bc35f1ad658fdd6c
1876+
PODFILE CHECKSUM: ecf8d73b0aefca76e0e218d8845b105ea9282718
18001877

18011878
COCOAPODS: 1.14.3

0 commit comments

Comments
 (0)