Skip to content

Commit cef11b7

Browse files
authored
Merge pull request #3738 from rdjuric/bigSingleEmoji
Feature: Make lonely emojis bigger
2 parents 3fdea74 + ff5cb8f commit cef11b7

File tree

5 files changed

+43
-12
lines changed

5 files changed

+43
-12
lines changed

src/CONST.js

Lines changed: 13 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/libs/ValidationUtils.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,23 @@ function isValidAddress(value) {
1717
return !CONST.REGEX.PO_BOX.test(value);
1818
}
1919

20+
/**
21+
* Validates that this string is composed of a single emoji
22+
*
23+
* @param {String} message
24+
* @returns {Boolean}
25+
*/
26+
function isSingleEmoji(message) {
27+
const match = message.match(CONST.REGEX.EMOJIS);
28+
29+
if (!match) {
30+
return false;
31+
}
32+
33+
const matchedEmoji = match[0];
34+
return message.length === matchedEmoji.length;
35+
}
36+
2037
/**
2138
* Validate date fields
2239
*
@@ -85,4 +102,5 @@ export {
85102
isValidIndustryCode,
86103
isValidIdentity,
87104
isValidZipCode,
105+
isSingleEmoji,
88106
};

src/pages/home/report/ReportActionItemFragment.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import themeColors from '../../../styles/themes/default';
99
import RenderHTML from '../../../components/RenderHTML';
1010
import Text from '../../../components/Text';
1111
import Tooltip from '../../../components/Tooltip';
12+
import {isSingleEmoji} from '../../../libs/ValidationUtils';
1213

1314
const propTypes = {
1415
/** The message fragment needing to be displayed */
@@ -56,7 +57,10 @@ class ReportActionItemFragment extends React.PureComponent {
5657
debug={false}
5758
/>
5859
) : (
59-
<Text selectable>
60+
<Text
61+
selectable
62+
style={isSingleEmoji(fragment.text) ? styles.singleEmojiText : undefined}
63+
>
6064
{Str.htmlDecode(fragment.text)}
6165
{fragment.isEdited && (
6266
<Text

src/styles/styles.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,11 @@ const styles = {
571571
textDecorationLine: 'none',
572572
},
573573

574+
singleEmojiText: {
575+
fontSize: variables.fontSizeSingleEmoji,
576+
lineHeight: variables.fontSizeSingleEmojiHeight,
577+
},
578+
574579
createMenuPositionSidebar: {
575580
left: 18,
576581
bottom: 100,

src/styles/variables.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export default {
99
componentBorderRadiusCard: 12,
1010
avatarSizeNormal: 40,
1111
avatarSizeSmall: 28,
12+
fontSizeSingleEmoji: 30,
13+
fontSizeSingleEmojiHeight: 35,
1214
fontSizeSmall: 11,
1315
fontSizeExtraSmall: 9,
1416
fontSizeLabel: 13,

0 commit comments

Comments
 (0)