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

Increase emoji size within text messages on web #46398

Closed
wants to merge 4 commits into from
Closed

Increase emoji size within text messages on web #46398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0aae8b
Increase emoji size within text messages on web
VickyStash Jul 29, 2024
5af5830
Minor improvement
VickyStash Jul 29, 2024
1e27458
Use default line height
VickyStash Jul 29, 2024
bd428bd
Improve emojis display
VickyStash Jul 29, 2024
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
15 changes: 13 additions & 2 deletions src/components/HTMLEngineProvider/HTMLRenderers/EmojiRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
import React from 'react';
import React, {useMemo} from 'react';
import type {CustomRendererProps, TPhrasing, TText} from 'react-native-render-html';
import EmojiWithTooltip from '@components/EmojiWithTooltip';
import useThemeStyles from '@hooks/useThemeStyles';

function EmojiRenderer({tnode}: CustomRendererProps<TText | TPhrasing>) {
const styles = useThemeStyles();
const style = 'islarge' in tnode.attributes ? styles.onlyEmojisText : {};
const style = useMemo(() => {
if ('islarge' in tnode.attributes) {
return styles.onlyEmojisText;
}

if ('ismedium' in tnode.attributes) {
return [styles.emojisWithinText, styles.verticalAlignMiddle];
}

return null;
}, [tnode.attributes, styles]);

return (
<EmojiWithTooltip
style={[style, styles.cursorDefault, styles.emojiDefaultStyles]}
Expand Down
12 changes: 10 additions & 2 deletions src/pages/home/report/comment/TextCommentFragment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
const {html = '', text = ''} = fragment ?? {};
const {translate} = useLocalize();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const emojisRegex = new RegExp(CONST.REGEX.EMOJIS, CONST.REGEX.EMOJIS.flags.concat('g'));
const doesTextContainEmojis = emojisRegex.test(text);

// If the only difference between fragment.text and fragment.html is <br /> tags and emoji tag
// on native, we render it as text, not as html
Expand All @@ -57,7 +59,14 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''} ${doesTextContainOnlyEmojis ? 'islarge' : ''}></edited>` : '';
const htmlWithDeletedTag = styleAsDeleted ? `<del>${html}</del>` : html;

const htmlContent = doesTextContainOnlyEmojis ? Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>') : htmlWithDeletedTag;
let htmlContent = doesTextContainOnlyEmojis ? Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>') : htmlWithDeletedTag;
Copy link
Member

Choose a reason for hiding this comment

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

This String.replaceAll is duplicate.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated


if (doesTextContainOnlyEmojis) {
htmlContent = Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>');
} else if (doesTextContainEmojis) {
htmlContent = Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji ismedium>');
}

let htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;

if (styleAsMuted) {
Expand All @@ -73,7 +82,6 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
}

const message = isEmpty(iouMessage) ? text : iouMessage;
const emojisRegex = new RegExp(CONST.REGEX.EMOJIS, CONST.REGEX.EMOJIS.flags.concat('g'));

return (
<Text style={[doesTextContainOnlyEmojis && styles.onlyEmojisText, styles.ltr, style]}>
Expand Down
3 changes: 3 additions & 0 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,9 @@ const styles = (theme: ThemeColors) =>
verticalAlignTop: {
verticalAlign: 'top',
},
verticalAlignMiddle: {
verticalAlign: 'middle',
},
lineHeightLarge: {
lineHeight: variables.lineHeightLarge,
},
Expand Down
Loading