Skip to content

Commit 3297b18

Browse files
committed
shared: Upgrade to 0.0.16
This brings a nice change to the typeahead code: the overabstracted function query_matches_source_attrs is removed, and query_matches_string is exported instead: zulip/zulip#23375 In zulip/zulip#23412, released in 0.0.16, we corrected the type for `typeahead.get_emoji_matcher` to reflect that the code assumes a reaction_type property on emoji objects. So, update our EmojiForShared type to include that property.
1 parent 4e09f23 commit 3297b18

File tree

6 files changed

+44
-18
lines changed

6 files changed

+44
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@react-navigation/native": "^5.7.6",
3333
"@react-navigation/stack": "^5.9.3",
3434
"@sentry/react-native": "^3.3.3",
35-
"@zulip/shared": "^0.0.14",
35+
"@zulip/shared": "0.0.16",
3636
"base-64": "^1.0.0",
3737
"blueimp-md5": "^2.10.0",
3838
"color": "^4.0.1",

src/emoji/__tests__/data-test.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,37 @@ describe('getFilteredEmojis', () => {
9090
});
9191

9292
test('search in realm emojis as well', () => {
93-
const emoji = { emoji_type: 'image', emoji_code: '654', emoji_name: 'qwerty' };
93+
const emoji = {
94+
reaction_type: 'realm_emoji',
95+
emoji_type: 'image',
96+
emoji_code: '654',
97+
emoji_name: 'qwerty',
98+
};
9499
expect(getFilteredEmojis('qwerty', [emoji], null)).toEqual([emoji]);
95100
});
96101

97102
test('remove duplicates', () => {
98103
expect(names('dog')).toEqual(['dog', 'dogi', 'hotdog']);
99-
const emoji = { emoji_type: 'image', emoji_code: '345', emoji_name: 'dog' };
104+
const emoji = {
105+
reaction_type: 'realm_emoji',
106+
emoji_type: 'image',
107+
emoji_code: '345',
108+
emoji_name: 'dog',
109+
};
100110
expect(getFilteredEmojis('dog', [emoji], null)).toEqual([
101-
{ emoji_type: 'image', emoji_code: '345', emoji_name: 'dog' },
102-
{ emoji_type: 'unicode', emoji_code: '1f94b', emoji_name: 'dogi' },
103-
{ emoji_type: 'unicode', emoji_code: '1f32d', emoji_name: 'hotdog' },
111+
{ reaction_type: 'realm_emoji', emoji_type: 'image', emoji_code: '345', emoji_name: 'dog' },
112+
{
113+
reaction_type: 'unicode_emoji',
114+
emoji_type: 'unicode',
115+
emoji_code: '1f94b',
116+
emoji_name: 'dogi',
117+
},
118+
{
119+
reaction_type: 'unicode_emoji',
120+
emoji_type: 'unicode',
121+
emoji_code: '1f32d',
122+
emoji_name: 'hotdog',
123+
},
104124
]);
105125
});
106126

src/emoji/data.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ const getUnicodeEmojiObjects = (
7070
): $ReadOnlyArray<EmojiForShared> => {
7171
if (!serverEmojiData) {
7272
return objectEntries(unicodeCodeByName).map(([name, code]) => ({
73+
reaction_type: 'unicode_emoji',
7374
emoji_type: 'unicode',
7475
emoji_name: name,
7576
emoji_code: code,
@@ -80,6 +81,7 @@ const getUnicodeEmojiObjects = (
8081
for (const [code, names] of serverEmojiData.code_to_names.entries()) {
8182
result.push(
8283
...names.map(name => ({
84+
reaction_type: 'unicode_emoji',
8385
emoji_type: 'unicode',
8486
emoji_name: name,
8587
emoji_code: code,

src/emoji/emojiSelectors.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export const getActiveImageEmoji: Selector<$ReadOnlyArray<EmojiForShared>> = cre
4646
getActiveImageEmojiById,
4747
emojis =>
4848
Object.keys(emojis).map(id => ({
49+
reaction_type: 'realm_emoji',
4950
emoji_type: 'image',
5051
emoji_name: emojis[id].name,
5152
emoji_code: emojis[id].code,

src/types.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,12 @@ export type Identity = $Diff<Auth, {| apiKey: string |}>;
156156
export type EmojiType = 'image' | 'unicode';
157157

158158
/** An emoji, in a shape we can pass to @zulip/shared */
159-
export type EmojiForShared = {| emoji_type: EmojiType, emoji_name: string, emoji_code: string |};
159+
export type EmojiForShared = {|
160+
reaction_type: ReactionType,
161+
emoji_type: EmojiType,
162+
emoji_name: string,
163+
emoji_code: string,
164+
|};
160165

161166
/** An aggregate of all the reactions with one emoji to one message. */
162167
export type AggregatedReaction = {|

yarn.lock

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3206,12 +3206,12 @@
32063206
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
32073207
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
32083208

3209-
"@zulip/shared@^0.0.14":
3210-
version "0.0.14"
3211-
resolved "https://registry.yarnpkg.com/@zulip/shared/-/shared-0.0.14.tgz#3b660a8ea54bc915921b506ad1150184de39c13e"
3212-
integrity sha512-kjNJzik9VTJgHtubzUJBHiXXG27NSdZA6c+badnPz1/KvVZLK7PGlDlYPL33Q2EPWHhI3pmiNN0nf6c43YU+HQ==
3209+
"@zulip/[email protected].16":
3210+
version "0.0.16"
3211+
resolved "https://registry.yarnpkg.com/@zulip/shared/-/shared-0.0.16.tgz#8a0879ea5c727be6faef43c1663e8025ac554348"
3212+
integrity sha512-mgjsZgATZZgBVTDjWyM23pVPienA/fXRQTZ35tNrskBhTZ7ltHtPGgAl0gE5wzLiKypeIjr77ADqEaMwwPrWsQ==
32133213
dependencies:
3214-
katex "^0.15.3"
3214+
katex "^0.16.2"
32153215
lodash "^4.17.19"
32163216

32173217
abab@^2.0.3, abab@^2.0.5:
@@ -10074,10 +10074,10 @@ katex@^0.11.1:
1007410074
dependencies:
1007510075
commander "^2.19.0"
1007610076

10077-
katex@^0.15.3:
10078-
version "0.15.6"
10079-
resolved "https://registry.yarnpkg.com/katex/-/katex-0.15.6.tgz#c4e2f6ced2ac4de1ef6f737fe7c67d3026baa0e5"
10080-
integrity sha512-UpzJy4yrnqnhXvRPhjEuLA4lcPn6eRngixW7Q3TJErjg3Aw2PuLFBzTkdUb89UtumxjhHTqL3a5GDGETMSwgJA==
10077+
katex@^0.16.2:
10078+
version "0.16.3"
10079+
resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.3.tgz#29640560b8fa0403e45f3aa20da5fdbb6d2b83a8"
10080+
integrity sha512-3EykQddareoRmbtNiNEDgl3IGjryyrp2eg/25fHDEnlHymIDi33bptkMv6K4EOC2LZCybLW/ZkEo6Le+EM9pmA==
1008110081
dependencies:
1008210082
commander "^8.0.0"
1008310083

@@ -16261,10 +16261,8 @@ watchpack@^1.6.1:
1626116261
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
1626216262
integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
1626316263
dependencies:
16264-
chokidar "^3.4.1"
1626516264
graceful-fs "^4.1.2"
1626616265
neo-async "^2.5.0"
16267-
watchpack-chokidar2 "^2.0.1"
1626816266
optionalDependencies:
1626916267
chokidar "^3.4.1"
1627016268
watchpack-chokidar2 "^2.0.1"

0 commit comments

Comments
 (0)