diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/BasePreRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/BasePreRenderer.js index 8226a11b8d09..ab6147b7615d 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/BasePreRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/BasePreRenderer.js @@ -1,6 +1,6 @@ import React, {forwardRef} from 'react'; import {ScrollView} from 'react-native-gesture-handler'; -import {TouchableWithoutFeedback, View} from 'react-native'; +import {View} from 'react-native'; import PropTypes from 'prop-types'; import _ from 'underscore'; import htmlRendererPropTypes from '../htmlRendererPropTypes'; @@ -8,6 +8,7 @@ import withLocalize from '../../../withLocalize'; import {ShowContextMenuContext, showContextMenuForReport} from '../../../ShowContextMenuContext'; import styles from '../../../../styles/styles'; import * as ReportUtils from '../../../../libs/ReportUtils'; +import PressableWithoutFeedback from '../../../Pressable/PressableWithoutFeedback'; const propTypes = { /** Press in handler for the code block */ @@ -37,16 +38,18 @@ const BasePreRenderer = forwardRef((props, ref) => { > {({anchor, report, action, checkIfContextMenuActive}) => ( - showContextMenuForReport(event, anchor, report.reportID, action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))} + accessibilityRole="text" + accessibilityLabel={props.translate('accessibilityHints.prestyledText')} > {/* eslint-disable-next-line react/jsx-props-no-spreading */} - + )} diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js index 8600ee3ac807..6cdb83bbb81a 100644 --- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js +++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js @@ -91,6 +91,9 @@ const GenericPressable = forwardRef((props, ref) => { if (isDisabled) { return; } + if (!onPress) { + return; + } if (shouldUseHapticsOnPress) { HapticFeedback.press(); } diff --git a/src/components/Pressable/GenericPressable/PropTypes.js b/src/components/Pressable/GenericPressable/PropTypes.js index 950c443f8e96..588161031e10 100644 --- a/src/components/Pressable/GenericPressable/PropTypes.js +++ b/src/components/Pressable/GenericPressable/PropTypes.js @@ -21,7 +21,7 @@ const pressablePropTypes = { /** * onPress callback */ - onPress: PropTypes.func.isRequired, + onPress: PropTypes.func, /** * Specifies keyboard shortcut to trigger onPressHandler @@ -121,6 +121,7 @@ const pressablePropTypes = { }; const defaultProps = { + onPress: undefined, keyboardShortcut: undefined, shouldUseHapticsOnPress: false, shouldUseHapticsOnLongPress: false, diff --git a/src/languages/en.js b/src/languages/en.js index 62aa5f0816b7..45e2e00873ff 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -1388,6 +1388,7 @@ export default { workspaceName: 'Workspace name', chatUserDisplayNames: 'Chat user display names', scrollToNewestMessages: 'Scroll to newest messages', + prestyledText: 'Prestyled text', }, parentReportAction: { deletedMessage: '[Deleted message]', diff --git a/src/languages/es.js b/src/languages/es.js index 973c2ff8cea1..8f004aed65a0 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -1854,6 +1854,7 @@ export default { workspaceName: 'Nombre del espacio de trabajo', chatUserDisplayNames: 'Nombres de los usuarios del chat', scrollToNewestMessages: 'Desplázate a los mensajes más recientes', + prestyledText: 'texto preestilizado', }, parentReportAction: { deletedMessage: '[Mensaje eliminado]',