Skip to content

Commit 355b1cb

Browse files
sbuggaymeta-codesync[bot]
authored andcommitted
Remove RCTUIStatusBarManager usage from AppleTV (#55276)
Summary: Pull Request resolved: #55276 UIStatusBar APIs are not available on AppleTV, removing. Changelog: [Internal] Just excluding RCTStatusBarManager from the build using exclusion rules instead of adding more platform guards. Reviewed By: cipolleschi, shwanton Differential Revision: D90704876 fbshipit-source-id: 00d6bedbb10503090edde4805b7d4c9160c69c0e
1 parent 0592181 commit 355b1cb

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

packages/react-native/React/CoreModules/RCTStatusBarManager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
#import <React/RCTConvert.h>
1111
#import <React/RCTEventEmitter.h>
1212

13+
#if !TARGET_OS_TV
1314
@interface RCTConvert (UIStatusBar)
1415

1516
+ (UIStatusBarStyle)UIStatusBarStyle:(id)json;
1617
+ (UIStatusBarAnimation)UIStatusBarAnimation:(id)json;
1718

1819
@end
20+
#endif
1921

2022
@interface RCTStatusBarManager : RCTEventEmitter
2123

packages/react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,22 @@ - (void)loadView
4646
#endif
4747
}
4848

49+
#if !TARGET_OS_TV
4950
- (UIStatusBarStyle)preferredStatusBarStyle
5051
{
5152
return [RCTUIStatusBarManager() statusBarStyle];
5253
}
5354

54-
- (void)viewDidDisappear:(BOOL)animated
55+
- (BOOL)prefersStatusBarHidden
5556
{
56-
[super viewDidDisappear:animated];
57-
_lastViewBounds = CGRectZero;
57+
return [RCTUIStatusBarManager() isStatusBarHidden];
5858
}
59+
#endif
5960

60-
- (BOOL)prefersStatusBarHidden
61+
- (void)viewDidDisappear:(BOOL)animated
6162
{
62-
return [RCTUIStatusBarManager() isStatusBarHidden];
63+
[super viewDidDisappear:animated];
64+
_lastViewBounds = CGRectZero;
6365
}
6466

6567
#if RCT_DEV && TARGET_OS_IOS

0 commit comments

Comments
 (0)