From 1ebe3d7509665805d70cb45a1cafbfdd560058f0 Mon Sep 17 00:00:00 2001 From: alduzy Date: Tue, 16 Jul 2024 11:58:22 +0200 Subject: [PATCH 1/5] Added repro --- apps/src/tests/Test2231.tsx | 83 +++++++++++++++++++++++++++++++++++++ apps/src/tests/index.ts | 3 +- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 apps/src/tests/Test2231.tsx diff --git a/apps/src/tests/Test2231.tsx b/apps/src/tests/Test2231.tsx new file mode 100644 index 0000000000..90fa44c3b6 --- /dev/null +++ b/apps/src/tests/Test2231.tsx @@ -0,0 +1,83 @@ +import { + createNativeStackNavigator, + NativeStackNavigationProp, +} from '@react-navigation/native-stack'; +import React, { useLayoutEffect, useState } from 'react'; +import { ScrollView, StyleSheet, View } from 'react-native'; + +import { SettingsSwitch, Square, ToastProvider } from '../shared'; +import { NavigationContainer } from '@react-navigation/native'; + +type StackParamList = { + Settings: undefined; +}; + +interface SettingsScreenProps { + navigation: NativeStackNavigationProp; +} + +const SettingsScreen = ({ + navigation, +}: SettingsScreenProps): React.JSX.Element => { + 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 = (): React.JSX.Element => ( + + + + + + + +); + +const styles = StyleSheet.create({ + container: { + flex: 1, + paddingTop: 10, + backgroundColor: 'white', + }, +}); + +export default App; diff --git a/apps/src/tests/index.ts b/apps/src/tests/index.ts index 36d3f12ca9..24c07ea766 100644 --- a/apps/src/tests/index.ts +++ b/apps/src/tests/index.ts @@ -45,7 +45,7 @@ export { default as Test861 } from './Test861'; export { default as Test865 } from './Test865'; export { default as Test881 } from './Test881'; export { default as Test887 } from './Test887'; -export { default as Test898 } from './Test898'; +// export { default as Test898 } from './Test898'; export { default as Test913 } from './Test913'; export { default as Test999 } from './Test999'; export { default as Test1017 } from './Test1017'; @@ -105,5 +105,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'; From 514b8dab02725db11489ac7c28c953f99931ceee Mon Sep 17 00:00:00 2001 From: alduzy Date: Tue, 16 Jul 2024 12:00:55 +0200 Subject: [PATCH 2/5] Subview layout fix --- ios/RNSScreenStackHeaderSubview.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm index c23c7b301d..d35323e95f 100644 --- a/ios/RNSScreenStackHeaderSubview.mm +++ b/ios/RNSScreenStackHeaderSubview.mm @@ -72,6 +72,7 @@ - (void)updateLayoutMetrics:(const react::LayoutMetrics &)layoutMetrics self); } else { self.bounds = CGRect{CGPointZero, frame.size}; + [self.superview layoutIfNeeded]; } } From 089fc0b17ec71552db71c59dbca30dabd2adba42 Mon Sep 17 00:00:00 2001 From: alduzy Date: Wed, 17 Jul 2024 17:49:33 +0200 Subject: [PATCH 3/5] simplified test --- apps/src/tests/Test2231.tsx | 65 +++++++++++-------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/apps/src/tests/Test2231.tsx b/apps/src/tests/Test2231.tsx index 90fa44c3b6..46b91d22e1 100644 --- a/apps/src/tests/Test2231.tsx +++ b/apps/src/tests/Test2231.tsx @@ -1,24 +1,11 @@ -import { - createNativeStackNavigator, - NativeStackNavigationProp, -} from '@react-navigation/native-stack'; +import { createNativeStackNavigator } from '@react-navigation/native-stack'; import React, { useLayoutEffect, useState } from 'react'; -import { ScrollView, StyleSheet, View } from 'react-native'; +import { View } from 'react-native'; import { SettingsSwitch, Square, ToastProvider } from '../shared'; import { NavigationContainer } from '@react-navigation/native'; -type StackParamList = { - Settings: undefined; -}; - -interface SettingsScreenProps { - navigation: NativeStackNavigationProp; -} - -const SettingsScreen = ({ - navigation, -}: SettingsScreenProps): React.JSX.Element => { +const SettingsScreen = ({ navigation }: any) => { const [hasLeftItem, setHasLeftItem] = useState(false); const square1 = (props: { tintColor?: string }) => ( @@ -42,42 +29,28 @@ const SettingsScreen = ({ }, [navigation, hasLeftItem]); return ( - - - + ); }; -const Stack = createNativeStackNavigator(); +const Stack = createNativeStackNavigator(); -const App = (): React.JSX.Element => ( +const App = () => ( - - - - - + + + ); -const styles = StyleSheet.create({ - container: { - flex: 1, - paddingTop: 10, - backgroundColor: 'white', - }, -}); - export default App; From 74937b6033cc0c47c502738c6c7725ec791ac1ea Mon Sep 17 00:00:00 2001 From: alduzy Date: Wed, 17 Jul 2024 17:50:49 +0200 Subject: [PATCH 4/5] removed import --- apps/src/tests/Test2231.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/src/tests/Test2231.tsx b/apps/src/tests/Test2231.tsx index 46b91d22e1..9449ffc3ff 100644 --- a/apps/src/tests/Test2231.tsx +++ b/apps/src/tests/Test2231.tsx @@ -2,7 +2,7 @@ import { createNativeStackNavigator } from '@react-navigation/native-stack'; import React, { useLayoutEffect, useState } from 'react'; import { View } from 'react-native'; -import { SettingsSwitch, Square, ToastProvider } from '../shared'; +import { SettingsSwitch, Square } from '../shared'; import { NavigationContainer } from '@react-navigation/native'; const SettingsScreen = ({ navigation }: any) => { From 436409fb05f9aa00ca639619584f602f01530fd4 Mon Sep 17 00:00:00 2001 From: alduzy Date: Thu, 18 Jul 2024 18:04:48 +0200 Subject: [PATCH 5/5] Added comment --- ios/RNSScreenStackHeaderSubview.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/RNSScreenStackHeaderSubview.mm b/ios/RNSScreenStackHeaderSubview.mm index d35323e95f..35212e92d8 100644 --- a/ios/RNSScreenStackHeaderSubview.mm +++ b/ios/RNSScreenStackHeaderSubview.mm @@ -72,6 +72,8 @@ - (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]; } }