@atlaskit/emoji 70.11.2 → 70.13.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/emoji
 
+## 70.13.0
+
+### Minor Changes
+
+- [`81637ec91afd1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/81637ec91afd1) -
+  Represent standard emojis as native Unicode characters instead of images. Updates
+  EmojiNodeDataProvider to support Unicode representations.
+
+## 70.12.0
+
+### Minor Changes
+
+- [`5048d8b2e4dea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5048d8b2e4dea) -
+  Revert emoji empty state changes due to resolution issues
+
 ## 70.11.2
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -43,9 +43,6 @@
 		{
 			"path": "../../../design-system/icon/afm-cc/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/image/afm-cc/tsconfig.json"
-		},
 		{
 			"path": "../../../media/media-client/afm-cc/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -43,9 +43,6 @@
 		{
 			"path": "../../../design-system/icon/afm-products/tsconfig.json"
 		},
-		{
-			"path": "../../../design-system/image/afm-products/tsconfig.json"
-		},
 		{
 			"path": "../../../media/media-client/afm-products/tsconfig.json"
 		},

package/dist/cjs/api/EmojiUtils.js

@@ -9,8 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _utilServiceSupport = require("@atlaskit/util-service-support");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _types = require("../types");
 var _typeHelpers = require("../util/type-helpers");
 var _logger = _interopRequireDefault(require("../util/logger"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _emojiIdToEmoji = require("../util/emojiIdToEmoji");
 var _excluded = ["getRatio"],
   _excluded2 = ["queryParams"],
   _excluded3 = ["representation", "altRepresentations"],
@@ -138,7 +141,11 @@ var denormaliseSkinEmoji = exports.denormaliseSkinEmoji = function denormaliseSk
  */
 var denormaliseEmojiServiceResponse = exports.denormaliseEmojiServiceResponse = function denormaliseEmojiServiceResponse(emojiData) {
   var emojis = emojiData.emojis.map(function (emoji) {
-    var newRepresentation = denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
+    var unicodeEmoji = (0, _emojiIdToEmoji.emojiIdToEmoji)(emoji.id);
+    var useUnicodeRepresentation = !!(emoji.id && emoji.type === _types.ProviderTypes.STANDARD && unicodeEmoji && (0, _platformFeatureFlags.fg)('platform_twemoji_removal_unicode_emojis'));
+    var newRepresentation = useUnicodeRepresentation ? {
+      unicodeEmoji: unicodeEmoji
+    } : denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
     var altRepresentation = denormaliseServiceAltRepresentation(emoji.altRepresentations, emojiData.meta);
     var newSkinVariations = denormaliseSkinEmoji(emoji, emojiData.meta);
 

package/dist/cjs/components/i18n.js

@@ -231,16 +231,6 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
     defaultMessage: 'An emoji with this name exists already',
     description: 'Error message shown when the user tries to upload an emoji with a name that already exists in the custom emoji set'
   },
-  emojiPickerNoResults: {
-    id: 'fabric.emoji.picker.no.results',
-    defaultMessage: 'No results',
-    description: 'Heading shown in the emoji picker when a search query returns no matching emojis.'
-  },
-  emojiPickerAddCustomEmoji: {
-    id: 'fabric.emoji.picker.add.custom.emoji',
-    defaultMessage: 'Add custom emoji',
-    description: 'Label for the button shown in the emoji picker no-results screen that opens the custom emoji upload panel.'
-  },
   emojiPickerTitle: {
     id: 'fabric.emoji.picker',
     defaultMessage: 'Emoji picker',

package/dist/cjs/components/picker/EmojiPickerComponent.compiled.css

@@ -21,16 +21,13 @@
 ._1xi2idpf{right:0}
 ._2lx21bp4{flex-direction:column}
 ._4t3i1784{height:470px}
-._4t3i19lm{height:514px}
 ._4t3i1ckg{height:455px}
 ._4t3i1dsu{height:419px}
-._4t3i1j8x{height:354px}
 ._4t3i1sa4{height:390px}
 ._4t3i2300{height:429px}
 ._4t3i50k7{height:499px}
 ._4t3iaq3k{height:295px}
 ._4t3ibqjm{height:310px}
-._4t3iihnn{height:434px}
 ._4t3iixjv{height:375px}
 ._4t3iqbeb{height:339px}
 ._4t3iuxo9{height:var(--_19dn98e)}

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

@@ -76,12 +76,6 @@ var withoutPreviewHeight = {
   medium: "_4t3iixjv _1tke5x59",
   large: "_4t3i1ckg _1tke1pna"
 };
-var emojiPickerHeightNoResults = 354;
-var withNoResultsRefreshHeight = {
-  small: "_4t3i1j8x _1tkegx0z",
-  medium: "_4t3iihnn _1tke5x59",
-  large: "_4t3i19lm _1tke1pna"
-};
 var FREQUENTLY_USED_MAX = 16;
 var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   var onSelection = _ref.onSelection,
@@ -156,7 +150,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   }, []);
   var openTime = (0, _react.useRef)(0);
   var isMounting = (0, _react.useRef)(true);
-  var lastNonSearchCategory = (0, _react.useRef)(activeCategory);
   var previousEmojiProvider = (0, _react.useRef)(emojiProvider);
   var isProgrammaticScroll = (0, _react.useRef)(false);
   var pickerRef = (0, _react.useRef)(null);
@@ -198,11 +191,8 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     }
     if (activeCategory !== category) {
       setActiveCategory(category);
-      if (!query && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
-        lastNonSearchCategory.current = category;
-      }
     }
-  }, [activeCategory, uploading, emojiToDelete, query]);
+  }, [activeCategory, uploading, emojiToDelete]);
   var calculateElapsedTime = function calculateElapsedTime() {
     return Date.now() - openTime.current;
   };
@@ -419,10 +409,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       source: _types.SearchSourceTypes.PICKER
     };
     if (searchQuery !== query) {
-      // Capture the active category before entering search so we can keep it highlighted
-      if (!query && searchQuery && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
-        lastNonSearchCategory.current = activeCategory;
-      }
       setQuery(searchQuery);
     }
     updateEmojis(searchQuery, options);
@@ -430,7 +416,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       // scroll to top when search, which is search results section
       scrollToTopOfList();
     }
-  }, [activeCategory, query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
+  }, [query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
 
   // When the upload screen is open, intercept any file drag at the window level so it
   // cannot reach underlying page drop handlers (e.g. the Confluence editor).
@@ -651,7 +637,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       role: "dialog",
       "aria-label": formatMessage(_i18n.messages.emojiPickerTitle),
       "aria-modal": true,
-      className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
+      className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
       style: {
         "--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
         "--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
@@ -696,7 +682,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       onOpenUpload: onOpenUpload,
       size: size,
       activeCategoryId: activeCategory
-    }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
+    }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
       selectedEmoji: selectedEmoji,
       uploadEnabled: isUploadSupported && !uploading,
       onOpenUpload: onOpenUpload
@@ -711,7 +697,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onKeyPress: suppressKeyPress,
     onKeyUp: suppressKeyPress,
     onKeyDown: suppressKeyPress,
-    className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
+    className: (0, _runtime.ax)([(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
     style: {
       "--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
       "--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
@@ -750,7 +736,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onOpenUpload: onOpenUpload,
     size: size,
     activeCategoryId: activeCategory
-  }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
+  }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
     selectedEmoji: selectedEmoji,
     uploadEnabled: isUploadSupported && !uploading,
     onOpenUpload: onOpenUpload

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.RENDER_EMOJI_PICKER_LIST_TESTID = exports.EmojiPickerVirtualListInternal = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _reactIntl = require("react-intl");
 var _react = _interopRequireWildcard(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../util/constants");
@@ -21,7 +20,6 @@ var _utils = require("./utils");
 var _VirtualList = require("./VirtualList");
 var _EmojiPickerListContext = require("../../context/EmojiPickerListContext");
 var _EmojiPickerTabPanel = _interopRequireDefault(require("./EmojiPickerTabPanel"));
-var _i18n = require("../i18n");
 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); }
 /**
  * Test id for wrapper Emoji Picker List div
@@ -70,8 +68,6 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
     onFileChooserClicked = props.onFileChooserClicked,
     onOpenUpload = props.onOpenUpload,
     activeCategoryId = props.activeCategoryId;
-  var _useIntl = (0, _reactIntl.useIntl)(),
-    formatMessage = _useIntl.formatMessage;
   var listRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -189,27 +185,14 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
       items.push(new _EmojiPickerVirtualItems.LoadingItem());
     } else {
       if (query) {
-        var search = (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? _categories.CategoryDescriptionMapNew.SEARCH : _categories.CategoryDescriptionMap.SEARCH;
-        if (emojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
-          // Show a "No results" category heading, then a no-results illustration below it
-          items.push(new _EmojiPickerVirtualItems.CategoryHeadingItem({
-            id: _constants.searchCategory,
-            title: formatMessage(_i18n.messages.emojiPickerNoResults),
-            className: categoryClassname
-          }));
-          items.push(new _EmojiPickerVirtualItems.NoResultsItem({
-            onOpenUpload: onOpenUpload,
-            uploadEnabled: uploadEnabled
-          }));
-        } else {
-          // Only a single "result" category
-          items = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(buildVirtualItemFromGroup({
-            category: _constants.searchCategory,
-            title: search.name,
-            emojis: emojis,
-            order: search.order
-          })));
-        }
+        var search = _categories.CategoryDescriptionMap.SEARCH;
+        // Only a single "result" category
+        items = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(buildVirtualItemFromGroup({
+          category: _constants.searchCategory,
+          title: search.name,
+          emojis: emojis,
+          order: search.order
+        })));
       } else {
         // Group by category
 
@@ -234,7 +217,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allEmojiGroups, loading, query, emojis, onOpenUpload, uploadEnabled, formatMessage]);
+  }, [allEmojiGroups, loading, query, emojis]);
   var findCategoryToActivate = function findCategoryToActivate(row) {
     var category = null;
     if (row instanceof _EmojiPickerVirtualItems.CategoryHeadingItem) {
@@ -344,12 +327,8 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [virtualItems, categoriesChanged]);
   var virtualListHeight = (0, _react.useMemo)(function () {
-    if (query && emojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
-      // No-results state: expand the list height to fit heading + illustration without scrolling
-      return _EmojiPickerSizes.sizes.categoryHeadingHeight + _EmojiPickerSizes.sizes.noResultsHeight + (0, _utils.emojiPickerHeightOffset)(size);
-    }
     return (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? _EmojiPickerSizes.sizes.listHeightNew + (0, _utils.emojiPickerHeightOffset)(size) : _EmojiPickerSizes.sizes.listHeight + (0, _utils.emojiPickerHeightOffset)(size);
-  }, [size, query, emojis.length]);
+  }, [size]);
   return /*#__PURE__*/_react.default.createElement(_EmojiPickerTabPanel.default, {
     showSearchResults: !!query
   }, /*#__PURE__*/_react.default.createElement(_EmojiActions.default, {

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

@@ -19,8 +19,6 @@ var sizes = exports.sizes = {
   // 32px height
   loadingRowHeight: 150,
   // Fills remaining space without scrolling when loading.
-  noResultsHeight: 300,
-  // illustration (200px) + button + padding + gap
   uploadActionHeight: 40,
   // 40px height
   emojiPerRow: 8

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

@@ -6,7 +6,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.virtualItemRenderer = exports.NoResultsItem = exports.LoadingItem = exports.EmojisRowItem = exports.CategoryHeadingItem = exports.AbstractItem = void 0;
+exports.virtualItemRenderer = exports.LoadingItem = exports.EmojisRowItem = exports.CategoryHeadingItem = exports.AbstractItem = void 0;
 require("./EmojiPickerVirtualItems.compiled.css");
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
@@ -20,7 +20,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 var _EmojiPickerCategoryHeading = _interopRequireDefault(require("./EmojiPickerCategoryHeading"));
 var _EmojiPickerEmojiRow = _interopRequireDefault(require("./EmojiPickerEmojiRow"));
-var _EmojiPickerNoResults = _interopRequireDefault(require("./EmojiPickerNoResults"));
 var _EmojiPickerSizes = require("./EmojiPickerSizes");
 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 _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)); }
@@ -76,19 +75,6 @@ var CategoryHeadingItem = exports.CategoryHeadingItem = /*#__PURE__*/function (_
   (0, _inherits2.default)(CategoryHeadingItem, _AbstractItem3);
   return (0, _createClass2.default)(CategoryHeadingItem);
 }(AbstractItem);
-var NoResultsItem = exports.NoResultsItem = /*#__PURE__*/function (_AbstractItem4) {
-  function NoResultsItem(props) {
-    var _this4;
-    (0, _classCallCheck2.default)(this, NoResultsItem);
-    _this4 = _callSuper(this, NoResultsItem, [props, _EmojiPickerSizes.sizes.noResultsHeight]);
-    (0, _defineProperty2.default)(_this4, "renderItem", function () {
-      return /*#__PURE__*/React.createElement(_EmojiPickerNoResults.default, _this4.props);
-    });
-    return _this4;
-  }
-  (0, _inherits2.default)(NoResultsItem, _AbstractItem4);
-  return (0, _createClass2.default)(NoResultsItem);
-}(AbstractItem);
 var virtualItemRenderer = exports.virtualItemRenderer = function virtualItemRenderer(rows, context) {
   var index = context.index,
     key = context.key;

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

@@ -20,7 +20,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "70.11.1"
+      packageVersion: "70.12.0"
     }, attributes)
   };
 };

package/dist/es2019/api/EmojiUtils.js

@@ -1,7 +1,10 @@
 import { utils as serviceUtils } from '@atlaskit/util-service-support';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { ProviderTypes } from '../types';
 import { isImageRepresentation, isSpriteServiceRepresentation, convertImageToMediaRepresentation, buildEmojiDescriptionWithAltRepresentation } from '../util/type-helpers';
 import debug from '../util/logger';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { emojiIdToEmoji } from '../util/emojiIdToEmoji';
 export const emojiRequest = (provider, options) => {
   const {
     getRatio = getPixelRatio,
@@ -131,7 +134,11 @@ export const denormaliseSkinEmoji = (emoji, meta) => {
  */
 export const denormaliseEmojiServiceResponse = emojiData => {
   const emojis = emojiData.emojis.map(emoji => {
-    const newRepresentation = denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
+    const unicodeEmoji = emojiIdToEmoji(emoji.id);
+    const useUnicodeRepresentation = !!(emoji.id && emoji.type === ProviderTypes.STANDARD && unicodeEmoji && fg('platform_twemoji_removal_unicode_emojis'));
+    const newRepresentation = useUnicodeRepresentation ? {
+      unicodeEmoji
+    } : denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
     const altRepresentation = denormaliseServiceAltRepresentation(emoji.altRepresentations, emojiData.meta);
     const newSkinVariations = denormaliseSkinEmoji(emoji, emojiData.meta);
 

package/dist/es2019/components/i18n.js

@@ -225,16 +225,6 @@ export const messages = defineMessages({
     defaultMessage: 'An emoji with this name exists already',
     description: 'Error message shown when the user tries to upload an emoji with a name that already exists in the custom emoji set'
   },
-  emojiPickerNoResults: {
-    id: 'fabric.emoji.picker.no.results',
-    defaultMessage: 'No results',
-    description: 'Heading shown in the emoji picker when a search query returns no matching emojis.'
-  },
-  emojiPickerAddCustomEmoji: {
-    id: 'fabric.emoji.picker.add.custom.emoji',
-    defaultMessage: 'Add custom emoji',
-    description: 'Label for the button shown in the emoji picker no-results screen that opens the custom emoji upload panel.'
-  },
   emojiPickerTitle: {
     id: 'fabric.emoji.picker',
     defaultMessage: 'Emoji picker',

package/dist/es2019/components/picker/EmojiPickerComponent.compiled.css

@@ -21,16 +21,13 @@
 ._1xi2idpf{right:0}
 ._2lx21bp4{flex-direction:column}
 ._4t3i1784{height:470px}
-._4t3i19lm{height:514px}
 ._4t3i1ckg{height:455px}
 ._4t3i1dsu{height:419px}
-._4t3i1j8x{height:354px}
 ._4t3i1sa4{height:390px}
 ._4t3i2300{height:429px}
 ._4t3i50k7{height:499px}
 ._4t3iaq3k{height:295px}
 ._4t3ibqjm{height:310px}
-._4t3iihnn{height:434px}
 ._4t3iixjv{height:375px}
 ._4t3iqbeb{height:339px}
 ._4t3ivixp{height:349px}

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

@@ -60,12 +60,6 @@ const withoutPreviewHeight = {
   medium: "_4t3iixjv _1tke5x59",
   large: "_4t3i1ckg _1tke1pna"
 };
-const emojiPickerHeightNoResults = 354;
-const withNoResultsRefreshHeight = {
-  small: "_4t3i1j8x _1tkegx0z",
-  medium: "_4t3iihnn _1tke5x59",
-  large: "_4t3i19lm _1tke1pna"
-};
 const FREQUENTLY_USED_MAX = 16;
 const EmojiPickerComponent = ({
   onSelection,
@@ -98,7 +92,6 @@ const EmojiPickerComponent = ({
   const emojiPickerList = useMemo(() => /*#__PURE__*/createRef(), []);
   const openTime = useRef(0);
   const isMounting = useRef(true);
-  const lastNonSearchCategory = useRef(activeCategory);
   const previousEmojiProvider = useRef(emojiProvider);
   const isProgrammaticScroll = useRef(false);
   const pickerRef = useRef(null);
@@ -140,11 +133,8 @@ const EmojiPickerComponent = ({
     }
     if (activeCategory !== category) {
       setActiveCategory(category);
-      if (!query && fg('platform_emoji_picker_refresh')) {
-        lastNonSearchCategory.current = category;
-      }
     }
-  }, [activeCategory, uploading, emojiToDelete, query]);
+  }, [activeCategory, uploading, emojiToDelete]);
   const calculateElapsedTime = () => {
     return Date.now() - openTime.current;
   };
@@ -357,10 +347,6 @@ const EmojiPickerComponent = ({
       source: SearchSourceTypes.PICKER
     };
     if (searchQuery !== query) {
-      // Capture the active category before entering search so we can keep it highlighted
-      if (!query && searchQuery && fg('platform_emoji_picker_refresh')) {
-        lastNonSearchCategory.current = activeCategory;
-      }
       setQuery(searchQuery);
     }
     updateEmojis(searchQuery, options);
@@ -368,7 +354,7 @@ const EmojiPickerComponent = ({
       // scroll to top when search, which is search results section
       scrollToTopOfList();
     }
-  }, [activeCategory, query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
+  }, [query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
 
   // When the upload screen is open, intercept any file drag at the window level so it
   // cannot reach underlying page drop handlers (e.g. the Confluence editor).
@@ -561,7 +547,7 @@ const EmojiPickerComponent = ({
       role: "dialog",
       "aria-label": formatMessage(messages.emojiPickerTitle),
       "aria-modal": true,
-      className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", !!emojiToDelete && fg('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
+      className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", !!emojiToDelete && fg('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
     }, /*#__PURE__*/React.createElement("div", {
       role: "presentation",
       onKeyPress: suppressKeyPress,
@@ -602,7 +588,7 @@ const EmojiPickerComponent = ({
       onOpenUpload: onOpenUpload,
       size: size,
       activeCategoryId: activeCategory
-    }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
+    }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
       selectedEmoji: selectedEmoji,
       uploadEnabled: isUploadSupported && !uploading,
       onOpenUpload: onOpenUpload
@@ -617,7 +603,7 @@ const EmojiPickerComponent = ({
     onKeyPress: suppressKeyPress,
     onKeyUp: suppressKeyPress,
     onKeyDown: suppressKeyPress,
-    className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", !!emojiToDelete && fg('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
+    className: ax([fg('platform_emoji_picker_refresh') ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm", !!emojiToDelete && fg('platform_emoji_picker_refresh') ? withDeleteRefreshHeight[size] : uploading && fg('platform_emoji_picker_refresh') ? withUploadRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
   }, /*#__PURE__*/React.createElement(CategorySelector, {
     activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
     dynamicCategories: dynamicCategories,
@@ -652,7 +638,7 @@ const EmojiPickerComponent = ({
     onOpenUpload: onOpenUpload,
     size: size,
     activeCategoryId: activeCategory
-  }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
+  }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
     selectedEmoji: selectedEmoji,
     uploadEnabled: isUploadSupported && !uploading,
     onOpenUpload: onOpenUpload

package/dist/es2019/components/picker/EmojiPickerList.js

@@ -1,17 +1,15 @@
-import { useIntl } from 'react-intl';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { customCategory, defaultEmojiPickerSize, frequentCategory, searchCategory, userCustomTitle, yourUploadsCategory } from '../../util/constants';
 import { CategoryDescriptionMap, CategoryDescriptionMapNew } from './categories';
 import CategoryTracker from './CategoryTracker';
 import { sizes } from './EmojiPickerSizes';
-import { CategoryHeadingItem, EmojisRowItem, LoadingItem, NoResultsItem, virtualItemRenderer } from './EmojiPickerVirtualItems';
+import { CategoryHeadingItem, EmojisRowItem, LoadingItem, virtualItemRenderer } from './EmojiPickerVirtualItems';
 import EmojiActions from '../common/EmojiActions';
 import { emojiPickerHeightOffset, scrollToRow } from './utils';
 import { VirtualList } from './VirtualList';
 import { EmojiPickerListContextProvider } from '../../context/EmojiPickerListContext';
 import EmojiPickerTabPanel from './EmojiPickerTabPanel';
-import { messages } from '../i18n';
 
 /**
  * Test id for wrapper Emoji Picker List div
@@ -54,9 +52,6 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     onOpenUpload,
     activeCategoryId
   } = props;
-  const {
-    formatMessage
-  } = useIntl();
   const listRef = useRef(null);
   const [allEmojiGroups, setAllEmojiGroups] = useState([]);
   const [virtualItems, setVirtualItems] = useState([]);
@@ -158,27 +153,14 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       items.push(new LoadingItem());
     } else {
       if (query) {
-        const search = fg('platform_emoji_picker_refresh') ? CategoryDescriptionMapNew.SEARCH : CategoryDescriptionMap.SEARCH;
-        if (emojis.length === 0 && fg('platform_emoji_picker_refresh')) {
-          // Show a "No results" category heading, then a no-results illustration below it
-          items.push(new CategoryHeadingItem({
-            id: searchCategory,
-            title: formatMessage(messages.emojiPickerNoResults),
-            className: categoryClassname
-          }));
-          items.push(new NoResultsItem({
-            onOpenUpload,
-            uploadEnabled
-          }));
-        } else {
-          // Only a single "result" category
-          items = [...items, ...buildVirtualItemFromGroup({
-            category: searchCategory,
-            title: search.name,
-            emojis,
-            order: search.order
-          })];
-        }
+        const search = CategoryDescriptionMap.SEARCH;
+        // Only a single "result" category
+        items = [...items, ...buildVirtualItemFromGroup({
+          category: searchCategory,
+          title: search.name,
+          emojis,
+          order: search.order
+        })];
       } else {
         // Group by category
 
@@ -203,7 +185,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allEmojiGroups, loading, query, emojis, onOpenUpload, uploadEnabled, formatMessage]);
+  }, [allEmojiGroups, loading, query, emojis]);
   const findCategoryToActivate = row => {
     let category = null;
     if (row instanceof CategoryHeadingItem) {
@@ -312,12 +294,8 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [virtualItems, categoriesChanged]);
   const virtualListHeight = useMemo(() => {
-    if (query && emojis.length === 0 && fg('platform_emoji_picker_refresh')) {
-      // No-results state: expand the list height to fit heading + illustration without scrolling
-      return sizes.categoryHeadingHeight + sizes.noResultsHeight + emojiPickerHeightOffset(size);
-    }
     return fg('platform_emoji_picker_refresh') ? sizes.listHeightNew + emojiPickerHeightOffset(size) : sizes.listHeight + emojiPickerHeightOffset(size);
-  }, [size, query, emojis.length]);
+  }, [size]);
   return /*#__PURE__*/React.createElement(EmojiPickerTabPanel, {
     showSearchResults: !!query
   }, /*#__PURE__*/React.createElement(EmojiActions, {

package/dist/es2019/components/picker/EmojiPickerSizes.js

@@ -13,8 +13,6 @@ export const sizes = {
   // 32px height
   loadingRowHeight: 150,
   // Fills remaining space without scrolling when loading.
-  noResultsHeight: 300,
-  // illustration (200px) + button + padding + gap
   uploadActionHeight: 40,
   // 40px height
   emojiPerRow: 8

package/dist/es2019/components/picker/EmojiPickerVirtualItems.js

@@ -7,7 +7,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import Spinner from '@atlaskit/spinner';
 import EmojiPickerCategoryHeading from './EmojiPickerCategoryHeading';
 import EmojiPickerEmojiRow from './EmojiPickerEmojiRow';
-import EmojiPickerNoResults from './EmojiPickerNoResults';
 import { sizes } from './EmojiPickerSizes';
 const emojiPickerSpinner = null;
 export class AbstractItem {
@@ -40,12 +39,6 @@ export class CategoryHeadingItem extends AbstractItem {
     _defineProperty(this, "renderItem", () => /*#__PURE__*/React.createElement(EmojiPickerCategoryHeading, this.props));
   }
 }
-export class NoResultsItem extends AbstractItem {
-  constructor(props) {
-    super(props, sizes.noResultsHeight);
-    _defineProperty(this, "renderItem", () => /*#__PURE__*/React.createElement(EmojiPickerNoResults, this.props));
-  }
-}
 export const virtualItemRenderer = (rows, context) => {
   const {
     index,

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

@@ -9,7 +9,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "70.11.1",
+    packageVersion: "70.12.0",
     ...attributes
   }
 });