fix(iOS): right header incorrect position (#2316)

## Description

This PR fixes the incorrect position of the custom header items when
updating more than one option at the same time. The proposed solution
let us remove the previous fix for a similar problem:
#2248 which
only fixed the issue on fabric.

Fixes #432, #2231.

## Changes

- forced re-layout of the navigation controller when subviews are
updated
- removed previous fix
- updated `Test432` repro

<!--

## Screenshots / GIFs

Here you can add screenshots / GIFs documenting your change.

You can add before / after section if you're changing some behavior.

### Before

### After

-->

## Test code and steps to reproduce

- use `Test432` and `Test2231` to test this fix on both architectures.

## Checklist

- [x] Included code example that can be used to test this change
- [x] Ensured that CI passes

(cherry picked from commit bc95fa4)

Author: alduzy

apps/src/tests/Test432.tsx

@@ -13,18 +13,34 @@ type RootStackParamList = {
 };
 type RootStackScreenProps<T extends keyof RootStackParamList> =
   NativeStackScreenProps<RootStackParamList, T>;
+
 const HomeScreen = ({ navigation }: RootStackScreenProps<'Home'>) => {
-  const showSettings = useCallback(() => {
-    navigation.navigate('Settings');
-  }, [navigation]);
+  const [x, setX] = React.useState(false);
+  React.useEffect(() => {
+    navigation.setOptions({
+      headerBackVisible: !x,
+      headerRight: x
+        ? () => (
+            <View style={{ backgroundColor: 'green', width: 20, height: 20 }} />
+          )
+        : () => (
+            <View style={{ backgroundColor: 'green', width: 10, height: 10 }} />
+          ),
+    });
+  }, [navigation, x]);
+
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
-      <Button onPress={showSettings} title={'Show settings'} />
+      <Button title="Tap me for header update" onPress={() => setX(!x)} />
+      <Button
+        title={'Show settings'}
+        onPress={() => navigation.navigate('Settings')}
+      />
     </View>
   );
 };
 
-const SettingsScreen = ({ navigation }: RootStackScreenProps<'Settings'>) => {
+const SettingsScreen = () => {
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
       <Text>Settings</Text>
@@ -47,7 +63,7 @@ const RootNavigator = () => {
     [navigation],
   );
   return (
-    <RootStack.Navigator screenOptions={{ headerShown: false }}>
+    <RootStack.Navigator>
       <RootStack.Screen name="Home" component={HomeScreen} />
       <RootStack.Screen
         name="Settings"

ios/RNSScreenStackHeaderConfig.mm

@@ -681,6 +681,9 @@ + (void)updateViewController:(UIViewController *)vc
         break;
       }
     }
+    // We're forcing a re-layout when the subviews change,
+    // see: https://github.com/software-mansion/react-native-screens/pull/2316
+    [navctr.view layoutIfNeeded];
   }
 
   // This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).

ios/RNSScreenStackHeaderSubview.mm

@@ -78,9 +78,6 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics
         self);
   } else {
     self.bounds = CGRect{CGPointZero, frame.size};
-    // We're forcing the parent view to layout this subview with correct frame size,
-    // see: https://github.com/software-mansion/react-native-screens/pull/2248
-    [self.superview layoutIfNeeded];
   }
 }