diff options
Diffstat (limited to 'src/view')
-rw-r--r-- | src/view/com/pager/FeedsTabBarMobile.tsx | 6 | ||||
-rw-r--r-- | src/view/screens/PostThread.tsx | 18 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBar.tsx | 3 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBarStyles.tsx | 3 |
4 files changed, 11 insertions, 19 deletions
diff --git a/src/view/com/pager/FeedsTabBarMobile.tsx b/src/view/com/pager/FeedsTabBarMobile.tsx index 9848ce2d5..b33829ee5 100644 --- a/src/view/com/pager/FeedsTabBarMobile.tsx +++ b/src/view/com/pager/FeedsTabBarMobile.tsx @@ -25,7 +25,7 @@ export const FeedsTabBar = observer(function FeedsTabBarImpl( const setDrawerOpen = useSetDrawerOpen() const items = useHomeTabs(store.preferences.pinnedFeeds) const brandBlue = useColorSchemeStyle(s.brandBlue, s.blue3) - const {minimalShellMode, headerMinimalShellTransform} = useMinimalShellMode() + const {headerMinimalShellTransform} = useMinimalShellMode() const onPressAvi = React.useCallback(() => { setDrawerOpen(true) @@ -38,7 +38,6 @@ export const FeedsTabBar = observer(function FeedsTabBarImpl( pal.border, styles.tabBar, headerMinimalShellTransform, - minimalShellMode && styles.disabled, ]}> <View style={[pal.view, styles.topBar]}> <View style={[pal.view]}> @@ -110,7 +109,4 @@ const styles = StyleSheet.create({ title: { fontSize: 21, }, - disabled: { - pointerEvents: 'none', - }, }) diff --git a/src/view/screens/PostThread.tsx b/src/view/screens/PostThread.tsx index 0bdd06269..0abce45fa 100644 --- a/src/view/screens/PostThread.tsx +++ b/src/view/screens/PostThread.tsx @@ -1,5 +1,6 @@ import React, {useMemo} from 'react' import {InteractionManager, StyleSheet, View} from 'react-native' +import Animated from 'react-native-reanimated' import {useFocusEffect} from '@react-navigation/native' import {observer} from 'mobx-react-lite' import {NativeStackScreenProps, CommonNavigatorParams} from 'lib/routes/types' @@ -15,15 +16,14 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context' import {clamp} from 'lodash' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {logger} from '#/logger' -import {useMinimalShellMode, useSetMinimalShellMode} from '#/state/shell' - -const SHELL_FOOTER_HEIGHT = 44 +import {useMinimalShellMode} from 'lib/hooks/useMinimalShellMode' +import {useSetMinimalShellMode} from '#/state/shell' type Props = NativeStackScreenProps<CommonNavigatorParams, 'PostThread'> export const PostThreadScreen = withAuthRequired( observer(function PostThreadScreenImpl({route}: Props) { const store = useStores() - const minimalShellMode = useMinimalShellMode() + const {fabMinimalShellTransform} = useMinimalShellMode() const setMinimalShellMode = useSetMinimalShellMode() const safeAreaInsets = useSafeAreaInsets() const {name, rkey} = route.params @@ -83,17 +83,17 @@ export const PostThreadScreen = withAuthRequired( treeView={!!store.preferences.thread.lab_treeViewEnabled} /> </View> - {isMobile && !minimalShellMode && ( - <View + {isMobile && ( + <Animated.View style={[ styles.prompt, + fabMinimalShellTransform, { - bottom: - SHELL_FOOTER_HEIGHT + clamp(safeAreaInsets.bottom, 15, 30), + bottom: clamp(safeAreaInsets.bottom, 15, 30), }, ]}> <ComposePrompt onPressCompose={onPressReply} /> - </View> + </Animated.View> )} </View> ) diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index fedfcdfca..db4fa9d71 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -39,7 +39,7 @@ export const BottomBar = observer(function BottomBarImpl({ const {isAtHome, isAtSearch, isAtFeeds, isAtNotifications, isAtMyProfile} = useNavigationTabState() - const {minimalShellMode, footerMinimalShellTransform} = useMinimalShellMode() + const {footerMinimalShellTransform} = useMinimalShellMode() const {notifications} = store.me const onPressTab = React.useCallback( @@ -85,7 +85,6 @@ export const BottomBar = observer(function BottomBarImpl({ pal.border, {paddingBottom: clamp(safeAreaInsets.bottom, 15, 30)}, footerMinimalShellTransform, - minimalShellMode && styles.disabled, ]}> <Btn testID="bottomBarHomeBtn" diff --git a/src/view/shell/bottom-bar/BottomBarStyles.tsx b/src/view/shell/bottom-bar/BottomBarStyles.tsx index c175ed848..ae9381440 100644 --- a/src/view/shell/bottom-bar/BottomBarStyles.tsx +++ b/src/view/shell/bottom-bar/BottomBarStyles.tsx @@ -65,7 +65,4 @@ export const styles = StyleSheet.create({ borderWidth: 1, borderRadius: 100, }, - disabled: { - pointerEvents: 'none', - }, }) |