@atlaskit/emoji 67.3.1 → 67.4.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.
- package/CHANGELOG.md +17 -0
- package/dist/cjs/api/EmojiRepository.js +2 -0
- package/dist/cjs/api/EmojiResource.js +184 -191
- package/dist/cjs/api/media/SiteEmojiResource.js +24 -26
- package/dist/cjs/components/common/Emoji.js +1 -1
- package/dist/cjs/components/common/EmojiDeletePreview.js +1 -1
- package/dist/cjs/components/common/EmojiUploadPicker.js +18 -20
- package/dist/cjs/components/common/EmojiUploadPreview.js +1 -1
- package/dist/cjs/components/common/ResourcedEmoji.js +1 -1
- package/dist/cjs/components/common/ResourcedEmojiComponent.js +48 -50
- package/dist/cjs/components/common/Scrollable.js +3 -1
- package/dist/cjs/components/common/ToneSelector.js +1 -1
- package/dist/cjs/components/common/UfoErrorBoundary.js +1 -1
- package/dist/cjs/components/common/internal-types.js +4 -4
- package/dist/cjs/components/picker/EmojiPicker.js +4 -5
- package/dist/cjs/components/picker/EmojiPickerComponent.js +1 -1
- package/dist/cjs/components/picker/EmojiPickerList.js +17 -1
- package/dist/cjs/components/picker/EmojiPickerVirtualItems.js +1 -1
- package/dist/cjs/components/picker/VirtualList.js +1 -1
- package/dist/cjs/components/typeahead/EmojiTypeAhead.js +3 -4
- package/dist/cjs/components/typeahead/EmojiTypeAheadComponent.js +1 -1
- package/dist/cjs/components/typeahead/EmojiTypeAheadItem.js +2 -1
- package/dist/cjs/components/typeahead/EmojiTypeAheadList.js +2 -3
- package/dist/cjs/components/uploader/EmojiUploadComponent.js +36 -38
- package/dist/cjs/components/uploader/EmojiUploader.js +3 -4
- package/dist/cjs/context/EmojiContextProvider.js +15 -17
- package/dist/cjs/hooks/useEmoji.js +17 -19
- package/dist/cjs/types.js +28 -28
- package/dist/cjs/util/StoredDuplicateLimitedQueue.js +3 -0
- package/dist/cjs/util/analytics/samplingUfo.js +65 -73
- package/dist/cjs/util/constants.js +8 -8
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/api/EmojiRepository.js +2 -0
- package/dist/es2019/api/EmojiResource.js +3 -0
- package/dist/es2019/components/common/ResourcedEmojiComponent.js +3 -3
- package/dist/es2019/components/common/Scrollable.js +1 -0
- package/dist/es2019/components/common/internal-types.js +3 -3
- package/dist/es2019/components/picker/EmojiPicker.js +2 -3
- package/dist/es2019/components/picker/EmojiPickerList.js +16 -0
- package/dist/es2019/components/typeahead/EmojiTypeAhead.js +2 -3
- package/dist/es2019/components/typeahead/EmojiTypeAheadItem.js +1 -0
- package/dist/es2019/components/typeahead/EmojiTypeAheadList.js +1 -3
- package/dist/es2019/components/uploader/EmojiUploader.js +2 -3
- package/dist/es2019/types.js +21 -21
- package/dist/es2019/util/constants.js +8 -8
- package/dist/es2019/version.json +1 -1
- package/dist/esm/api/EmojiRepository.js +2 -0
- package/dist/esm/api/EmojiResource.js +184 -191
- package/dist/esm/api/media/SiteEmojiResource.js +24 -26
- package/dist/esm/components/common/EmojiUploadPicker.js +18 -20
- package/dist/esm/components/common/ResourcedEmojiComponent.js +48 -50
- package/dist/esm/components/common/Scrollable.js +1 -0
- package/dist/esm/components/common/UfoErrorBoundary.js +1 -1
- package/dist/esm/components/common/internal-types.js +3 -3
- package/dist/esm/components/picker/EmojiPicker.js +2 -3
- package/dist/esm/components/picker/EmojiPickerList.js +16 -0
- package/dist/esm/components/typeahead/EmojiTypeAhead.js +2 -3
- package/dist/esm/components/typeahead/EmojiTypeAheadComponent.js +1 -1
- package/dist/esm/components/typeahead/EmojiTypeAheadItem.js +1 -0
- package/dist/esm/components/typeahead/EmojiTypeAheadList.js +1 -2
- package/dist/esm/components/uploader/EmojiUploadComponent.js +36 -38
- package/dist/esm/components/uploader/EmojiUploader.js +2 -3
- package/dist/esm/context/EmojiContextProvider.js +15 -17
- package/dist/esm/hooks/useEmoji.js +17 -19
- package/dist/esm/types.js +21 -21
- package/dist/esm/util/analytics/samplingUfo.js +65 -73
- package/dist/esm/util/constants.js +8 -8
- package/dist/esm/version.json +1 -1
- package/package.json +18 -18
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/emoji
|
|
2
2
|
|
|
3
|
+
## 67.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`56507598609`](https://bitbucket.org/atlassian/atlassian-frontend/commits/56507598609) - Skip minor dependency bump
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 67.3.2
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [`2e01c9c74b5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2e01c9c74b5) - DUMMY remove before merging to master; dupe adf-schema via adf-utils
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
|
|
3
20
|
## 67.3.1
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -116,6 +116,8 @@ var findEmojiIndex = function findEmojiIndex(emojis, toFind) {
|
|
|
116
116
|
return match;
|
|
117
117
|
};
|
|
118
118
|
var EmojiRepository = /*#__PURE__*/function () {
|
|
119
|
+
// protected to allow subclasses to access (for testing and storybooks).
|
|
120
|
+
|
|
119
121
|
function EmojiRepository(emojis, usageTracker) {
|
|
120
122
|
(0, _classCallCheck2.default)(this, EmojiRepository);
|
|
121
123
|
this.emojis = emojis;
|
|
@@ -29,6 +29,9 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
29
29
|
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) { (0, _defineProperty2.default)(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; }
|
|
30
30
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
31
31
|
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; } }
|
|
32
|
+
// Re-exporting to not cause a breaking change
|
|
33
|
+
// Re-exporting to not cause a breaking change
|
|
34
|
+
|
|
32
35
|
/**
|
|
33
36
|
* Checks if the emojiProvider can support uploading at a feature level.
|
|
34
37
|
*
|
|
@@ -90,33 +93,31 @@ var EmojiResource = /*#__PURE__*/function (_ref) {
|
|
|
90
93
|
var options,
|
|
91
94
|
_args = arguments;
|
|
92
95
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
93
|
-
while (1) {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
if (!options.fetchAtStart) {
|
|
100
|
-
_context.next = 11;
|
|
101
|
-
break;
|
|
102
|
-
}
|
|
103
|
-
_context.prev = 2;
|
|
104
|
-
_context.next = 5;
|
|
105
|
-
return this.fetchEmojiProvider();
|
|
106
|
-
case 5:
|
|
96
|
+
while (1) switch (_context.prev = _context.next) {
|
|
97
|
+
case 0:
|
|
98
|
+
options = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
|
|
99
|
+
fetchAtStart: true
|
|
100
|
+
};
|
|
101
|
+
if (!options.fetchAtStart) {
|
|
107
102
|
_context.next = 11;
|
|
108
103
|
break;
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
104
|
+
}
|
|
105
|
+
_context.prev = 2;
|
|
106
|
+
_context.next = 5;
|
|
107
|
+
return this.fetchEmojiProvider();
|
|
108
|
+
case 5:
|
|
109
|
+
_context.next = 11;
|
|
110
|
+
break;
|
|
111
|
+
case 7:
|
|
112
|
+
_context.prev = 7;
|
|
113
|
+
_context.t0 = _context["catch"](2);
|
|
114
|
+
(0, _logger.default)(_context.t0);
|
|
115
|
+
return _context.abrupt("return", Promise.resolve(this));
|
|
116
|
+
case 11:
|
|
117
|
+
return _context.abrupt("return", Promise.resolve(this));
|
|
118
|
+
case 12:
|
|
119
|
+
case "end":
|
|
120
|
+
return _context.stop();
|
|
120
121
|
}
|
|
121
122
|
}, _callee, this, [[2, 7]]);
|
|
122
123
|
}));
|
|
@@ -131,52 +132,50 @@ var EmojiResource = /*#__PURE__*/function (_ref) {
|
|
|
131
132
|
var _fetchIndividualProvider = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(provider, index) {
|
|
132
133
|
var providerType, loader, emojiResponse;
|
|
133
134
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
134
|
-
while (1) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
return _context2.stop();
|
|
179
|
-
}
|
|
135
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
136
|
+
case 0:
|
|
137
|
+
providerType = this.getProviderType(provider);
|
|
138
|
+
_context2.prev = 1;
|
|
139
|
+
(0, _ufoExperiences.sampledUfoEmojiResourceFetched)(providerType).start({
|
|
140
|
+
samplingRate: _constants.SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP
|
|
141
|
+
});
|
|
142
|
+
(0, _ufoExperiences.sampledUfoEmojiResourceFetched)(providerType).addMetadata({
|
|
143
|
+
type: providerType
|
|
144
|
+
});
|
|
145
|
+
loader = new _EmojiLoader.default(provider); // fetch emoji from provider url and denormalise
|
|
146
|
+
_context2.next = 7;
|
|
147
|
+
return loader.loadEmoji();
|
|
148
|
+
case 7:
|
|
149
|
+
emojiResponse = _context2.sent;
|
|
150
|
+
(0, _ufoExperiences.sampledUfoEmojiResourceFetched)(providerType).success();
|
|
151
|
+
// setup emoji repository
|
|
152
|
+
this.emojiResponses[index] = emojiResponse;
|
|
153
|
+
this.initEmojiRepository(this.emojiResponses);
|
|
154
|
+
_context2.next = 13;
|
|
155
|
+
return this.initSiteEmojiResource(emojiResponse, provider);
|
|
156
|
+
case 13:
|
|
157
|
+
this.activeLoaders--;
|
|
158
|
+
this.performRetries();
|
|
159
|
+
this.refreshLastFilter();
|
|
160
|
+
_context2.next = 25;
|
|
161
|
+
break;
|
|
162
|
+
case 18:
|
|
163
|
+
_context2.prev = 18;
|
|
164
|
+
_context2.t0 = _context2["catch"](1);
|
|
165
|
+
this.activeLoaders--;
|
|
166
|
+
this.notifyError(_context2.t0);
|
|
167
|
+
(0, _ufoExperiences.sampledUfoEmojiResourceFetched)(providerType).failure({
|
|
168
|
+
metadata: {
|
|
169
|
+
reason: _context2.t0,
|
|
170
|
+
source: 'EmojiProvider',
|
|
171
|
+
providerUrl: provider.url
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
(0, _logger.default)("failed to fetch emoji provider for ".concat(provider.url), _context2.t0);
|
|
175
|
+
throw new Error("failed to fetch emoji from ".concat(provider.url));
|
|
176
|
+
case 25:
|
|
177
|
+
case "end":
|
|
178
|
+
return _context2.stop();
|
|
180
179
|
}
|
|
181
180
|
}, _callee2, this, [[1, 18]]);
|
|
182
181
|
}));
|
|
@@ -193,27 +192,25 @@ var EmojiResource = /*#__PURE__*/function (_ref) {
|
|
|
193
192
|
var force,
|
|
194
193
|
_args3 = arguments;
|
|
195
194
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
196
|
-
while (1) {
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
if (!(force || !this.isRepositoryAvailable(this.emojiRepository) && !this.isInitialised)) {
|
|
201
|
-
_context3.next = 6;
|
|
202
|
-
break;
|
|
203
|
-
}
|
|
204
|
-
this.isInitialised = true;
|
|
205
|
-
this.emojiResponses = [];
|
|
206
|
-
// fetch emoji providers
|
|
195
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
196
|
+
case 0:
|
|
197
|
+
force = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : false;
|
|
198
|
+
if (!(force || !this.isRepositoryAvailable(this.emojiRepository) && !this.isInitialised)) {
|
|
207
199
|
_context3.next = 6;
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
return
|
|
216
|
-
|
|
200
|
+
break;
|
|
201
|
+
}
|
|
202
|
+
this.isInitialised = true;
|
|
203
|
+
this.emojiResponses = [];
|
|
204
|
+
// fetch emoji providers
|
|
205
|
+
_context3.next = 6;
|
|
206
|
+
return Promise.all(this.emojiProviderConfig.providers.map(function (provider, index) {
|
|
207
|
+
return _this2.fetchIndividualProvider(provider, index);
|
|
208
|
+
}));
|
|
209
|
+
case 6:
|
|
210
|
+
return _context3.abrupt("return", Promise.resolve(this.emojiRepository));
|
|
211
|
+
case 7:
|
|
212
|
+
case "end":
|
|
213
|
+
return _context3.stop();
|
|
217
214
|
}
|
|
218
215
|
}, _callee3, this);
|
|
219
216
|
}));
|
|
@@ -228,85 +225,83 @@ var EmojiResource = /*#__PURE__*/function (_ref) {
|
|
|
228
225
|
var _fetchByEmojiId = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(emojiId, optimistic) {
|
|
229
226
|
var _emoji, provider, loader, loadEmoji, _emoji2, emoji;
|
|
230
227
|
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
231
|
-
while (1) {
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
if (this.isRepositoryAvailable(this.siteEmojiResource)) {
|
|
273
|
-
_context4.next = 20;
|
|
274
|
-
break;
|
|
275
|
-
}
|
|
228
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
229
|
+
case 0:
|
|
230
|
+
if (!(this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository))) {
|
|
231
|
+
_context4.next = 8;
|
|
232
|
+
break;
|
|
233
|
+
}
|
|
234
|
+
_context4.next = 3;
|
|
235
|
+
return this.findByEmojiId(emojiId);
|
|
236
|
+
case 3:
|
|
237
|
+
_emoji = _context4.sent;
|
|
238
|
+
if (!_emoji) {
|
|
239
|
+
_context4.next = 8;
|
|
240
|
+
break;
|
|
241
|
+
}
|
|
242
|
+
_context4.next = 7;
|
|
243
|
+
return this.getMediaEmojiDescriptionURLWithInlineToken(_emoji);
|
|
244
|
+
case 7:
|
|
245
|
+
return _context4.abrupt("return", _context4.sent);
|
|
246
|
+
case 8:
|
|
247
|
+
if (!(this.emojiProviderConfig.singleEmojiApi && optimistic)) {
|
|
248
|
+
_context4.next = 31;
|
|
249
|
+
break;
|
|
250
|
+
}
|
|
251
|
+
// if config has singleEmojiApi then fetch single emoji
|
|
252
|
+
provider = {
|
|
253
|
+
url: this.emojiProviderConfig.singleEmojiApi.getUrl(emojiId),
|
|
254
|
+
securityProvider: this.emojiProviderConfig.singleEmojiApi.securityProvider
|
|
255
|
+
};
|
|
256
|
+
loader = new _EmojiLoader.default(provider);
|
|
257
|
+
_context4.prev = 11;
|
|
258
|
+
_context4.next = 14;
|
|
259
|
+
return loader.loadEmoji();
|
|
260
|
+
case 14:
|
|
261
|
+
loadEmoji = _context4.sent;
|
|
262
|
+
if (loadEmoji.emojis[0]) {
|
|
263
|
+
_context4.next = 17;
|
|
264
|
+
break;
|
|
265
|
+
}
|
|
266
|
+
return _context4.abrupt("return");
|
|
267
|
+
case 17:
|
|
268
|
+
if (this.isRepositoryAvailable(this.siteEmojiResource)) {
|
|
276
269
|
_context4.next = 20;
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
270
|
+
break;
|
|
271
|
+
}
|
|
272
|
+
_context4.next = 20;
|
|
273
|
+
return this.initSiteEmojiResource(loadEmoji, provider);
|
|
274
|
+
case 20:
|
|
275
|
+
return _context4.abrupt("return", this.getMediaEmojiDescriptionURLWithInlineToken(loadEmoji.emojis[0]));
|
|
276
|
+
case 23:
|
|
277
|
+
_context4.prev = 23;
|
|
278
|
+
_context4.t0 = _context4["catch"](11);
|
|
279
|
+
_context4.next = 27;
|
|
280
|
+
return this.findByEmojiId(emojiId);
|
|
281
|
+
case 27:
|
|
282
|
+
_emoji2 = _context4.sent;
|
|
283
|
+
if (_emoji2) {
|
|
284
|
+
_context4.next = 30;
|
|
285
|
+
break;
|
|
286
|
+
}
|
|
287
|
+
return _context4.abrupt("return");
|
|
288
|
+
case 30:
|
|
289
|
+
return _context4.abrupt("return", this.getMediaEmojiDescriptionURLWithInlineToken(_emoji2));
|
|
290
|
+
case 31:
|
|
291
|
+
_context4.next = 33;
|
|
292
|
+
return this.findByEmojiId(emojiId);
|
|
293
|
+
case 33:
|
|
294
|
+
emoji = _context4.sent;
|
|
295
|
+
if (emoji) {
|
|
296
|
+
_context4.next = 36;
|
|
297
|
+
break;
|
|
298
|
+
}
|
|
299
|
+
return _context4.abrupt("return");
|
|
300
|
+
case 36:
|
|
301
|
+
return _context4.abrupt("return", this.getMediaEmojiDescriptionURLWithInlineToken(emoji));
|
|
302
|
+
case 37:
|
|
303
|
+
case "end":
|
|
304
|
+
return _context4.stop();
|
|
310
305
|
}
|
|
311
306
|
}, _callee4, this, [[11, 23]]);
|
|
312
307
|
}));
|
|
@@ -434,28 +429,26 @@ var EmojiResource = /*#__PURE__*/function (_ref) {
|
|
|
434
429
|
var _getMediaEmojiDescriptionURLWithInlineToken = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(emoji) {
|
|
435
430
|
var tokenisedMediaPath;
|
|
436
431
|
return _regenerator.default.wrap(function _callee5$(_context5) {
|
|
437
|
-
while (1) {
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
return _context5.stop();
|
|
458
|
-
}
|
|
432
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
433
|
+
case 0:
|
|
434
|
+
if (!(this.isRepositoryAvailable(this.siteEmojiResource) && (0, _typeHelpers.isMediaRepresentation)(emoji.representation))) {
|
|
435
|
+
_context5.next = 5;
|
|
436
|
+
break;
|
|
437
|
+
}
|
|
438
|
+
_context5.next = 3;
|
|
439
|
+
return this.siteEmojiResource.generateTokenisedMediaURL(emoji);
|
|
440
|
+
case 3:
|
|
441
|
+
tokenisedMediaPath = _context5.sent;
|
|
442
|
+
return _context5.abrupt("return", _objectSpread(_objectSpread({}, emoji), {}, {
|
|
443
|
+
representation: _objectSpread(_objectSpread({}, emoji.representation), {}, {
|
|
444
|
+
mediaPath: tokenisedMediaPath
|
|
445
|
+
})
|
|
446
|
+
}));
|
|
447
|
+
case 5:
|
|
448
|
+
return _context5.abrupt("return", emoji);
|
|
449
|
+
case 6:
|
|
450
|
+
case "end":
|
|
451
|
+
return _context5.stop();
|
|
459
452
|
}
|
|
460
453
|
}, _callee5, this);
|
|
461
454
|
}));
|
|
@@ -82,32 +82,30 @@ var SiteEmojiResource = /*#__PURE__*/function () {
|
|
|
82
82
|
var _generateTokenisedMediaURL = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(emoji) {
|
|
83
83
|
var currentMediaPathURL, currentMediaPathPARAMS, readToken;
|
|
84
84
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
85
|
-
while (1) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
return _context.stop();
|
|
110
|
-
}
|
|
85
|
+
while (1) switch (_context.prev = _context.next) {
|
|
86
|
+
case 0:
|
|
87
|
+
if (!(emoji && (0, _typeHelpers.isMediaRepresentation)(emoji.representation))) {
|
|
88
|
+
_context.next = 9;
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
91
|
+
currentMediaPathURL = new URL(emoji.representation.mediaPath);
|
|
92
|
+
currentMediaPathPARAMS = currentMediaPathURL.searchParams;
|
|
93
|
+
_context.next = 5;
|
|
94
|
+
return this.tokenManager.getToken('read');
|
|
95
|
+
case 5:
|
|
96
|
+
readToken = _context.sent;
|
|
97
|
+
if (currentMediaPathPARAMS.get('token') !== readToken.jwt) {
|
|
98
|
+
currentMediaPathPARAMS.set('token', readToken.jwt);
|
|
99
|
+
}
|
|
100
|
+
if (currentMediaPathPARAMS.get('client') !== readToken.clientId) {
|
|
101
|
+
currentMediaPathPARAMS.set('client', readToken.clientId);
|
|
102
|
+
}
|
|
103
|
+
return _context.abrupt("return", currentMediaPathURL.toString());
|
|
104
|
+
case 9:
|
|
105
|
+
throw Error('Emoji resource is not of type Media Representation');
|
|
106
|
+
case 10:
|
|
107
|
+
case "end":
|
|
108
|
+
return _context.stop();
|
|
111
109
|
}
|
|
112
110
|
}, _callee, this);
|
|
113
111
|
}));
|
|
@@ -29,7 +29,7 @@ var _excluded = ["emoji", "fitToHeight", "selected", "selectOnHover", "className
|
|
|
29
29
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
30
30
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
31
31
|
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; }
|
|
32
|
-
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) { (0, _defineProperty2.default)(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; }
|
|
32
|
+
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) { (0, _defineProperty2.default)(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; } /** @jsx jsx */
|
|
33
33
|
var handleMouseDown = function handleMouseDown(props, event) {
|
|
34
34
|
// Clicked emoji delete button
|
|
35
35
|
if (event.target instanceof Element && event.target.getAttribute('aria-label') === _constants.deleteEmojiLabel) {
|
|
@@ -28,7 +28,7 @@ var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"
|
|
|
28
28
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
29
29
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
30
30
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
31
|
-
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; } }
|
|
31
|
+
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; } } /** @jsx jsx */
|
|
32
32
|
var emojiDeletePreviewTestId = 'emoji-delete-preview';
|
|
33
33
|
exports.emojiDeletePreviewTestId = emojiDeletePreviewTestId;
|
|
34
34
|
var deleteEmojiLabelId = 'fabric.emoji.delete.label.id';
|
|
@@ -239,26 +239,24 @@ var EmojiUploadPicker = function EmojiUploadPicker(props) {
|
|
|
239
239
|
return /*#__PURE__*/function () {
|
|
240
240
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(f) {
|
|
241
241
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
242
|
-
while (1) {
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
return _context.stop();
|
|
261
|
-
}
|
|
242
|
+
while (1) switch (_context.prev = _context.next) {
|
|
243
|
+
case 0:
|
|
244
|
+
_context.prev = 0;
|
|
245
|
+
setFilename(file.name);
|
|
246
|
+
_context.next = 4;
|
|
247
|
+
return ImageUtil.parseImage(f.target.result);
|
|
248
|
+
case 4:
|
|
249
|
+
setPreviewImage(f.target.result);
|
|
250
|
+
_context.next = 11;
|
|
251
|
+
break;
|
|
252
|
+
case 7:
|
|
253
|
+
_context.prev = 7;
|
|
254
|
+
_context.t0 = _context["catch"](0);
|
|
255
|
+
setChooseEmojiErrorMessage((0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.emojiInvalidImage));
|
|
256
|
+
cancelChooseFile();
|
|
257
|
+
case 11:
|
|
258
|
+
case "end":
|
|
259
|
+
return _context.stop();
|
|
262
260
|
}
|
|
263
261
|
}, _callee, null, [[0, 7]]);
|
|
264
262
|
}));
|
|
@@ -27,7 +27,7 @@ var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"
|
|
|
27
27
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
28
28
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
29
29
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
30
|
-
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; } }
|
|
30
|
+
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; } } /** @jsx jsx */
|
|
31
31
|
var uploadPreviewTestId = 'upload-preview';
|
|
32
32
|
exports.uploadPreviewTestId = uploadPreviewTestId;
|
|
33
33
|
var cancelUploadButtonTestId = 'cancel-upload-button';
|
|
@@ -16,7 +16,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
16
16
|
var ResourcedEmojiComponent = (0, _reactLoadable.default)({
|
|
17
17
|
loader: function loader() {
|
|
18
18
|
return Promise.resolve().then(function () {
|
|
19
|
-
return _interopRequireWildcard(require('./ResourcedEmojiComponent'));
|
|
19
|
+
return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_resourcedEmojiComponent" */'./ResourcedEmojiComponent'));
|
|
20
20
|
}).then(function (component) {
|
|
21
21
|
return component.ResourcedEmojiComponent;
|
|
22
22
|
});
|