@atlaskit/emoji 70.11.0 → 70.11.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/emoji
 
+## 70.11.2
+
+### Patch Changes
+
+- [`73c9a0824c93e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73c9a0824c93e) -
+  Add a new empty state for no results in emoji picker
+
+## 70.11.1
+
+### Patch Changes
+
+- [`f9457ee7bd8fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f9457ee7bd8fc) -
+  Add file type validation to emoji picker.
+- Updated dependencies
+
 ## 70.11.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -43,6 +43,9 @@
 		{
 			"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,6 +43,9 @@
 		{
 			"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/components/common/EmojiUploadPicker.js

@@ -43,6 +43,8 @@ var uploadChooseFileEmojiName = null;
 var uploadChooseFileMessage = null;
 var uploadChooseFileRow = null;
 var uploadChooseFileRowNew = null;
+var supportedEmojiUploadMimeTypes = new Set(['image/png', 'image/jpeg', 'image/gif']);
+var supportedEmojiUploadExtensions = ['.png', '.jpg', '.jpeg', '.gif'];
 var uploadEmojiNameInputTestId = exports.uploadEmojiNameInputTestId = 'upload-emoji-name-input';
 var uploadEmojiComponentTestId = exports.uploadEmojiComponentTestId = 'upload-emoji-component';
 var cancelEmojiUploadPickerTestId = exports.cancelEmojiUploadPickerTestId = 'cancel-emoji-upload-picker';
@@ -59,6 +61,18 @@ var toEmojiName = function toEmojiName(uploadName) {
   var name = uploadName.split('_').join(' ');
   return "".concat(name.substr(0, 1).toLocaleUpperCase()).concat(name.substr(1));
 };
+var isSupportedEmojiUploadFileType = function isSupportedEmojiUploadFileType(file) {
+  if (!(0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
+    return true;
+  }
+  if (supportedEmojiUploadMimeTypes.has(file.type)) {
+    return true;
+  }
+  var lowerCaseFileName = file.name.toLowerCase();
+  return supportedEmojiUploadExtensions.some(function (extension) {
+    return lowerCaseFileName.endsWith(extension);
+  });
+};
 var ChooseEmojiFile = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _props$name = props.name,
     name = _props$name === void 0 ? '' : _props$name,
@@ -342,6 +356,11 @@ var EmojiUploadPicker = function EmojiUploadPicker(props) {
     if (files.length) {
       var reader = new FileReader();
       var file = files[0];
+      if (!isSupportedEmojiUploadFileType(file)) {
+        setChooseEmojiErrorMessage( /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.emojiUnsupportedFileType));
+        cancelChooseFile();
+        return;
+      }
       if (ImageUtil.hasFileExceededSize(file)) {
         setChooseEmojiErrorMessage( /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.emojiImageTooBig));
         cancelChooseFile();

package/dist/cjs/components/i18n.js

@@ -221,11 +221,26 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
     defaultMessage: 'Selected image is more than 1 MB',
     description: 'Error message for image too big, beyond the size limit'
   },
+  emojiUnsupportedFileType: {
+    id: 'fabric.emoji.error.unsupported.file.type',
+    defaultMessage: "This file type isn't supported. Select a PNG, JPEG, or GIF to create your emoji.",
+    description: 'Error message shown when the selected emoji upload file type is not supported'
+  },
   emojiDuplicateName: {
     id: 'fabric.emoji.error.duplicate.name',
     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,13 +21,16 @@
 ._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,6 +76,12 @@ 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,
@@ -150,6 +156,7 @@ 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);
@@ -191,8 +198,11 @@ 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]);
+  }, [activeCategory, uploading, emojiToDelete, query]);
   var calculateElapsedTime = function calculateElapsedTime() {
     return Date.now() - openTime.current;
   };
@@ -409,6 +419,10 @@ 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);
@@ -416,7 +430,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       // scroll to top when search, which is search results section
       scrollToTopOfList();
     }
-  }, [query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
+  }, [activeCategory, 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).
@@ -637,7 +651,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] : 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] : query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
       style: {
         "--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
         "--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
@@ -682,7 +696,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       onOpenUpload: onOpenUpload,
       size: size,
       activeCategoryId: activeCategory
-    }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
+    }), 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, {
       selectedEmoji: selectedEmoji,
       uploadEnabled: isUploadSupported && !uploading,
       onOpenUpload: onOpenUpload
@@ -697,7 +711,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] : 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] : query && filteredEmojis.length === 0 && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]]),
     style: {
       "--_19dn98e": (0, _runtime.ix)("".concat(emojiPickerHeight, "px")),
       "--_gsvyy7": (0, _runtime.ix)("".concat(emojiPickerWidth, "px"))
@@ -736,7 +750,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onOpenUpload: onOpenUpload,
     size: size,
     activeCategoryId: activeCategory
-  }), showPreview && !(emojiToDelete && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(_EmojiPickerFooter.default, {
+  }), 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, {
     selectedEmoji: selectedEmoji,
     uploadEnabled: isUploadSupported && !uploading,
     onOpenUpload: onOpenUpload

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

@@ -8,6 +8,7 @@ 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");
@@ -20,6 +21,7 @@ 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
@@ -68,6 +70,8 @@ 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),
@@ -185,14 +189,27 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
       items.push(new _EmojiPickerVirtualItems.LoadingItem());
     } else {
       if (query) {
-        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
-        })));
+        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
+          })));
+        }
       } else {
         // Group by category
 
@@ -217,7 +234,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allEmojiGroups, loading, query, emojis]);
+  }, [allEmojiGroups, loading, query, emojis, onOpenUpload, uploadEnabled, formatMessage]);
   var findCategoryToActivate = function findCategoryToActivate(row) {
     var category = null;
     if (row instanceof _EmojiPickerVirtualItems.CategoryHeadingItem) {
@@ -327,8 +344,12 @@ 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]);
+  }, [size, query, emojis.length]);
   return /*#__PURE__*/_react.default.createElement(_EmojiPickerTabPanel.default, {
     showSearchResults: !!query
   }, /*#__PURE__*/_react.default.createElement(_EmojiActions.default, {

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

@@ -0,0 +1,12 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}._19bvpxbi{padding-left:var(--ds-space-200,1pc)}
+._1bah1h6o{justify-content:center}
+._1bsb1osq{width:100%}
+._1e0c1txw{display:flex}
+._2lx21bp4{flex-direction:column}
+._4cvr1h6o{align-items:center}
+._ca0q1ejb{padding-top:var(--ds-space-300,24px)}
+._n3td1ejb{padding-bottom:var(--ds-space-300,24px)}
+._u5f3pxbi{padding-right:var(--ds-space-200,1pc)}
+._vchhusvi{box-sizing:border-box}
+._y3gn1h6o{text-align:center}

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

@@ -0,0 +1,50 @@
+/* EmojiPickerNoResults.tsx generated by @compiled/babel-plugin v0.39.1 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.RENDER_EMOJI_PICKER_NO_RESULTS_TESTID = void 0;
+require("./EmojiPickerNoResults.compiled.css");
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
+var _runtime = require("@compiled/react/runtime");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _reactIntl = require("react-intl");
+var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
+var _image = _interopRequireDefault(require("@atlaskit/image"));
+var _i18n = require("../i18n");
+var _dark = _interopRequireDefault(require("./assets/spot/search-no-result/dark.svg"));
+var _light = _interopRequireDefault(require("./assets/spot/search-no-result/light.svg"));
+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); }
+var noResultsContainer = null;
+var RENDER_EMOJI_PICKER_NO_RESULTS_TESTID = exports.RENDER_EMOJI_PICKER_NO_RESULTS_TESTID = 'render-emoji-picker-no-results';
+var EmojiPickerNoResults = function EmojiPickerNoResults(_ref) {
+  var onOpenUpload = _ref.onOpenUpload,
+    uploadEnabled = _ref.uploadEnabled;
+  var handleOpenUpload = (0, _react.useCallback)(function (event) {
+    if ((0, _platformFeatureFlags.fg)('platform_emoji_keep_picker_open_on_upload')) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    onOpenUpload();
+  }, [onOpenUpload]);
+  return /*#__PURE__*/React.createElement("div", {
+    "data-testid": RENDER_EMOJI_PICKER_NO_RESULTS_TESTID,
+    className: (0, _runtime.ax)(["_zulppxbi _1e0c1txw _2lx21bp4 _4cvr1h6o _1bah1h6o _ca0q1ejb _u5f3pxbi _n3td1ejb _19bvpxbi _y3gn1h6o _1bsb1osq _vchhusvi"])
+  }, /*#__PURE__*/React.createElement(_image.default, {
+    src: _light.default,
+    srcDark: _dark.default,
+    alt: "",
+    width: 200
+  }), uploadEnabled && /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _i18n.messages.emojiPickerAddCustomEmoji, function (label) {
+    return /*#__PURE__*/React.createElement(_standardButton.default, {
+      onClick: handleOpenUpload,
+      appearance: "default",
+      tabIndex: 0
+    }, label);
+  }));
+};
+var _default = exports.default = EmojiPickerNoResults;

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

@@ -19,6 +19,8 @@ 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.LoadingItem = exports.EmojisRowItem = exports.CategoryHeadingItem = exports.AbstractItem = void 0;
+exports.virtualItemRenderer = exports.NoResultsItem = 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,6 +20,7 @@ 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)); }
@@ -75,6 +76,19 @@ 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.10.14"
+      packageVersion: "70.11.1"
     }, attributes)
   };
 };

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

@@ -32,6 +32,8 @@ const uploadChooseFileEmojiName = null;
 const uploadChooseFileMessage = null;
 const uploadChooseFileRow = null;
 const uploadChooseFileRowNew = null;
+const supportedEmojiUploadMimeTypes = new Set(['image/png', 'image/jpeg', 'image/gif']);
+const supportedEmojiUploadExtensions = ['.png', '.jpg', '.jpeg', '.gif'];
 export const uploadEmojiNameInputTestId = 'upload-emoji-name-input';
 export const uploadEmojiComponentTestId = 'upload-emoji-component';
 export const cancelEmojiUploadPickerTestId = 'cancel-emoji-upload-picker';
@@ -48,6 +50,16 @@ const toEmojiName = uploadName => {
   const name = uploadName.split('_').join(' ');
   return `${name.substr(0, 1).toLocaleUpperCase()}${name.substr(1)}`;
 };
+const isSupportedEmojiUploadFileType = file => {
+  if (!fg('platform_emoji_picker_refresh')) {
+    return true;
+  }
+  if (supportedEmojiUploadMimeTypes.has(file.type)) {
+    return true;
+  }
+  const lowerCaseFileName = file.name.toLowerCase();
+  return supportedEmojiUploadExtensions.some(extension => lowerCaseFileName.endsWith(extension));
+};
 const ChooseEmojiFile = /*#__PURE__*/memo(props => {
   const {
     name = '',
@@ -297,6 +309,11 @@ const EmojiUploadPicker = props => {
     if (files.length) {
       const reader = new FileReader();
       const file = files[0];
+      if (!isSupportedEmojiUploadFileType(file)) {
+        setChooseEmojiErrorMessage( /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiUnsupportedFileType));
+        cancelChooseFile();
+        return;
+      }
       if (ImageUtil.hasFileExceededSize(file)) {
         setChooseEmojiErrorMessage( /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiImageTooBig));
         cancelChooseFile();

package/dist/es2019/components/i18n.js

@@ -215,11 +215,26 @@ export const messages = defineMessages({
     defaultMessage: 'Selected image is more than 1 MB',
     description: 'Error message for image too big, beyond the size limit'
   },
+  emojiUnsupportedFileType: {
+    id: 'fabric.emoji.error.unsupported.file.type',
+    defaultMessage: "This file type isn't supported. Select a PNG, JPEG, or GIF to create your emoji.",
+    description: 'Error message shown when the selected emoji upload file type is not supported'
+  },
   emojiDuplicateName: {
     id: 'fabric.emoji.error.duplicate.name',
     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,13 +21,16 @@
 ._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,6 +60,12 @@ 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,
@@ -92,6 +98,7 @@ 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);
@@ -133,8 +140,11 @@ const EmojiPickerComponent = ({
     }
     if (activeCategory !== category) {
       setActiveCategory(category);
+      if (!query && fg('platform_emoji_picker_refresh')) {
+        lastNonSearchCategory.current = category;
+      }
     }
-  }, [activeCategory, uploading, emojiToDelete]);
+  }, [activeCategory, uploading, emojiToDelete, query]);
   const calculateElapsedTime = () => {
     return Date.now() - openTime.current;
   };
@@ -347,6 +357,10 @@ 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);
@@ -354,7 +368,7 @@ const EmojiPickerComponent = ({
       // scroll to top when search, which is search results section
       scrollToTopOfList();
     }
-  }, [query, filteredEmojis, selectedTone, updateEmojis, scrollToTopOfList]);
+  }, [activeCategory, 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).
@@ -547,7 +561,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] : 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] : query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
     }, /*#__PURE__*/React.createElement("div", {
       role: "presentation",
       onKeyPress: suppressKeyPress,
@@ -588,7 +602,7 @@ const EmojiPickerComponent = ({
       onOpenUpload: onOpenUpload,
       size: size,
       activeCategoryId: activeCategory
-    }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
+    }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
       selectedEmoji: selectedEmoji,
       uploadEnabled: isUploadSupported && !uploading,
       onOpenUpload: onOpenUpload
@@ -603,7 +617,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] : 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] : query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh') ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size]])
   }, /*#__PURE__*/React.createElement(CategorySelector, {
     activeCategoryId: (uploading || emojiToDelete) && fg('platform_emoji_picker_refresh') ? null : activeCategory,
     dynamicCategories: dynamicCategories,
@@ -638,7 +652,7 @@ const EmojiPickerComponent = ({
     onOpenUpload: onOpenUpload,
     size: size,
     activeCategoryId: activeCategory
-  }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
+  }), showPreview && !(emojiToDelete && fg('platform_emoji_picker_refresh')) && !(query && filteredEmojis.length === 0 && fg('platform_emoji_picker_refresh')) && /*#__PURE__*/React.createElement(EmojiPickerFooter, {
     selectedEmoji: selectedEmoji,
     uploadEnabled: isUploadSupported && !uploading,
     onOpenUpload: onOpenUpload