octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Pilot fix for #558

Browse Source
This commit is contained in:
xmflsct
2022-12-16 00:21:53 +01:00
parent e09e2da1b7
commit 78dba4ae1a
6 changed files with 119 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Timeline/Shared/Avatar.tsx
View File

@ -12,7 +12,8 @@ export interface Props {
}
const TimelineAvatar: React.FC<Props> = ({ account }) => {
const { status, highlighted, disableDetails, disableOnPress } = useContext(StatusContext)
const { status, highlighted, disableDetails, disableOnPress, isConversation } =
useContext(StatusContext)
const actualAccount = account || status?.account
if (!actualAccount) return null
@ -34,7 +35,7 @@ const TimelineAvatar: React.FC<Props> = ({ account }) => {
}
uri={{ original: actualAccount.avatar, static: actualAccount.avatar_static }}
dimension={
disableDetails
disableDetails || isConversation
? {
width: StyleConstants.Avatar.XS,
height: StyleConstants.Avatar.XS
@ -47,7 +48,8 @@ const TimelineAvatar: React.FC<Props> = ({ account }) => {
style={{
borderRadius: StyleConstants.Avatar.M,
overflow: 'hidden',
marginRight: StyleConstants.Spacing.S
marginRight: StyleConstants.Spacing.S,
marginLeft: isConversation ? StyleConstants.Avatar.M - StyleConstants.Avatar.XS : undefined
}}
/>
)

1
src/components/Timeline/Shared/Context.tsx
View File

@ -19,6 +19,7 @@ type ContextType = {
inThread?: boolean
disableDetails?: boolean
disableOnPress?: boolean
isConversation?: boolean
}
const StatusContext = createContext<ContextType>({} as ContextType)