@atlaskit/emoji 63.2.0 → 64.1.1

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 (120) hide show
  1. package/CHANGELOG.md +67 -0
  2. package/dist/cjs/api/EmojiUtils.js +11 -6
  3. package/dist/cjs/api/internal/UsageFrequencyTracker.js +2 -2
  4. package/dist/cjs/api/media/SiteEmojiResource.js +5 -3
  5. package/dist/cjs/components/common/CachingEmoji.js +5 -2
  6. package/dist/cjs/components/common/DeleteButton.js +1 -1
  7. package/dist/cjs/components/common/Emoji.js +37 -16
  8. package/dist/cjs/components/common/EmojiActions.js +233 -0
  9. package/dist/cjs/components/common/EmojiDeletePreview.js +22 -23
  10. package/dist/cjs/components/common/EmojiPlaceholder.js +3 -10
  11. package/dist/cjs/components/common/EmojiPreview.js +24 -24
  12. package/dist/cjs/components/common/EmojiUploadPicker.js +76 -72
  13. package/dist/cjs/components/common/EmojiUploadPreview.js +17 -15
  14. package/dist/cjs/components/common/ResourcedEmoji.js +3 -1
  15. package/dist/cjs/components/common/RetryableButton.js +2 -2
  16. package/dist/cjs/components/common/styles.js +22 -25
  17. package/dist/cjs/components/i18n.js +2 -2
  18. package/dist/cjs/components/picker/CategorySelector.js +21 -16
  19. package/dist/cjs/components/picker/EmojiPicker.js +3 -1
  20. package/dist/cjs/components/picker/EmojiPickerCategoryHeading.js +2 -2
  21. package/dist/cjs/components/picker/EmojiPickerComponent.js +12 -31
  22. package/dist/cjs/components/picker/EmojiPickerEmojiRow.js +2 -1
  23. package/dist/cjs/components/picker/EmojiPickerFooter.js +7 -49
  24. package/dist/cjs/components/picker/EmojiPickerList.js +38 -12
  25. package/dist/cjs/components/picker/EmojiPickerListSearch.js +25 -26
  26. package/dist/cjs/components/picker/EmojiPickerPreview.js +87 -0
  27. package/dist/cjs/components/picker/EmojiPickerVirtualItems.js +7 -6
  28. package/dist/cjs/components/picker/styles.js +21 -16
  29. package/dist/cjs/components/typeahead/EmojiTypeAhead.js +3 -1
  30. package/dist/cjs/components/typeahead/EmojiTypeAheadItem.js +3 -3
  31. package/dist/cjs/components/typeahead/styles.js +2 -2
  32. package/dist/cjs/components/uploader/EmojiUploadComponent.js +2 -2
  33. package/dist/cjs/components/uploader/EmojiUploader.js +3 -1
  34. package/dist/cjs/components/uploader/styles.js +1 -1
  35. package/dist/cjs/util/analytics.js +2 -2
  36. package/dist/cjs/util/shared-styles.js +6 -6
  37. package/dist/cjs/util/type-helpers.js +2 -2
  38. package/dist/cjs/version.json +1 -1
  39. package/dist/es2019/components/common/DeleteButton.js +1 -1
  40. package/dist/es2019/components/common/Emoji.js +33 -13
  41. package/dist/es2019/components/common/EmojiActions.js +178 -0
  42. package/dist/es2019/components/common/EmojiDeletePreview.js +16 -9
  43. package/dist/es2019/components/common/EmojiPlaceholder.js +3 -7
  44. package/dist/es2019/components/common/EmojiPreview.js +21 -16
  45. package/dist/es2019/components/common/EmojiUploadPicker.js +22 -13
  46. package/dist/es2019/components/common/EmojiUploadPreview.js +14 -7
  47. package/dist/es2019/components/common/RetryableButton.js +1 -1
  48. package/dist/es2019/components/common/styles.js +19 -24
  49. package/dist/es2019/components/i18n.js +1 -1
  50. package/dist/es2019/components/picker/CategorySelector.js +13 -6
  51. package/dist/es2019/components/picker/EmojiPickerCategoryHeading.js +1 -1
  52. package/dist/es2019/components/picker/EmojiPickerComponent.js +9 -30
  53. package/dist/es2019/components/picker/EmojiPickerEmojiRow.js +2 -1
  54. package/dist/es2019/components/picker/EmojiPickerFooter.js +6 -46
  55. package/dist/es2019/components/picker/EmojiPickerList.js +36 -10
  56. package/dist/es2019/components/picker/EmojiPickerListSearch.js +15 -8
  57. package/dist/es2019/components/picker/EmojiPickerPreview.js +43 -0
  58. package/dist/es2019/components/picker/styles.js +18 -14
  59. package/dist/es2019/components/typeahead/EmojiTypeAheadItem.js +2 -2
  60. package/dist/es2019/components/typeahead/styles.js +2 -2
  61. package/dist/es2019/components/uploader/EmojiUploadComponent.js +3 -3
  62. package/dist/es2019/components/uploader/styles.js +1 -1
  63. package/dist/es2019/util/shared-styles.js +6 -6
  64. package/dist/es2019/version.json +1 -1
  65. package/dist/esm/api/EmojiUtils.js +10 -6
  66. package/dist/esm/api/internal/UsageFrequencyTracker.js +2 -2
  67. package/dist/esm/api/media/SiteEmojiResource.js +4 -3
  68. package/dist/esm/components/common/CachingEmoji.js +4 -2
  69. package/dist/esm/components/common/DeleteButton.js +1 -1
  70. package/dist/esm/components/common/Emoji.js +37 -15
  71. package/dist/esm/components/common/EmojiActions.js +200 -0
  72. package/dist/esm/components/common/EmojiDeletePreview.js +18 -21
  73. package/dist/esm/components/common/EmojiPlaceholder.js +3 -7
  74. package/dist/esm/components/common/EmojiPreview.js +19 -24
  75. package/dist/esm/components/common/EmojiUploadPicker.js +70 -71
  76. package/dist/esm/components/common/EmojiUploadPreview.js +13 -13
  77. package/dist/esm/components/common/ResourcedEmoji.js +2 -1
  78. package/dist/esm/components/common/RetryableButton.js +1 -1
  79. package/dist/esm/components/common/styles.js +19 -22
  80. package/dist/esm/components/i18n.js +1 -1
  81. package/dist/esm/components/picker/CategorySelector.js +17 -15
  82. package/dist/esm/components/picker/EmojiPicker.js +2 -1
  83. package/dist/esm/components/picker/EmojiPickerCategoryHeading.js +1 -1
  84. package/dist/esm/components/picker/EmojiPickerComponent.js +11 -32
  85. package/dist/esm/components/picker/EmojiPickerEmojiRow.js +2 -1
  86. package/dist/esm/components/picker/EmojiPickerFooter.js +6 -46
  87. package/dist/esm/components/picker/EmojiPickerList.js +38 -12
  88. package/dist/esm/components/picker/EmojiPickerListSearch.js +21 -25
  89. package/dist/esm/components/picker/EmojiPickerPreview.js +67 -0
  90. package/dist/esm/components/picker/EmojiPickerVirtualItems.js +6 -5
  91. package/dist/esm/components/picker/styles.js +18 -14
  92. package/dist/esm/components/typeahead/EmojiTypeAhead.js +2 -1
  93. package/dist/esm/components/typeahead/EmojiTypeAheadItem.js +2 -2
  94. package/dist/esm/components/typeahead/styles.js +2 -2
  95. package/dist/esm/components/uploader/EmojiUploadComponent.js +3 -3
  96. package/dist/esm/components/uploader/EmojiUploader.js +2 -1
  97. package/dist/esm/components/uploader/styles.js +1 -1
  98. package/dist/esm/util/analytics.js +2 -2
  99. package/dist/esm/util/shared-styles.js +6 -6
  100. package/dist/esm/util/type-helpers.js +2 -2
  101. package/dist/esm/version.json +1 -1
  102. package/dist/types/components/common/Emoji.d.ts +2 -0
  103. package/dist/types/components/common/EmojiActions.d.ts +43 -0
  104. package/dist/types/components/common/EmojiDeletePreview.d.ts +6 -8
  105. package/dist/types/components/common/EmojiPlaceholder.d.ts +1 -0
  106. package/dist/types/components/common/EmojiPreview.d.ts +7 -1
  107. package/dist/types/components/common/EmojiUploadPicker.d.ts +11 -4
  108. package/dist/types/components/common/EmojiUploadPreview.d.ts +6 -4
  109. package/dist/types/components/common/UploadEmoji.d.ts +2 -2
  110. package/dist/types/components/common/styles.d.ts +1 -1
  111. package/dist/types/components/picker/CategorySelector.d.ts +5 -11
  112. package/dist/types/components/picker/EmojiPickerComponent.d.ts +2 -5
  113. package/dist/types/components/picker/EmojiPickerFooter.d.ts +3 -19
  114. package/dist/types/components/picker/EmojiPickerList.d.ts +17 -3
  115. package/dist/types/components/picker/EmojiPickerListSearch.d.ts +6 -15
  116. package/dist/types/components/picker/EmojiPickerPreview.d.ts +9 -0
  117. package/dist/types/components/picker/styles.d.ts +1 -0
  118. package/dist/types/components/uploader/EmojiUploadComponent.d.ts +2 -2
  119. package/dist/types/util/shared-styles.d.ts +6 -6
  120. package/package.json +10 -10
@@ -7,9 +7,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
7
7
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
8
8
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
15
15
 
@@ -19,7 +19,7 @@ import classNames from 'classnames';
19
19
  import PropTypes from 'prop-types';
20
20
  import React from 'react';
21
21
  import { PureComponent } from 'react';
22
- import { FormattedMessage } from 'react-intl';
22
+ import { FormattedMessage } from 'react-intl-next';
23
23
  import { getEmojiVariation } from '../../api/EmojiRepository';
24
24
  import { supportsUploadFeature } from '../../api/EmojiResource';
25
25
  import { customCategory, frequentCategory } from '../../util/constants';
@@ -52,12 +52,7 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
52
52
  _defineProperty(_assertThisInitialized(_this), "onEmojiActive", function (_emojiId, emoji) {
53
53
  if (_this.state.selectedEmoji !== emoji) {
54
54
  _this.setState({
55
- selectedEmoji: emoji,
56
- showUploadButton: false
57
- });
58
- } else {
59
- _this.setState({
60
- showUploadButton: false
55
+ selectedEmoji: emoji
61
56
  });
62
57
  }
63
58
  });
@@ -111,18 +106,6 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
111
106
  _this.fireAnalytics(selectedFileEvent());
112
107
  });
113
108
 
114
- _defineProperty(_assertThisInitialized(_this), "onEmojiPickerMouseLeave", function () {
115
- _this.setState({
116
- showUploadButton: true
117
- });
118
- });
119
-
120
- _defineProperty(_assertThisInitialized(_this), "onEmojiPickerMouseEnter", function () {
121
- _this.setState({
122
- showUploadButton: false
123
- });
124
- });
125
-
126
109
  _defineProperty(_assertThisInitialized(_this), "fireAnalytics", function (analyticsEvent) {
127
110
  var createAnalyticsEvent = _this.props.createAnalyticsEvent;
128
111
 
@@ -372,8 +355,7 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
372
355
  selectedTone: !hideToneSelector ? _emojiProvider.getSelectedTone() : undefined,
373
356
  loading: true,
374
357
  uploadSupported: false,
375
- uploading: false,
376
- showUploadButton: true
358
+ uploading: false
377
359
  };
378
360
  _this.openTime = 0;
379
361
  return _this;
@@ -554,8 +536,7 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
554
536
  emojiToDelete = _this$state3.emojiToDelete,
555
537
  uploading = _this$state3.uploading,
556
538
  uploadErrorMessage = _this$state3.uploadErrorMessage,
557
- uploadSupported = _this$state3.uploadSupported,
558
- showUploadButton = _this$state3.showUploadButton;
539
+ uploadSupported = _this$state3.uploadSupported;
559
540
  var recordUsageOnSelection = createRecordSelectionDefault(emojiProvider, this.onSelectWrapper, function (analytic) {
560
541
  return _this4.fireAnalytics(analytic('picker'));
561
542
  });
@@ -577,30 +558,28 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
577
558
  onEmojiActive: this.onEmojiActive,
578
559
  onEmojiDelete: this.onTriggerDelete,
579
560
  onCategoryActivated: this.onCategoryActivated,
580
- onMouseLeave: this.onEmojiPickerMouseLeave,
581
- onMouseEnter: this.onEmojiPickerMouseEnter,
582
561
  onSearch: this.onSearch,
583
562
  query: query,
584
563
  selectedTone: selectedTone,
585
564
  loading: loading,
586
- ref: "emojiPickerList"
587
- }), /*#__PURE__*/React.createElement(EmojiPickerFooter, {
565
+ ref: "emojiPickerList",
588
566
  initialUploadName: query,
589
- selectedEmoji: selectedEmoji,
590
- selectedTone: selectedTone,
591
567
  onToneSelected: this.onToneSelected,
592
568
  onToneSelectorCancelled: this.onToneSelectorCancelled,
593
569
  toneEmoji: toneEmoji,
594
570
  uploading: uploading,
595
571
  emojiToDelete: emojiToDelete,
596
572
  uploadErrorMessage: formattedErrorMessage,
597
- uploadEnabled: uploadSupported && showUploadButton && !uploading,
573
+ uploadEnabled: uploadSupported && !uploading,
598
574
  onUploadEmoji: this.onUploadEmoji,
599
575
  onUploadCancelled: this.onUploadCancelled,
600
576
  onDeleteEmoji: this.onDeleteEmoji,
601
577
  onCloseDelete: this.onCloseDelete,
602
578
  onFileChooserClicked: this.onFileChooserClicked,
603
579
  onOpenUpload: this.onOpenUpload
580
+ }), /*#__PURE__*/React.createElement(EmojiPickerFooter, {
581
+ selectedEmoji: selectedEmoji,
582
+ isUploading: uploading
604
583
  }));
605
584
  return picker;
606
585
  }
@@ -50,7 +50,8 @@ var EmojiPickerEmojiRow = /*#__PURE__*/function (_PureComponent) {
50
50
  onMouseMove: onMouseMove,
51
51
  showDelete: showDelete,
52
52
  onDelete: onDelete,
53
- placeholderSize: 24
53
+ placeholderSize: 24,
54
+ shouldBeInteractive: true
54
55
  }));
55
56
  }));
56
57
  }
@@ -11,10 +11,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
11
11
  import classNames from 'classnames';
12
12
  import React from 'react';
13
13
  import { PureComponent } from 'react';
14
- import EmojiDeletePreview from '../common/EmojiDeletePreview';
15
- import EmojiPreview from '../common/EmojiPreview';
16
- import EmojiUploadPicker from '../common/EmojiUploadPicker';
17
14
  import * as styles from './styles';
15
+ import EmojiPickerPreview from './EmojiPickerPreview';
18
16
 
19
17
  var EmojiPickerFooter = /*#__PURE__*/function (_PureComponent) {
20
18
  _inherits(EmojiPickerFooter, _PureComponent);
@@ -31,56 +29,18 @@ var EmojiPickerFooter = /*#__PURE__*/function (_PureComponent) {
31
29
  key: "render",
32
30
  value: function render() {
33
31
  var _this$props = this.props,
34
- initialUploadName = _this$props.initialUploadName,
35
- onToneSelected = _this$props.onToneSelected,
36
- onToneSelectorCancelled = _this$props.onToneSelectorCancelled,
37
- onUploadCancelled = _this$props.onUploadCancelled,
38
- onUploadEmoji = _this$props.onUploadEmoji,
39
- onCloseDelete = _this$props.onCloseDelete,
40
- onDeleteEmoji = _this$props.onDeleteEmoji,
41
32
  selectedEmoji = _this$props.selectedEmoji,
42
- selectedTone = _this$props.selectedTone,
43
- toneEmoji = _this$props.toneEmoji,
44
- uploadErrorMessage = _this$props.uploadErrorMessage,
45
- uploading = _this$props.uploading,
46
- onFileChooserClicked = _this$props.onFileChooserClicked,
47
- onOpenUpload = _this$props.onOpenUpload,
48
- uploadEnabled = _this$props.uploadEnabled,
49
- emojiToDelete = _this$props.emojiToDelete;
33
+ isUploading = _this$props.isUploading;
50
34
  var previewFooterClassnames = classNames([styles.emojiPickerFooter, styles.emojiPickerFooterWithTopShadow]);
51
35
 
52
- if (uploading) {
53
- return /*#__PURE__*/React.createElement("div", {
54
- className: previewFooterClassnames
55
- }, /*#__PURE__*/React.createElement(EmojiUploadPicker, {
56
- onUploadCancelled: onUploadCancelled,
57
- onUploadEmoji: onUploadEmoji,
58
- onFileChooserClicked: onFileChooserClicked,
59
- errorMessage: uploadErrorMessage,
60
- initialUploadName: initialUploadName
61
- }));
62
- }
63
-
64
- if (emojiToDelete) {
65
- return /*#__PURE__*/React.createElement("div", {
66
- className: previewFooterClassnames
67
- }, /*#__PURE__*/React.createElement(EmojiDeletePreview, {
68
- emoji: emojiToDelete,
69
- onDeleteEmoji: onDeleteEmoji,
70
- onCloseDelete: onCloseDelete
71
- }));
36
+ if (!selectedEmoji || isUploading) {
37
+ return null;
72
38
  }
73
39
 
74
40
  return /*#__PURE__*/React.createElement("div", {
75
41
  className: previewFooterClassnames
76
- }, /*#__PURE__*/React.createElement(EmojiPreview, {
77
- emoji: selectedEmoji,
78
- toneEmoji: toneEmoji,
79
- selectedTone: selectedTone,
80
- onToneSelected: onToneSelected,
81
- onToneSelectorCancelled: onToneSelectorCancelled,
82
- onOpenUpload: onOpenUpload,
83
- uploadEnabled: uploadEnabled
42
+ }, /*#__PURE__*/React.createElement(EmojiPickerPreview, {
43
+ emoji: selectedEmoji
84
44
  }));
85
45
  }
86
46
  }]);
@@ -7,9 +7,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
7
7
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
8
8
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
9
9
 
10
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
10
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
 
12
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
12
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
13
 
14
14
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
15
15
 
@@ -26,7 +26,7 @@ import CategoryTracker from './CategoryTracker';
26
26
  import { sizes } from './EmojiPickerSizes';
27
27
  import { CategoryHeadingItem, EmojisRowItem, LoadingItem, virtualItemRenderer } from './EmojiPickerVirtualItems';
28
28
  import * as styles from './styles';
29
- import EmojiPickerListSearch from './EmojiPickerListSearch';
29
+ import EmojiActions from '../common/EmojiActions';
30
30
  var categoryClassname = 'emoji-category';
31
31
 
32
32
  var byOrder = function byOrder(orderableA, orderableB) {
@@ -272,18 +272,44 @@ var EmojiPickerVirtualList = /*#__PURE__*/function (_PureComponent) {
272
272
  key: "render",
273
273
  value: function render() {
274
274
  var _this$props2 = this.props,
275
- onMouseLeave = _this$props2.onMouseLeave,
276
- onMouseEnter = _this$props2.onMouseEnter,
277
- query = _this$props2.query;
275
+ query = _this$props2.query,
276
+ selectedTone = _this$props2.selectedTone,
277
+ onToneSelected = _this$props2.onToneSelected,
278
+ onToneSelectorCancelled = _this$props2.onToneSelectorCancelled,
279
+ toneEmoji = _this$props2.toneEmoji,
280
+ uploading = _this$props2.uploading,
281
+ uploadEnabled = _this$props2.uploadEnabled,
282
+ emojiToDelete = _this$props2.emojiToDelete,
283
+ initialUploadName = _this$props2.initialUploadName,
284
+ uploadErrorMessage = _this$props2.uploadErrorMessage,
285
+ onUploadCancelled = _this$props2.onUploadCancelled,
286
+ onUploadEmoji = _this$props2.onUploadEmoji,
287
+ onCloseDelete = _this$props2.onCloseDelete,
288
+ onDeleteEmoji = _this$props2.onDeleteEmoji,
289
+ onFileChooserClicked = _this$props2.onFileChooserClicked,
290
+ onOpenUpload = _this$props2.onOpenUpload;
278
291
  var classes = [styles.emojiPickerList];
279
292
  return /*#__PURE__*/React.createElement("div", {
280
293
  ref: "root",
281
- className: classNames(classes),
282
- onMouseLeave: onMouseLeave,
283
- onMouseEnter: onMouseEnter
284
- }, /*#__PURE__*/React.createElement(EmojiPickerListSearch, {
285
- onChange: this.onSearch,
286
- query: query
294
+ className: classNames(classes)
295
+ }, /*#__PURE__*/React.createElement(EmojiActions, {
296
+ selectedTone: selectedTone,
297
+ onToneSelected: onToneSelected,
298
+ onToneSelectorCancelled: onToneSelectorCancelled,
299
+ toneEmoji: toneEmoji,
300
+ uploading: uploading,
301
+ uploadEnabled: uploadEnabled,
302
+ emojiToDelete: emojiToDelete,
303
+ initialUploadName: initialUploadName,
304
+ uploadErrorMessage: uploadErrorMessage,
305
+ onUploadCancelled: onUploadCancelled,
306
+ onUploadEmoji: onUploadEmoji,
307
+ onCloseDelete: onCloseDelete,
308
+ onDeleteEmoji: onDeleteEmoji,
309
+ onFileChooserClicked: onFileChooserClicked,
310
+ onOpenUpload: onOpenUpload,
311
+ query: query,
312
+ onChange: this.onSearch
287
313
  }), /*#__PURE__*/React.createElement(VirtualList, {
288
314
  ref: "list",
289
315
  height: sizes.listHeight,
@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
13
13
  import React, { PureComponent } from 'react';
14
14
  import TextField from '@atlaskit/textfield';
15
15
  import SearchIcon from '@atlaskit/icon/glyph/search';
16
- import { FormattedMessage } from 'react-intl';
16
+ import { injectIntl } from 'react-intl-next';
17
17
  import { messages } from '../i18n';
18
18
  import * as styles from './styles';
19
19
 
@@ -103,34 +103,30 @@ var EmojiPickerListSearch = /*#__PURE__*/function (_PureComponent) {
103
103
  }, {
104
104
  key: "render",
105
105
  value: function render() {
106
- var _this2 = this;
107
-
108
106
  var _this$props = this.props,
109
107
  style = _this$props.style,
110
- query = _this$props.query;
108
+ query = _this$props.query,
109
+ intl = _this$props.intl;
110
+ var formatMessage = intl.formatMessage;
111
111
  return /*#__PURE__*/React.createElement("div", {
112
112
  className: styles.pickerSearch,
113
113
  style: style
114
- }, /*#__PURE__*/React.createElement(FormattedMessage, messages.searchPlaceholder, function (searchPlaceholder) {
115
- return /*#__PURE__*/React.createElement(FormattedMessage, messages.searchLabel, function (searchLabel) {
116
- return /*#__PURE__*/React.createElement(TextField, {
117
- "aria-label": searchLabel,
118
- className: styles.input,
119
- autoComplete: "off",
120
- name: "search",
121
- placeholder: "".concat(searchPlaceholder, "..."),
122
- onChange: _this2.onChange,
123
- value: query || '',
124
- ref: _this2.handleInputRef,
125
- isCompact: true,
126
- onBlur: _this2.onBlur,
127
- elemBeforeInput: /*#__PURE__*/React.createElement("span", {
128
- className: styles.searchIcon
129
- }, /*#__PURE__*/React.createElement(SearchIcon, {
130
- label: ""
131
- }))
132
- });
133
- });
114
+ }, /*#__PURE__*/React.createElement(TextField, {
115
+ "aria-label": formatMessage(messages.searchLabel),
116
+ className: styles.input,
117
+ autoComplete: "off",
118
+ name: "search",
119
+ placeholder: "".concat(formatMessage(messages.searchPlaceholder), "..."),
120
+ onChange: this.onChange,
121
+ value: query || '',
122
+ ref: this.handleInputRef,
123
+ isCompact: true,
124
+ onBlur: this.onBlur,
125
+ elemBeforeInput: /*#__PURE__*/React.createElement("span", {
126
+ className: styles.searchIcon
127
+ }, /*#__PURE__*/React.createElement(SearchIcon, {
128
+ label: ""
129
+ }))
134
130
  }));
135
131
  }
136
132
  }]);
@@ -142,4 +138,4 @@ _defineProperty(EmojiPickerListSearch, "defaultProps", {
142
138
  style: {}
143
139
  });
144
140
 
145
- export { EmojiPickerListSearch as default };
141
+ export default injectIntl(EmojiPickerListSearch);
@@ -0,0 +1,67 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
+ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
+ import _createClass from "@babel/runtime/helpers/createClass";
4
+ import _inherits from "@babel/runtime/helpers/inherits";
5
+ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
6
+ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
7
+
8
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
9
+
10
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
11
+
12
+ import classNames from 'classnames';
13
+ import React from 'react';
14
+ import { PureComponent } from 'react';
15
+ import CachingEmoji from '../../components/common/CachingEmoji';
16
+ import * as styles from '../common/styles';
17
+
18
+ var EmojiPickerPreview = /*#__PURE__*/function (_PureComponent) {
19
+ _inherits(EmojiPickerPreview, _PureComponent);
20
+
21
+ var _super = _createSuper(EmojiPickerPreview);
22
+
23
+ function EmojiPickerPreview() {
24
+ _classCallCheck(this, EmojiPickerPreview);
25
+
26
+ return _super.apply(this, arguments);
27
+ }
28
+
29
+ _createClass(EmojiPickerPreview, [{
30
+ key: "renderEmojiPreview",
31
+ value: function renderEmojiPreview() {
32
+ var emoji = this.props.emoji;
33
+
34
+ if (emoji) {
35
+ var _classNames2;
36
+
37
+ var previewClasses = classNames(_defineProperty({}, styles.preview, true));
38
+ var previewTextClasses = classNames((_classNames2 = {}, _defineProperty(_classNames2, styles.previewText, true), _defineProperty(_classNames2, styles.previewSingleLine, !emoji.name), _classNames2));
39
+ return /*#__PURE__*/React.createElement("div", {
40
+ className: previewClasses
41
+ }, /*#__PURE__*/React.createElement("span", {
42
+ className: styles.previewImg
43
+ }, /*#__PURE__*/React.createElement(CachingEmoji, {
44
+ emoji: emoji
45
+ })), /*#__PURE__*/React.createElement("div", {
46
+ className: previewTextClasses
47
+ }, /*#__PURE__*/React.createElement("span", {
48
+ className: styles.name
49
+ }, emoji.name), /*#__PURE__*/React.createElement("span", {
50
+ className: styles.shortName
51
+ }, emoji.shortName)));
52
+ }
53
+ }
54
+ }, {
55
+ key: "render",
56
+ value: function render() {
57
+ var sectionClasses = classNames([styles.emojiPreview, styles.emojiPreviewSection]);
58
+ return /*#__PURE__*/React.createElement("div", {
59
+ className: sectionClasses
60
+ }, this.renderEmojiPreview());
61
+ }
62
+ }]);
63
+
64
+ return EmojiPickerPreview;
65
+ }(PureComponent);
66
+
67
+ export { EmojiPickerPreview as default };
@@ -3,6 +3,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
3
3
  import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
4
4
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
5
5
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
6
+ import _createClass from "@babel/runtime/helpers/createClass";
6
7
  import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
7
8
 
8
9
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -15,12 +16,12 @@ import EmojiPickerCategoryHeading from './EmojiPickerCategoryHeading';
15
16
  import EmojiPickerEmojiRow from './EmojiPickerEmojiRow';
16
17
  import { sizes } from './EmojiPickerSizes';
17
18
  import * as styles from './styles';
18
- export var AbstractItem = function AbstractItem(props, height) {
19
+ export var AbstractItem = /*#__PURE__*/_createClass(function AbstractItem(props, height) {
19
20
  _classCallCheck(this, AbstractItem);
20
21
 
21
22
  this.props = props;
22
23
  this.height = height;
23
- };
24
+ });
24
25
  export var EmojisRowItem = /*#__PURE__*/function (_AbstractItem) {
25
26
  _inherits(EmojisRowItem, _AbstractItem);
26
27
 
@@ -40,7 +41,7 @@ export var EmojisRowItem = /*#__PURE__*/function (_AbstractItem) {
40
41
  return _this;
41
42
  }
42
43
 
43
- return EmojisRowItem;
44
+ return _createClass(EmojisRowItem);
44
45
  }(AbstractItem);
45
46
  export var LoadingItem = /*#__PURE__*/function (_AbstractItem2) {
46
47
  _inherits(LoadingItem, _AbstractItem2);
@@ -65,7 +66,7 @@ export var LoadingItem = /*#__PURE__*/function (_AbstractItem2) {
65
66
  return _this2;
66
67
  }
67
68
 
68
- return LoadingItem;
69
+ return _createClass(LoadingItem);
69
70
  }(AbstractItem);
70
71
  export var CategoryHeadingItem = /*#__PURE__*/function (_AbstractItem3) {
71
72
  _inherits(CategoryHeadingItem, _AbstractItem3);
@@ -86,7 +87,7 @@ export var CategoryHeadingItem = /*#__PURE__*/function (_AbstractItem3) {
86
87
  return _this3;
87
88
  }
88
89
 
89
- return CategoryHeadingItem;
90
+ return _createClass(CategoryHeadingItem);
90
91
  }(AbstractItem);
91
92
  /**
92
93
  * These are the values provided by react-virtualized.
@@ -16,7 +16,7 @@ export var emojiPicker = style({
16
16
  display: 'flex',
17
17
  flexDirection: 'column',
18
18
  justifyContent: 'space-between',
19
- background: token('color.background.overlay', 'white'),
19
+ background: token('elevation.surface.overlay', 'white'),
20
20
  border: "".concat(emojiPickerBorderColor, " 1px solid"),
21
21
  borderRadius: "".concat(borderRadius(), "px"),
22
22
  boxShadow: emojiPickerBoxShadow,
@@ -30,7 +30,7 @@ export var emojiPicker = style({
30
30
  export var addButton = 'emoji-picker-add-button';
31
31
  export var categorySelector = style({
32
32
  flex: '0 0 auto',
33
- backgroundColor: token('color.background.sunken', colors.N30),
33
+ backgroundColor: token('elevation.surface.sunken', colors.N30),
34
34
  $nest: _defineProperty({
35
35
  ul: {
36
36
  listStyle: 'none',
@@ -51,7 +51,7 @@ export var categorySelector = style({
51
51
  }
52
52
  }
53
53
  }, ".".concat(addButton), {
54
- color: token('color.text.lowEmphasis', colors.N200),
54
+ color: token('color.text.subtlest', colors.N200),
55
55
  margin: '0 0 0 5px',
56
56
  verticalAlign: 'middle'
57
57
  })
@@ -59,7 +59,7 @@ export var categorySelector = style({
59
59
  export var category = style({
60
60
  backgroundColor: 'transparent',
61
61
  border: 0,
62
- color: token('color.text.lowEmphasis', colors.N100A),
62
+ color: token('color.text.subtlest', colors.N100A),
63
63
  cursor: 'pointer',
64
64
  margin: '2px 0',
65
65
  padding: 0,
@@ -68,17 +68,17 @@ export var category = style({
68
68
  border: '0 none',
69
69
  padding: 0
70
70
  }), _defineProperty(_$nest4, "&.".concat(active), {
71
- color: token('color.text.selected', colors.B300),
71
+ color: token('color.text.brand', colors.B300),
72
72
  $nest: _defineProperty({}, '&:hover', {
73
- color: token('color.text.selected', colors.B300)
73
+ color: token('color.text.brand', colors.B300)
74
74
  })
75
75
  }), _defineProperty(_$nest4, '&:hover', {
76
- color: token('color.text.selected', colors.B200)
76
+ color: token('color.text.brand', colors.B200)
77
77
  }), _defineProperty(_$nest4, "&.".concat(disable), {
78
- color: token('color.text.lowEmphasis', colors.N50),
78
+ color: token('color.text.subtlest', colors.N50),
79
79
  cursor: 'default',
80
80
  $nest: _defineProperty({}, '&:hover', {
81
- color: token('color.text.lowEmphasis', colors.N50)
81
+ color: token('color.text.subtlest', colors.N50)
82
82
  })
83
83
  }), _$nest4)
84
84
  }); /// EmojiPickerList
@@ -103,8 +103,8 @@ export var searchIcon = 'search-icon';
103
103
  export var input = 'input';
104
104
  export var pickerSearch = style({
105
105
  boxSizing: 'border-box',
106
- padding: '10px 10px 9px 10px',
107
- flex: '0 0 auto',
106
+ padding: '10px 10px 11px 10px',
107
+ width: '100%',
108
108
  $nest: (_$nest6 = {}, _defineProperty(_$nest6, ".".concat(searchIcon), {
109
109
  opacity: 0.5
110
110
  }), _defineProperty(_$nest6, ".".concat(input), {
@@ -141,7 +141,7 @@ export var emojiPickerRow = style({
141
141
  });
142
142
  export var emojiCategoryTitle = style({
143
143
  boxSizing: 'border-box',
144
- color: token('color.text.highEmphasis', colors.N900),
144
+ color: token('color.text', colors.N900),
145
145
  fontSize: '14px',
146
146
  padding: '5px 8px',
147
147
  textTransform: 'lowercase',
@@ -209,6 +209,10 @@ export var emojiPickerFooter = style({
209
209
  flex: '0 0 auto'
210
210
  });
211
211
  export var emojiPickerFooterWithTopShadow = style({
212
- borderTop: token('color.border.neutral', "2px solid ".concat(colors.N30A)),
213
- boxShadow: "0px -1px 1px 0px ".concat(token('color.border.neutral', 'rgba(0, 0, 0, 0.1)'))
212
+ borderTop: "2px solid ".concat(token('color.border', colors.N30A)),
213
+ boxShadow: "0px -1px 1px 0px ".concat(token('color.border', 'rgba(0, 0, 0, 0.1)'))
214
+ });
215
+ export var emojiActionsContainerWithBottomShadow = style({
216
+ borderBottom: "2px solid ".concat(token('color.border', colors.N30A)),
217
+ boxShadow: "0px 1px 1px 0px ".concat(token('color.border', 'rgba(0, 0, 0, 0.1)'))
214
218
  });
@@ -7,6 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
7
7
  import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
8
8
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
9
9
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
10
+ var _excluded = ["emojiProvider", "target", "position", "zIndex", "offsetX", "offsetY"];
10
11
 
11
12
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
12
13
 
@@ -97,7 +98,7 @@ var EmojiTypeahead = /*#__PURE__*/function (_LoadingEmojiComponen) {
97
98
  zIndex = _this$props.zIndex,
98
99
  offsetX = _this$props.offsetX,
99
100
  offsetY = _this$props.offsetY,
100
- otherProps = _objectWithoutProperties(_this$props, ["emojiProvider", "target", "position", "zIndex", "offsetX", "offsetY"]);
101
+ otherProps = _objectWithoutProperties(_this$props, _excluded);
101
102
 
102
103
  var typeAhead = /*#__PURE__*/React.createElement(EmojiTypeAheadComponent, _extends({}, otherProps, {
103
104
  emojiProvider: loadedEmojiProvider,
@@ -15,8 +15,8 @@ import React from 'react';
15
15
  import { PureComponent } from 'react';
16
16
  import { toEmojiId } from '../../util/type-helpers';
17
17
  import { leftClick } from '../../util/mouse';
18
- import EmojiPreview from '../common/EmojiPreview';
19
18
  import * as styles from './styles';
19
+ import EmojiPickerPreview from '../picker/EmojiPickerPreview';
20
20
 
21
21
  var EmojiTypeAheadItem = /*#__PURE__*/function (_PureComponent) {
22
22
  _inherits(EmojiTypeAheadItem, _PureComponent);
@@ -76,7 +76,7 @@ var EmojiTypeAheadItem = /*#__PURE__*/function (_PureComponent) {
76
76
  "data-emoji-id": emoji.shortName
77
77
  }, /*#__PURE__*/React.createElement("div", {
78
78
  className: styles.typeAheadItemRow
79
- }, /*#__PURE__*/React.createElement(EmojiPreview, {
79
+ }, /*#__PURE__*/React.createElement(EmojiPickerPreview, {
80
80
  emoji: emoji
81
81
  })));
82
82
  }
@@ -6,11 +6,11 @@ export var selected = 'emoji-typeahead-selected';
6
6
  export var emojiTypeAhead = 'emoji-typeahead-element';
7
7
  export var typeAheadListContainer = 'emoji-typeahead-list-container';
8
8
  export var typeAheadList = style({
9
- background: token('color.background.overlay', 'white'),
9
+ background: token('elevation.surface.overlay', 'white'),
10
10
  border: "1px solid ".concat(noDialogContainerBorderColor),
11
11
  borderRadius: noDialogContainerBorderRadius,
12
12
  boxShadow: noDialogContainerBoxShadow,
13
- color: token('color.text.mediumEmphasis', '#333'),
13
+ color: token('color.text.subtle', '#333'),
14
14
  width: emojiTypeAheadWidth
15
15
  });
16
16
  export var typeAheadEmpty = style({
@@ -12,11 +12,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
12
12
 
13
13
  import React from 'react';
14
14
  import { PureComponent } from 'react';
15
- import { FormattedMessage } from 'react-intl';
15
+ import { FormattedMessage } from 'react-intl-next';
16
16
  import classNames from 'classnames';
17
17
  import * as styles from './styles';
18
18
  import { supportsUploadFeature } from '../../api/EmojiResource';
19
- import EmojiUploadPicker from '../common/EmojiUploadPicker';
19
+ import EmojiUploadPickerWithIntl from '../common/EmojiUploadPicker';
20
20
  import { uploadEmoji } from '../common/UploadEmoji';
21
21
  import { createAndFireEventInElementsChannel, selectedFileEvent, uploadCancelButton, uploadConfirmButton } from '../../util/analytics';
22
22
 
@@ -104,7 +104,7 @@ var EmojiUploadComponent = /*#__PURE__*/function (_PureComponent) {
104
104
  ref: this.props.onUploaderRef
105
105
  }, /*#__PURE__*/React.createElement("div", {
106
106
  className: classNames([styles.emojiUploadFooter])
107
- }, /*#__PURE__*/React.createElement(EmojiUploadPicker, {
107
+ }, /*#__PURE__*/React.createElement(EmojiUploadPickerWithIntl, {
108
108
  ref: this.onUploaderRef,
109
109
  onFileChooserClicked: this.onFileChooserClicked,
110
110
  onUploadCancelled: this.onUploadCancelled,
@@ -7,6 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
7
7
  import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
8
8
  import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
9
9
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
10
+ var _excluded = ["emojiProvider"];
10
11
 
11
12
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
12
13
 
@@ -65,7 +66,7 @@ export var EmojiUploaderInternal = /*#__PURE__*/function (_LoadingEmojiComponen)
65
66
  value: function renderLoaded(loadedEmojiProvider, EmojiUploadComponent) {
66
67
  var _this$props = this.props,
67
68
  emojiProvider = _this$props.emojiProvider,
68
- otherProps = _objectWithoutProperties(_this$props, ["emojiProvider"]);
69
+ otherProps = _objectWithoutProperties(_this$props, _excluded);
69
70
 
70
71
  return /*#__PURE__*/React.createElement(EmojiUploadComponent, _extends({
71
72
  emojiProvider: loadedEmojiProvider