diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-09-05 10:42:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 10:42:19 -0700 |
commit | 764c7cd5694a41c98d8543b68d7791fa90db4291 (patch) | |
tree | 8a11af0aa0e898cf7fb57ab0354f9fb5d28f004e /src/view/com/util/ViewHeader.tsx | |
parent | be8084ae103064d5680485f25e202c763957f2b4 (diff) | |
download | voidsky-764c7cd5694a41c98d8543b68d7791fa90db4291.tar.zst |
Updates to use dynamic/responsive styles on web (#1351)
* Move most responsive queries to the hook * Fix invalid CSS value * Fixes to tablet render of post thread * Fix overflow issues on web * Fix search header on tablet * Fix QP margin in web composer * Fix: only apply double gutter once to flatlist (close #1368) * Fix styles on discover feeds header * Fix double discover links in multifeed
Diffstat (limited to 'src/view/com/util/ViewHeader.tsx')
-rw-r--r-- | src/view/com/util/ViewHeader.tsx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx index 7482db8eb..91cdb08c7 100644 --- a/src/view/com/util/ViewHeader.tsx +++ b/src/view/com/util/ViewHeader.tsx @@ -8,9 +8,9 @@ import {Text} from './text/Text' import {useStores} from 'state/index' import {usePalette} from 'lib/hooks/usePalette' import {useAnimatedValue} from 'lib/hooks/useAnimatedValue' +import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {useAnalytics} from 'lib/analytics/analytics' import {NavigationProp} from 'lib/routes/types' -import {isDesktopWeb} from 'platform/detection' const BACK_HITSLOP = {left: 20, top: 20, right: 50, bottom: 20} @@ -35,6 +35,7 @@ export const ViewHeader = observer(function ({ const store = useStores() const navigation = useNavigation<NavigationProp>() const {track} = useAnalytics() + const {isDesktop, isTablet} = useWebMediaQueries() const onPressBack = React.useCallback(() => { if (navigation.canGoBack()) { @@ -49,7 +50,7 @@ export const ViewHeader = observer(function ({ store.shell.openDrawer() }, [track, store]) - if (isDesktopWeb) { + if (isDesktop) { if (showOnDesktop) { return ( <DesktopWebHeader @@ -84,13 +85,13 @@ export const ViewHeader = observer(function ({ icon="angle-left" style={[styles.backIcon, pal.text]} /> - ) : ( + ) : !isTablet ? ( <FontAwesomeIcon size={18} icon="bars" style={[styles.backIcon, pal.textLight]} /> - )} + ) : null} </TouchableOpacity> ) : null} <View style={styles.titleContainer} pointerEvents="none"> @@ -122,6 +123,7 @@ function DesktopWebHeader({ <CenteredView style={[ styles.header, + styles.headerFixed, styles.desktopHeader, pal.border, { @@ -178,6 +180,7 @@ const Container = observer( <View style={[ styles.header, + styles.headerFixed, pal.view, pal.border, showBorder && styles.border, @@ -190,9 +193,9 @@ const Container = observer( <Animated.View style={[ styles.header, + styles.headerFloating, pal.view, pal.border, - styles.headerFloating, transform, showBorder && styles.border, ]}> @@ -208,6 +211,12 @@ const styles = StyleSheet.create({ alignItems: 'center', paddingHorizontal: 12, paddingVertical: 6, + width: '100%', + }, + headerFixed: { + maxWidth: 600, + marginLeft: 'auto', + marginRight: 'auto', }, headerFloating: { position: 'absolute', |