diff --git a/__snapshots__/features/bookings/pages/BookingDetails/BookingDetails.native.test.tsx.native-snap b/__snapshots__/features/bookings/pages/BookingDetails/BookingDetails.native.test.tsx.native-snap
index f2e1c8d4491..aeadb1c6e8c 100644
--- a/__snapshots__/features/bookings/pages/BookingDetails/BookingDetails.native.test.tsx.native-snap
+++ b/__snapshots__/features/bookings/pages/BookingDetails/BookingDetails.native.test.tsx.native-snap
@@ -1088,17 +1088,6 @@ exports[`BookingDetails should render correctly 1`] = `
}
}
>
-
-
-
-
- Avez-vous déjà vu ?
+
+ Avez-vous déjà vu ?
+
-
-
-
+
-
-
-
-
-
- HeaderTitle
+
+ HeaderTitle
+
-
-
+
-
-
should display not logged in version
}
}
>
-
should display not logged in version
/>
-
-
should display not logged in version
},
]
}
- />
-
- Le pass Culture à 15 ans
+
+ Le pass Culture à 15 ans
+
-
-
-
+
-
,
]
`;
@@ -5264,17 +5207,6 @@ exports[` should render correctly when logged i
}
}
>
-
should render correctly when logged i
/>
-
-
should render correctly when logged i
},
]
}
- />
-
- Comment ça marche ?
+
+ Comment ça marche ?
+
-
-
-
+
-
,
]
`;
diff --git a/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap b/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap
index 77d74bbf7ae..d6cebdefc63 100644
--- a/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap
+++ b/__snapshots__/features/venue/pages/Venue/Venue.native.test.tsx.native-snap
@@ -4414,17 +4414,6 @@ d’options
}
}
>
-
-
-
-
- Le Petit Rintintin 1
+
+ Le Petit Rintintin 1
+
-
-
+
-
-
-
-
-
-
- Le Petit Rintintin 1
+
+ Le Petit Rintintin 1
+
-
-
+
-
-
)
onBackPress={goBack}
LeftElement={}
RightElement={
-
+
)
accessibilityLabel="Partager"
finalColor={theme.colors.black}
/>
-
-
+
}
/>
{shareContent ? (
@@ -81,3 +81,8 @@ export function OfferHeader({ headerTransition, title, offer }: Readonly)
)
}
+
+const ButtonsWrapper = styled(ViewGap)({
+ flexDirection: 'row',
+ alignItems: 'center',
+})
diff --git a/src/ui/components/headers/ContentHeader.tsx b/src/ui/components/headers/ContentHeader.tsx
index 516cc8f59de..fa7246c5ce2 100644
--- a/src/ui/components/headers/ContentHeader.tsx
+++ b/src/ui/components/headers/ContentHeader.tsx
@@ -6,7 +6,7 @@ import styled, { useTheme } from 'styled-components/native'
import { getAnimationState } from 'ui/animations/helpers/getAnimationState'
import { BlurView } from 'ui/components/BlurView'
import { RoundedButton } from 'ui/components/buttons/RoundedButton'
-import { Spacer, TypoDS } from 'ui/theme'
+import { TypoDS, getSpacing } from 'ui/theme'
type AnimatedBlurHeaderFullProps = {
headerTitle?: string
@@ -38,9 +38,10 @@ export const ContentHeader = ({
const [ariaHiddenTitle, setAriaHiddenTitle] = useState(true)
headerTransition.addListener((opacity) => setAriaHiddenTitle(opacity.value !== 1))
+ const marginTopHeader = Platform.OS === 'ios' ? top : top + getSpacing(2)
+
return (
-
{
// There is an issue with the blur on Android: we chose not to render it and use a white background
// https://github.com/Kureev/react-native-blur/issues/511
@@ -50,9 +51,7 @@ export const ContentHeader = ({
)
}
-
-
-
+
- {LeftElement ? {LeftElement} : null}
-
-
- {headerTitle}
-
-
- {RightElement ? (
-
- {RightElement}
-
-
- ) : (
-
- )}
+ {LeftElement}
+
+
+ {headerTitle}
+
+
+ {RightElement}
-
)
}
@@ -108,6 +99,10 @@ const HeaderContainer = styled(Animated.View)<{ height: number }>(({ theme, heig
borderBottomWidth: 1,
}))
+const TitleContainer = styled.View({
+ flex: 1,
+})
+
const Title = styled(Animated.Text).attrs({
numberOfLines: 2,
})(({ theme }) => ({
@@ -121,8 +116,15 @@ const Body = styled(TypoDS.Body)(({ theme }) => ({
color: theme.colors.black,
}))
-const Row = styled.View({
- flex: 1,
- flexDirection: 'row',
- alignItems: 'center',
-})
+const Row = styled.View<{ marginRight: number; marginTop: number }>(
+ ({ marginRight, marginTop }) => ({
+ ...(Platform.OS === 'web' ? { flex: 1 } : {}),
+ flexDirection: 'row',
+ alignItems: 'center',
+ justifyContent: 'space-between',
+ marginTop,
+ marginBottom: getSpacing(2),
+ marginLeft: getSpacing(6),
+ marginRight,
+ })
+)