diff options
Diffstat (limited to 'src/view/com')
-rw-r--r-- | src/view/com/post-thread/PostLikedBy.tsx | 2 | ||||
-rw-r--r-- | src/view/com/post-thread/PostRepostedBy.tsx | 2 | ||||
-rw-r--r-- | src/view/com/profile/ProfileFollowers.tsx | 2 | ||||
-rw-r--r-- | src/view/com/profile/ProfileFollows.tsx | 2 | ||||
-rw-r--r-- | src/view/com/util/forms/Button.tsx | 21 |
5 files changed, 25 insertions, 4 deletions
diff --git a/src/view/com/post-thread/PostLikedBy.tsx b/src/view/com/post-thread/PostLikedBy.tsx index 3ab9a279b..dc090e7ad 100644 --- a/src/view/com/post-thread/PostLikedBy.tsx +++ b/src/view/com/post-thread/PostLikedBy.tsx @@ -78,6 +78,8 @@ export const PostLikedBy = observer(function ({uri}: {uri: string}) { </View> )} extraData={view.isLoading} + // @ts-ignore our .web version only -prf + desktopFixedHeight /> ) }) diff --git a/src/view/com/post-thread/PostRepostedBy.tsx b/src/view/com/post-thread/PostRepostedBy.tsx index 9874460e9..65579ae23 100644 --- a/src/view/com/post-thread/PostRepostedBy.tsx +++ b/src/view/com/post-thread/PostRepostedBy.tsx @@ -89,6 +89,8 @@ export const PostRepostedBy = observer(function PostRepostedBy({ </View> )} extraData={view.isLoading} + // @ts-ignore our .web version only -prf + desktopFixedHeight /> ) }) diff --git a/src/view/com/profile/ProfileFollowers.tsx b/src/view/com/profile/ProfileFollowers.tsx index db592075a..cba171925 100644 --- a/src/view/com/profile/ProfileFollowers.tsx +++ b/src/view/com/profile/ProfileFollowers.tsx @@ -92,6 +92,8 @@ export const ProfileFollowers = observer(function ProfileFollowers({ </View> )} extraData={view.isLoading} + // @ts-ignore our .web version only -prf + desktopFixedHeight /> ) }) diff --git a/src/view/com/profile/ProfileFollows.tsx b/src/view/com/profile/ProfileFollows.tsx index 10da79c5e..dafba62fc 100644 --- a/src/view/com/profile/ProfileFollows.tsx +++ b/src/view/com/profile/ProfileFollows.tsx @@ -89,6 +89,8 @@ export const ProfileFollows = observer(function ProfileFollows({ </View> )} extraData={view.isLoading} + // @ts-ignore our .web version only -prf + desktopFixedHeight /> ) }) diff --git a/src/view/com/util/forms/Button.tsx b/src/view/com/util/forms/Button.tsx index a634b47a9..8548860d0 100644 --- a/src/view/com/util/forms/Button.tsx +++ b/src/view/com/util/forms/Button.tsx @@ -1,15 +1,20 @@ import React from 'react' import { + GestureResponderEvent, StyleProp, StyleSheet, TextStyle, - TouchableOpacity, + Pressable, ViewStyle, } from 'react-native' import {Text} from '../text/Text' import {useTheme} from 'lib/ThemeContext' import {choose} from 'lib/functions' +type Event = + | React.MouseEvent<HTMLAnchorElement, MouseEvent> + | GestureResponderEvent + export type ButtonType = | 'primary' | 'secondary' @@ -114,10 +119,18 @@ export function Button({ }, }, ) + const onPressWrapped = React.useCallback( + (event: Event) => { + event.stopPropagation() + event.preventDefault() + onPress?.() + }, + [onPress], + ) return ( - <TouchableOpacity + <Pressable style={[typeOuterStyle, styles.outer, style]} - onPress={onPress} + onPress={onPressWrapped} testID={testID}> {label ? ( <Text type="button" style={[typeLabelStyle, labelStyle]}> @@ -126,7 +139,7 @@ export function Button({ ) : ( children )} - </TouchableOpacity> + </Pressable> ) } |