Skip to content

Commit 0108011

Browse files
authored
Merge pull request #751 from GetStream/close-emoji-picker
allows user to close emoji picker using smiley button
2 parents 6f9123b + 64c21a4 commit 0108011

File tree

13 files changed

+49
-8
lines changed

13 files changed

+49
-8
lines changed

src/components/MessageInput/MessageInputFlat.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,18 @@ const MessageInputFlat = (props) => {
5050
)}
5151

5252
<div className="str-chat__emojiselect-wrapper">
53-
<Tooltip>{t('Open emoji picker')}</Tooltip>
53+
<Tooltip>
54+
{messageInput.emojiPickerIsOpen
55+
? t('Close emoji picker')
56+
: t('Open emoji picker')}
57+
</Tooltip>
5458
<span
5559
className="str-chat__input-flat-emojiselect"
56-
onClick={messageInput.openEmojiPicker}
60+
onClick={
61+
messageInput.emojiPickerIsOpen
62+
? messageInput.closeEmojiPicker
63+
: messageInput.openEmojiPicker
64+
}
5765
onKeyDown={messageInput.handleEmojiKeyDown}
5866
role="button"
5967
tabIndex={0}

src/components/MessageInput/MessageInputLarge.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,18 @@ const MessageInputLarge = (props) => {
118118
)}
119119

120120
<div className="str-chat__emojiselect-wrapper">
121-
<Tooltip>{t('Open emoji picker')}</Tooltip>
121+
<Tooltip>
122+
{messageInput.emojiPickerIsOpen
123+
? t('Close emoji picker')
124+
: t('Open emoji picker')}
125+
</Tooltip>
122126
<span
123127
className="str-chat__input-emojiselect"
124-
onClick={messageInput.openEmojiPicker}
128+
onClick={
129+
messageInput.emojiPickerIsOpen
130+
? messageInput.closeEmojiPicker
131+
: messageInput.openEmojiPicker
132+
}
125133
onKeyDown={messageInput.handleEmojiKeyDown}
126134
ref={messageInput.emojiPickerRef}
127135
role="button"

src/components/MessageInput/MessageInputSimple.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,18 @@ const MessageInputSimple = (props) => {
4747
/>
4848

4949
<div className="str-chat__emojiselect-wrapper">
50-
<Tooltip>{t('Open emoji picker')}</Tooltip>
50+
<Tooltip>
51+
{messageInput.emojiPickerIsOpen
52+
? t('Close emoji picker')
53+
: t('Open emoji picker')}
54+
</Tooltip>
5155
<span
5256
className="str-chat__input-flat-emojiselect"
53-
onClick={messageInput.openEmojiPicker}
57+
onClick={
58+
messageInput.emojiPickerIsOpen
59+
? messageInput.closeEmojiPicker
60+
: messageInput.openEmojiPicker
61+
}
5462
onKeyDown={messageInput.handleEmojiKeyDown}
5563
role="button"
5664
tabIndex={0}

src/components/MessageInput/MessageInputSmall.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,18 @@ const MessageInputSmall = (props) => {
9393
)}
9494

9595
<div className="str-chat__emojiselect-wrapper">
96-
<Tooltip>{t('Open emoji picker')}</Tooltip>
96+
<Tooltip>
97+
{messageInput.emojiPickerIsOpen
98+
? t('Close emoji picker')
99+
: t('Open emoji picker')}
100+
</Tooltip>
97101
<span
98102
className="str-chat__small-message-input-emojiselect"
99-
onClick={messageInput.openEmojiPicker}
103+
onClick={
104+
messageInput.emojiPickerIsOpen
105+
? messageInput.closeEmojiPicker
106+
: messageInput.openEmojiPicker
107+
}
100108
onKeyDown={messageInput.handleEmojiKeyDown}
101109
role="button"
102110
tabIndex={0}

src/components/MessageInput/hooks/messageInput.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,7 @@ export default function useMessageInput(props) {
797797
handleChange,
798798
onPaste,
799799
onSelectItem,
800+
closeEmojiPicker,
800801
openEmojiPicker,
801802
handleEmojiKeyDown,
802803
};

src/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Cancel": "Cancel",
55
"Channel Missing": "Channel Missing",
66
"Close": "Close",
7+
"Close emoji picker": "Close emoji picker",
78
"Commands matching": "Commands matching",
89
"Connection failure, reconnecting now...": "Connection failure, reconnecting now...",
910
"Delete": "Delete",

src/i18n/fr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Cancel": "Annuler",
55
"Channel Missing": "Canal Manquant",
66
"Close": "Fermer",
7+
"Close emoji picker": "Fermer le sélecteur d'emojis",
78
"Commands matching": "Correspondance des commandes",
89
"Connection failure, reconnecting now...": "Échec de la connexion, reconnexion en cours...",
910
"Delete": "Supprimer",

src/i18n/hi.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Cancel": "रद्द करें",
55
"Channel Missing": "चैनल उपलब्ध नहीं है",
66
"Close": "बंद करे",
7+
"Close emoji picker": "इमोजी पिकर बंद करें",
78
"Commands matching": "मेल खाती है",
89
"Connection failure, reconnecting now...": "कनेक्शन विफल रहा, अब पुनः कनेक्ट हो रहा है ...",
910
"Delete": "डिलीट",

src/i18n/it.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Cancel": "Annulla",
55
"Channel Missing": "Il canale non esiste",
66
"Close": "Chiudi",
7+
"Close emoji picker": "Chiudi il selettore di emoji",
78
"Commands matching": "Comandi corrispondenti",
89
"Connection failure, reconnecting now...": "Connessione fallitta, riconnessione in corso...",
910
"Delete": "Cancella",

src/i18n/nl.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Cancel": "Annuleer",
55
"Channel Missing": "Kanaal niet gevonden",
66
"Close": "Sluit",
7+
"Close emoji picker": "Sluit de emoji-kiezer",
78
"Commands matching": "Bijpassende opdrachten",
89
"Connection failure, reconnecting now...": "Probleem met de verbinding, opnieuw verbinding maken...",
910
"Delete": "Verwijder",

0 commit comments

Comments
 (0)