Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

inserted zero width character for emoji selection prevention #29686

Merged
merged 6 commits into from
Oct 18, 2023
Merged

inserted zero width character for emoji selection prevention #29686

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b259693
inserted zero width character for emoji selection prevention
ayazalavi Oct 16, 2023
8ad8f96
linting/pretter fixes
ayazalavi Oct 16, 2023
49144c1
updated comments
ayazalavi Oct 16, 2023
2ad6677
fixed typo
ayazalavi Oct 17, 2023
2f8dd62
updated methods
ayazalavi Oct 18, 2023
816fa87
prettier fix
ayazalavi Oct 18, 2023
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
View file
Open in desktop
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 firstLetterIsEmoji(message) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer this as isFirstLetterEmoji or isFirstCharacterEmoji

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, please check.

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,
firstLetterIsEmoji,
};
24 changes: 24 additions & 0 deletions src/pages/home/report/ReportActionItemFragment.js
View file
Open in desktop
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 characyter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo in character word 'characyter'

* 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
*/

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer this as an arrow function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, please check.


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
View file
Open in desktop
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
Loading