Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wix/react-native-navigation
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 034f02e83edc0249a0ff876be9fab30fb01d54f5
Choose a base ref
..
head repository: wix/react-native-navigation
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b8e666ab138a8c003bd9863872e3f209fc74d591
Choose a head ref
Original file line number Diff line number Diff line change
@@ -25,13 +25,6 @@ open class ButtonBar internal constructor(context: Context) : Toolbar(context) {

override fun onViewAdded(child: View) {
super.onViewAdded(child)
enableOverflowForReactButtonViews(child)
}

private fun enableOverflowForReactButtonViews(child: View) {
if (child is ActionMenuView) {
(child as ViewGroup).clipChildren = false
}
}

override fun setLayoutDirection(layoutDirection: Int) {
4 changes: 2 additions & 2 deletions lib/ios/RNNTabBarItemCreator.m
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ - (void)appendTitleAttributes:(UITabBarItem *)tabItem
fontSize:fontSize
fontWeight:fontWeight
color:textColor
centered:NO];
centered:YES];
[self setTitleAttributes:tabItem titleAttributes:normalAttributes];

NSDictionary *selectedAttributes = [RNNFontAttributesCreator
@@ -106,7 +106,7 @@ - (void)appendTitleAttributes:(UITabBarItem *)tabItem
fontSize:fontSize
fontWeight:fontWeight
color:selectedTextColor
centered:NO];
centered:YES];
[self setSelectedTitleAttributes:tabItem selectedTitleAttributes:selectedAttributes];
}

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-navigation",
"version": "7.38.3",
"version": "7.38.4",
"description": "React Native Navigation - truly native navigation for iOS and Android",
"license": "MIT",
"nativePackage": true,
@@ -112,7 +112,7 @@
"react-native": "0.72.3",
"react-native-fast-image": "^8.6.3",
"react-native-gesture-handler": "^2.10.1",
"react-native-reanimated": "3.4.1",
"react-native-reanimated": "^3.8.1",
"react-native-ui-lib": "7.3.6",
"react-redux": "5.x.x",
"react-test-renderer": "18.2.0",
26 changes: 26 additions & 0 deletions playground/ios/Podfile
Original file line number Diff line number Diff line change
@@ -38,7 +38,10 @@ def all_pods
end

post_install do |installer|
__apply_Xcode_15_3_flipper_post_install_workaround(installer)

react_native_post_install(installer, "../../node_modules/react-native", :mac_catalyst_enabled => false)

__apply_Xcode_12_5_M1_post_install_workaround(installer)

# This is to resolve "'shared_timed_mutex' is unavailable: introduced in iOS 10.0" error
@@ -49,6 +52,29 @@ post_install do |installer|
end
end

def __apply_Xcode_15_3_flipper_post_install_workaround(installer)
installer.pods_project.targets.each do |target|
if target.name == 'Flipper'
file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
contents = File.read(file_path)
unless contents.include?('#include <functional>')
File.open(file_path, 'w') do |file|
file.puts('#include <functional>')
file.puts(contents)
end
end
end
end
end

def __apply_Xcode_15_unary_binary_error_workaround(installer)
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
end
end
end

target 'playground' do
all_pods
end
5 changes: 2 additions & 3 deletions playground/ios/playground.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -569,7 +569,6 @@
};
E58D261A238587F4003F36BA = {
CreatedOnToolsVersion = 11.2.1;
DevelopmentTeam = S3GLW74Y8N;
ProvisioningStyle = Automatic;
TestTargetID = 13B07F861A680F5B00A75B9A;
};
@@ -1571,7 +1570,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = S3GLW74Y8N;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = NavigationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -1599,7 +1598,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = S3GLW74Y8N;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = NavigationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;