Skip to content

Commit 505d345

Browse files
committed
chore: sync with upstream
1 parent a09ac0d commit 505d345

File tree

4 files changed

+156
-180
lines changed

4 files changed

+156
-180
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ - (void)initialize
6060
selector:@selector(interfaceOrientationDidChange)
6161
name:UIApplicationDidChangeStatusBarOrientationNotification
6262
object:nil];
63+
#endif
6364

6465
_currentInterfaceDimensions = [self _exportedDimensions];
6566

@@ -77,10 +78,13 @@ - (void)initialize
7778
selector:@selector(interfaceFrameDidChange)
7879
name:RCTWindowFrameDidChangeNotification
7980
object:nil];
81+
#if !TARGET_OS_VISION
8082
[[NSNotificationCenter defaultCenter] addObserver:self
8183
selector:@selector(interfaceFrameDidChange)
8284
name:UIDeviceOrientationDidChangeNotification
8385
object:nil];
86+
#endif
87+
8488

8589
// TODO T175901725 - Registering the RCTDeviceInfo module to the notification is a short-term fix to unblock 0.73
8690
// The actual behavior should be that the module is properly registered in the TurboModule/Bridge infrastructure
@@ -120,7 +124,9 @@ - (void)_cleanupObservers
120124

121125
[[NSNotificationCenter defaultCenter] removeObserver:self name:RCTBridgeWillInvalidateModulesNotification object:nil];
122126

127+
#if !TARGET_OS_VISION
123128
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
129+
#endif
124130
}
125131

126132
static BOOL RCTIsIPhoneNotched()

packages/rn-tester/Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PODS:
1313
- hermes-engine/inspector (0.74.0-rc.1)
1414
- hermes-engine/inspector_chrome (0.74.0-rc.1)
1515
- hermes-engine/Public (0.74.0-rc.1)
16-
- MyNativeView (0.74.77):
16+
- MyNativeView (0.74.79):
1717
- DoubleConversion
1818
- glog
1919
- hermes-engine
@@ -34,7 +34,7 @@ PODS:
3434
- ReactCommon/turbomodule/bridging
3535
- ReactCommon/turbomodule/core
3636
- Yoga
37-
- NativeCxxModuleExample (0.74.77):
37+
- NativeCxxModuleExample (0.74.79):
3838
- DoubleConversion
3939
- glog
4040
- hermes-engine
@@ -1309,7 +1309,7 @@ PODS:
13091309
- React-logger (= 0.74.0-rc.1)
13101310
- React-perflogger (= 0.74.0-rc.1)
13111311
- React-utils (= 0.74.0-rc.1)
1312-
- ScreenshotManager (0.74.77):
1312+
- ScreenshotManager (0.74.79):
13131313
- DoubleConversion
13141314
- glog
13151315
- hermes-engine
@@ -1548,8 +1548,8 @@ SPEC CHECKSUMS:
15481548
fmt: 5d9ffa7ccba126c08b730252123601d514652320
15491549
glog: 4f05d17aa39a829fee878689fc9a41af587fabba
15501550
hermes-engine: 2b53c232d1a95c2093578fd17dd32237b9c0c62f
1551-
MyNativeView: 7fa78132e3351d2cc4233e5a9c1cb478c48c6416
1552-
NativeCxxModuleExample: 335f99741dc1c38dd5594814c885bf834ee1a3c0
1551+
MyNativeView: c4aaa3f972a479202196ca591d3c65eb6b1ab059
1552+
NativeCxxModuleExample: 978ea1de41abda27891de7137ac60c049ccdd0ca
15531553
OCMock: 267d92c078398b7ce11d99e811e3a402744c06bc
15541554
RCT-Folly: 70c792c856324d6a518af75b3a307c14c226343a
15551555
RCTDeprecation: d2d9ef7c3dba88e97dc2f329d818982f3e8d83af
@@ -1580,9 +1580,9 @@ SPEC CHECKSUMS:
15801580
React-perflogger: 089abef3eb4eabcb534fce3da0386c47cf080646
15811581
React-RCTActionSheet: 76864856b2f8b97d33bf7739ea1d0d92fe38db5a
15821582
React-RCTAnimation: 67028d7666ea64565eb312ed200badf89b910e62
1583-
React-RCTAppDelegate: 65efd3065c275163319432394a54305c93bfa5e0
1583+
React-RCTAppDelegate: a53575c3ac64f533b09336f4a51906206d7841ab
15841584
React-RCTBlob: ab6878c80437f2cc26c155e94b8578b7a6858710
1585-
React-RCTFabric: cb092419f72f4282f990dacddaec58e53568e0f8
1585+
React-RCTFabric: fbb9fb9232c0424b0e13a45e8999f92a57cbbd5c
15861586
React-RCTImage: a57120e92370a2d005c15a0d2a12af79d3d9c727
15871587
React-RCTLinking: 16deab069f2c88f9173673cebe4f99e4ede88140
15881588
React-RCTNetwork: 3aeea25d834e4f28a7c6209bb8565b662153a3a5
@@ -1604,10 +1604,10 @@ SPEC CHECKSUMS:
16041604
React-utils: 02a3705421e204e0f754067f0a7f4a3e5120c325
16051605
ReactCommon: 6d3ce1d6b1aa56620b7a11ab6932a1037c6b89db
16061606
ReactCommon-Samples: d4a4e28f5a50f5051315dca3545981512b0710ca
1607-
ScreenshotManager: 99c369c7042ab32574e3c8c0443dd56578311451
1607+
ScreenshotManager: 649fb870b10882e51d0a8cef4227e93be094f679
16081608
SocketRocket: 0ba3e799f983d2dfa878777017659ef6c866e5c6
1609-
Yoga: 0a7ac0788eaaea91b812e1d50c4133f050b6f5e8
1609+
Yoga: 8813645d004ffb1dfa3d9ec4b96833d23214203a
16101610

16111611
PODFILE CHECKSUM: 7e999b8158f1055609ef4491bc35f1ad658fdd6c
16121612

1613-
COCOAPODS: 1.14.3
1613+
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)