Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/libs/EmojiUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,23 @@ function trimEmojiUnicode(emojiCode) {
return emojiCode.replace(/(fe0f|1f3fb|1f3fc|1f3fd|1f3fe|1f3ff)$/, '').trim();
}

/**
* Validates first character is emoji in text string
*
* @param {String} message
* @returns {Boolean}
*/
function isFirstLetterEmoji(message) {
const trimmedMessage = Str.replaceAll(message.replace(/ /g, ''), '\n', '');
const match = trimmedMessage.match(CONST.REGEX.EMOJIS);

if (!match) {
return false;
}

return trimmedMessage.indexOf(match[0]) === 0;
}

/**
* Validates that this message contains only emojis
*
Expand Down Expand Up @@ -497,4 +514,5 @@ export {
replaceAndExtractEmojis,
extractEmojis,
getAddedEmojis,
isFirstLetterEmoji,
};
24 changes: 24 additions & 0 deletions src/pages/home/report/ReportActionItemFragment.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import CONST from '../../../CONST';
import editedLabelStyles from '../../../styles/editedLabelStyles';
import UserDetailsTooltip from '../../../components/UserDetailsTooltip';
import avatarPropTypes from '../../../components/avatarPropTypes';
import * as Browser from '../../../libs/Browser';

const propTypes = {
/** Users accountID */
Expand Down Expand Up @@ -66,6 +67,9 @@ const propTypes = {

/** localization props */
...withLocalizePropTypes,

/** Should the comment have the appearance of being grouped with the previous comment? */
displayAsGroup: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -82,9 +86,28 @@ const defaultProps = {
delegateAccountID: 0,
actorIcon: {},
isThreadParentMessage: false,
displayAsGroup: false,
};

function ReportActionItemFragment(props) {
/**
* Checks text element for presence of emoji as first character
* and insert Zero-Width character to avoid selection issue
* mentioned here https://github.com/Expensify/App/issues/29021
*
* @param {String} text
* @param {Boolean} displayAsGroup
* @returns {ReactNode | null} Text component with zero width character
*/

const checkForEmojiForSelection = (text, displayAsGroup) => {
const firstLetterIsEmoji = EmojiUtils.isFirstLetterEmoji(text);
if (firstLetterIsEmoji && !displayAsGroup && !Browser.isMobile()) {
return <Text>&#x200b;</Text>;
}
return null;
};

switch (props.fragment.type) {
case 'COMMENT': {
const {html, text} = props.fragment;
Expand Down Expand Up @@ -116,6 +139,7 @@ function ReportActionItemFragment(props) {

return (
<Text style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}>
{checkForEmojiForSelection(text, props.displayAsGroup)}
<Text
selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style, isPendingDelete ? styles.offlineFeedback.deleted : undefined]}
Expand Down
1 change: 1 addition & 0 deletions src/pages/home/report/ReportActionItemMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ function ReportActionItemMessage(props) {
source={lodashGet(props.action, 'originalMessage.source')}
accountID={props.action.actorAccountID}
style={props.style}
displayAsGroup={props.displayAsGroup}
/>
))
) : (
Expand Down