Skip to content

Fix native RNTester tabs in Buck builds #58900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
Closed

Fix native RNTester tabs in Buck builds #58900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions packages/rn-tester/RNTesterTabsIOS/ios/RNTesterTabsIOSComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,18 @@
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>

#if __has_include(<React/RCTFabricComponentsPlugins.h>)
#import <React/RCTFabricComponentsPlugins.h>
#else
#import "RCTFabricComponentsPlugins.h"
#endif

using namespace facebook::react;

// Preserve RNTester's existing example bounds on compact bottom-tab layouts.
static constexpr CGFloat LegacyTopInset = 50;
static constexpr CGFloat LegacyBottomInset = 65;

/**
* A tab's view controller, which reports when the tab bar or window changes
* the area its content needs to clear.
Expand Down Expand Up @@ -205,17 +215,20 @@ - (void)updateEventEmitter:(const EventEmitter::Shared &)eventEmitter

- (void)tabSafeAreaInsetsDidChange:(UIEdgeInsets)insets
{
// The home indicator's inset only applies beneath a tab bar along the bottom edge, which already
// clears it. With the tab bar at the side, content runs to the bottom edge.
CGRect tabBarFrame = _tabBarController.tabBar.frame;
CGRect bounds = _tabBarController.view.bounds;
if (CGRectGetWidth(tabBarFrame) < CGRectGetWidth(bounds) || CGRectGetMaxY(tabBarFrame) < CGRectGetMaxY(bounds)) {
BOOL hasBottomTabBar = !_tabBarController.tabBar.hidden && CGRectGetWidth(tabBarFrame) >= CGRectGetWidth(bounds) &&
CGRectGetMaxY(tabBarFrame) >= CGRectGetMaxY(bounds);
if (hasBottomTabBar) {
insets.top = MAX(insets.top, LegacyTopInset);
insets.bottom = MIN(insets.bottom, LegacyBottomInset);
} else {
insets.bottom = 0;
}
// A window with no status bar along the top, such as the iPhone Duo's, reports no top inset. Keep
// content a small distance from the display's rounded top edge.
if (insets.top == 0) {
insets.top = 16;
// A window with no status bar along the top, such as the iPhone Duo's, reports no top inset. Keep
// content a small distance from the display's rounded top edge.
if (insets.top == 0) {
insets.top = 16;
}
}
if (UIEdgeInsetsEqualToEdgeInsets(insets, _contentInsets) || _eventEmitter == nullptr) {
return;
Expand Down
Loading