New layout for notification bundles

This commit is contained in:
Alex Benzer
2026-04-22 13:17:25 -07:00
parent 5df51bdea7
commit 02aeb7d1e9
2 changed files with 100 additions and 14 deletions
+1
View File
@@ -15,5 +15,6 @@ export enum Features {
DmsNewMessageComposerEnable = 'dms:new_message_composer:enable', DmsNewMessageComposerEnable = 'dms:new_message_composer:enable',
KlipyGifProviderEnable = 'klipy_gif_provider:enable', KlipyGifProviderEnable = 'klipy_gif_provider:enable',
PostGalleryEmbedEnable = 'post_gallery_embed:enable', PostGalleryEmbedEnable = 'post_gallery_embed:enable',
NotificationsExpandedProfileCardEnable = 'notifications:expanded_profile_card:enable',
AATest = 'aa-test', AATest = 'aa-test',
} }
@@ -2,6 +2,7 @@ import {memo, useCallback, useEffect, useMemo, useState} from 'react'
import { import {
Animated, Animated,
type GestureResponderEvent, type GestureResponderEvent,
type LayoutChangeEvent,
Pressable, Pressable,
StyleSheet, StyleSheet,
TouchableOpacity, TouchableOpacity,
@@ -63,11 +64,14 @@ import {VerifiedCheck} from '#/components/icons/VerifiedCheck'
import {InlineLinkText, Link} from '#/components/Link' import {InlineLinkText, Link} from '#/components/Link'
import * as MediaPreview from '#/components/MediaPreview' import * as MediaPreview from '#/components/MediaPreview'
import {ProfileBadges} from '#/components/ProfileBadges' import {ProfileBadges} from '#/components/ProfileBadges'
import * as ProfileCard from '#/components/ProfileCard'
import {ProfileHoverCard} from '#/components/ProfileHoverCard' import {ProfileHoverCard} from '#/components/ProfileHoverCard'
import {Notification as StarterPackCard} from '#/components/StarterPack/StarterPackCard' import {Notification as StarterPackCard} from '#/components/StarterPack/StarterPackCard'
import {SubtleHover} from '#/components/SubtleHover' import {SubtleHover} from '#/components/SubtleHover'
import * as Toast from '#/components/Toast' import * as Toast from '#/components/Toast'
import {Text} from '#/components/Typography' import {Text} from '#/components/Typography'
import {useAnalytics} from '#/analytics'
import {IS_WEB} from '#/env'
import * as bsky from '#/types/bsky' import * as bsky from '#/types/bsky'
const MAX_AUTHORS = 5 const MAX_AUTHORS = 5
@@ -616,7 +620,7 @@ let NotificationFeedItem = ({
}}> }}>
{({hovered}) => ( {({hovered}) => (
<> <>
<SubtleHover hover={hovered} /> <SubtleHover hover={hovered && !isAuthorsExpanded} />
<View style={[styles.layoutIcon, a.pr_sm]}> <View style={[styles.layoutIcon, a.pr_sm]}>
{/* TODO: Prevent conditional rendering and move toward composable {/* TODO: Prevent conditional rendering and move toward composable
notifications for clearer accessibility labeling */} notifications for clearer accessibility labeling */}
@@ -635,6 +639,7 @@ let NotificationFeedItem = ({
<ExpandedAuthorsList <ExpandedAuthorsList
visible={isAuthorsExpanded} visible={isAuthorsExpanded}
authors={authors} authors={authors}
moderationOpts={moderationOpts}
/> />
<Text <Text
style={[ style={[
@@ -983,40 +988,120 @@ function CondensedAuthorsList({
function ExpandedAuthorsList({ function ExpandedAuthorsList({
visible, visible,
authors, authors,
moderationOpts,
}: { }: {
visible: boolean visible: boolean
authors: Author[] authors: Author[]
moderationOpts: ModerationOpts
}) { }) {
const ax = useAnalytics()
const profileCardEnabled = ax.features.enabled(
ax.features.NotificationsExpandedProfileCardEnable,
)
const isNativeFade = !IS_WEB && profileCardEnabled
const heightInterp = useAnimatedValue(visible ? 1 : 0) const heightInterp = useAnimatedValue(visible ? 1 : 0)
const targetHeight = const opacityInterp = useAnimatedValue(visible ? 1 : 0)
authors.length * (EXPANDED_AUTHOR_EL_HEIGHT + 10) /*10=margin*/ const [measuredHeight, setMeasuredHeight] = useState(0)
useEffect(() => {
Animated.timing(isNativeFade ? opacityInterp : heightInterp, {
toValue: visible ? 1 : 0,
duration: 200,
useNativeDriver: isNativeFade,
}).start()
}, [heightInterp, opacityInterp, visible, isNativeFade])
const onInnerLayout = (e: LayoutChangeEvent) => {
if (measuredHeight === 0) {
setMeasuredHeight(e.nativeEvent.layout.height)
}
}
if (isNativeFade) {
return (
<Animated.View style={{opacity: opacityInterp}}>
{visible && (
<View style={[a.pt_sm, a.pb_md]}>
{authors.map((author, i) => (
<ExpandedAuthorProfileCard
key={author.profile.did}
author={author}
moderationOpts={moderationOpts}
isLast={i === authors.length - 1}
/>
))}
</View>
)}
</Animated.View>
)
}
const targetHeight = profileCardEnabled
? measuredHeight
: authors.length * (EXPANDED_AUTHOR_EL_HEIGHT + 10) /*10=margin*/
const heightStyle = { const heightStyle = {
height: Animated.multiply(heightInterp, targetHeight), height: Animated.multiply(heightInterp, targetHeight),
} }
useEffect(() => {
Animated.timing(heightInterp, {
toValue: visible ? 1 : 0,
duration: 200,
useNativeDriver: false,
}).start()
}, [heightInterp, visible])
return ( return (
<Animated.View style={[a.overflow_hidden, heightStyle]}> <Animated.View style={[a.overflow_hidden, heightStyle]}>
{visible && {profileCardEnabled ? (
<View onLayout={onInnerLayout} style={[a.pt_sm, a.pb_md]}>
{authors.map((author, i) => (
<ExpandedAuthorProfileCard
key={author.profile.did}
author={author}
moderationOpts={moderationOpts}
isLast={i === authors.length - 1}
/>
))}
</View>
) : (
visible &&
authors.map(author => ( authors.map(author => (
<ExpandedAuthorCard key={author.profile.did} author={author} /> <ExpandedAuthorCard key={author.profile.did} author={author} />
))} ))
)}
</Animated.View> </Animated.View>
) )
} }
function ExpandedAuthorProfileCard({
author,
moderationOpts,
isLast,
}: {
author: Author
moderationOpts: ModerationOpts
isLast: boolean
}) {
return (
<ProfileCard.Link
profile={author.profile}
style={isLast ? undefined : a.pb_md}>
<ProfileCard.Outer>
<ProfileCard.Header>
<ProfileCard.Avatar
profile={author.profile}
moderationOpts={moderationOpts}
/>
<ProfileCard.NameAndHandle
profile={author.profile}
moderationOpts={moderationOpts}
/>
<ProfileCard.FollowButton
profile={author.profile}
moderationOpts={moderationOpts}
logContext="ProfileCard"
/>
</ProfileCard.Header>
</ProfileCard.Outer>
</ProfileCard.Link>
)
}
function ExpandedAuthorCard({author}: {author: Author}) { function ExpandedAuthorCard({author}: {author: Author}) {
const t = useTheme() const t = useTheme()
const {_} = useLingui() const {_} = useLingui()
return ( return (
<Link <Link
key={author.profile.did}
label={author.profile.displayName || author.profile.handle} label={author.profile.displayName || author.profile.handle}
accessibilityHint={_(msg`Opens this profile`)} accessibilityHint={_(msg`Opens this profile`)}
to={makeProfileLink({ to={makeProfileLink({