diff --git a/apps/src/tests/Test2231.tsx b/apps/src/tests/Test2231.tsx
new file mode 100644
index 0000000000..9449ffc3ff
--- /dev/null
+++ b/apps/src/tests/Test2231.tsx
@@ -0,0 +1,56 @@
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import React, { useLayoutEffect, useState } from 'react';
+import { View } from 'react-native';
+
+import { SettingsSwitch, Square } from '../shared';
+import { NavigationContainer } from '@react-navigation/native';
+
+const SettingsScreen = ({ navigation }: any) => {
+ const [hasLeftItem, setHasLeftItem] = useState(false);
+
+ const square1 = (props: { tintColor?: string }) => (
+
+ {hasLeftItem && }
+
+
+ );
+
+ const square2 = (props: { tintColor?: string }) => (
+
+ );
+
+ useLayoutEffect(() => {
+ navigation.setOptions({
+ headerRight: square1,
+ headerTitle: undefined,
+ headerLeft: hasLeftItem ? square2 : undefined,
+ headerBackTitleVisible: false,
+ });
+ }, [navigation, hasLeftItem]);
+
+ return (
+
+ );
+};
+
+const Stack = createNativeStackNavigator();
+
+const App = () => (
+
+
+
+
+
+);
+
+export default App;
diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts
index e0b13ffa17..9233d3ba8b 100644
--- a/apps/src/tests/index.ts
+++ b/apps/src/tests/index.ts
@@ -104,5 +104,6 @@ export { default as Test2184 } from './Test2184';
export { default as Test2223 } from './Test2223';
export { default as Test2227 } from './Test2227';
export { default as Test2229 } from './Test2229';
+export { default as Test2231 } from './Test2231';
export { default as TestScreenAnimation } from './TestScreenAnimation';
export { default as TestHeader } from './TestHeader';
diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm
index c23c7b301d..35212e92d8 100644
--- a/ios/RNSScreenStackHeaderSubview.mm
+++ b/ios/RNSScreenStackHeaderSubview.mm
@@ -72,6 +72,9 @@ - (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];
}
}