1
0
mirror of https://github.com/tooot-app/app synced 2025-04-16 11:17:29 +02:00

Now it should finally fix #451

This commit is contained in:
xmflsct 2022-11-22 21:39:25 +01:00
parent 39bda959e3
commit a631966952
7 changed files with 131 additions and 150 deletions

View File

@ -131,6 +131,9 @@ const contextMenuAccount = ({ actions, type, queryKey, rootQueryKey, id: account
} }
return (index: number) => { return (index: number) => {
if (typeof index !== 'number' || !actions[index]) {
return // For Android
}
if (actions[index].id === 'account-mute') { if (actions[index].id === 'account-mute') {
analytics('timeline_shared_headeractions_account_mute_press', { analytics('timeline_shared_headeractions_account_mute_press', {
page: queryKey && queryKey[1].page page: queryKey && queryKey[1].page

View File

@ -1,9 +1,6 @@
import analytics from '@components/analytics' import analytics from '@components/analytics'
import { displayMessage } from '@components/Message' import { displayMessage } from '@components/Message'
import { import { QueryKeyTimeline, useTimelineMutation } from '@utils/queryHooks/timeline'
QueryKeyTimeline,
useTimelineMutation
} from '@utils/queryHooks/timeline'
import { getInstanceUrl } from '@utils/slices/instancesSlice' import { getInstanceUrl } from '@utils/slices/instancesSlice'
import { useTheme } from '@utils/styles/ThemeManager' import { useTheme } from '@utils/styles/ThemeManager'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
@ -19,12 +16,7 @@ export interface Props {
rootQueryKey?: QueryKeyTimeline rootQueryKey?: QueryKeyTimeline
} }
const contextMenuInstance = ({ const contextMenuInstance = ({ actions, status, queryKey, rootQueryKey }: Props) => {
actions,
status,
queryKey,
rootQueryKey
}: Props) => {
const { t } = useTranslation('componentContextMenu') const { t } = useTranslation('componentContextMenu')
const { theme } = useTheme() const { theme } = useTheme()
@ -72,10 +64,12 @@ const contextMenuInstance = ({
} }
return (index: number) => { return (index: number) => {
if (typeof index !== 'number' || !actions[index]) {
return // For Android
}
if ( if (
actions[index].id === 'instance-block' || actions[index].id === 'instance-block' ||
(actions[index].id === 'instance' && (actions[index].id === 'instance' && actions[index].actions?.[0].id === 'instance-block')
actions[index].actions?.[0].id === 'instance-block')
) { ) {
analytics('timeline_shared_headeractions_domain_block_press', { analytics('timeline_shared_headeractions_domain_block_press', {
page: queryKey[1].page page: queryKey[1].page

View File

@ -25,7 +25,8 @@ 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' && type === 'status' && Platform.OS !== 'android' &&
type === 'status' &&
actions.push({ actions.push({
id: 'copy', id: 'copy',
title: t(`copy.action`), title: t(`copy.action`),
@ -34,6 +35,9 @@ const contextMenuShare = ({ copiableContent, actions, type, url }: Props) => {
}) })
return (index: number) => { return (index: number) => {
if (typeof index !== 'number' || !actions[index]) {
return // For Android
}
if (actions[index].id === 'copy') { if (actions[index].id === 'copy') {
analytics('timeline_shared_headeractions_copy_press') analytics('timeline_shared_headeractions_copy_press')
Clipboard.setString(copiableContent?.current.content || '') Clipboard.setString(copiableContent?.current.content || '')

View File

@ -9,10 +9,7 @@ import {
QueryKeyTimeline, QueryKeyTimeline,
useTimelineMutation useTimelineMutation
} from '@utils/queryHooks/timeline' } from '@utils/queryHooks/timeline'
import { import { checkInstanceFeature, getInstanceAccount } from '@utils/slices/instancesSlice'
checkInstanceFeature,
getInstanceAccount
} from '@utils/slices/instancesSlice'
import { useTheme } from '@utils/styles/ThemeManager' import { useTheme } from '@utils/styles/ThemeManager'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Alert } from 'react-native' import { Alert } from 'react-native'
@ -27,16 +24,8 @@ export interface Props {
rootQueryKey?: QueryKeyTimeline rootQueryKey?: QueryKeyTimeline
} }
const contextMenuStatus = ({ const contextMenuStatus = ({ actions, status, queryKey, rootQueryKey }: Props) => {
actions, const navigation = useNavigation<NativeStackNavigationProp<RootStackParamList, 'Screen-Tabs'>>()
status,
queryKey,
rootQueryKey
}: Props) => {
const navigation =
useNavigation<
NativeStackNavigationProp<RootStackParamList, 'Screen-Tabs'>
>()
const { theme } = useTheme() const { theme } = useTheme()
const { t } = useTranslation('componentContextMenu') const { t } = useTranslation('componentContextMenu')
@ -44,8 +33,7 @@ const contextMenuStatus = ({
const mutation = useTimelineMutation({ const mutation = useTimelineMutation({
onMutate: true, onMutate: true,
onError: (err: any, params, oldData) => { onError: (err: any, params, oldData) => {
const theFunction = (params as MutationVarsTimelineUpdateStatusProperty) const theFunction = (params as MutationVarsTimelineUpdateStatusProperty).payload
.payload
? (params as MutationVarsTimelineUpdateStatusProperty).payload.property ? (params as MutationVarsTimelineUpdateStatusProperty).payload.property
: 'delete' : 'delete'
displayMessage({ displayMessage({
@ -66,10 +54,7 @@ const contextMenuStatus = ({
} }
}) })
const instanceAccount = useSelector( const instanceAccount = useSelector(getInstanceAccount, (prev, next) => prev.id === next.id)
getInstanceAccount,
(prev, next) => prev.id === next.id
)
const ownAccount = instanceAccount?.id === status?.account?.id const ownAccount = instanceAccount?.id === status?.account?.id
if (ownAccount) { if (ownAccount) {
@ -118,14 +103,14 @@ const contextMenuStatus = ({
} }
return async (index: number) => { return async (index: number) => {
if (typeof index !== 'number' || !actions[index]) {
return // For Android
}
if (actions[index].id === 'status-delete') { if (actions[index].id === 'status-delete') {
analytics('timeline_shared_headeractions_status_delete_press', { analytics('timeline_shared_headeractions_status_delete_press', {
page: queryKey && queryKey[1].page page: queryKey && queryKey[1].page
}) })
Alert.alert( Alert.alert(t('status.delete.alert.title'), t('status.delete.alert.message'), [
t('status.delete.alert.title'),
t('status.delete.alert.message'),
[
{ {
text: t('status.delete.alert.buttons.confirm'), text: t('status.delete.alert.buttons.confirm'),
style: 'destructive', style: 'destructive',
@ -145,27 +130,20 @@ const contextMenuStatus = ({
{ {
text: t('common:buttons.cancel') text: t('common:buttons.cancel')
} }
] ])
)
} }
if (actions[index].id === 'status-delete-edit') { if (actions[index].id === 'status-delete-edit') {
analytics('timeline_shared_headeractions_status_deleteedit_press', { analytics('timeline_shared_headeractions_status_deleteedit_press', {
page: queryKey && queryKey[1].page page: queryKey && queryKey[1].page
}) })
Alert.alert( Alert.alert(t('status.deleteEdit.alert.title'), t('status.deleteEdit.alert.message'), [
t('status.deleteEdit.alert.title'),
t('status.deleteEdit.alert.message'),
[
{ {
text: t('status.deleteEdit.alert.buttons.confirm'), text: t('status.deleteEdit.alert.buttons.confirm'),
style: 'destructive', style: 'destructive',
onPress: async () => { onPress: async () => {
analytics( analytics('timeline_shared_headeractions_status_deleteedit_confirm', {
'timeline_shared_headeractions_status_deleteedit_confirm',
{
page: queryKey && queryKey[1].page page: queryKey && queryKey[1].page
} })
)
let replyToStatus: Mastodon.Status | undefined = undefined let replyToStatus: Mastodon.Status | undefined = undefined
if (status.in_reply_to_id) { if (status.in_reply_to_id) {
replyToStatus = await apiInstance<Mastodon.Status>({ replyToStatus = await apiInstance<Mastodon.Status>({
@ -193,8 +171,7 @@ const contextMenuStatus = ({
{ {
text: t('common:buttons.cancel') text: t('common:buttons.cancel')
} }
] ])
)
} }
if (actions[index].id === 'status-mute') { if (actions[index].id === 'status-mute') {
analytics('timeline_shared_headeractions_status_mute_press', { analytics('timeline_shared_headeractions_status_mute_press', {

View File

@ -157,15 +157,6 @@ const TimelineDefault: React.FC<Props> = ({
return disableOnPress ? ( return disableOnPress ? (
<View style={mainStyle}>{main()}</View> <View style={mainStyle}>{main()}</View>
) : Platform.OS === 'android' ? (
<Pressable
accessible={highlighted ? false : true}
style={mainStyle}
onPress={onPress}
onLongPress={() => {}}
>
{main()}
</Pressable>
) : ( ) : (
<TimelineContextMenu <TimelineContextMenu
copiableContent={copiableContent} copiableContent={copiableContent}

View File

@ -3,13 +3,14 @@ import contextMenuInstance from '@components/ContextMenu/instance'
import contextMenuShare from '@components/ContextMenu/share' import contextMenuShare from '@components/ContextMenu/share'
import contextMenuStatus from '@components/ContextMenu/status' import contextMenuStatus from '@components/ContextMenu/status'
import Icon from '@components/Icon' import Icon from '@components/Icon'
import { useActionSheet } from '@expo/react-native-action-sheet'
import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
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 React from 'react' import React from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { Pressable, View } from 'react-native' import { Pressable, View } from 'react-native'
import ContextMenu, { ContextMenuAction } from 'react-native-context-menu-view' import { ContextMenuAction } from 'react-native-context-menu-view'
import HeaderSharedAccount from './HeaderShared/Account' import HeaderSharedAccount from './HeaderShared/Account'
import HeaderSharedApplication from './HeaderShared/Application' import HeaderSharedApplication from './HeaderShared/Application'
import HeaderSharedCreated from './HeaderShared/Created' import HeaderSharedCreated from './HeaderShared/Created'
@ -55,6 +56,8 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
queryKey queryKey
}) })
const { showActionSheetWithOptions } = useActionSheet()
return ( return (
<View style={{ flex: 1, flexDirection: 'row' }}> <View style={{ flex: 1, flexDirection: 'row' }}>
<View style={{ flex: 7 }}> <View style={{ flex: 7 }}>
@ -82,25 +85,26 @@ const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
<Pressable <Pressable
accessibilityHint={t('accessibilityHint')} accessibilityHint={t('accessibilityHint')}
style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }} style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
onLongPress={() => null} onPress={() =>
> showActionSheetWithOptions(
<ContextMenu {
style={{ flex: 1, alignItems: 'center' }} options: actions.map(action => action.title),
dropdownMenuMode cancelButtonIndex: 999,
actions={actions} destructiveButtonIndex: actions
onPress={({ nativeEvent: { index } }) => { .map((action, index) => (action.destructive ? index : 999))
.filter(num => num !== 999)
},
index => {
if (index !== undefined) {
for (const on of [shareOnPress, statusOnPress, accountOnPress, instanceOnPress]) { for (const on of [shareOnPress, statusOnPress, accountOnPress, instanceOnPress]) {
on && on(index) on && on(index)
} }
}}
children={
<Icon
name='MoreHorizontal'
color={colors.secondary}
size={StyleConstants.Font.Size.L}
/>
} }
/> }
)
}
>
<Icon name='MoreHorizontal' color={colors.secondary} size={StyleConstants.Font.Size.L} />
</Pressable> </Pressable>
) : null} ) : null}
</View> </View>

View File

@ -4,12 +4,13 @@ import contextMenuShare from '@components/ContextMenu/share'
import contextMenuStatus from '@components/ContextMenu/status' import contextMenuStatus from '@components/ContextMenu/status'
import Icon from '@components/Icon' import Icon from '@components/Icon'
import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship' import { RelationshipIncoming, RelationshipOutgoing } from '@components/Relationship'
import { useActionSheet } from '@expo/react-native-action-sheet'
import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
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 React, { useMemo } from 'react' import React, { useMemo } from 'react'
import { Pressable, View } from 'react-native' import { Pressable, View } from 'react-native'
import ContextMenu, { ContextMenuAction } from 'react-native-context-menu-view' import { ContextMenuAction } from 'react-native-context-menu-view'
import HeaderSharedAccount from './HeaderShared/Account' import HeaderSharedAccount from './HeaderShared/Account'
import HeaderSharedApplication from './HeaderShared/Application' import HeaderSharedApplication from './HeaderShared/Application'
import HeaderSharedCreated from './HeaderShared/Created' import HeaderSharedCreated from './HeaderShared/Created'
@ -57,6 +58,8 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
queryKey queryKey
}) })
const { showActionSheetWithOptions } = useActionSheet()
const actions = useMemo(() => { const actions = useMemo(() => {
switch (notification.type) { switch (notification.type) {
case 'follow': case 'follow':
@ -68,13 +71,17 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
return ( return (
<Pressable <Pressable
style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }} style={{ flex: 1, flexBasis: StyleConstants.Font.Size.L }}
onLongPress={() => null} onPress={() =>
children={ showActionSheetWithOptions(
<ContextMenu {
style={{ flex: 1, alignItems: 'center' }} options: contextMenuActions.map(action => action.title),
dropdownMenuMode cancelButtonIndex: 999,
actions={contextMenuActions} destructiveButtonIndex: contextMenuActions
onPress={({ nativeEvent: { index } }) => { .map((action, index) => (action.destructive ? index : 999))
.filter(num => num !== 999)
},
index => {
if (index !== undefined) {
for (const on of [ for (const on of [
shareOnPress, shareOnPress,
statusOnPress, statusOnPress,
@ -83,7 +90,10 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
]) { ]) {
on && on(index) on && on(index)
} }
}} }
}
)
}
children={ children={
<Icon <Icon
name='MoreHorizontal' name='MoreHorizontal'
@ -92,8 +102,6 @@ const TimelineHeaderNotification = ({ queryKey, notification }: Props) => {
/> />
} }
/> />
}
/>
) )
} }
} }