From ce801330a5a3b727c28ee2c91879b5bf48e2c03b Mon Sep 17 00:00:00 2001
From: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
Date: Tue, 19 Jan 2021 12:49:47 +0100
Subject: [PATCH] fix: remove setting tintColor in ios14 (#748)

The change introduced in #552 brakes the behavior of headerRight (see Test748 without the change in native code) in iOS 14, and the bug, that #552 fixed, is not present anymore in iOS 14.
---
 TestsExample/App.js                |   2 ++
 TestsExample/assets/backButton.png | Bin 0 -> 803 bytes
 TestsExample/src/Test550.js        |  48 ++++++++++++++++++++++++++
 TestsExample/src/Test748.tsx       |  53 +++++++++++++++++++++++++++++
 ios/RNSScreenStackHeaderConfig.m   |   9 ++++-
 5 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 TestsExample/assets/backButton.png
 create mode 100644 TestsExample/src/Test550.js
 create mode 100644 TestsExample/src/Test748.tsx

diff --git a/TestsExample/App.js b/TestsExample/App.js
index b3f627b9f..3dcde9010 100644
--- a/TestsExample/App.js
+++ b/TestsExample/App.js
@@ -8,6 +8,7 @@ import Test263 from './src/Test263';
 import Test349 from './src/Test349';
 import Test364 from './src/Test364';
 import Test528 from './src/Test528';
+import Test550 from './src/Test550';
 import Test556 from './src/Test556';
 import Test564 from './src/Test564';
 import Test577 from './src/Test577';
@@ -23,6 +24,7 @@ import Test691 from './src/Test691';
 import Test702 from './src/Test702';
 import Test706 from './src/Test706';
 import Test713 from './src/Test713';
+import Test748 from './src/Test748';
 import Test750 from './src/Test750';
 
 enableScreens();
diff --git a/TestsExample/assets/backButton.png b/TestsExample/assets/backButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05671e9894fab3b628982d6078c3d87e2bd100d
GIT binary patch
literal 803
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k8A#4*i(3PvssnsNT>t<74`klIf1j0=_0OL_
z{QUgizJ1%hdv|4J<@@*V`}_NU{`|?s#r65~=jP_-i4!M2fBsxwUtd&Ibp87EnVFdn
z9z3{k;lk3TOHZCW+1c57<Hn7=ygYe%`H+wh8yg#6U*B1?W*HkBTUl9YXlO`FOS`(d
z9yoAd%a$#1adE~s^nq40C40I!hE&XXdpkOa$xxv6VGE<6%+4-_riPf5|Jovkvd?<k
z<#J~K+RtjRe6>#Tq%$o*O=#c)|Jka)jiqf?Ym$4`&Mf8HoB3zs#=eEu^v*SlT(jJg
z_O!CkVhi6Q6ZyaA1dm_yEMe<5aX)X>>6bp^S;a=bMV~)Rd=_E4cJT_6@XWsR?5{Pf
zj+-3cmOR(xx#8K3vm?|mzFck@wH~N%S!Um&+_^65qLU?-1G!6P95H{bVzqO|o@n)p
zCy%DQtX4d8^vUCsR$X3tYUjic#rW*eZwZ1BUCpIJbMyA}w+3{1zKK%5_;XUyqZ**{
zluV#`;*<BjZ#58~yzqVNhRwdkIyLeU&yz0Aigph?d2~t1J^?Sok98(mM^(P9o&4fN
zr>BkCzbi|g_1?CKx_PzA%~*52{l~CVR_3;MU!UJS*Xs7myF8b6Ot)WaptsKcqnVhg
z{E2l>+yDQ#pZ|C5I`zpG@dC~j(>>>ePq`4Y%yG~Bc`eIpXC0~R<$qW?S?y!pAqlok
zt|j}f+UoY~HtGBv{6iovI#cNRcO^xcC2K6~7p$Hl`n<e->ZV731bzpF?YX}`{#4iZ
z?s?vklBR1GYdi&t8*KrK?_XZ3seSJL9P6o~J2eac=_M~+V^P2ROGsEsXFM>lCM92a
zblR$O+LWo6{+4qEg}L4PzVD%`@1s9K8-v2k&R+|hQWRNO_pwe(`;*??i&mXsb)64D
zl%Dpx@}8hDv1^W3maM7JKLoU?Ugz86KaNYkJOA4J^LA~`BT$k@1q%BZUn@u~uit**
P6-dI<)z4*}Q$iB}uwi*_

literal 0
HcmV?d00001

diff --git a/TestsExample/src/Test550.js b/TestsExample/src/Test550.js
new file mode 100644
index 000000000..a260d175f
--- /dev/null
+++ b/TestsExample/src/Test550.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import {Button, ScrollView} from 'react-native';
+import {NavigationContainer} from '@react-navigation/native';
+import {createNativeStackNavigator} from 'react-native-screens/native-stack';
+
+function HomeScreen({navigation}) {
+  return (
+    <ScrollView contentContainerStyle={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
+        <Button
+          onPress={() => navigation.navigate('Details')}
+          title="Go to Details"
+        />
+    </ScrollView>
+  );
+}
+
+function DetailsScreen() {
+  return (
+    <ScrollView />
+  );
+}
+
+const RootStack = createNativeStackNavigator();
+
+function RootStackScreen() {
+  return (
+    <RootStack.Navigator
+      screenOptions={{
+        backButtonImage: require('../assets/backButton.png'),
+        headerBackTitleVisible: false,
+        headerTintColor: 'red',
+      }}>
+      <RootStack.Screen name="Home" component={HomeScreen} options={{headerShown: false}}/>
+      <RootStack.Screen
+        name="Details"
+        component={DetailsScreen}
+      />
+    </RootStack.Navigator>
+  );
+}
+
+export default function App() {
+  return (
+    <NavigationContainer>
+      <RootStackScreen />
+    </NavigationContainer>
+  );
+}
diff --git a/TestsExample/src/Test748.tsx b/TestsExample/src/Test748.tsx
new file mode 100644
index 000000000..b4887c471
--- /dev/null
+++ b/TestsExample/src/Test748.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import {Button, ScrollView, View} from 'react-native';
+import {NavigationContainer, NavigationProp, ParamListBase} from '@react-navigation/native';
+import {createNativeStackNavigator} from 'react-native-screens/native-stack';
+
+function HomeScreen({navigation}: {navigation: NavigationProp<ParamListBase>}) {
+  return (
+    <Button
+      onPress={() => {
+        navigation.navigate('Details');
+      }}
+      title="Go to details"
+    />
+  );
+}
+
+function DetailsScreen({navigation}: {navigation: NavigationProp<ParamListBase>}) {
+
+  const [visible, setVisible] = React.useState(true);
+
+  return (
+    <ScrollView>
+      <View style={{flex: 1, alignItems: 'center', justifyContent: 'center'}}>
+        <Button
+          onPress={() => {
+            navigation.setOptions({headerRight: visible ? () => <View style={{width: 40, height: 40, backgroundColor: 'red'}} /> : () => null})
+            setVisible(!visible);
+          }}
+          title="Swap headerRight"
+        />
+      </View>
+    </ScrollView>
+  );
+}
+
+const RootStack = createNativeStackNavigator();
+
+function RootStackScreen() {
+  return (
+    <RootStack.Navigator>
+      <RootStack.Screen name="Home" component={HomeScreen}/>
+      <RootStack.Screen name="Details" component={DetailsScreen} />
+    </RootStack.Navigator>
+  );
+}
+
+export default function App(): JSX.Element {
+  return (
+    <NavigationContainer>
+      <RootStackScreen />
+    </NavigationContainer>
+  );
+}
diff --git a/ios/RNSScreenStackHeaderConfig.m b/ios/RNSScreenStackHeaderConfig.m
index 36bd4f87b..670fc8705 100644
--- a/ios/RNSScreenStackHeaderConfig.m
+++ b/ios/RNSScreenStackHeaderConfig.m
@@ -123,7 +123,14 @@ + (void)setAnimatedConfig:(UIViewController *)vc withConfig:(RNSScreenStackHeade
   // This action fails when navigating to the screen with header for the second time and loads default back button.
   // It looks like changing the tint color of navbar triggers an update of the items belonging to it and it seems to load the custom back image
   // so we change the tint color's alpha by a very small amount and then set it to the one it should have.
-  [navbar setTintColor:[config.color colorWithAlphaComponent:CGColorGetAlpha(config.color.CGColor) - 0.01]];
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_14_0) && \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
+  // it brakes the behavior of `headerRight` in iOS 14, where the bug desribed above seems to be fixed, so we do nothing in iOS 14
+  if (@available(iOS 14.0, *)) {} else
+#endif
+  {
+    [navbar setTintColor:[config.color colorWithAlphaComponent:CGColorGetAlpha(config.color.CGColor) - 0.01]];
+  }
   [navbar setTintColor:config.color];
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \