@atlaskit/emoji 73.1.4 → 73.2.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/emoji
2
2
 
3
+ ## 73.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`d5c2acafa064f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d5c2acafa064f) -
8
+ Cleanup feature gate `platform_emoji_prevent_img_src_changing_all`. Preserve optimistic emoji
9
+ images when catalogue data arrives on all surfaces.
10
+
11
+ ## 73.2.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [`6dfebc2196fe9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6dfebc2196fe9) -
16
+ Update i18n NPM package versions for editor,editor-extensions,activity-platform,media,elements
17
+ (Group 3)
18
+
3
19
  ## 73.1.4
4
20
 
5
21
  ### Patch Changes
@@ -10,7 +10,6 @@ exports.default = exports.ResourcedEmojiComponent = void 0;
10
10
  require("./ResourcedEmojiComponent.compiled.css");
11
11
  var _runtime = require("@compiled/react/runtime");
12
12
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
13
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
14
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
16
15
  var _react = _interopRequireWildcard(require("react"));
@@ -20,14 +19,10 @@ var _types = require("../../types");
20
19
  var _hasUfoMarked = require("../../util/analytics/hasUfoMarked");
21
20
  var _sampledUfoRenderedEmoji = require("../../util/analytics/sampledUfoRenderedEmoji");
22
21
  var _constants = require("../../util/constants");
23
- var _isImageRepresentation = require("../../util/is-image-representation");
24
- var _isMediaRepresentation = require("../../util/is-media-representation");
25
22
  var _isPromise = require("../../util/is-promise");
26
23
  var _Emoji = _interopRequireDefault(require("./Emoji"));
27
24
  var _EmojiPlaceholder = _interopRequireDefault(require("./EmojiPlaceholder"));
28
25
  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); }
29
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
30
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
31
26
  var ignoreWrapperStyles = null;
32
27
  var ResourcedEmojiComponentRenderStatesEnum = /*#__PURE__*/function (ResourcedEmojiComponentRenderStatesEnum) {
33
28
  ResourcedEmojiComponentRenderStatesEnum["INITIAL"] = "INITIAL";
@@ -208,8 +203,8 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
208
203
  }
209
204
  };
210
205
  }
211
- // extend prevention to all surfaces
212
- if (optimisticImageURL && (0, _fg.fg)('platform_emoji_prevent_img_src_changing_all')) {
206
+ // Keep the optimistic representation stable when catalogue data arrives.
207
+ if (optimisticImageURL) {
213
208
  return {
214
209
  id: id,
215
210
  shortName: shortName,
@@ -224,34 +219,6 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
224
219
  }
225
220
  };
226
221
  }
227
- if (optimisticImageURL) {
228
- if (emoji && ((0, _isImageRepresentation.isImageRepresentation)(emoji.representation) || (0, _isMediaRepresentation.isMediaRepresentation)(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
229
- var _emoji$representation = emoji.representation,
230
- width = _emoji$representation.width,
231
- height = _emoji$representation.height;
232
- return _objectSpread(_objectSpread({}, emoji), {}, {
233
- representation: {
234
- width: width,
235
- height: height,
236
- imagePath: optimisticImageURL
237
- }
238
- });
239
- } else {
240
- return {
241
- id: id,
242
- shortName: shortName,
243
- fallback: fallback,
244
- type: '',
245
- category: '',
246
- representation: {
247
- height: fitToHeight || _constants.defaultEmojiHeight,
248
- width: fitToHeight || _constants.defaultEmojiHeight,
249
- imagePath: optimisticImageURL
250
- },
251
- searchable: true
252
- };
253
- }
254
- }
255
222
  return emoji;
256
223
  }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
257
224
  var handleOnLoadError = (0, _react.useCallback)(function (emojiId) {
@@ -19,7 +19,7 @@ var createEvent = exports.createEvent = function createEvent(eventType, action,
19
19
  actionSubjectId: actionSubjectId,
20
20
  attributes: _objectSpread({
21
21
  packageName: "@atlaskit/emoji",
22
- packageVersion: "73.1.3"
22
+ packageVersion: "73.2.0"
23
23
  }, attributes)
24
24
  };
25
25
  };
@@ -8,8 +8,6 @@ import { UfoEmojiTimings } from '../../types';
8
8
  import { hasUfoMarked } from '../../util/analytics/hasUfoMarked';
9
9
  import { sampledUfoRenderedEmoji } from '../../util/analytics/sampledUfoRenderedEmoji';
10
10
  import { defaultEmojiHeight } from '../../util/constants';
11
- import { isImageRepresentation } from '../../util/is-image-representation';
12
- import { isMediaRepresentation } from '../../util/is-media-representation';
13
11
  import { isPromise } from '../../util/is-promise';
14
12
  import Emoji from './Emoji';
15
13
  import EmojiPlaceholder from './EmojiPlaceholder';
@@ -159,8 +157,8 @@ export const ResourcedEmojiComponent = ({
159
157
  }
160
158
  };
161
159
  }
162
- // extend prevention to all surfaces
163
- if (optimisticImageURL && fg('platform_emoji_prevent_img_src_changing_all')) {
160
+ // Keep the optimistic representation stable when catalogue data arrives.
161
+ if (optimisticImageURL) {
164
162
  return {
165
163
  id,
166
164
  shortName,
@@ -175,36 +173,6 @@ export const ResourcedEmojiComponent = ({
175
173
  }
176
174
  };
177
175
  }
178
- if (optimisticImageURL) {
179
- if (emoji && (isImageRepresentation(emoji.representation) || isMediaRepresentation(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
180
- const {
181
- width,
182
- height
183
- } = emoji.representation;
184
- return {
185
- ...emoji,
186
- representation: {
187
- width,
188
- height,
189
- imagePath: optimisticImageURL
190
- }
191
- };
192
- } else {
193
- return {
194
- id,
195
- shortName,
196
- fallback,
197
- type: '',
198
- category: '',
199
- representation: {
200
- height: fitToHeight || defaultEmojiHeight,
201
- width: fitToHeight || defaultEmojiHeight,
202
- imagePath: optimisticImageURL
203
- },
204
- searchable: true
205
- };
206
- }
207
- }
208
176
  return emoji;
209
177
  }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
210
178
  const handleOnLoadError = useCallback(emojiId => {
@@ -7,7 +7,7 @@ export const createEvent = (eventType, action, actionSubject, actionSubjectId, a
7
7
  actionSubjectId,
8
8
  attributes: {
9
9
  packageName: "@atlaskit/emoji",
10
- packageVersion: "73.1.3",
10
+ packageVersion: "73.2.0",
11
11
  ...attributes
12
12
  }
13
13
  });
@@ -1,11 +1,8 @@
1
1
  /* ResourcedEmojiComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
2
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
2
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
4
3
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
5
4
  import "./ResourcedEmojiComponent.compiled.css";
6
5
  import { ax, ix } from "@compiled/react/runtime";
7
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
8
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
9
6
  import _regeneratorRuntime from "@babel/runtime/regenerator";
10
7
  import React, { useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
11
8
  import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -14,8 +11,6 @@ import { UfoEmojiTimings } from '../../types';
14
11
  import { hasUfoMarked } from '../../util/analytics/hasUfoMarked';
15
12
  import { sampledUfoRenderedEmoji } from '../../util/analytics/sampledUfoRenderedEmoji';
16
13
  import { defaultEmojiHeight } from '../../util/constants';
17
- import { isImageRepresentation } from '../../util/is-image-representation';
18
- import { isMediaRepresentation } from '../../util/is-media-representation';
19
14
  import { isPromise } from '../../util/is-promise';
20
15
  import Emoji from './Emoji';
21
16
  import EmojiPlaceholder from './EmojiPlaceholder';
@@ -199,8 +194,8 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
199
194
  }
200
195
  };
201
196
  }
202
- // extend prevention to all surfaces
203
- if (optimisticImageURL && fg('platform_emoji_prevent_img_src_changing_all')) {
197
+ // Keep the optimistic representation stable when catalogue data arrives.
198
+ if (optimisticImageURL) {
204
199
  return {
205
200
  id: id,
206
201
  shortName: shortName,
@@ -215,34 +210,6 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
215
210
  }
216
211
  };
217
212
  }
218
- if (optimisticImageURL) {
219
- if (emoji && (isImageRepresentation(emoji.representation) || isMediaRepresentation(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
220
- var _emoji$representation = emoji.representation,
221
- width = _emoji$representation.width,
222
- height = _emoji$representation.height;
223
- return _objectSpread(_objectSpread({}, emoji), {}, {
224
- representation: {
225
- width: width,
226
- height: height,
227
- imagePath: optimisticImageURL
228
- }
229
- });
230
- } else {
231
- return {
232
- id: id,
233
- shortName: shortName,
234
- fallback: fallback,
235
- type: '',
236
- category: '',
237
- representation: {
238
- height: fitToHeight || defaultEmojiHeight,
239
- width: fitToHeight || defaultEmojiHeight,
240
- imagePath: optimisticImageURL
241
- },
242
- searchable: true
243
- };
244
- }
245
- }
246
213
  return emoji;
247
214
  }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
248
215
  var handleOnLoadError = useCallback(function (emojiId) {
@@ -12,7 +12,7 @@ export var createEvent = function createEvent(eventType, action, actionSubject,
12
12
  actionSubjectId: actionSubjectId,
13
13
  attributes: _objectSpread({
14
14
  packageName: "@atlaskit/emoji",
15
- packageVersion: "73.1.3"
15
+ packageVersion: "73.2.0"
16
16
  }, attributes)
17
17
  };
18
18
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/emoji",
3
- "version": "73.1.4",
3
+ "version": "73.2.1",
4
4
  "description": "Fabric emoji React components",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -32,12 +32,12 @@
32
32
  "access": "public"
33
33
  },
34
34
  "dependencies": {
35
- "@atlaskit/afm-i18n-platform-elements-emoji": "2.287.0",
35
+ "@atlaskit/afm-i18n-platform-elements-emoji": "2.294.0",
36
36
  "@atlaskit/analytics-next": "^12.6.0",
37
37
  "@atlaskit/browser-apis": "^1.2.0",
38
38
  "@atlaskit/button": "^25.6.0",
39
39
  "@atlaskit/css": "^1.1.0",
40
- "@atlaskit/feature-gate-js-client": "^7.0.0",
40
+ "@atlaskit/feature-gate-js-client": "^7.1.0",
41
41
  "@atlaskit/form": "^18.3.0",
42
42
  "@atlaskit/heading": "^8.0.0",
43
43
  "@atlaskit/icon": "^38.0.0",
@@ -52,9 +52,9 @@
52
52
  "@atlaskit/primitives": "^22.6.0",
53
53
  "@atlaskit/radio": "^10.2.0",
54
54
  "@atlaskit/spinner": "^20.4.0",
55
- "@atlaskit/textfield": "^10.2.0",
55
+ "@atlaskit/textfield": "^10.3.0",
56
56
  "@atlaskit/theme": "^28.2.0",
57
- "@atlaskit/tmp-editor-statsig": "^248.0.0",
57
+ "@atlaskit/tmp-editor-statsig": "^248.1.0",
58
58
  "@atlaskit/tokens": "^20.8.0",
59
59
  "@atlaskit/tooltip": "^24.4.0",
60
60
  "@atlaskit/ufo": "^2.0.0",
@@ -82,7 +82,7 @@
82
82
  "@atlaskit/docs": "^12.3.0",
83
83
  "@atlaskit/editor-test-helpers": "workspace:^",
84
84
  "@atlaskit/media-core": "^39.0.0",
85
- "@atlaskit/popup": "^10.0.0",
85
+ "@atlaskit/popup": "^10.1.0",
86
86
  "@atlaskit/section-message": "^10.2.0",
87
87
  "@atlaskit/ssr": "workspace:^",
88
88
  "@atlaskit/util-data-test": "^19.1.0",
@@ -124,9 +124,6 @@
124
124
  "platform_emoji_prevent_img_src_changing": {
125
125
  "type": "boolean"
126
126
  },
127
- "platform_emoji_prevent_img_src_changing_all": {
128
- "type": "boolean"
129
- },
130
127
  "platform_suppression_removal_fix_reactions": {
131
128
  "type": "boolean"
132
129
  },