@atlaskit/emoji 71.7.1 → 71.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/cjs/api/EmojiRepository.js +6 -6
  3. package/dist/cjs/components/picker/EmojiPickerComponent.js +3 -3
  4. package/dist/cjs/components/picker/EmojiPickerList.js +4 -2
  5. package/dist/cjs/util/analytics/analytics.js +1 -1
  6. package/dist/es2019/api/EmojiRepository.js +6 -6
  7. package/dist/es2019/components/picker/EmojiPickerComponent.js +3 -3
  8. package/dist/es2019/components/picker/EmojiPickerList.js +4 -2
  9. package/dist/es2019/util/analytics/analytics.js +1 -1
  10. package/dist/esm/api/EmojiRepository.js +6 -6
  11. package/dist/esm/components/picker/EmojiPickerComponent.js +3 -3
  12. package/dist/esm/components/picker/EmojiPickerList.js +4 -2
  13. package/dist/esm/util/analytics/analytics.js +1 -1
  14. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/emoji
2
2
 
3
+ ## 71.7.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`f294eca9448a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f294eca9448a6) -
8
+ If emoji upload is disabled, retain previously selected emoji in preview
9
+
10
+ ## 71.7.2
11
+
12
+ ### Patch Changes
13
+
14
+ - [`209d9185455f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/209d9185455f8) -
15
+ Ensure Atlassian emoji category lookups include new backend metadata format
16
+ - Updated dependencies
17
+
3
18
  ## 71.7.1
4
19
 
5
20
  ### Patch Changes
package/dist/cjs/api/EmojiRepository.js CHANGED
@@ -214,9 +214,9 @@ var EmojiRepository = exports.default = /*#__PURE__*/function () {
214
214
  value: function findInCategory(categoryId) {
215
215
  if (categoryId === _constants.frequentCategory) {
216
216
  return this.getFrequentlyUsed();
217
- } else if (isRefreshEmojiPickerEnabled() && categoryId === 'ATLASSIAN') {
217
+ } else if (categoryId === 'ATLASSIAN') {
218
218
  return this.all().emojis.filter(function (emoji) {
219
- return emoji.type === 'ATLASSIAN';
219
+ return emoji.category === categoryId || emoji.type === 'ATLASSIAN';
220
220
  });
221
221
  } else {
222
222
  return this.all().emojis.filter(function (emoji) {
@@ -367,7 +367,7 @@ var EmojiRepository = exports.default = /*#__PURE__*/function () {
367
367
  this.asciiMap = new Map();
368
368
  var categorySet = new Set();
369
369
  this.emojis.forEach(function (emoji) {
370
- categorySet.add(_this3.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled()));
370
+ categorySet.add(_this3.getDynamicCategoryForEmoji(emoji));
371
371
  _this3.addToMaps(emoji);
372
372
  });
373
373
  if (this.usageTracker.getOrder().length) {
@@ -432,16 +432,16 @@ var EmojiRepository = exports.default = /*#__PURE__*/function () {
432
432
  }, {
433
433
  key: "addToDynamicCategories",
434
434
  value: function addToDynamicCategories(emoji) {
435
- var category = this.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled());
435
+ var category = this.getDynamicCategoryForEmoji(emoji);
436
436
  if (_constants.defaultCategories.indexOf(category) === -1 && this.dynamicCategoryList.indexOf(category) === -1) {
437
437
  this.dynamicCategoryList.push(category);
438
438
  }
439
439
  }
440
440
  }, {
441
441
  key: "getDynamicCategoryForEmoji",
442
- value: function getDynamicCategoryForEmoji(emoji, isTeamojiRefreshEnabled) {
442
+ value: function getDynamicCategoryForEmoji(emoji) {
443
443
  var category = (0, _typeHelpers.getCategoryId)(emoji);
444
- if (isTeamojiRefreshEnabled && emoji.type === 'ATLASSIAN' && category !== _constants.frequentCategory) {
444
+ if (emoji.type === 'ATLASSIAN' && category !== _constants.frequentCategory) {
445
445
  return 'ATLASSIAN';
446
446
  }
447
447
  return category;
package/dist/cjs/components/picker/EmojiPickerComponent.js CHANGED
@@ -208,11 +208,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
208
208
  setSelectedEmoji(emoji);
209
209
  }
210
210
  }, [selectedEmoji]);
211
+ var uploadEnabled = isUploadSupported && !uploading;
211
212
  var onEmojiLeave = (0, _react.useCallback)(function () {
212
- if (isRefreshEmojiPickerEnabled()) {
213
+ if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
213
214
  setSelectedEmoji(undefined);
214
215
  }
215
- }, []);
216
+ }, [uploadEnabled]);
216
217
  var onCategoryActivated = (0, _react.useCallback)(function (category) {
217
218
  // Ignore scroll-driven category changes while a programmatic reveal()
218
219
  // scroll is in progress — they would flicker the indicator through
@@ -678,7 +679,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
678
679
  emojiProvider.unsubscribe(onProviderChange);
679
680
  };
680
681
  }, [emojiProvider, onProviderChange]);
681
- var uploadEnabled = isUploadSupported && !uploading;
682
682
  var showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
683
683
  var shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
684
684
  var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
package/dist/cjs/components/picker/EmojiPickerList.js CHANGED
@@ -134,7 +134,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
134
134
  var _categoryToGroupMap$c;
135
135
  if (!categoryToGroupMap[category]) {
136
136
  var categoryDefinition = isTeamojiExperimentEnabled ? _categories.CategoryDescriptionMapNew[category] : _categories.CategoryDescriptionMap[category];
137
- if (!categoryDefinition && isTeamojiExperimentEnabled) {
137
+ if (!categoryDefinition) {
138
138
  return categoryToGroupMap;
139
139
  }
140
140
  categoryToGroupMap[category] = {
@@ -169,6 +169,8 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
169
169
  }
170
170
  subcategory.emojis.push(emoji);
171
171
  }
172
+ } else if (emoji.type === 'ATLASSIAN' && emoji.category !== _constants.frequentCategory) {
173
+ addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
172
174
  } else {
173
175
  addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
174
176
  }
@@ -343,7 +345,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
343
345
  allEmojiGroups.forEach(function (group) {
344
346
  // Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
345
347
  // by not passing it to irrelevant groups
346
- categoryTracker.add(isTeamojiExperimentEnabled ? group.category : group.emojis[0].category, items.length);
348
+ categoryTracker.add(isTeamojiExperimentEnabled || group.category === atlassianCategory ? group.category : group.emojis[0].category, items.length);
347
349
  items = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(buildVirtualItemFromGroup(group)));
348
350
  if (group.category === _constants.yourUploadsCategory) {
349
351
  setLastYourUploadsRow(items.length - 1);
package/dist/cjs/util/analytics/analytics.js CHANGED
@@ -20,7 +20,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
20
20
  actionSubjectId: actionSubjectId,
21
21
  attributes: _objectSpread({
22
22
  packageName: "@atlaskit/emoji",
23
- packageVersion: "71.7.0"
23
+ packageVersion: "71.7.2"
24
24
  }, attributes)
25
25
  };
26
26
  };
package/dist/es2019/api/EmojiRepository.js CHANGED
@@ -177,8 +177,8 @@ export default class EmojiRepository {
177
177
  findInCategory(categoryId) {
178
178
  if (categoryId === frequentCategory) {
179
179
  return this.getFrequentlyUsed();
180
- } else if (isRefreshEmojiPickerEnabled() && categoryId === 'ATLASSIAN') {
181
- return this.all().emojis.filter(emoji => emoji.type === 'ATLASSIAN');
180
+ } else if (categoryId === 'ATLASSIAN') {
181
+ return this.all().emojis.filter(emoji => emoji.category === categoryId || emoji.type === 'ATLASSIAN');
182
182
  } else {
183
183
  return this.all().emojis.filter(emoji => emoji.category === categoryId);
184
184
  }
@@ -297,7 +297,7 @@ export default class EmojiRepository {
297
297
  this.asciiMap = new Map();
298
298
  const categorySet = new Set();
299
299
  this.emojis.forEach(emoji => {
300
- categorySet.add(this.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled()));
300
+ categorySet.add(this.getDynamicCategoryForEmoji(emoji));
301
301
  this.addToMaps(emoji);
302
302
  });
303
303
  if (this.usageTracker.getOrder().length) {
@@ -341,14 +341,14 @@ export default class EmojiRepository {
341
341
  }
342
342
  }
343
343
  addToDynamicCategories(emoji) {
344
- const category = this.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled());
344
+ const category = this.getDynamicCategoryForEmoji(emoji);
345
345
  if (defaultCategories.indexOf(category) === -1 && this.dynamicCategoryList.indexOf(category) === -1) {
346
346
  this.dynamicCategoryList.push(category);
347
347
  }
348
348
  }
349
- getDynamicCategoryForEmoji(emoji, isTeamojiRefreshEnabled) {
349
+ getDynamicCategoryForEmoji(emoji) {
350
350
  const category = getCategoryId(emoji);
351
- if (isTeamojiRefreshEnabled && emoji.type === 'ATLASSIAN' && category !== frequentCategory) {
351
+ if (emoji.type === 'ATLASSIAN' && category !== frequentCategory) {
352
352
  return 'ATLASSIAN';
353
353
  }
354
354
  return category;
package/dist/es2019/components/picker/EmojiPickerComponent.js CHANGED
@@ -145,11 +145,12 @@ const EmojiPickerComponent = ({
145
145
  setSelectedEmoji(emoji);
146
146
  }
147
147
  }, [selectedEmoji]);
148
+ const uploadEnabled = isUploadSupported && !uploading;
148
149
  const onEmojiLeave = useCallback(() => {
149
- if (isRefreshEmojiPickerEnabled()) {
150
+ if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
150
151
  setSelectedEmoji(undefined);
151
152
  }
152
- }, []);
153
+ }, [uploadEnabled]);
153
154
  const onCategoryActivated = useCallback(category => {
154
155
  // Ignore scroll-driven category changes while a programmatic reveal()
155
156
  // scroll is in progress — they would flicker the indicator through
@@ -583,7 +584,6 @@ const EmojiPickerComponent = ({
583
584
  emojiProvider.unsubscribe(onProviderChange);
584
585
  };
585
586
  }, [emojiProvider, onProviderChange]);
586
- const uploadEnabled = isUploadSupported && !uploading;
587
587
  const showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
588
588
  const shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
589
589
  const useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
package/dist/es2019/components/picker/EmojiPickerList.js CHANGED
@@ -98,7 +98,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
98
98
  var _categoryToGroupMap$c;
99
99
  if (!categoryToGroupMap[category]) {
100
100
  const categoryDefinition = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew[category] : CategoryDescriptionMap[category];
101
- if (!categoryDefinition && isTeamojiExperimentEnabled) {
101
+ if (!categoryDefinition) {
102
102
  return categoryToGroupMap;
103
103
  }
104
104
  categoryToGroupMap[category] = {
@@ -130,6 +130,8 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
130
130
  }
131
131
  subcategory.emojis.push(emoji);
132
132
  }
133
+ } else if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
134
+ addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
133
135
  } else {
134
136
  addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
135
137
  }
@@ -301,7 +303,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
301
303
  allEmojiGroups.forEach(group => {
302
304
  // Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
303
305
  // by not passing it to irrelevant groups
304
- categoryTracker.add(isTeamojiExperimentEnabled ? group.category : group.emojis[0].category, items.length);
306
+ categoryTracker.add(isTeamojiExperimentEnabled || group.category === atlassianCategory ? group.category : group.emojis[0].category, items.length);
305
307
  items = [...items, ...buildVirtualItemFromGroup(group)];
306
308
  if (group.category === yourUploadsCategory) {
307
309
  setLastYourUploadsRow(items.length - 1);
package/dist/es2019/util/analytics/analytics.js CHANGED
@@ -9,7 +9,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
9
9
  actionSubjectId,
10
10
  attributes: {
11
11
  packageName: "@atlaskit/emoji",
12
- packageVersion: "71.7.0",
12
+ packageVersion: "71.7.2",
13
13
  ...attributes
14
14
  }
15
15
  });
package/dist/esm/api/EmojiRepository.js CHANGED
@@ -207,9 +207,9 @@ var EmojiRepository = /*#__PURE__*/function () {
207
207
  value: function findInCategory(categoryId) {
208
208
  if (categoryId === frequentCategory) {
209
209
  return this.getFrequentlyUsed();
210
- } else if (isRefreshEmojiPickerEnabled() && categoryId === 'ATLASSIAN') {
210
+ } else if (categoryId === 'ATLASSIAN') {
211
211
  return this.all().emojis.filter(function (emoji) {
212
- return emoji.type === 'ATLASSIAN';
212
+ return emoji.category === categoryId || emoji.type === 'ATLASSIAN';
213
213
  });
214
214
  } else {
215
215
  return this.all().emojis.filter(function (emoji) {
@@ -360,7 +360,7 @@ var EmojiRepository = /*#__PURE__*/function () {
360
360
  this.asciiMap = new Map();
361
361
  var categorySet = new Set();
362
362
  this.emojis.forEach(function (emoji) {
363
- categorySet.add(_this3.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled()));
363
+ categorySet.add(_this3.getDynamicCategoryForEmoji(emoji));
364
364
  _this3.addToMaps(emoji);
365
365
  });
366
366
  if (this.usageTracker.getOrder().length) {
@@ -425,16 +425,16 @@ var EmojiRepository = /*#__PURE__*/function () {
425
425
  }, {
426
426
  key: "addToDynamicCategories",
427
427
  value: function addToDynamicCategories(emoji) {
428
- var category = this.getDynamicCategoryForEmoji(emoji, isRefreshEmojiPickerEnabled());
428
+ var category = this.getDynamicCategoryForEmoji(emoji);
429
429
  if (defaultCategories.indexOf(category) === -1 && this.dynamicCategoryList.indexOf(category) === -1) {
430
430
  this.dynamicCategoryList.push(category);
431
431
  }
432
432
  }
433
433
  }, {
434
434
  key: "getDynamicCategoryForEmoji",
435
- value: function getDynamicCategoryForEmoji(emoji, isTeamojiRefreshEnabled) {
435
+ value: function getDynamicCategoryForEmoji(emoji) {
436
436
  var category = getCategoryId(emoji);
437
- if (isTeamojiRefreshEnabled && emoji.type === 'ATLASSIAN' && category !== frequentCategory) {
437
+ if (emoji.type === 'ATLASSIAN' && category !== frequentCategory) {
438
438
  return 'ATLASSIAN';
439
439
  }
440
440
  return category;
package/dist/esm/components/picker/EmojiPickerComponent.js CHANGED
@@ -199,11 +199,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
199
199
  setSelectedEmoji(emoji);
200
200
  }
201
201
  }, [selectedEmoji]);
202
+ var uploadEnabled = isUploadSupported && !uploading;
202
203
  var onEmojiLeave = useCallback(function () {
203
- if (isRefreshEmojiPickerEnabled()) {
204
+ if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
204
205
  setSelectedEmoji(undefined);
205
206
  }
206
- }, []);
207
+ }, [uploadEnabled]);
207
208
  var onCategoryActivated = useCallback(function (category) {
208
209
  // Ignore scroll-driven category changes while a programmatic reveal()
209
210
  // scroll is in progress — they would flicker the indicator through
@@ -669,7 +670,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
669
670
  emojiProvider.unsubscribe(onProviderChange);
670
671
  };
671
672
  }, [emojiProvider, onProviderChange]);
672
- var uploadEnabled = isUploadSupported && !uploading;
673
673
  var showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
674
674
  var shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
675
675
  var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
package/dist/esm/components/picker/EmojiPickerList.js CHANGED
@@ -126,7 +126,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
126
126
  var _categoryToGroupMap$c;
127
127
  if (!categoryToGroupMap[category]) {
128
128
  var categoryDefinition = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew[category] : CategoryDescriptionMap[category];
129
- if (!categoryDefinition && isTeamojiExperimentEnabled) {
129
+ if (!categoryDefinition) {
130
130
  return categoryToGroupMap;
131
131
  }
132
132
  categoryToGroupMap[category] = {
@@ -161,6 +161,8 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
161
161
  }
162
162
  subcategory.emojis.push(emoji);
163
163
  }
164
+ } else if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
165
+ addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
164
166
  } else {
165
167
  addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
166
168
  }
@@ -335,7 +337,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
335
337
  allEmojiGroups.forEach(function (group) {
336
338
  // Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
337
339
  // by not passing it to irrelevant groups
338
- categoryTracker.add(isTeamojiExperimentEnabled ? group.category : group.emojis[0].category, items.length);
340
+ categoryTracker.add(isTeamojiExperimentEnabled || group.category === atlassianCategory ? group.category : group.emojis[0].category, items.length);
339
341
  items = [].concat(_toConsumableArray(items), _toConsumableArray(buildVirtualItemFromGroup(group)));
340
342
  if (group.category === yourUploadsCategory) {
341
343
  setLastYourUploadsRow(items.length - 1);
package/dist/esm/util/analytics/analytics.js CHANGED
@@ -14,7 +14,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
14
14
  actionSubjectId: actionSubjectId,
15
15
  attributes: _objectSpread({
16
16
  packageName: "@atlaskit/emoji",
17
- packageVersion: "71.7.0"
17
+ packageVersion: "71.7.2"
18
18
  }, attributes)
19
19
  };
20
20
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/emoji",
3
- "version": "71.7.1",
3
+ "version": "71.7.3",
4
4
  "description": "Fabric emoji React components",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -50,7 +50,7 @@
50
50
  "@atlaskit/spinner": "^20.1.0",
51
51
  "@atlaskit/textfield": "^9.1.0",
52
52
  "@atlaskit/theme": "^26.1.0",
53
- "@atlaskit/tmp-editor-statsig": "^120.0.0",
53
+ "@atlaskit/tmp-editor-statsig": "^120.1.0",
54
54
  "@atlaskit/tokens": "^15.3.0",
55
55
  "@atlaskit/tooltip": "^23.1.0",
56
56
  "@atlaskit/ufo": "^1.0.0",