@atlaskit/emoji 70.8.0 → 70.9.0

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 (8) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/cjs/components/picker/EmojiPickerComponent.js +14 -4
  3. package/dist/cjs/util/analytics/analytics.js +1 -1
  4. package/dist/es2019/components/picker/EmojiPickerComponent.js +14 -4
  5. package/dist/es2019/util/analytics/analytics.js +1 -1
  6. package/dist/esm/components/picker/EmojiPickerComponent.js +14 -4
  7. package/dist/esm/util/analytics/analytics.js +1 -1
  8. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # @atlaskit/emoji
2
2
 
3
+ ## 70.9.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`54ec962646a89`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/54ec962646a89) -
8
+ Close upload emoji on category selected + hide selected category on upload emoji open
9
+
3
10
  ## 70.8.0
4
11
 
5
12
  ### Minor Changes
package/dist/cjs/components/picker/EmojiPickerComponent.js CHANGED
@@ -160,10 +160,14 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
160
160
  if (isProgrammaticScroll.current && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
161
161
  return;
162
162
  }
163
+ // Ignore scroll-driven category changes while the upload screen is open
164
+ if (uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
165
+ return;
166
+ }
163
167
  if (activeCategory !== category) {
164
168
  setActiveCategory(category);
165
169
  }
166
- }, [activeCategory]);
170
+ }, [activeCategory, uploading]);
167
171
  var calculateElapsedTime = function calculateElapsedTime() {
168
172
  return Date.now() - openTime.current;
169
173
  };
@@ -318,6 +322,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
318
322
  if (!categoryId) {
319
323
  return;
320
324
  }
325
+
326
+ // If the upload screen is open, close it when a category is selected
327
+ if (uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
328
+ setUploading(false);
329
+ setUploadErrorMessage(undefined);
330
+ }
321
331
  emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
322
332
  if (!disableCategories) {
323
333
  var newSelectedEmoji;
@@ -347,7 +357,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
347
357
  }));
348
358
  }
349
359
  });
350
- }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone]);
360
+ }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
351
361
  var recordUsageOnSelection = (0, _react.useMemo)(function () {
352
362
  return (0, _RecordSelectionDefault.createRecordSelectionDefault)(emojiProvider, onSelectWrapper, function (analytic) {
353
363
  return fireAnalytics(analytic(_types.SearchSourceTypes.PICKER));
@@ -575,7 +585,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
575
585
  onKeyDown: suppressKeyPress,
576
586
  className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
577
587
  }, /*#__PURE__*/React.createElement(_CategorySelector.default, {
578
- activeCategoryId: activeCategory,
588
+ activeCategoryId: uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
579
589
  dynamicCategories: dynamicCategories,
580
590
  disableCategories: disableCategories,
581
591
  onCategorySelected: onCategorySelected
@@ -629,7 +639,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
629
639
  "--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
630
640
  }
631
641
  }, /*#__PURE__*/React.createElement(_CategorySelector.default, {
632
- activeCategoryId: activeCategory,
642
+ activeCategoryId: uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? null : activeCategory,
633
643
  dynamicCategories: dynamicCategories,
634
644
  disableCategories: disableCategories,
635
645
  onCategorySelected: onCategorySelected
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: "70.7.2"
23
+ packageVersion: "70.8.0"
24
24
  }, attributes)
25
25
  };
26
26
  };
package/dist/es2019/components/picker/EmojiPickerComponent.js CHANGED
@@ -102,10 +102,14 @@ const EmojiPickerComponent = ({
102
102
  if (isProgrammaticScroll.current && fg('platform_emoji_picker_refresh')) {
103
103
  return;
104
104
  }
105
+ // Ignore scroll-driven category changes while the upload screen is open
106
+ if (uploading && fg('platform_emoji_picker_refresh')) {
107
+ return;
108
+ }
105
109
  if (activeCategory !== category) {
106
110
  setActiveCategory(category);
107
111
  }
108
- }, [activeCategory]);
112
+ }, [activeCategory, uploading]);
109
113
  const calculateElapsedTime = () => {
110
114
  return Date.now() - openTime.current;
111
115
  };
@@ -262,6 +266,12 @@ const EmojiPickerComponent = ({
262
266
  if (!categoryId) {
263
267
  return;
264
268
  }
269
+
270
+ // If the upload screen is open, close it when a category is selected
271
+ if (uploading && fg('platform_emoji_picker_refresh')) {
272
+ setUploading(false);
273
+ setUploadErrorMessage(undefined);
274
+ }
265
275
  emojiProvider.findInCategory(categoryId).then(emojisInCategory => {
266
276
  if (!disableCategories) {
267
277
  let newSelectedEmoji;
@@ -291,7 +301,7 @@ const EmojiPickerComponent = ({
291
301
  }));
292
302
  }
293
303
  });
294
- }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone]);
304
+ }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
295
305
  const recordUsageOnSelection = useMemo(() => createRecordSelectionDefault(emojiProvider, onSelectWrapper, analytic => fireAnalytics(analytic(SearchSourceTypes.PICKER))), [emojiProvider, fireAnalytics, onSelectWrapper]);
296
306
  const formattedErrorMessage = useMemo(() => uploadErrorMessage ? /*#__PURE__*/React.createElement(FormattedMessage, uploadErrorMessage) : null, [uploadErrorMessage]);
297
307
  const onFileChooserClicked = useCallback(() => {
@@ -485,7 +495,7 @@ const EmojiPickerComponent = ({
485
495
  onKeyDown: suppressKeyPress,
486
496
  className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
487
497
  }, /*#__PURE__*/React.createElement(CategorySelector, {
488
- activeCategoryId: activeCategory,
498
+ activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
489
499
  dynamicCategories: dynamicCategories,
490
500
  disableCategories: disableCategories,
491
501
  onCategorySelected: onCategorySelected
@@ -535,7 +545,7 @@ const EmojiPickerComponent = ({
535
545
  onKeyDown: suppressKeyPress,
536
546
  className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", showPreview || uploading && fg('platform_emoji_picker_refresh') ? withPreviewHeight[size] : withoutPreviewHeight[size]])
537
547
  }, /*#__PURE__*/React.createElement(CategorySelector, {
538
- activeCategoryId: activeCategory,
548
+ activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
539
549
  dynamicCategories: dynamicCategories,
540
550
  disableCategories: disableCategories,
541
551
  onCategorySelected: onCategorySelected
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: "70.7.2",
12
+ packageVersion: "70.8.0",
13
13
  ...attributes
14
14
  }
15
15
  });
package/dist/esm/components/picker/EmojiPickerComponent.js CHANGED
@@ -151,10 +151,14 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
151
151
  if (isProgrammaticScroll.current && fg('platform_emoji_picker_refresh')) {
152
152
  return;
153
153
  }
154
+ // Ignore scroll-driven category changes while the upload screen is open
155
+ if (uploading && fg('platform_emoji_picker_refresh')) {
156
+ return;
157
+ }
154
158
  if (activeCategory !== category) {
155
159
  setActiveCategory(category);
156
160
  }
157
- }, [activeCategory]);
161
+ }, [activeCategory, uploading]);
158
162
  var calculateElapsedTime = function calculateElapsedTime() {
159
163
  return Date.now() - openTime.current;
160
164
  };
@@ -309,6 +313,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
309
313
  if (!categoryId) {
310
314
  return;
311
315
  }
316
+
317
+ // If the upload screen is open, close it when a category is selected
318
+ if (uploading && fg('platform_emoji_picker_refresh')) {
319
+ setUploading(false);
320
+ setUploadErrorMessage(undefined);
321
+ }
312
322
  emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
313
323
  if (!disableCategories) {
314
324
  var newSelectedEmoji;
@@ -338,7 +348,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
338
348
  }));
339
349
  }
340
350
  });
341
- }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone]);
351
+ }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading]);
342
352
  var recordUsageOnSelection = useMemo(function () {
343
353
  return createRecordSelectionDefault(emojiProvider, onSelectWrapper, function (analytic) {
344
354
  return fireAnalytics(analytic(SearchSourceTypes.PICKER));
@@ -566,7 +576,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
566
576
  onKeyDown: suppressKeyPress,
567
577
  className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf"])
568
578
  }, /*#__PURE__*/React.createElement(CategorySelector, {
569
- activeCategoryId: activeCategory,
579
+ activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
570
580
  dynamicCategories: dynamicCategories,
571
581
  disableCategories: disableCategories,
572
582
  onCategorySelected: onCategorySelected
@@ -620,7 +630,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
620
630
  "--_gsvyy7": ix("".concat(emojiPickerWidth, "px"))
621
631
  }
622
632
  }, /*#__PURE__*/React.createElement(CategorySelector, {
623
- activeCategoryId: activeCategory,
633
+ activeCategoryId: uploading && fg('platform_emoji_picker_refresh') ? null : activeCategory,
624
634
  dynamicCategories: dynamicCategories,
625
635
  disableCategories: disableCategories,
626
636
  onCategorySelected: onCategorySelected
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: "70.7.2"
17
+ packageVersion: "70.8.0"
18
18
  }, attributes)
19
19
  };
20
20
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/emoji",
3
- "version": "70.8.0",
3
+ "version": "70.9.0",
4
4
  "description": "Fabric emoji React components",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -44,8 +44,8 @@
44
44
  "@atlaskit/css": "^0.19.0",
45
45
  "@atlaskit/form": "^15.5.0",
46
46
  "@atlaskit/heading": "^5.4.0",
47
- "@atlaskit/icon": "^34.5.0",
48
- "@atlaskit/media-client": "^36.2.0",
47
+ "@atlaskit/icon": "^34.6.0",
48
+ "@atlaskit/media-client": "^36.3.0",
49
49
  "@atlaskit/media-client-react": "^5.1.0",
50
50
  "@atlaskit/platform-feature-flags": "^1.1.0",
51
51
  "@atlaskit/pragmatic-drag-and-drop": "^1.8.0",