@atlaskit/emoji 73.3.2 → 73.3.4
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.
- package/CHANGELOG.md +15 -0
- package/dist/cjs/api/EmojiRepository.js +1 -7
- package/dist/cjs/api/EmojiResource.js +1 -3
- package/dist/cjs/components/common/DeleteButton.js +2 -8
- package/dist/cjs/components/common/EmojiActions.compiled.css +1 -3
- package/dist/cjs/components/common/EmojiActions.js +6 -45
- package/dist/cjs/components/common/EmojiDeletePreview.compiled.css +1 -16
- package/dist/cjs/components/common/EmojiDeletePreview.js +17 -65
- package/dist/cjs/components/common/EmojiErrorMessage.js +2 -9
- package/dist/cjs/components/common/EmojiRadioButton.js +3 -4
- package/dist/cjs/components/common/EmojiUploadPicker.compiled.css +1 -14
- package/dist/cjs/components/common/EmojiUploadPicker.js +7 -90
- package/dist/cjs/components/common/FileChooser.js +15 -25
- package/dist/cjs/components/common/TonePreviewButton.compiled.css +1 -2
- package/dist/cjs/components/common/TonePreviewButton.js +2 -23
- package/dist/cjs/components/common/ToneSelectorInternal.js +1 -10
- package/dist/cjs/components/picker/CategorySelector.compiled.css +0 -6
- package/dist/cjs/components/picker/CategorySelector.js +5 -44
- package/dist/cjs/components/picker/EmojiPickerComponent.compiled.css +1 -2
- package/dist/cjs/components/picker/EmojiPickerComponent.js +38 -57
- package/dist/cjs/components/picker/EmojiPickerEmojiRow.js +1 -2
- package/dist/cjs/components/picker/EmojiPickerFooter.compiled.css +0 -2
- package/dist/cjs/components/picker/EmojiPickerFooter.js +1 -8
- package/dist/cjs/components/picker/EmojiPickerInternal.compiled.css +1 -2
- package/dist/cjs/components/picker/EmojiPickerInternal.js +1 -9
- package/dist/cjs/components/picker/EmojiPickerList.js +30 -36
- package/dist/cjs/components/picker/EmojiPickerListSearch.compiled.css +0 -1
- package/dist/cjs/components/picker/EmojiPickerListSearch.js +2 -24
- package/dist/cjs/components/picker/EmojiPickerSizes.js +0 -1
- package/dist/cjs/components/picker/VirtualList.js +2 -3
- package/dist/cjs/components/picker/categories.js +1 -84
- package/dist/cjs/components/uploader/EmojiUploadComponent.js +0 -2
- package/dist/cjs/util/analytics/createEvent.js +1 -1
- package/dist/cjs/util/constants.js +1 -2
- package/dist/es2019/api/EmojiRepository.js +1 -7
- package/dist/es2019/api/EmojiResource.js +1 -3
- package/dist/es2019/components/common/DeleteButton.js +2 -8
- package/dist/es2019/components/common/EmojiActions.compiled.css +1 -3
- package/dist/es2019/components/common/EmojiActions.js +6 -45
- package/dist/es2019/components/common/EmojiDeletePreview.compiled.css +1 -16
- package/dist/es2019/components/common/EmojiDeletePreview.js +17 -65
- package/dist/es2019/components/common/EmojiErrorMessage.js +2 -9
- package/dist/es2019/components/common/EmojiRadioButton.js +2 -3
- package/dist/es2019/components/common/EmojiUploadPicker.compiled.css +1 -14
- package/dist/es2019/components/common/EmojiUploadPicker.js +7 -87
- package/dist/es2019/components/common/FileChooser.js +15 -25
- package/dist/es2019/components/common/TonePreviewButton.compiled.css +1 -2
- package/dist/es2019/components/common/TonePreviewButton.js +2 -23
- package/dist/es2019/components/common/ToneSelectorInternal.js +1 -10
- package/dist/es2019/components/picker/CategorySelector.compiled.css +0 -6
- package/dist/es2019/components/picker/CategorySelector.js +5 -44
- package/dist/es2019/components/picker/EmojiPickerComponent.compiled.css +1 -2
- package/dist/es2019/components/picker/EmojiPickerComponent.js +44 -61
- package/dist/es2019/components/picker/EmojiPickerEmojiRow.js +1 -2
- package/dist/es2019/components/picker/EmojiPickerFooter.compiled.css +0 -2
- package/dist/es2019/components/picker/EmojiPickerFooter.js +1 -8
- package/dist/es2019/components/picker/EmojiPickerInternal.compiled.css +1 -2
- package/dist/es2019/components/picker/EmojiPickerInternal.js +1 -9
- package/dist/es2019/components/picker/EmojiPickerList.js +29 -35
- package/dist/es2019/components/picker/EmojiPickerListSearch.compiled.css +0 -1
- package/dist/es2019/components/picker/EmojiPickerListSearch.js +2 -24
- package/dist/es2019/components/picker/EmojiPickerSizes.js +1 -2
- package/dist/es2019/components/picker/VirtualList.js +2 -3
- package/dist/es2019/components/picker/categories.js +0 -83
- package/dist/es2019/components/uploader/EmojiUploadComponent.js +0 -2
- package/dist/es2019/util/analytics/createEvent.js +1 -1
- package/dist/es2019/util/constants.js +0 -1
- package/dist/esm/api/EmojiRepository.js +1 -7
- package/dist/esm/api/EmojiResource.js +1 -3
- package/dist/esm/components/common/DeleteButton.js +2 -8
- package/dist/esm/components/common/EmojiActions.compiled.css +1 -3
- package/dist/esm/components/common/EmojiActions.js +6 -45
- package/dist/esm/components/common/EmojiDeletePreview.compiled.css +1 -16
- package/dist/esm/components/common/EmojiDeletePreview.js +17 -65
- package/dist/esm/components/common/EmojiErrorMessage.js +2 -9
- package/dist/esm/components/common/EmojiRadioButton.js +3 -4
- package/dist/esm/components/common/EmojiUploadPicker.compiled.css +1 -14
- package/dist/esm/components/common/EmojiUploadPicker.js +7 -90
- package/dist/esm/components/common/FileChooser.js +15 -25
- package/dist/esm/components/common/TonePreviewButton.compiled.css +1 -2
- package/dist/esm/components/common/TonePreviewButton.js +2 -23
- package/dist/esm/components/common/ToneSelectorInternal.js +1 -10
- package/dist/esm/components/picker/CategorySelector.compiled.css +0 -6
- package/dist/esm/components/picker/CategorySelector.js +6 -45
- package/dist/esm/components/picker/EmojiPickerComponent.compiled.css +1 -2
- package/dist/esm/components/picker/EmojiPickerComponent.js +39 -58
- package/dist/esm/components/picker/EmojiPickerEmojiRow.js +1 -2
- package/dist/esm/components/picker/EmojiPickerFooter.compiled.css +0 -2
- package/dist/esm/components/picker/EmojiPickerFooter.js +1 -8
- package/dist/esm/components/picker/EmojiPickerInternal.compiled.css +1 -2
- package/dist/esm/components/picker/EmojiPickerInternal.js +1 -9
- package/dist/esm/components/picker/EmojiPickerList.js +31 -37
- package/dist/esm/components/picker/EmojiPickerListSearch.compiled.css +0 -1
- package/dist/esm/components/picker/EmojiPickerListSearch.js +2 -24
- package/dist/esm/components/picker/EmojiPickerSizes.js +1 -2
- package/dist/esm/components/picker/VirtualList.js +2 -3
- package/dist/esm/components/picker/categories.js +0 -83
- package/dist/esm/components/uploader/EmojiUploadComponent.js +0 -2
- package/dist/esm/util/analytics/createEvent.js +1 -1
- package/dist/esm/util/constants.js +0 -1
- package/dist/types/components/common/EmojiUploadPicker.d.ts +0 -1
- package/dist/types/components/picker/EmojiPickerSizes.d.ts +0 -1
- package/dist/types/components/picker/categories.d.ts +0 -1
- package/dist/types/components/uploader/EmojiUploadComponent.d.ts +0 -1
- package/dist/types/components/uploader/EmojiUploader.d.ts +0 -1
- package/dist/types/util/constants.d.ts +0 -1
- package/package.json +2 -15
- package/dist/cjs/components/common/AddOwnEmoji.compiled.css +0 -6
- package/dist/cjs/components/common/AddOwnEmoji.js +0 -58
- package/dist/cjs/components/common/EmojiUploadPreview.compiled.css +0 -19
- package/dist/cjs/components/common/EmojiUploadPreview.js +0 -119
- package/dist/cjs/components/common/isRefreshEmojiPickerEnabled.js +0 -10
- package/dist/cjs/components/picker/sortCategories.js +0 -15
- package/dist/cjs/util/teamoji26RefreshEmojiPicker.js +0 -19
- package/dist/es2019/components/common/AddOwnEmoji.compiled.css +0 -6
- package/dist/es2019/components/common/AddOwnEmoji.js +0 -49
- package/dist/es2019/components/common/EmojiUploadPreview.compiled.css +0 -19
- package/dist/es2019/components/common/EmojiUploadPreview.js +0 -100
- package/dist/es2019/components/common/isRefreshEmojiPickerEnabled.js +0 -4
- package/dist/es2019/components/picker/sortCategories.js +0 -7
- package/dist/es2019/util/teamoji26RefreshEmojiPicker.js +0 -13
- package/dist/esm/components/common/AddOwnEmoji.compiled.css +0 -6
- package/dist/esm/components/common/AddOwnEmoji.js +0 -49
- package/dist/esm/components/common/EmojiUploadPreview.compiled.css +0 -19
- package/dist/esm/components/common/EmojiUploadPreview.js +0 -110
- package/dist/esm/components/common/isRefreshEmojiPickerEnabled.js +0 -4
- package/dist/esm/components/picker/sortCategories.js +0 -9
- package/dist/esm/util/teamoji26RefreshEmojiPicker.js +0 -13
- package/dist/types/components/common/AddOwnEmoji.d.ts +0 -9
- package/dist/types/components/common/EmojiUploadPreview.d.ts +0 -22
- package/dist/types/components/common/isRefreshEmojiPickerEnabled.d.ts +0 -1
- package/dist/types/components/picker/sortCategories.d.ts +0 -6
- package/dist/types/util/teamoji26RefreshEmojiPicker.d.ts +0 -6
|
@@ -52,7 +52,6 @@ var _getToneEmoji = require("../../util/get-tone-emoji");
|
|
|
52
52
|
var _isEmojiDescription = require("../../util/is-emoji-description");
|
|
53
53
|
var _isPromise = require("../../util/is-promise");
|
|
54
54
|
var _productivityColors = require("../../util/productivity-colors");
|
|
55
|
-
var _isRefreshEmojiPickerEnabled = require("../common/isRefreshEmojiPickerEnabled");
|
|
56
55
|
var _RecordSelectionDefault = require("../common/RecordSelectionDefault");
|
|
57
56
|
var _UploadEmoji = require("../common/UploadEmoji");
|
|
58
57
|
var _i18n = require("../i18n");
|
|
@@ -71,7 +70,6 @@ var emojiPickerHeightDeleteRefresh = 339;
|
|
|
71
70
|
var emojiPickerWidth = 350;
|
|
72
71
|
var emojiPickerMinHeight = 260;
|
|
73
72
|
var heightOffset = 80;
|
|
74
|
-
var emojiPicker = null;
|
|
75
73
|
var emojiPickerNew = null;
|
|
76
74
|
var emojiPickerWrapper = null;
|
|
77
75
|
|
|
@@ -130,7 +128,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
130
128
|
var _useEmoji = (0, _useEmoji2.useEmoji)(),
|
|
131
129
|
emojiProvider = _useEmoji.emojiProvider,
|
|
132
130
|
isUploadSupported = _useEmoji.isUploadSupported;
|
|
133
|
-
var isTeamojiExperimentEnabled = (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)();
|
|
134
131
|
var _useState = (0, _react.useState)([]),
|
|
135
132
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
136
133
|
filteredEmojis = _useState2[0],
|
|
@@ -156,7 +153,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
156
153
|
selectedTone = _useState10[0],
|
|
157
154
|
setSelectedTone = _useState10[1];
|
|
158
155
|
var _useState11 = (0, _react.useState)(function () {
|
|
159
|
-
return
|
|
156
|
+
return (0, _productivityColors.getStoredProductivityColor)();
|
|
160
157
|
}),
|
|
161
158
|
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
|
|
162
159
|
selectedProductivityColor = _useState12[0],
|
|
@@ -207,11 +204,9 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
207
204
|
var isProgrammaticScroll = (0, _react.useRef)(false);
|
|
208
205
|
var pickerRef = (0, _react.useRef)(null);
|
|
209
206
|
var setPickerRef = (0, _react.useCallback)(function (el) {
|
|
210
|
-
|
|
211
|
-
pickerRef.current = el;
|
|
212
|
-
}
|
|
207
|
+
pickerRef.current = el;
|
|
213
208
|
onPickerRef === null || onPickerRef === void 0 || onPickerRef(el);
|
|
214
|
-
}, [
|
|
209
|
+
}, [onPickerRef]);
|
|
215
210
|
var currentUser = (0, _react.useMemo)(function () {
|
|
216
211
|
return emojiProvider.getCurrentUser();
|
|
217
212
|
}, [emojiProvider]);
|
|
@@ -228,7 +223,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
228
223
|
}, [selectedEmoji]);
|
|
229
224
|
var uploadEnabled = isUploadSupported && !uploading;
|
|
230
225
|
var onEmojiLeave = (0, _react.useCallback)(function () {
|
|
231
|
-
if (
|
|
226
|
+
if (uploadEnabled) {
|
|
232
227
|
setSelectedEmoji(undefined);
|
|
233
228
|
}
|
|
234
229
|
}, [uploadEnabled]);
|
|
@@ -236,16 +231,16 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
236
231
|
// Ignore scroll-driven category changes while a programmatic reveal()
|
|
237
232
|
// scroll is in progress — they would flicker the indicator through
|
|
238
233
|
// intermediate categories before landing on the correct one.
|
|
239
|
-
if (isProgrammaticScroll.current
|
|
234
|
+
if (isProgrammaticScroll.current) {
|
|
240
235
|
return;
|
|
241
236
|
}
|
|
242
237
|
// Ignore scroll-driven category changes while the upload or delete screen is open
|
|
243
|
-
if (
|
|
238
|
+
if (uploading || emojiToDelete) {
|
|
244
239
|
return;
|
|
245
240
|
}
|
|
246
241
|
if (activeCategory !== category) {
|
|
247
242
|
setActiveCategory(category);
|
|
248
|
-
if (!query
|
|
243
|
+
if (!query) {
|
|
249
244
|
lastNonSearchCategory.current = category;
|
|
250
245
|
}
|
|
251
246
|
}
|
|
@@ -262,12 +257,10 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
262
257
|
setUploadErrorMessage(undefined);
|
|
263
258
|
});
|
|
264
259
|
fireAnalytics((0, _uploadCancelButton.uploadCancelButton)());
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
}, 0);
|
|
270
|
-
}
|
|
260
|
+
setTimeout(function () {
|
|
261
|
+
var _getDocument;
|
|
262
|
+
(_getDocument = (0, _browserApis.getDocument)()) === null || _getDocument === void 0 || (_getDocument = _getDocument.getElementById('add-custom-emoji')) === null || _getDocument === void 0 || _getDocument.focus();
|
|
263
|
+
}, 0);
|
|
271
264
|
}, [fireAnalytics]);
|
|
272
265
|
var getDynamicCategories = (0, _react.useCallback)(function () {
|
|
273
266
|
if (!emojiProvider.calculateDynamicCategories) {
|
|
@@ -313,7 +306,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
313
306
|
}, [filteredEmojis.length, getDynamicCategories, onDynamicCategoryChange, selectedEmoji]);
|
|
314
307
|
var onFrequentEmojiResult = (0, _react.useCallback)(function (frequentEmoji) {
|
|
315
308
|
// change the category of each of the featured emoji
|
|
316
|
-
var visibleFrequentEmoji =
|
|
309
|
+
var visibleFrequentEmoji = (0, _filterHiddenEmojis.filterHiddenEmojis)(frequentEmoji);
|
|
317
310
|
var recategorised = visibleFrequentEmoji.map(function (emoji) {
|
|
318
311
|
var clone = JSON.parse(JSON.stringify(emoji));
|
|
319
312
|
clone.category = _constants.frequentCategory;
|
|
@@ -322,11 +315,11 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
322
315
|
setStateAfterEmojiChange({
|
|
323
316
|
frequentEmoji: recategorised
|
|
324
317
|
});
|
|
325
|
-
}, [
|
|
318
|
+
}, [setStateAfterEmojiChange]);
|
|
326
319
|
var onSearchResult = (0, _react.useCallback)(function (searchResults) {
|
|
327
320
|
var frequentlyUsedEmoji = frequentlyUsedEmojis || [];
|
|
328
321
|
var searchQuery = searchResults.query || '';
|
|
329
|
-
var visibleSearchEmojis =
|
|
322
|
+
var visibleSearchEmojis = (0, _filterHiddenEmojis.filterHiddenEmojis)(searchResults.emojis);
|
|
330
323
|
|
|
331
324
|
/**
|
|
332
325
|
* If there is no user search in the EmojiPicker then it should display all emoji received from the EmojiRepository and should
|
|
@@ -348,7 +341,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
348
341
|
queryLength: searchQuery.length,
|
|
349
342
|
numMatches: visibleSearchEmojis.length
|
|
350
343
|
}));
|
|
351
|
-
}, [frequentlyUsedEmojis,
|
|
344
|
+
}, [frequentlyUsedEmojis, query, setStateAfterEmojiChange, fireAnalytics]);
|
|
352
345
|
var onProviderChange = (0, _react.useMemo)(function () {
|
|
353
346
|
return {
|
|
354
347
|
result: onSearchResult
|
|
@@ -410,37 +403,29 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
410
403
|
if (!categoryId) {
|
|
411
404
|
return;
|
|
412
405
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
}
|
|
420
|
-
if (emojiToDelete) {
|
|
421
|
-
setEmojiToDelete(undefined);
|
|
422
|
-
}
|
|
406
|
+
if (uploading) {
|
|
407
|
+
setUploading(false);
|
|
408
|
+
setUploadErrorMessage(undefined);
|
|
409
|
+
}
|
|
410
|
+
if (emojiToDelete) {
|
|
411
|
+
setEmojiToDelete(undefined);
|
|
423
412
|
}
|
|
424
413
|
emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
|
|
425
414
|
if (!disableCategories) {
|
|
426
415
|
var newSelectedEmoji;
|
|
427
|
-
var visibleEmojisInCategory =
|
|
416
|
+
var visibleEmojisInCategory = (0, _filterHiddenEmojis.filterHiddenEmojis)(emojisInCategory || []);
|
|
428
417
|
if (visibleEmojisInCategory.length > 0) {
|
|
429
418
|
newSelectedEmoji = (0, _getEmojiVariation.getEmojiVariation)(visibleEmojisInCategory[0], {
|
|
430
419
|
skinTone: selectedTone
|
|
431
420
|
});
|
|
432
421
|
}
|
|
433
422
|
if (emojiPickerList.current) {
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
setTimeout(function () {
|
|
441
|
-
isProgrammaticScroll.current = false;
|
|
442
|
-
}, 300);
|
|
443
|
-
}
|
|
423
|
+
isProgrammaticScroll.current = true;
|
|
424
|
+
emojiPickerList.current.reveal(categoryId, true);
|
|
425
|
+
// Clear the flag after the scroll animation has settled.
|
|
426
|
+
setTimeout(function () {
|
|
427
|
+
isProgrammaticScroll.current = false;
|
|
428
|
+
}, 300);
|
|
444
429
|
}
|
|
445
430
|
(0, _reactDom.unstable_batchedUpdates)(function () {
|
|
446
431
|
setActiveCategory(categoryId);
|
|
@@ -451,7 +436,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
451
436
|
}));
|
|
452
437
|
}
|
|
453
438
|
});
|
|
454
|
-
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics,
|
|
439
|
+
}, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
|
|
455
440
|
var recordUsageOnSelection = (0, _react.useMemo)(function () {
|
|
456
441
|
return (0, _RecordSelectionDefault.createRecordSelectionDefault)(emojiProvider, onSelectWrapper, function (analytic) {
|
|
457
442
|
return fireAnalytics(analytic(_types.SearchSourceTypes.PICKER));
|
|
@@ -474,7 +459,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
474
459
|
};
|
|
475
460
|
if (searchQuery !== query) {
|
|
476
461
|
// Capture the active category before entering search so we can keep it highlighted
|
|
477
|
-
if (!query && searchQuery
|
|
462
|
+
if (!query && searchQuery) {
|
|
478
463
|
lastNonSearchCategory.current = activeCategory;
|
|
479
464
|
}
|
|
480
465
|
setQuery(searchQuery);
|
|
@@ -490,7 +475,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
490
475
|
// cannot reach underlying page drop handlers (e.g. the Confluence editor).
|
|
491
476
|
(0, _react.useEffect)(function () {
|
|
492
477
|
var _getDocument2;
|
|
493
|
-
if (!uploading
|
|
478
|
+
if (!uploading) {
|
|
494
479
|
return;
|
|
495
480
|
}
|
|
496
481
|
var body = (_getDocument2 = (0, _browserApis.getDocument)()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.body;
|
|
@@ -560,10 +545,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
560
545
|
});
|
|
561
546
|
scrollToUploadedEmoji(emojiDescription);
|
|
562
547
|
};
|
|
563
|
-
if (!(0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)()) {
|
|
564
|
-
_context.next = 2;
|
|
565
|
-
break;
|
|
566
|
-
}
|
|
567
548
|
uploadShortName = ":".concat(upload.name.toLowerCase(), ":");
|
|
568
549
|
_context.next = 1;
|
|
569
550
|
return emojiProvider.findByShortName(uploadShortName);
|
|
@@ -698,9 +679,9 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
698
679
|
emojiProvider.unsubscribe(onProviderChange);
|
|
699
680
|
};
|
|
700
681
|
}, [emojiProvider, onProviderChange]);
|
|
701
|
-
var showPreview =
|
|
702
|
-
var shouldRenderFooter = showPreview && !
|
|
703
|
-
var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0)
|
|
682
|
+
var showPreview = !uploading;
|
|
683
|
+
var shouldRenderFooter = showPreview && !emojiToDelete && !(query && filteredEmojis.length === 0) && (Boolean(selectedEmoji) || uploadEnabled);
|
|
684
|
+
var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0);
|
|
704
685
|
|
|
705
686
|
// When the AI emoji section is shown in the upload panel, grow the picker so
|
|
706
687
|
// the section isn't clipped by the fixed upload height.
|
|
@@ -711,7 +692,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
711
692
|
role: "dialog",
|
|
712
693
|
"aria-label": formatMessage(_i18n.messages.emojiPickerTitle),
|
|
713
694
|
"aria-modal": true,
|
|
714
|
-
className: (0, _runtime.ax)([
|
|
695
|
+
className: (0, _runtime.ax)(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete ? withDeleteRefreshHeight[size] : uploading ? hasUploadPreviewError ? withUploadRefreshAndPreviewErrorHeight[size] : withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size], showAiUpload && "_4t3ikbql _c71l8k0t"]),
|
|
715
696
|
style: {
|
|
716
697
|
"--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
|
|
717
698
|
"--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
|
|
@@ -723,7 +704,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
723
704
|
onKeyDown: suppressKeyPress,
|
|
724
705
|
className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf", showAiUpload && "_1reo15vq _18m91wug"])
|
|
725
706
|
}, /*#__PURE__*/React.createElement(_CategorySelector.default, {
|
|
726
|
-
activeCategoryId:
|
|
707
|
+
activeCategoryId: uploading || emojiToDelete ? null : activeCategory,
|
|
727
708
|
dynamicCategories: dynamicCategories,
|
|
728
709
|
disableCategories: disableCategories,
|
|
729
710
|
onCategorySelected: onCategorySelected
|
|
@@ -738,13 +719,13 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
|
|
|
738
719
|
onSearch: onSearch,
|
|
739
720
|
query: query,
|
|
740
721
|
selectedTone: selectedTone,
|
|
741
|
-
selectedProductivityColor:
|
|
722
|
+
selectedProductivityColor: selectedProductivityColor,
|
|
742
723
|
loading: loading,
|
|
743
724
|
ref: emojiPickerList,
|
|
744
725
|
initialUploadName: query,
|
|
745
726
|
onToneSelected: onToneSelected,
|
|
746
727
|
onToneSelectorCancelled: onToneSelectorCancelled,
|
|
747
|
-
onProductivityColorSelected:
|
|
728
|
+
onProductivityColorSelected: onProductivityColorSelected,
|
|
748
729
|
toneEmoji: toneEmoji,
|
|
749
730
|
uploading: uploading,
|
|
750
731
|
emojiToDelete: emojiToDelete,
|
|
@@ -13,7 +13,6 @@ var React = _react;
|
|
|
13
13
|
var _runtime = require("@compiled/react/runtime");
|
|
14
14
|
var _reactIntl = require("react-intl");
|
|
15
15
|
var _useEmojiPickerListContext = require("../../hooks/useEmojiPickerListContext");
|
|
16
|
-
var _teamoji26RefreshEmojiPicker = require("../../util/teamoji26RefreshEmojiPicker");
|
|
17
16
|
var _CachingEmoji = _interopRequireDefault(require("../common/CachingEmoji"));
|
|
18
17
|
var _i18n = require("../i18n");
|
|
19
18
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
@@ -35,7 +34,7 @@ var EmojiPickerEmojiRow = function EmojiPickerEmojiRow(_ref) {
|
|
|
35
34
|
var rowIndex = (virtualItemContext === null || virtualItemContext === void 0 ? void 0 : virtualItemContext.index) || 0;
|
|
36
35
|
var _useIntl = (0, _reactIntl.useIntl)(),
|
|
37
36
|
formatMessage = _useIntl.formatMessage;
|
|
38
|
-
var preventFocusOnMouseDown =
|
|
37
|
+
var preventFocusOnMouseDown = true;
|
|
39
38
|
var handleFocus = function handleFocus(index) {
|
|
40
39
|
return function (emojiId, emoji, event) {
|
|
41
40
|
setEmojisFocus({
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
._x3do1uh4{border-top:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}
|
|
2
1
|
._x3doia51{border-top:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._16jlidpf{flex-grow:0}
|
|
3
|
-
._16qsvjqj{box-shadow:0 -1px 1px 0 var(--ds-border,#0b120e24)}
|
|
4
2
|
._19bvv77o{padding-left:var(--ds-space-025,2px)}
|
|
5
3
|
._1o9zidpf{flex-shrink:0}
|
|
6
4
|
._ca0qv77o{padding-top:var(--ds-space-025,2px)}
|
|
@@ -14,10 +14,8 @@ var _reactIntl = require("react-intl");
|
|
|
14
14
|
var _box = require("@atlaskit/primitives/compiled/box");
|
|
15
15
|
var _AddEmoji = require("../common/AddEmoji");
|
|
16
16
|
var _EmojiPreviewComponent = require("../common/EmojiPreviewComponent");
|
|
17
|
-
var _isRefreshEmojiPickerEnabled = require("../common/isRefreshEmojiPickerEnabled");
|
|
18
17
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
19
18
|
var emojiPickerFooter = null;
|
|
20
|
-
var emojiPickerFooterWithTopShadow = null;
|
|
21
19
|
var emojiPickerFooterWithTopShadowNew = null;
|
|
22
20
|
var emojiPreviewContainerStyles = {
|
|
23
21
|
emojiPreviewContainer: "_ca0qv77o _u5f3v77o _n3tdv77o _19bvv77o"
|
|
@@ -28,7 +26,7 @@ var EmojiPickerFooter = function EmojiPickerFooter(_ref) {
|
|
|
28
26
|
onOpenUpload = _ref.onOpenUpload,
|
|
29
27
|
uploadEnabled = _ref.uploadEnabled;
|
|
30
28
|
var intl = (0, _reactIntl.useIntl)();
|
|
31
|
-
return
|
|
29
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
32
30
|
"data-testid": emojiPickerFooterTestId,
|
|
33
31
|
className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug", "_x3doia51"])
|
|
34
32
|
}, selectedEmoji ? /*#__PURE__*/React.createElement(_box.Box, {
|
|
@@ -39,11 +37,6 @@ var EmojiPickerFooter = function EmojiPickerFooter(_ref) {
|
|
|
39
37
|
onOpenUpload: onOpenUpload,
|
|
40
38
|
uploadEnabled: uploadEnabled,
|
|
41
39
|
intl: intl
|
|
42
|
-
})) : /*#__PURE__*/React.createElement("div", {
|
|
43
|
-
"data-testid": emojiPickerFooterTestId,
|
|
44
|
-
className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug", "_x3do1uh4 _16qsvjqj"])
|
|
45
|
-
}, selectedEmoji && /*#__PURE__*/React.createElement(_EmojiPreviewComponent.EmojiPreviewComponent, {
|
|
46
|
-
emoji: selectedEmoji
|
|
47
40
|
}));
|
|
48
41
|
};
|
|
49
42
|
var _default_1 = /*#__PURE__*/(0, _react.memo)(EmojiPickerFooter);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
|
|
2
|
-
._2rko1mok{border-radius:var(--ds-radius-large,8px)}
|
|
3
|
-
._2rkofajl{border-radius:var(--ds-radius-small,3px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
2
|
+
._2rko1mok{border-radius:var(--ds-radius-large,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
|
|
4
3
|
._1bah1yb4{justify-content:space-between}
|
|
5
4
|
._1bsb1edt{width:350px}
|
|
6
5
|
._1e0c1txw{display:flex}
|
|
@@ -19,7 +19,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
19
19
|
var _EmojiCommonProvider = require("../../context/EmojiCommonProvider");
|
|
20
20
|
var _ufoExperiences = require("../../util/analytics/ufoExperiences");
|
|
21
21
|
var _constants = require("../../util/constants");
|
|
22
|
-
var _teamoji26RefreshEmojiPicker = require("../../util/teamoji26RefreshEmojiPicker");
|
|
23
22
|
var _LoadingEmojiComponent = _interopRequireDefault(require("../common/LoadingEmojiComponent"));
|
|
24
23
|
var _UfoErrorBoundary = require("../common/UfoErrorBoundary");
|
|
25
24
|
var _emojiPickerLoader = require("./emojiPickerLoader");
|
|
@@ -27,10 +26,6 @@ var _LoadingItem = require("./LoadingItem");
|
|
|
27
26
|
var _excluded = ["emojiProvider"];
|
|
28
27
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
29
28
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
30
|
-
var isRefreshEmojiPickerEnabled = function isRefreshEmojiPickerEnabled() {
|
|
31
|
-
return (0, _teamoji26RefreshEmojiPicker.isTeamoji26RefreshEmojiPickerEnabled)();
|
|
32
|
-
};
|
|
33
|
-
var emojiPicker = null;
|
|
34
29
|
var emojiPickerNew = null;
|
|
35
30
|
var EmojiPickerInternal = exports.EmojiPickerInternal = /*#__PURE__*/function (_LoadingEmojiComponen) {
|
|
36
31
|
function EmojiPickerInternal(props) {
|
|
@@ -64,12 +59,9 @@ var EmojiPickerInternal = exports.EmojiPickerInternal = /*#__PURE__*/function (_
|
|
|
64
59
|
}
|
|
65
60
|
};
|
|
66
61
|
_ufoExperiences.ufoExperiences['emoji-picker-opened'].markFMP();
|
|
67
|
-
return
|
|
62
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
68
63
|
ref: handlePickerRef,
|
|
69
64
|
className: (0, _runtime.ax)(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
70
|
-
}, item.renderItem()) : /*#__PURE__*/_react.default.createElement("div", {
|
|
71
|
-
ref: handlePickerRef,
|
|
72
|
-
className: (0, _runtime.ax)(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
|
|
73
65
|
}, item.renderItem());
|
|
74
66
|
}
|
|
75
67
|
}, {
|
|
@@ -15,7 +15,6 @@ var _constants = require("../../util/constants");
|
|
|
15
15
|
var _filterHiddenEmojis = require("../../util/filter-hidden-emojis");
|
|
16
16
|
var _productivityColors = require("../../util/productivity-colors");
|
|
17
17
|
var _EmojiActions = _interopRequireDefault(require("../common/EmojiActions"));
|
|
18
|
-
var _isRefreshEmojiPickerEnabled = require("../common/isRefreshEmojiPickerEnabled");
|
|
19
18
|
var _i18n = require("../i18n");
|
|
20
19
|
var _categories = require("./categories");
|
|
21
20
|
var _CategoryHeadingItem = require("./CategoryHeadingItem");
|
|
@@ -119,17 +118,16 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
119
118
|
_useState0 = (0, _slicedToArray2.default)(_useState9, 2),
|
|
120
119
|
categoriesChanged = _useState0[0],
|
|
121
120
|
setCategoriesChanged = _useState0[1];
|
|
122
|
-
var isTeamojiExperimentEnabled = (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)();
|
|
123
121
|
var visibleEmojis = (0, _react.useMemo)(function () {
|
|
124
|
-
return
|
|
125
|
-
}, [emojis
|
|
122
|
+
return (0, _filterHiddenEmojis.filterHiddenEmojis)(emojis);
|
|
123
|
+
}, [emojis]);
|
|
126
124
|
var productivityColorPreviewEmojis = (0, _react.useMemo)(function () {
|
|
127
|
-
return
|
|
128
|
-
}, [
|
|
125
|
+
return (0, _productivityColors.getProductivityColorPreviewEmojis)(visibleEmojis);
|
|
126
|
+
}, [visibleEmojis]);
|
|
129
127
|
var addToCategoryMap = (0, _react.useCallback)(function (categoryToGroupMap, emoji, category) {
|
|
130
128
|
var _categoryToGroupMap$c;
|
|
131
129
|
if (!categoryToGroupMap[category]) {
|
|
132
|
-
var categoryDefinition =
|
|
130
|
+
var categoryDefinition = _categories.CategoryDescriptionMapNew[category];
|
|
133
131
|
if (!categoryDefinition) {
|
|
134
132
|
return categoryToGroupMap;
|
|
135
133
|
}
|
|
@@ -142,10 +140,10 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
142
140
|
}
|
|
143
141
|
(_categoryToGroupMap$c = categoryToGroupMap[category]) === null || _categoryToGroupMap$c === void 0 || _categoryToGroupMap$c.emojis.push(emoji);
|
|
144
142
|
return categoryToGroupMap;
|
|
145
|
-
}, [
|
|
143
|
+
}, []);
|
|
146
144
|
var groupByCategory = (0, _react.useCallback)(function (currentUser) {
|
|
147
145
|
return function (categoryToGroupMap, emoji) {
|
|
148
|
-
if (
|
|
146
|
+
if (emoji.type === 'ATLASSIAN' && emoji.category !== _constants.frequentCategory) {
|
|
149
147
|
addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
|
|
150
148
|
var group = categoryToGroupMap[atlassianCategory];
|
|
151
149
|
if (group) {
|
|
@@ -165,8 +163,6 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
165
163
|
}
|
|
166
164
|
subcategory.emojis.push(emoji);
|
|
167
165
|
}
|
|
168
|
-
} else if (emoji.type === 'ATLASSIAN' && emoji.category !== _constants.frequentCategory) {
|
|
169
|
-
addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
|
|
170
166
|
} else {
|
|
171
167
|
addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
|
|
172
168
|
}
|
|
@@ -176,7 +172,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
176
172
|
}
|
|
177
173
|
return categoryToGroupMap;
|
|
178
174
|
};
|
|
179
|
-
}, [addToCategoryMap
|
|
175
|
+
}, [addToCategoryMap]);
|
|
180
176
|
var findAtlassianSubcategoryToActivate = (0, _react.useCallback)(function (startIndex) {
|
|
181
177
|
var row = virtualItems[startIndex];
|
|
182
178
|
if (row instanceof _CategoryHeadingItem.CategoryHeadingItem && row.props.id === atlassianCategory) {
|
|
@@ -213,11 +209,9 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
213
209
|
if (!query) {
|
|
214
210
|
// Calculate category in view - only relevant if categories shown, i.e. no query
|
|
215
211
|
var currentCategory = findCategoryToActivate(rowItem);
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
setActiveAtlassianSubcategory(currentAtlassianSubcategory);
|
|
220
|
-
}
|
|
212
|
+
var currentAtlassianSubcategory = findAtlassianSubcategoryToActivate(startIndex);
|
|
213
|
+
if (activeAtlassianSubcategory !== currentAtlassianSubcategory) {
|
|
214
|
+
setActiveAtlassianSubcategory(currentAtlassianSubcategory);
|
|
221
215
|
}
|
|
222
216
|
if (currentCategory !== null && activeCategoryId !== currentCategory) {
|
|
223
217
|
if (onCategoryActivated) {
|
|
@@ -225,13 +219,13 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
225
219
|
}
|
|
226
220
|
}
|
|
227
221
|
}
|
|
228
|
-
}, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate,
|
|
222
|
+
}, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate, onCategoryActivated]);
|
|
229
223
|
var buildEmojiGroupedByCategory = (0, _react.useCallback)(function (emojis, currentUser) {
|
|
230
224
|
var categoryToGroupMap = emojis.reduce(groupByCategory(currentUser), {});
|
|
231
225
|
setAllEmojiGroups(Object.keys(categoryToGroupMap).map(function (key) {
|
|
232
226
|
return categoryToGroupMap[key];
|
|
233
227
|
}).map(function (group) {
|
|
234
|
-
if (
|
|
228
|
+
if (selectedProductivityColor) {
|
|
235
229
|
var _group$subcategories;
|
|
236
230
|
group.emojis = (0, _productivityColors.filterProductivityEmojisByColor)(group.emojis, selectedProductivityColor);
|
|
237
231
|
(_group$subcategories = group.subcategories) === null || _group$subcategories === void 0 || _group$subcategories.forEach(function (subcategory) {
|
|
@@ -247,7 +241,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
247
241
|
}
|
|
248
242
|
return group;
|
|
249
243
|
}).sort(byOrder));
|
|
250
|
-
}, [groupByCategory,
|
|
244
|
+
}, [groupByCategory, selectedProductivityColor]);
|
|
251
245
|
var buildEmojiRows = (0, _react.useCallback)(function (items, category, title, emojis, showDelete) {
|
|
252
246
|
var remainingEmojis = emojis;
|
|
253
247
|
while (remainingEmojis.length > 0) {
|
|
@@ -262,14 +256,14 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
262
256
|
onDelete: onEmojiDelete,
|
|
263
257
|
onMouseMove: onEmojiActive,
|
|
264
258
|
onFocus: onEmojiActive,
|
|
265
|
-
onMouseLeave:
|
|
259
|
+
onMouseLeave: onEmojiLeave
|
|
266
260
|
}));
|
|
267
261
|
}
|
|
268
|
-
}, [
|
|
262
|
+
}, [onEmojiActive, onEmojiDelete, onEmojiLeave, onEmojiSelected]);
|
|
269
263
|
var buildVirtualItemFromGroup = (0, _react.useCallback)(function (group) {
|
|
270
264
|
var _group$subcategories3;
|
|
271
265
|
var items = [];
|
|
272
|
-
var hasAtlassianSubcategories =
|
|
266
|
+
var hasAtlassianSubcategories = group.category === atlassianCategory && !!((_group$subcategories3 = group.subcategories) !== null && _group$subcategories3 !== void 0 && _group$subcategories3.length);
|
|
273
267
|
if (!hasAtlassianSubcategories) {
|
|
274
268
|
items.push(new _CategoryHeadingItem.CategoryHeadingItem({
|
|
275
269
|
id: group.category,
|
|
@@ -304,7 +298,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
304
298
|
buildEmojiRows(items, group.category, group.title, group.emojis, group.title === _constants.userCustomTitle);
|
|
305
299
|
}
|
|
306
300
|
return items;
|
|
307
|
-
}, [buildEmojiRows
|
|
301
|
+
}, [buildEmojiRows]);
|
|
308
302
|
var buildVirtualItems = (0, _react.useCallback)(function () {
|
|
309
303
|
var items = [];
|
|
310
304
|
var prevFirstCategory = categoryTracker.getFirstCategory();
|
|
@@ -313,8 +307,8 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
313
307
|
items.push(new _LoadingItem.LoadingItem());
|
|
314
308
|
} else {
|
|
315
309
|
if (query) {
|
|
316
|
-
var search =
|
|
317
|
-
if (visibleEmojis.length === 0
|
|
310
|
+
var search = _categories.CategoryDescriptionMapNew.SEARCH;
|
|
311
|
+
if (visibleEmojis.length === 0) {
|
|
318
312
|
// Show a "No results" category heading, then a no-results illustration below it
|
|
319
313
|
items.push(new _CategoryHeadingItem.CategoryHeadingItem({
|
|
320
314
|
id: _constants.searchCategory,
|
|
@@ -341,7 +335,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
341
335
|
allEmojiGroups.forEach(function (group) {
|
|
342
336
|
// Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
|
|
343
337
|
// by not passing it to irrelevant groups
|
|
344
|
-
categoryTracker.add(
|
|
338
|
+
categoryTracker.add(group.category, items.length);
|
|
345
339
|
items = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(buildVirtualItemFromGroup(group)));
|
|
346
340
|
if (group.category === _constants.yourUploadsCategory) {
|
|
347
341
|
setLastYourUploadsRow(items.length - 1);
|
|
@@ -358,7 +352,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
358
352
|
}
|
|
359
353
|
}
|
|
360
354
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
361
|
-
}, [allEmojiGroups, buildVirtualItemFromGroup, formatMessage,
|
|
355
|
+
}, [allEmojiGroups, buildVirtualItemFromGroup, formatMessage, loading, onOpenUpload, query, uploadEnabled, visibleEmojis]);
|
|
362
356
|
var findCategoryToActivate = function findCategoryToActivate(row) {
|
|
363
357
|
var category = null;
|
|
364
358
|
if (row instanceof _CategoryHeadingItem.CategoryHeadingItem) {
|
|
@@ -482,12 +476,12 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
482
476
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
483
477
|
}, [virtualItems, categoriesChanged]);
|
|
484
478
|
var virtualListHeight = (0, _react.useMemo)(function () {
|
|
485
|
-
if (query && visibleEmojis.length === 0
|
|
479
|
+
if (query && visibleEmojis.length === 0) {
|
|
486
480
|
// No-results state: expand the list height to fit heading + illustration without scrolling
|
|
487
481
|
return _EmojiPickerSizes.sizes.categoryHeadingHeight + _EmojiPickerSizes.sizes.noResultsHeight + (0, _emojiPickerHeightOffset.emojiPickerHeightOffset)(size);
|
|
488
482
|
}
|
|
489
|
-
return
|
|
490
|
-
}, [size, query, visibleEmojis.length,
|
|
483
|
+
return _EmojiPickerSizes.sizes.listHeightNew + (0, _emojiPickerHeightOffset.emojiPickerHeightOffset)(size) + (useFooterSpaceForList ? _constants.emojiPickerPreviewHeight : 0);
|
|
484
|
+
}, [size, query, visibleEmojis.length, useFooterSpaceForList]);
|
|
491
485
|
return /*#__PURE__*/_react.default.createElement(_EmojiPickerTabPanel.default, {
|
|
492
486
|
showSearchResults: !!query
|
|
493
487
|
}, /*#__PURE__*/_react.default.createElement(_EmojiActions.default, {
|
|
@@ -495,10 +489,10 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
495
489
|
onToneSelected: onToneSelected,
|
|
496
490
|
onToneSelectorCancelled: onToneSelectorCancelled,
|
|
497
491
|
toneEmoji: toneEmoji,
|
|
498
|
-
activeCategoryId:
|
|
499
|
-
activeAtlassianSubcategory:
|
|
500
|
-
productivityColorPreviewEmojis:
|
|
501
|
-
selectedProductivityColor:
|
|
492
|
+
activeCategoryId: activeCategoryId,
|
|
493
|
+
activeAtlassianSubcategory: activeAtlassianSubcategory,
|
|
494
|
+
productivityColorPreviewEmojis: productivityColorPreviewEmojis,
|
|
495
|
+
selectedProductivityColor: selectedProductivityColor,
|
|
502
496
|
uploading: uploading,
|
|
503
497
|
uploadEnabled: uploadEnabled,
|
|
504
498
|
emojiToDelete: emojiToDelete,
|
|
@@ -511,7 +505,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
|
|
|
511
505
|
onDeleteEmoji: onDeleteEmoji,
|
|
512
506
|
onFileChooserClicked: onFileChooserClicked,
|
|
513
507
|
onOpenUpload: onOpenUpload,
|
|
514
|
-
onProductivityColorSelected:
|
|
508
|
+
onProductivityColorSelected: onProductivityColorSelected,
|
|
515
509
|
query: query,
|
|
516
510
|
onChange: onSearch,
|
|
517
511
|
resultsCount: visibleEmojis.length,
|
|
@@ -17,14 +17,11 @@ var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
|
|
|
17
17
|
var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
|
|
18
18
|
var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden/visually-hidden"));
|
|
19
19
|
var _constants = require("../../util/constants");
|
|
20
|
-
var _isRefreshEmojiPickerEnabled = require("../common/isRefreshEmojiPickerEnabled");
|
|
21
20
|
var _i18n = require("../i18n");
|
|
22
21
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
23
|
-
var input = null;
|
|
24
22
|
var inputNew = null;
|
|
25
23
|
var textFieldWrapperNew = null;
|
|
26
24
|
var pickerSearch = null;
|
|
27
|
-
var searchIcon = null;
|
|
28
25
|
var searchIconNew = null;
|
|
29
26
|
var hidden = null;
|
|
30
27
|
var emojiPickerSearchTestId = exports.emojiPickerSearchTestId = 'emoji-picker-search';
|
|
@@ -63,7 +60,7 @@ var EmojiPickerListSearch = exports.EmojiPickerListSearch = function EmojiPicker
|
|
|
63
60
|
role: "status"
|
|
64
61
|
}, dirty ? query === '' ? formatMessage(_i18n.messages.searchResultsStatusSeeAll) : formatMessage(_i18n.messages.searchResultsStatus, {
|
|
65
62
|
count: resultsCount
|
|
66
|
-
}) : null),
|
|
63
|
+
}) : null), /*#__PURE__*/_react.default.createElement("div", {
|
|
67
64
|
className: (0, _runtime.ax)(["_n6341l7x _18z11b66"])
|
|
68
65
|
}, /*#__PURE__*/_react.default.createElement(_textField.default, {
|
|
69
66
|
role: "searchbox",
|
|
@@ -84,24 +81,5 @@ var EmojiPickerListSearch = exports.EmojiPickerListSearch = function EmojiPicker
|
|
|
84
81
|
ref: textRef,
|
|
85
82
|
isCompact: true,
|
|
86
83
|
className: (0, _runtime.ax)(["_11c8fhey _12ji1r31 _1qu2glyw _12y31o36 _vchhusvi _syaz1kw7 _80om1kw7 _1q51yh40 _y4tize3t _85i5v77o _bozg12x7 _1bsb1osq _13xeglyw _1goxglyw"])
|
|
87
|
-
}))
|
|
88
|
-
role: "searchbox",
|
|
89
|
-
"aria-label": formatMessage(_i18n.messages.searchLabel),
|
|
90
|
-
autoComplete: "off",
|
|
91
|
-
name: "search",
|
|
92
|
-
placeholder: "".concat(formatMessage(_i18n.messages.searchPlaceholder), "..."),
|
|
93
|
-
defaultValue: query || '',
|
|
94
|
-
onChange: handleOnChange,
|
|
95
|
-
elemBeforeInput: /*#__PURE__*/_react.default.createElement("span", {
|
|
96
|
-
className: (0, _runtime.ax)(["_tzy4105o _18u01i6y"])
|
|
97
|
-
}, /*#__PURE__*/_react.default.createElement(_search.default, {
|
|
98
|
-
color: "currentColor",
|
|
99
|
-
spacing: "spacious",
|
|
100
|
-
label: ""
|
|
101
|
-
})),
|
|
102
|
-
testId: emojiPickerSearchTestId,
|
|
103
|
-
ref: textRef,
|
|
104
|
-
isCompact: true,
|
|
105
|
-
className: (0, _runtime.ax)(["_11c8fhey _12ji1r31 _1qu2glyw _12y31o36 _vchhusvi _syaz1kw7 _80om1kw7 _1q51t94y _y4tize3t _85i5v77o _bozg12x7 _1bsb1osq _13xeglyw _1goxglyw"])
|
|
106
|
-
}));
|
|
84
|
+
})));
|
|
107
85
|
};
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.sizes = void 0;
|
|
7
7
|
var _constants = require("../../util/constants");
|
|
8
8
|
var sizes = exports.sizes = {
|
|
9
|
-
listHeight: _constants.emojiPickerListHeight,
|
|
10
9
|
listHeightNew: _constants.emojiPickerListHeightNew,
|
|
11
10
|
listWidth: _constants.emojiPickerWidth,
|
|
12
11
|
searchHeight: 52,
|