Skip to content

Commit 3c12e0d

Browse files
Abner Soares Alves JuniorRokt33r
authored andcommitted
Fix emoji render on notes list
1 parent 60d6c68 commit 3c12e0d

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

browser/components/NoteItem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types'
55
import React from 'react'
66
import { isArray, sortBy } from 'lodash'
77
import invertColor from 'invert-color'
8+
import Emoji from 'react-emoji-render'
89
import CSSModules from 'browser/lib/CSSModules'
910
import { getTodoStatus } from 'browser/lib/getTodoStatus'
1011
import styles from './NoteItem.styl'
@@ -87,7 +88,7 @@ const NoteItem = ({
8788
: <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />}
8889
<div styleName='item-title'>
8990
{note.title.trim().length > 0
90-
? note.title
91+
? <Emoji text={note.title} />
9192
: <span styleName='item-title-empty'>{i18n.__('Empty note')}</span>}
9293
</div>
9394
<div styleName='item-middle'>

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
"react-composition-input": "^1.1.1",
112112
"react-debounce-render": "^4.0.1",
113113
"react-dom": "^16.8.6",
114+
"react-emoji-render": "^1.1.0",
114115
"react-image-carousel": "^2.0.18",
115116
"react-redux": "^7.0.3",
116117
"react-router-dom": "^5.0.0",

yarn.lock

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2661,7 +2661,7 @@ d@1:
26612661
dependencies:
26622662
es5-ext "^0.10.9"
26632663

2664-
"dagre-d3@github:dagrejs/dagre-d3":
2664+
dagre-d3@dagrejs/dagre-d3:
26652665
version "0.6.4-pre"
26662666
resolved "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"
26672667
dependencies:
@@ -3142,6 +3142,11 @@ electron@4:
31423142
electron-download "^4.1.0"
31433143
extract-zip "^1.0.3"
31443144

3145+
emoji-regex@^6.4.1:
3146+
version "6.5.1"
3147+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
3148+
integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==
3149+
31453150
emojis-list@^2.0.0:
31463151
version "2.1.0"
31473152
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -6045,7 +6050,7 @@ lodash.escaperegexp@^4.1.2:
60456050
version "4.1.2"
60466051
resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
60476052

6048-
lodash.flatten@^4.2.0:
6053+
lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
60496054
version "4.4.0"
60506055
resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
60516056

@@ -7937,6 +7942,17 @@ react-dom@^16.8.6:
79377942
prop-types "^15.6.2"
79387943
scheduler "^0.13.6"
79397944

7945+
react-emoji-render@^1.1.0:
7946+
version "1.1.0"
7947+
resolved "https://registry.yarnpkg.com/react-emoji-render/-/react-emoji-render-1.1.0.tgz#af494619bf1012083bc20ad18eb0a6d92d04228c"
7948+
integrity sha512-HIHIrtWd8Jel4qDgIBRQnPPFChJakuRkMFl5N5wObYjYsL7a4pkwK5P9wrEKxQWqlbviTrjGOANAfFldnVuRIQ==
7949+
dependencies:
7950+
classnames "^2.2.5"
7951+
emoji-regex "^6.4.1"
7952+
lodash.flatten "^4.4.0"
7953+
prop-types "^15.5.8"
7954+
string-replace-to-array "^1.0.1"
7955+
79407956
react-image-carousel@^2.0.18:
79417957
version "2.0.18"
79427958
resolved "https://registry.yarnpkg.com/react-image-carousel/-/react-image-carousel-2.0.18.tgz#5868ea09bd9cca09c4467d3d02695cd4e7792f28"
@@ -9137,6 +9153,15 @@ string-length@^2.0.0:
91379153
astral-regex "^1.0.0"
91389154
strip-ansi "^4.0.0"
91399155

9156+
string-replace-to-array@^1.0.1:
9157+
version "1.0.3"
9158+
resolved "https://registry.yarnpkg.com/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz#c93eba999a5ee24d731aebbaf5aba36b5f18f7bf"
9159+
integrity sha1-yT66mZpe4k1zGuu69auja18Y978=
9160+
dependencies:
9161+
invariant "^2.2.1"
9162+
lodash.flatten "^4.2.0"
9163+
lodash.isstring "^4.0.1"
9164+
91409165
string-width@^1.0.1, string-width@^1.0.2:
91419166
version "1.0.2"
91429167
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"

0 commit comments

Comments
 (0)