@atlaskit/emoji 73.2.0 → 73.2.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/emoji
 
+## 73.2.1
+
+### Patch Changes
+
+- [`d5c2acafa064f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d5c2acafa064f) -
+  Cleanup feature gate `platform_emoji_prevent_img_src_changing_all`. Preserve optimistic emoji
+  images when catalogue data arrives on all surfaces.
+
 ## 73.2.0
 
 ### Minor Changes

package/dist/cjs/components/common/ResourcedEmojiComponent.js

@@ -10,7 +10,6 @@ exports.default = exports.ResourcedEmojiComponent = void 0;
 require("./ResourcedEmojiComponent.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -20,14 +19,10 @@ var _types = require("../../types");
 var _hasUfoMarked = require("../../util/analytics/hasUfoMarked");
 var _sampledUfoRenderedEmoji = require("../../util/analytics/sampledUfoRenderedEmoji");
 var _constants = require("../../util/constants");
-var _isImageRepresentation = require("../../util/is-image-representation");
-var _isMediaRepresentation = require("../../util/is-media-representation");
 var _isPromise = require("../../util/is-promise");
 var _Emoji = _interopRequireDefault(require("./Emoji"));
 var _EmojiPlaceholder = _interopRequireDefault(require("./EmojiPlaceholder"));
 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); }
-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; }
-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; }
 var ignoreWrapperStyles = null;
 var ResourcedEmojiComponentRenderStatesEnum = /*#__PURE__*/function (ResourcedEmojiComponentRenderStatesEnum) {
   ResourcedEmojiComponentRenderStatesEnum["INITIAL"] = "INITIAL";
@@ -208,8 +203,8 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
         }
       };
     }
-    // extend prevention to all surfaces
-    if (optimisticImageURL && (0, _fg.fg)('platform_emoji_prevent_img_src_changing_all')) {
+    // Keep the optimistic representation stable when catalogue data arrives.
+    if (optimisticImageURL) {
       return {
         id: id,
         shortName: shortName,
@@ -224,34 +219,6 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
         }
       };
     }
-    if (optimisticImageURL) {
-      if (emoji && ((0, _isImageRepresentation.isImageRepresentation)(emoji.representation) || (0, _isMediaRepresentation.isMediaRepresentation)(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
-        var _emoji$representation = emoji.representation,
-          width = _emoji$representation.width,
-          height = _emoji$representation.height;
-        return _objectSpread(_objectSpread({}, emoji), {}, {
-          representation: {
-            width: width,
-            height: height,
-            imagePath: optimisticImageURL
-          }
-        });
-      } else {
-        return {
-          id: id,
-          shortName: shortName,
-          fallback: fallback,
-          type: '',
-          category: '',
-          representation: {
-            height: fitToHeight || _constants.defaultEmojiHeight,
-            width: fitToHeight || _constants.defaultEmojiHeight,
-            imagePath: optimisticImageURL
-          },
-          searchable: true
-        };
-      }
-    }
     return emoji;
   }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
   var handleOnLoadError = (0, _react.useCallback)(function (emojiId) {

package/dist/cjs/util/analytics/createEvent.js

@@ -19,7 +19,7 @@ var createEvent = exports.createEvent = function createEvent(eventType, action,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "73.1.4"
+      packageVersion: "73.2.0"
     }, attributes)
   };
 };

package/dist/es2019/components/common/ResourcedEmojiComponent.js

@@ -8,8 +8,6 @@ import { UfoEmojiTimings } from '../../types';
 import { hasUfoMarked } from '../../util/analytics/hasUfoMarked';
 import { sampledUfoRenderedEmoji } from '../../util/analytics/sampledUfoRenderedEmoji';
 import { defaultEmojiHeight } from '../../util/constants';
-import { isImageRepresentation } from '../../util/is-image-representation';
-import { isMediaRepresentation } from '../../util/is-media-representation';
 import { isPromise } from '../../util/is-promise';
 import Emoji from './Emoji';
 import EmojiPlaceholder from './EmojiPlaceholder';
@@ -159,8 +157,8 @@ export const ResourcedEmojiComponent = ({
         }
       };
     }
-    // extend prevention to all surfaces
-    if (optimisticImageURL && fg('platform_emoji_prevent_img_src_changing_all')) {
+    // Keep the optimistic representation stable when catalogue data arrives.
+    if (optimisticImageURL) {
       return {
         id,
         shortName,
@@ -175,36 +173,6 @@ export const ResourcedEmojiComponent = ({
         }
       };
     }
-    if (optimisticImageURL) {
-      if (emoji && (isImageRepresentation(emoji.representation) || isMediaRepresentation(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
-        const {
-          width,
-          height
-        } = emoji.representation;
-        return {
-          ...emoji,
-          representation: {
-            width,
-            height,
-            imagePath: optimisticImageURL
-          }
-        };
-      } else {
-        return {
-          id,
-          shortName,
-          fallback,
-          type: '',
-          category: '',
-          representation: {
-            height: fitToHeight || defaultEmojiHeight,
-            width: fitToHeight || defaultEmojiHeight,
-            imagePath: optimisticImageURL
-          },
-          searchable: true
-        };
-      }
-    }
     return emoji;
   }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
   const handleOnLoadError = useCallback(emojiId => {

package/dist/es2019/util/analytics/createEvent.js

@@ -7,7 +7,7 @@ export const createEvent = (eventType, action, actionSubject, actionSubjectId, a
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "73.1.4",
+    packageVersion: "73.2.0",
     ...attributes
   }
 });

package/dist/esm/components/common/ResourcedEmojiComponent.js

@@ -1,11 +1,8 @@
 /* ResourcedEmojiComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./ResourcedEmojiComponent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-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; }
-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; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -14,8 +11,6 @@ import { UfoEmojiTimings } from '../../types';
 import { hasUfoMarked } from '../../util/analytics/hasUfoMarked';
 import { sampledUfoRenderedEmoji } from '../../util/analytics/sampledUfoRenderedEmoji';
 import { defaultEmojiHeight } from '../../util/constants';
-import { isImageRepresentation } from '../../util/is-image-representation';
-import { isMediaRepresentation } from '../../util/is-media-representation';
 import { isPromise } from '../../util/is-promise';
 import Emoji from './Emoji';
 import EmojiPlaceholder from './EmojiPlaceholder';
@@ -199,8 +194,8 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
         }
       };
     }
-    // extend prevention to all surfaces
-    if (optimisticImageURL && fg('platform_emoji_prevent_img_src_changing_all')) {
+    // Keep the optimistic representation stable when catalogue data arrives.
+    if (optimisticImageURL) {
       return {
         id: id,
         shortName: shortName,
@@ -215,34 +210,6 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
         }
       };
     }
-    if (optimisticImageURL) {
-      if (emoji && (isImageRepresentation(emoji.representation) || isMediaRepresentation(emoji === null || emoji === void 0 ? void 0 : emoji.representation))) {
-        var _emoji$representation = emoji.representation,
-          width = _emoji$representation.width,
-          height = _emoji$representation.height;
-        return _objectSpread(_objectSpread({}, emoji), {}, {
-          representation: {
-            width: width,
-            height: height,
-            imagePath: optimisticImageURL
-          }
-        });
-      } else {
-        return {
-          id: id,
-          shortName: shortName,
-          fallback: fallback,
-          type: '',
-          category: '',
-          representation: {
-            height: fitToHeight || defaultEmojiHeight,
-            width: fitToHeight || defaultEmojiHeight,
-            imagePath: optimisticImageURL
-          },
-          searchable: true
-        };
-      }
-    }
     return emoji;
   }, [emoji, optimisticImageURL, fallback, fitToHeight, id, shortName, pageTitleEmoji]);
   var handleOnLoadError = useCallback(function (emojiId) {

package/dist/esm/util/analytics/createEvent.js

@@ -12,7 +12,7 @@ export var createEvent = function createEvent(eventType, action, actionSubject,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "73.1.4"
+      packageVersion: "73.2.0"
     }, attributes)
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "73.2.0",
+	"version": "73.2.1",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -37,7 +37,7 @@
 		"@atlaskit/browser-apis": "^1.2.0",
 		"@atlaskit/button": "^25.6.0",
 		"@atlaskit/css": "^1.1.0",
-		"@atlaskit/feature-gate-js-client": "^7.0.0",
+		"@atlaskit/feature-gate-js-client": "^7.1.0",
 		"@atlaskit/form": "^18.3.0",
 		"@atlaskit/heading": "^8.0.0",
 		"@atlaskit/icon": "^38.0.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/textfield": "^10.3.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^248.0.0",
+		"@atlaskit/tmp-editor-statsig": "^248.1.0",
 		"@atlaskit/tokens": "^20.8.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/ufo": "^2.0.0",
@@ -124,9 +124,6 @@
 		"platform_emoji_prevent_img_src_changing": {
 			"type": "boolean"
 		},
-		"platform_emoji_prevent_img_src_changing_all": {
-			"type": "boolean"
-		},
 		"platform_suppression_removal_fix_reactions": {
 			"type": "boolean"
 		},