Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix quote & feed padding not being pressable (#7694)

authored by

Samuel Newman and committed by
GitHub
521a764d 7d694f60

+12 -47
+3 -2
src/components/ListCard.tsx
··· 26 26 import {Link as InternalLink, LinkProps} from '#/components/Link' 27 27 import * as Hider from '#/components/moderation/Hider' 28 28 import {Text} from '#/components/Typography' 29 + import {ButtonProps} from './Button' 29 30 30 31 /* 31 32 * This component is based on `FeedCard` and is tightly coupled with that ··· 48 49 type Props = { 49 50 view: AppBskyGraphDefs.ListView 50 51 showPinButton?: boolean 51 - } 52 + } & Omit<LinkProps, 'to' | 'label' | 'children'> 52 53 53 54 export function Default(props: Props) { 54 55 const {view, showPinButton} = props ··· 82 83 view, 83 84 children, 84 85 ...props 85 - }: Props & Omit<LinkProps, 'to' | 'label'>) { 86 + }: Props & Pick<ButtonProps, 'children'>) { 86 87 const queryClient = useQueryClient() 87 88 88 89 const href = React.useMemo(() => {
+2 -3
src/view/com/util/post-embeds/QuoteEmbed.tsx
··· 221 221 modui={moderation?.ui('contentList')} 222 222 style={[ 223 223 a.rounded_md, 224 - a.p_md, 225 224 a.mt_sm, 226 225 a.border, 227 226 t.atoms.border_contrast_low, 228 227 style, 229 - ]} 230 - childContainerStyle={[a.pt_sm]}> 228 + ]}> 231 229 <SubtleWebHover hover={hover} /> 232 230 <Link 233 231 hoverStyle={{borderColor: pal.colors.borderLinkHover}} 232 + style={[a.p_md, a.pt_sm]} 234 233 href={itemHref} 235 234 title={itemTitle} 236 235 onBeforePress={onBeforePress}>
+7 -42
src/view/com/util/post-embeds/index.tsx
··· 1 1 import React from 'react' 2 - import { 3 - InteractionManager, 4 - StyleProp, 5 - StyleSheet, 6 - View, 7 - ViewStyle, 8 - } from 'react-native' 2 + import {InteractionManager, StyleProp, View, ViewStyle} from 'react-native' 9 3 import {MeasuredDimensions, runOnJS, runOnUI} from 'react-native-reanimated' 10 4 import {Image} from 'expo-image' 11 5 import { ··· 22 16 } from '@atproto/api' 23 17 24 18 import {HandleRef, measureHandle} from '#/lib/hooks/useHandleRef' 25 - import {usePalette} from '#/lib/hooks/usePalette' 26 19 import {useLightboxControls} from '#/state/lightbox' 27 20 import {useModerationOpts} from '#/state/preferences/moderation-opts' 28 21 import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard' ··· 255 248 } 256 249 257 250 export function MaybeFeedCard({view}: {view: AppBskyFeedDefs.GeneratorView}) { 258 - const pal = usePalette('default') 251 + const t = useTheme() 259 252 const moderationOpts = useModerationOpts() 260 253 const moderation = React.useMemo(() => { 261 254 return moderationOpts ··· 267 260 <ContentHider modui={moderation?.ui('contentList')}> 268 261 <FeedSourceCard 269 262 feedUri={view.uri} 270 - style={[pal.view, pal.border, styles.customFeedOuter]} 263 + style={[a.border, t.atoms.border_contrast_medium, a.p_md, a.rounded_sm]} 271 264 showLikes 272 265 /> 273 266 </ContentHider> ··· 283 276 284 277 return ( 285 278 <ContentHider modui={moderation?.ui('contentList')}> 286 - <View 287 - style={[ 288 - a.border, 289 - t.atoms.border_contrast_medium, 290 - a.p_md, 291 - a.rounded_sm, 292 - ]}> 293 - <ListCard.Default view={view} /> 294 - </View> 279 + <ListCard.Default 280 + view={view} 281 + style={[a.border, t.atoms.border_contrast_medium, a.p_md, a.rounded_sm]} 282 + /> 295 283 </ContentHider> 296 284 ) 297 285 } 298 - 299 - const styles = StyleSheet.create({ 300 - altContainer: { 301 - backgroundColor: 'rgba(0, 0, 0, 0.75)', 302 - borderRadius: 6, 303 - paddingHorizontal: 6, 304 - paddingVertical: 3, 305 - position: 'absolute', 306 - right: 6, 307 - bottom: 6, 308 - }, 309 - alt: { 310 - color: 'white', 311 - fontSize: 7, 312 - fontWeight: '600', 313 - }, 314 - customFeedOuter: { 315 - borderWidth: StyleSheet.hairlineWidth, 316 - borderRadius: 8, 317 - paddingHorizontal: 12, 318 - paddingVertical: 12, 319 - }, 320 - })