@atlaskit/emoji 64.6.0 → 64.7.1

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

@@ -19,6 +19,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _react = _interopRequireDefault(require("react"));
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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); }; }
 
 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; } }
@@ -35,10 +41,30 @@ var UfoErrorBoundary = /*#__PURE__*/function (_React$Component) {
 
   (0, _createClass2.default)(UfoErrorBoundary, [{
     key: "componentDidCatch",
-    value: function componentDidCatch() {
-      this.props.experiences.forEach(function (e) {
-        return e.failure();
-      });
+    value: function componentDidCatch(error, errorInfo) {
+      var _iterator = _createForOfIteratorHelper(this.props.experiences),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var exp = _step.value;
+          exp.failure({
+            metadata: {
+              source: 'UfoErrorBoundary',
+              reason: 'error',
+              error: {
+                name: error.name,
+                message: error.message,
+                infoStack: errorInfo.componentStack
+              }
+            }
+          });
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
     }
   }, {
     key: "render",

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

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.uploadEmoji = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _EmojiResource = require("../../api/EmojiResource");
 
 var _analytics = require("../../util/analytics");
@@ -13,6 +17,10 @@ var _i18n = require("../i18n");
 
 var _ufoExperiences = require("../../util/analytics/ufoExperiences");
 
+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; }
+
+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; }
+
 var uploadEmoji = function uploadEmoji(upload, emojiProvider, errorSetter, onSuccess, fireAnalytics) {
   var startTime = Date.now();
   errorSetter(undefined);
@@ -36,7 +44,15 @@ var uploadEmoji = function uploadEmoji(upload, emojiProvider, errorSetter, onSuc
         reason: _i18n.messages.emojiUploadFailed.defaultMessage
       }));
 
-      _ufoExperiences.ufoExperiences['emoji-uploaded'].failure();
+      _ufoExperiences.ufoExperiences['emoji-uploaded'].failure({
+        metadata: {
+          source: 'UploadEmoji',
+          error: err,
+          data: {
+            upload: _objectSpread({}, upload)
+          }
+        }
+      });
     });
   }
 };

package/dist/cjs/components/picker/EmojiPickerComponent.js

@@ -329,6 +329,10 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollToEndOfList", function () {
       var emojiPickerList = _this.refs.emojiPickerList;
 
+      if (typeof window === 'undefined') {
+        return;
+      }
+
       if (emojiPickerList) {
         // Wait a tick to ensure repaint and updated height for picker list
         window.setTimeout(function () {
@@ -430,11 +434,19 @@ var EmojiPickerComponent = /*#__PURE__*/function (_PureComponent) {
         duration: this.calculateElapsedTime()
       }));
 
-      _analytics.ufoExperiences['emoji-picker-opened'].abort();
-
-      _analytics.ufoExperiences['emoji-searched'].abort();
+      _analytics.ufoExperiences['emoji-picker-opened'].abort({
+        metadata: {
+          source: 'EmojiPickerComponent',
+          reason: 'unmount'
+        }
+      });
 
-      _analytics.ufoExperiences['emoji-selection-recorded'].abort();
+      _analytics.ufoExperiences['emoji-searched'].abort({
+        metadata: {
+          source: 'EmojiPickerComponent',
+          reason: 'unmount'
+        }
+      });
     }
   }, {
     key: "UNSAFE_componentWillReceiveProps",

package/dist/cjs/components/picker/EmojiPickerListSearch.js

@@ -84,6 +84,11 @@ var EmojiPickerListSearch = /*#__PURE__*/function (_PureComponent) {
         // setting the focus to search input.
         // see FS-2056
         _this.inputRef = input;
+
+        if (typeof window === 'undefined') {
+          return;
+        }
+
         window.setTimeout(_this.focusInput);
       }
     });

package/dist/cjs/components/picker/styles.js

@@ -181,6 +181,8 @@ var emojiItem = (0, _core.css)((_css6 = {
   margin: '7px',
   minWidth: '24px',
   maxWidth: '24px'
+}), (0, _defineProperty2.default)(_css6, "& .".concat(_styles.emojiNodeStyles, " .").concat(_styles.placeholder), {
+  margin: '0'
 }), (0, _defineProperty2.default)(_css6, "& .".concat(_styles.emojiNodeStyles, " > img"), {
   position: 'relative',
   left: '50%',

package/dist/cjs/components/typeahead/EmojiTypeAheadComponent.js

@@ -224,9 +224,25 @@ var EmojiTypeAheadComponent = /*#__PURE__*/function (_PureComponent) {
         this.fireAnalyticsEvent((0, _analytics.typeaheadCancelledEvent)(Date.now() - this.openTime, query, emojis));
       }
 
-      _analytics.ufoExperiences['emoji-searched'].abort();
+      _analytics.ufoExperiences['emoji-searched'].abort({
+        metadata: {
+          source: 'EmojiTypeAheadComponent',
+          reason: 'unmount',
+          data: {
+            query: query
+          }
+        }
+      });
 
-      _analytics.ufoExperiences['emoji-selection-recorded'].abort();
+      _analytics.ufoExperiences['emoji-selection-recorded'].abort({
+        metadata: {
+          source: 'EmojiTypeAheadComponent',
+          reason: 'unmount',
+          data: {
+            query: query
+          }
+        }
+      });
 
       this.sessionId = (0, _uuid.default)();
       this.selected = false;

package/dist/cjs/components/uploader/EmojiUploadComponent.js

@@ -119,7 +119,12 @@ var EmojiUploadComponent = /*#__PURE__*/function (_PureComponent) {
   (0, _createClass2.default)(EmojiUploadComponent, [{
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      _ufoExperiences.ufoExperiences['emoji-uploaded'].abort();
+      _ufoExperiences.ufoExperiences['emoji-uploaded'].abort({
+        metadata: {
+          source: 'EmojiUploadComponent',
+          reason: 'unmount'
+        }
+      });
     }
   }, {
     key: "render",

package/dist/cjs/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UfoExperienceName = exports.UfoComponentName = exports.SearchSort = exports.ProviderTypes = void 0;
+exports.UfoExperienceName = exports.UfoEmojiTimingsKeys = exports.UfoEmojiTimings = exports.UfoComponentName = exports.SearchSort = exports.ProviderTypes = void 0;
 
 /**
  * Minimum information to defined an emoji is the shortName.
@@ -72,4 +72,29 @@ exports.UfoComponentName = UfoComponentName;
   UfoComponentName["EMOJI"] = "emoji";
   UfoComponentName["EMOJI_PICKER"] = "emoji-picker";
   UfoComponentName["EMOJI_PROVIDER"] = "emoji-provider";
-})(UfoComponentName || (exports.UfoComponentName = UfoComponentName = {}));
+})(UfoComponentName || (exports.UfoComponentName = UfoComponentName = {}));
+
+var UfoEmojiTimingsKeys;
+exports.UfoEmojiTimingsKeys = UfoEmojiTimingsKeys;
+
+(function (UfoEmojiTimingsKeys) {
+  UfoEmojiTimingsKeys["FMP"] = "fmp";
+  UfoEmojiTimingsKeys["MOUNTED"] = "emoji-mount";
+  UfoEmojiTimingsKeys["METADATA"] = "emoji-metadata";
+  UfoEmojiTimingsKeys["MEDIADATA"] = "emoji-media";
+  UfoEmojiTimingsKeys["ONLOAD"] = "emoji-onload";
+})(UfoEmojiTimingsKeys || (exports.UfoEmojiTimingsKeys = UfoEmojiTimingsKeys = {}));
+
+var UfoEmojiTimings;
+exports.UfoEmojiTimings = UfoEmojiTimings;
+
+(function (UfoEmojiTimings) {
+  UfoEmojiTimings["FMP_END"] = "fmp";
+  UfoEmojiTimings["MOUNTED_END"] = "emoji-mount_end";
+  UfoEmojiTimings["METADATA_START"] = "emoji-metadata_start";
+  UfoEmojiTimings["METADATA_END"] = "emoji-metadata_end";
+  UfoEmojiTimings["MEDIA_START"] = "emoji-media_start";
+  UfoEmojiTimings["MEDIA_END"] = "emoji-media_end";
+  UfoEmojiTimings["ONLOAD_START"] = "emoji-onload_start";
+  UfoEmojiTimings["ONLOAD_END"] = "emoji-onload_end";
+})(UfoEmojiTimings || (exports.UfoEmojiTimings = UfoEmojiTimings = {}));

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ufoExperiences = exports.sampledUfoRenderedEmoji = void 0;
+exports.ufoExperiences = exports.sampledUfoRenderedEmoji = exports.sampledUfoEmojiResourceFetched = exports.hasUfoMarked = void 0;
 
 var _types = require("../../types");
 
@@ -31,8 +31,37 @@ var createInlineExperience = function createInlineExperience(componentName) {
   };
 };
 
+var customEmojiTimings = [{
+  key: _types.UfoEmojiTimingsKeys.FMP,
+  endMark: _types.UfoEmojiTimings.FMP_END
+}, {
+  key: _types.UfoEmojiTimingsKeys.METADATA,
+  component: 'resourced-emoji',
+  startMark: _types.UfoEmojiTimings.METADATA_START,
+  endMark: _types.UfoEmojiTimings.METADATA_END
+}, {
+  key: _types.UfoEmojiTimingsKeys.MEDIADATA,
+  component: 'caching-emoji',
+  startMark: _types.UfoEmojiTimings.MEDIA_START,
+  endMark: _types.UfoEmojiTimings.MEDIA_END
+}, {
+  key: _types.UfoEmojiTimingsKeys.MOUNTED,
+  component: 'emoji',
+  endMark: _types.UfoEmojiTimings.MOUNTED_END
+}, {
+  key: _types.UfoEmojiTimingsKeys.ONLOAD,
+  startMark: _types.UfoEmojiTimings.ONLOAD_START,
+  endMark: _types.UfoEmojiTimings.ONLOAD_END
+}];
 var ufoExperiences = {
-  'emoji-rendered': new _ufo.ConcurrentExperience(_types.UfoExperienceName.EMOJI_RENDERED, createRenderExperience(_types.UfoComponentName.EMOJI)),
+  'emoji-rendered': new _ufo.ConcurrentExperience(_types.UfoExperienceName.EMOJI_RENDERED, {
+    platform: {
+      component: _types.UfoComponentName.EMOJI
+    },
+    type: _ufo.ExperienceTypes.Operation,
+    performanceType: _ufo.ExperiencePerformanceTypes.Custom,
+    timings: customEmojiTimings
+  }),
   'emoji-resource-fetched': new _ufo.ConcurrentExperience(_types.UfoExperienceName.EMOJI_RESOURCE_FETCHED, createRenderExperience(_types.UfoComponentName.EMOJI_PROVIDER)),
   'emoji-picker-opened': new _ufo.UFOExperience(_types.UfoExperienceName.EMOJI_PICKER_OPENED, createRenderExperience(_types.UfoComponentName.EMOJI_PICKER)),
   'emoji-selection-recorded': new _ufo.UFOExperience(_types.UfoExperienceName.EMOJI_SELECTION_RECORDED, createInlineExperience(_types.UfoComponentName.EMOJI_PROVIDER)),
@@ -45,4 +74,18 @@ var sampledUfoRenderedEmoji = function sampledUfoRenderedEmoji(emojiId) {
   return (0, _samplingUfo.withSampling)(ufoExperiences['emoji-rendered'].getInstance(emojiId.id || emojiId.shortName));
 };
 
-exports.sampledUfoRenderedEmoji = sampledUfoRenderedEmoji;
+exports.sampledUfoRenderedEmoji = sampledUfoRenderedEmoji;
+
+var hasUfoMarked = function hasUfoMarked(ufoExperience, name) {
+  return ufoExperience.metrics.marks.some(function (mask) {
+    return mask.name === name;
+  });
+};
+
+exports.hasUfoMarked = hasUfoMarked;
+
+var sampledUfoEmojiResourceFetched = function sampledUfoEmojiResourceFetched(providerType) {
+  return (0, _samplingUfo.withSampling)(ufoExperiences['emoji-resource-fetched'].getInstance(providerType));
+};
+
+exports.sampledUfoEmojiResourceFetched = sampledUfoEmojiResourceFetched;

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

@@ -38,8 +38,9 @@ var useSampledUFOComponentExperience = function useSampledUFOComponentExperience
     (0, _samplingUfo.withSampling)(experience).start({
       samplingRate: samplingRate
     });
+    var isMetadataEmpty = Object.keys(experience.metadata).length === 0;
 
-    if (metadata) {
+    if (metadata && isMetadataEmpty) {
       experience.addMetadata(metadata);
     }
   });

package/dist/cjs/util/browser-support.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isIntersectionObserverSupported = void 0;
+var isIntersectionObserverSupported = typeof window !== 'undefined' && 'IntersectionObserver' in window && 'IntersectionObserverEntry' in window && 'intersectionRatio' in window.IntersectionObserverEntry.prototype;
+exports.isIntersectionObserverSupported = isIntersectionObserverSupported;

package/dist/cjs/util/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.userCustomTitle = exports.selectedToneStorageKey = exports.migrationUserId = exports.localStoragePrefix = exports.frequentCategory = exports.emojiPickerWidth = exports.emojiPickerHeight = exports.deleteEmojiLabel = exports.defaultListLimit = exports.defaultEmojiHeight = exports.defaultCategories = exports.dataURLPrefix = exports.customType = exports.customTitle = exports.customCategory = exports.analyticsEmojiPrefix = exports.SAMPLING_RATE_EMOJI_RENDERED_EXP_RESOURCEEMOJI = exports.SAMPLING_RATE_EMOJI_RENDERED_EXP = exports.MAX_ORDINAL = void 0;
+exports.userCustomTitle = exports.selectedToneStorageKey = exports.migrationUserId = exports.localStoragePrefix = exports.frequentCategory = exports.emojiPickerWidth = exports.emojiPickerHeight = exports.deleteEmojiLabel = exports.defaultListLimit = exports.defaultEmojiHeight = exports.defaultCategories = exports.dataURLPrefix = exports.customType = exports.customTitle = exports.customCategory = exports.analyticsEmojiPrefix = exports.SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP = exports.SAMPLING_RATE_EMOJI_RENDERED_EXP = exports.MAX_ORDINAL = void 0;
 var customCategory = 'CUSTOM';
 exports.customCategory = customCategory;
 var frequentCategory = 'FREQUENT';
@@ -44,9 +44,8 @@ exports.migrationUserId = migrationUserId;
 var analyticsEmojiPrefix = 'atlassian.fabric.emoji.picker'; // This is the base sampling rate in Emoji
 
 exports.analyticsEmojiPrefix = analyticsEmojiPrefix;
-var SAMPLING_RATE_EMOJI_RENDERED_EXP = 0.05; // This rate is used in ResourceEmoji which will be used in stead of base sampling rate above
+var SAMPLING_RATE_EMOJI_RENDERED_EXP = 0.05; // This rate is used in fetching emoji resource
 
 exports.SAMPLING_RATE_EMOJI_RENDERED_EXP = SAMPLING_RATE_EMOJI_RENDERED_EXP;
-var SAMPLING_RATE_EMOJI_RENDERED_EXP_RESOURCEEMOJI = 0.1; // add more sampling rate in parent components like EmojiTypeAheadItem.
-
-exports.SAMPLING_RATE_EMOJI_RENDERED_EXP_RESOURCEEMOJI = SAMPLING_RATE_EMOJI_RENDERED_EXP_RESOURCEEMOJI;
+var SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP = 0.01;
+exports.SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP = SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP;

package/dist/cjs/util/storage-available.js

@@ -8,6 +8,10 @@ exports.default = storageAvailable;
 // Copied from https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API#feature-detecting_localstorage
 // a brief history of local storage - https://gist.github.com/paulirish/5558557
 function storageAvailable(type) {
+  if (typeof window === 'undefined') {
+    return false;
+  }
+
   var storage;
 
   try {

package/dist/cjs/util/useInView.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useInView = void 0;
+
+var _reactIntersectionObserver = require("react-intersection-observer");
+
+var _browserSupport = require("./browser-support");
+
+var useInView = function useInView(options) {
+  var hookResult = (0, _reactIntersectionObserver.useInView)(options);
+
+  if (!_browserSupport.isIntersectionObserverSupported) {
+    // Unsupported, return no `ref` and default `inView` true value
+    return [undefined, true];
+  }
+
+  return hookResult;
+};
+
+exports.useInView = useInView;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "64.6.0",
+	"version": "64.7.1",
 	"sideEffects": false
 }

package/dist/es2019/api/EmojiRepository.js

@@ -246,6 +246,10 @@ export default class EmojiRepository {
     // frequent category being shown in the picker).
 
     if (this.dynamicCategoryList.indexOf(frequentCategory) === -1) {
+      if (typeof window === 'undefined') {
+        return;
+      }
+
       window.setTimeout(() => {
         this.dynamicCategoryList.push(frequentCategory);
       });

package/dist/es2019/api/EmojiResource.js

@@ -60,7 +60,11 @@ export class EmojiResource extends AbstractResource {
         this.notifyError(reason);
         ufoExperiences['emoji-resource-fetched'].getInstance(providerType).failure({
           metadata: {
-            reason
+            reason,
+            source: 'EmojiProvider',
+            data: {
+              providerUrl: provider.url
+            }
           }
         });
       });
@@ -143,6 +147,10 @@ export class EmojiResource extends AbstractResource {
   }
 
   loadStoredTone() {
+    if (typeof window === 'undefined') {
+      return undefined;
+    }
+
     const storedToneString = window.localStorage.getItem(selectedToneStorageKey);
 
     if (storedToneString) {
@@ -384,6 +392,10 @@ export class EmojiResource extends AbstractResource {
   setSelectedTone(tone) {
     this.selectedTone = tone;
 
+    if (typeof window === 'undefined') {
+      return;
+    }
+
     if (storageAvailable('localStorage')) {
       try {
         window.localStorage.setItem(selectedToneStorageKey, tone ? tone.toString() : '');

package/dist/es2019/api/EmojiUtils.js

@@ -36,6 +36,10 @@ const calculateScale = getRatio => {
 };
 
 export const getPixelRatio = () => {
+  if (typeof window === 'undefined') {
+    return 0;
+  }
+
   return window.devicePixelRatio;
 };
 export const getAltRepresentation = reps => {

package/dist/es2019/api/internal/UsageFrequencyTracker.js

@@ -111,7 +111,10 @@ export class Gateway {
       }
     };
 
-    window.setTimeout(wrappedFunc);
+    if (typeof window !== 'undefined') {
+      window.setTimeout(wrappedFunc);
+    }
+
     return true;
   }
 

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

@@ -1,8 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React from 'react';
+import React, { useEffect } from 'react';
 import { PureComponent } from 'react';
 import { isMediaEmoji } from '../../util/type-helpers';
+import { UfoEmojiTimings } from '../../types';
 import debug from '../../util/logger';
 import Emoji from './Emoji';
 import EmojiPlaceholder from './EmojiPlaceholder';
@@ -10,6 +11,7 @@ import { UfoErrorBoundary } from './UfoErrorBoundary';
 import { sampledUfoRenderedEmoji, ufoExperiences, useSampledUFOComponentExperience } from '../../util/analytics';
 import { SAMPLING_RATE_EMOJI_RENDERED_EXP } from '../../util/constants';
 import { EmojiContext } from '../../context/EmojiContext';
+import { hasUfoMarked } from '../../util/analytics/ufoExperiences';
 
 /**
  * Renders an emoji from a cached image, if required.
@@ -23,8 +25,15 @@ export const CachingEmoji = props => {
   } = props; // start emoji rendered experience, it may have already started earlier in ResourcedEmoji
 
   useSampledUFOComponentExperience(ufoExperiences['emoji-rendered'].getInstance(emojiProps.emoji.id || emojiProps.emoji.shortName), SAMPLING_RATE_EMOJI_RENDERED_EXP, {
-    source: 'caching-emoji'
+    source: 'caching-emoji',
+    emoji: emojiProps.emoji.shortName
   });
+  useEffect(() => {
+    if (!hasUfoMarked(sampledUfoRenderedEmoji(emojiProps.emoji), 'fmp')) {
+      sampledUfoRenderedEmoji(emojiProps.emoji).markFMP();
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, []);
 
   const emojiNode = () => {
     if (isMediaEmoji(props.emoji)) {
@@ -50,7 +59,12 @@ export class CachingMediaEmoji extends PureComponent {
     _defineProperty(this, "handleLoadError", _emojiId => {
       sampledUfoRenderedEmoji(_emojiId).failure({
         metadata: {
-          reason: 'load error'
+          reason: 'load error',
+          source: 'CachingMediaEmoji',
+          emoji: {
+            id: _emojiId.id,
+            shortName: _emojiId.shortName
+          }
         }
       });
       this.setState({
@@ -64,10 +78,6 @@ export class CachingMediaEmoji extends PureComponent {
     this.loadEmoji(props.emoji, context);
   }
 
-  componentDidMount() {
-    sampledUfoRenderedEmoji(this.props.emoji).markFMP();
-  }
-
   componentDidUpdate() {
     var _this$state$cachedEmo;
 
@@ -94,11 +104,13 @@ export class CachingMediaEmoji extends PureComponent {
     }
 
     debug('Loading image via media cache', emoji.shortName);
+    sampledUfoRenderedEmoji(emoji).mark(UfoEmojiTimings.MEDIA_START);
     emojiProvider.getMediaEmojiDescriptionURLWithInlineToken(emoji).then(cachedEmoji => {
       this.setState({
         cachedEmoji,
         invalidImage: false
       });
+      sampledUfoRenderedEmoji(emoji).mark(UfoEmojiTimings.MEDIA_END);
     }).catch(() => {
       this.setState({
         cachedEmoji: undefined,
@@ -106,7 +118,15 @@ export class CachingMediaEmoji extends PureComponent {
       });
       sampledUfoRenderedEmoji(emoji).failure({
         metadata: {
-          reason: 'failed to load media emoji'
+          reason: 'failed to load media emoji',
+          source: 'CachingMediaEmoji',
+          data: {
+            emoji: {
+              id: emoji.id,
+              shortName: emoji.shortName,
+              name: emoji.name
+            }
+          }
         }
       });
     });
@@ -119,7 +139,6 @@ export class CachingMediaEmoji extends PureComponent {
     } = this.state;
     const {
       children,
-      placeholderSize,
       ...otherProps
     } = this.props;
     let emojiComponent;

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

@@ -9,7 +9,8 @@ import { emojiDeleteButton, deleteButton } from './styles';
 
 const DeleteButton = props => jsx("span", {
   css: deleteButton,
-  className: emojiDeleteButton
+  className: emojiDeleteButton,
+  "data-testid": "emoji-delete-button"
 }, jsx(Button, {
   iconBefore: jsx(CrossCircleIcon, {
     label: deleteEmojiLabel,