mirror of https://github.com/tooot-app/app
Fix copy menu item
This commit is contained in:
parent
e5f750c3c8
commit
8aaa9bafb7
|
@ -25,7 +25,7 @@ const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => {
|
||||||
title: t(`share.${type}.action`),
|
title: t(`share.${type}.action`),
|
||||||
systemIcon: 'square.and.arrow.up'
|
systemIcon: 'square.and.arrow.up'
|
||||||
})
|
})
|
||||||
Platform.OS !== 'android' &&
|
Platform.OS !== 'android' && type === 'status' &&
|
||||||
actions.push({
|
actions.push({
|
||||||
id: 'copy',
|
id: 'copy',
|
||||||
title: t(`copy.action`),
|
title: t(`copy.action`),
|
||||||
|
|
|
@ -16,7 +16,7 @@ import { getInstanceAccount } from '@utils/slices/instancesSlice'
|
||||||
import { StyleConstants } from '@utils/styles/constants'
|
import { StyleConstants } from '@utils/styles/constants'
|
||||||
import { useTheme } from '@utils/styles/ThemeManager'
|
import { useTheme } from '@utils/styles/ThemeManager'
|
||||||
import { uniqBy } from 'lodash'
|
import { uniqBy } from 'lodash'
|
||||||
import React, { useCallback, useEffect, useRef } from 'react'
|
import React, { useCallback, useRef } from 'react'
|
||||||
import { Pressable, View } from 'react-native'
|
import { Pressable, View } from 'react-native'
|
||||||
import { useSelector } from 'react-redux'
|
import { useSelector } from 'react-redux'
|
||||||
import TimelineContextMenu from './Shared/ContextMenu'
|
import TimelineContextMenu from './Shared/ContextMenu'
|
||||||
|
@ -47,8 +47,7 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
}) => {
|
}) => {
|
||||||
const { colors } = useTheme()
|
const { colors } = useTheme()
|
||||||
const instanceAccount = useSelector(getInstanceAccount, () => true)
|
const instanceAccount = useSelector(getInstanceAccount, () => true)
|
||||||
const navigation =
|
const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()
|
||||||
useNavigation<StackNavigationProp<TabLocalStackParamList>>()
|
|
||||||
|
|
||||||
const actualStatus = item.reblog ? item.reblog : item
|
const actualStatus = item.reblog ? item.reblog : item
|
||||||
|
|
||||||
|
@ -60,9 +59,9 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
})
|
})
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!highlighted &&
|
|
||||||
queryKey &&
|
queryKey &&
|
||||||
shouldFilter({ copiableContent, status: actualStatus, queryKey })
|
shouldFilter({ copiableContent, status: actualStatus, queryKey }) &&
|
||||||
|
!highlighted
|
||||||
) {
|
) {
|
||||||
return <TimelineFiltered />
|
return <TimelineFiltered />
|
||||||
}
|
}
|
||||||
|
@ -92,9 +91,7 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
padding: StyleConstants.Spacing.Global.PagePadding,
|
padding: StyleConstants.Spacing.Global.PagePadding,
|
||||||
backgroundColor: colors.backgroundDefault,
|
backgroundColor: colors.backgroundDefault,
|
||||||
paddingBottom:
|
paddingBottom:
|
||||||
disableDetails && disableOnPress
|
disableDetails && disableOnPress ? StyleConstants.Spacing.Global.PagePadding : 0
|
||||||
? StyleConstants.Spacing.Global.PagePadding
|
|
||||||
: 0
|
|
||||||
}}
|
}}
|
||||||
onPress={onPress}
|
onPress={onPress}
|
||||||
onLongPress={() => {}}
|
onLongPress={() => {}}
|
||||||
|
@ -121,13 +118,10 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
|
paddingTop: highlighted ? StyleConstants.Spacing.S : 0,
|
||||||
paddingLeft: highlighted
|
paddingLeft: highlighted ? 0 : StyleConstants.Avatar.M + StyleConstants.Spacing.S
|
||||||
? 0
|
|
||||||
: StyleConstants.Avatar.M + StyleConstants.Spacing.S
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{typeof actualStatus.content === 'string' &&
|
{typeof actualStatus.content === 'string' && actualStatus.content.length > 0 ? (
|
||||||
actualStatus.content.length > 0 ? (
|
|
||||||
<TimelineContent
|
<TimelineContent
|
||||||
status={actualStatus}
|
status={actualStatus}
|
||||||
highlighted={highlighted}
|
highlighted={highlighted}
|
||||||
|
@ -149,14 +143,9 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
actualStatus.media_attachments.length ? (
|
actualStatus.media_attachments.length ? (
|
||||||
<TimelineAttachment status={actualStatus} />
|
<TimelineAttachment status={actualStatus} />
|
||||||
) : null}
|
) : null}
|
||||||
{!disableDetails && actualStatus.card ? (
|
{!disableDetails && actualStatus.card ? <TimelineCard card={actualStatus.card} /> : null}
|
||||||
<TimelineCard card={actualStatus.card} />
|
|
||||||
) : null}
|
|
||||||
{!disableDetails ? (
|
{!disableDetails ? (
|
||||||
<TimelineFullConversation
|
<TimelineFullConversation queryKey={queryKey} status={actualStatus} />
|
||||||
queryKey={queryKey}
|
|
||||||
status={actualStatus}
|
|
||||||
/>
|
|
||||||
) : null}
|
) : null}
|
||||||
<TimelineTranslate status={actualStatus} highlighted={highlighted} />
|
<TimelineTranslate status={actualStatus} highlighted={highlighted} />
|
||||||
<TimelineFeedback status={actualStatus} highlighted={highlighted} />
|
<TimelineFeedback status={actualStatus} highlighted={highlighted} />
|
||||||
|
@ -170,10 +159,7 @@ const TimelineDefault: React.FC<Props> = ({
|
||||||
status={actualStatus}
|
status={actualStatus}
|
||||||
ownAccount={ownAccount}
|
ownAccount={ownAccount}
|
||||||
accts={uniqBy(
|
accts={uniqBy(
|
||||||
(
|
([actualStatus.account] as Mastodon.Account[] & Mastodon.Mention[])
|
||||||
[actualStatus.account] as Mastodon.Account[] &
|
|
||||||
Mastodon.Mention[]
|
|
||||||
)
|
|
||||||
.concat(actualStatus.mentions)
|
.concat(actualStatus.mentions)
|
||||||
.filter(d => d?.id !== instanceAccount?.id),
|
.filter(d => d?.id !== instanceAccount?.id),
|
||||||
d => d?.id
|
d => d?.id
|
||||||
|
|
Loading…
Reference in New Issue