@atlaskit/emoji 67.0.7 → 67.2.0

package/dist/esm/components/i18n.js

@@ -22,8 +22,8 @@ export var messages = defineMessages({
   },
   emojiPlaceholder: {
     id: 'fabric.emoji.placeholder',
-    defaultMessage: 'Emoji name',
-    description: 'Placeholder for emoji'
+    defaultMessage: 'e.g. hello',
+    description: 'Placeholder for emoji that provides an example for emoji name'
   },
   emojiNameAriaLabel: {
     id: 'fabric.emoji.name.ariaLabel',
@@ -42,9 +42,14 @@ export var messages = defineMessages({
   },
   emojiSelectSkinToneButtonAriaLabelText: {
     id: 'fabric.emoji.select.skin.tone.ariaLabel',
-    defaultMessage: 'Select skin tone, {selectedTone}',
+    defaultMessage: 'Choose your skin tone, {selectedTone} selected',
     description: 'Message indicating the purpose of the skin tone selection button and the selected tone'
   },
+  emojiSelectSkinToneListAriaLabelText: {
+    id: 'fabric.emoji.select.skin.list.ariaLabel',
+    defaultMessage: 'Skin tone selector',
+    description: 'Message indicating the purpose of the skin tone list and make user to choose one tone'
+  },
   emojiImageRequirements: {
     id: 'fabric.emoji.image.requirements',
     defaultMessage: 'JPG, PNG or GIF. Max size 1 MB.',
@@ -82,9 +87,24 @@ export var messages = defineMessages({
   },
   searchLabel: {
     id: 'fabric.emoji.search.label',
-    defaultMessage: 'Search emoji',
+    defaultMessage: 'Emoji name',
     description: 'verb - button label to search'
   },
+  searchResultsStatus: {
+    id: 'fabric.emoji.search.status',
+    defaultMessage: 'Found {count} emojis',
+    description: 'search results status for screenreader to read out'
+  },
+  searchResultsStatusSeeAll: {
+    id: 'fabric.emoji.search.status',
+    defaultMessage: 'Seeing all emojis',
+    description: 'search results status when no search query for screenreader to read out'
+  },
+  categoriesSelectorLabel: {
+    id: 'fabric.emoji.categories.label',
+    defaultMessage: 'Choose a emoji category',
+    description: 'Aria label for Emoji categories selector at the top of emoji picker'
+  },
   categoriesSearchResults: {
     id: 'fabric.emoji.categories.search.results',
     defaultMessage: 'Search results',
@@ -169,5 +189,25 @@ export var messages = defineMessages({
     id: 'fabric.emoji.error.image.too.big',
     defaultMessage: 'Selected image is more than 1 MB',
     description: 'Error message for image too big, beyond the size limit'
+  },
+  emojiPickerTitle: {
+    id: 'fabric.emoji.picker',
+    defaultMessage: 'Emoji picker',
+    description: 'Aria label for emoji picker'
+  },
+  emojiPickerListPanel: {
+    id: 'fabric.emoji.pickerlist.tabpanel',
+    defaultMessage: 'Emojis actions and list panel',
+    description: 'Aria lable for tabpanel of emoji picker, which shows emojis actions and list'
+  },
+  emojiPickerGrid: {
+    id: 'fabric.emoji.pickerlist.grid',
+    defaultMessage: '{showSearchResults, select, true{Search results} other{Emojis}}',
+    description: "Aria label for emoji picker grid, showSearchResults is a boolean variable, message will be \"Entering Emojis table\", or \"Leaving Emojis\""
+  },
+  emojiButtonRoleDescription: {
+    id: 'fabric.emoji.emojipicker.emoi.roledescription',
+    defaultMessage: 'emoji button',
+    description: "Aria roledescription for emoji button, used in emoji picker."
   }
 });

package/dist/esm/components/picker/CategorySelector.js

@@ -1,21 +1,15 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
-import React from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { jsx } from '@emotion/react';
-import { PureComponent } from 'react';
-import { injectIntl } from 'react-intl-next';
-import { defaultCategories } from '../../util/constants';
+import { useIntl } from 'react-intl-next';
+import Tooltip from '@atlaskit/tooltip';
+import { CATEGORYSELECTOR_KEYBOARD_KEYS_SUPPORTED, defaultCategories, KeyboardKeys } from '../../util/constants';
 import { messages } from '../i18n';
 import { CategoryDescriptionMap } from './categories';
-import { active, categorySelector, disable, categoryStyles } from './styles';
+import { active, categorySelector, disable, categoryStyles, categorySelectorTablist } from './styles';
+import { usePrevious } from '../../hooks/usePrevious';
+import { RENDER_EMOJI_PICKER_LIST_TESTID } from './EmojiPickerList';
 export var sortCategories = function sortCategories(c1, c2) {
   return CategoryDescriptionMap[c1].order - CategoryDescriptionMap[c2].order;
 };
@@ -31,94 +25,119 @@ export var categorySelectorComponentTestId = 'category-selector-component';
 export var categorySelectorCategoryTestId = function categorySelectorCategoryTestId(categoryId) {
   return "category-selector-".concat(categoryId);
 };
-var CategorySelector = /*#__PURE__*/function (_PureComponent) {
-  _inherits(CategorySelector, _PureComponent);
-  var _super = _createSuper(CategorySelector);
-  function CategorySelector(props) {
-    var _this;
-    _classCallCheck(this, CategorySelector);
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "onClick", function (event) {
-      var _this$props = _this.props,
-        onCategorySelected = _this$props.onCategorySelected,
-        disableCategories = _this$props.disableCategories;
+var CategorySelector = function CategorySelector(props) {
+  var disableCategories = props.disableCategories,
+    dynamicCategories = props.dynamicCategories,
+    activeCategoryId = props.activeCategoryId,
+    onCategorySelected = props.onCategorySelected;
+  var _useState = useState(addNewCategories(defaultCategories, dynamicCategories)),
+    _useState2 = _slicedToArray(_useState, 2),
+    categories = _useState2[0],
+    setCategories = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentFocus = _useState4[0],
+    setCurrentFocus = _useState4[1];
+  var categoryRef = useRef(null);
+  var prevDynamicCategories = usePrevious(dynamicCategories);
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var updateCategories = useCallback(function () {
+    var newCategories = addNewCategories(defaultCategories, dynamicCategories);
+    setCategories(newCategories);
+  }, [dynamicCategories]);
+  useEffect(function () {
+    if (prevDynamicCategories !== dynamicCategories) {
+      updateCategories();
+    }
+  }, [prevDynamicCategories, dynamicCategories, updateCategories]);
+  var focusCategory = useCallback(function (index) {
+    var _categoryRef$current;
+    var categoryToFocus = (_categoryRef$current = categoryRef.current) === null || _categoryRef$current === void 0 ? void 0 : _categoryRef$current.querySelector("[data-focus-index=\"".concat(index, "\"]"));
+    categoryToFocus && categoryToFocus.focus();
+    setCurrentFocus(index);
+  }, [categoryRef, setCurrentFocus]);
+  var handleKeyDown = function handleKeyDown(e) {
+    if (!CATEGORYSELECTOR_KEYBOARD_KEYS_SUPPORTED.includes(e.key)) {
+      return;
+    }
+    e.preventDefault();
+    var lastCategoryIndex = categories.length - 1;
+    switch (e.key) {
+      // navigate to the right category
+      case KeyboardKeys.ArrowRight:
+        focusCategory(currentFocus === lastCategoryIndex ? 0 : currentFocus + 1);
+        break;
+      // navigate to the left category
+      case KeyboardKeys.ArrowLeft:
+        focusCategory(currentFocus === 0 ? lastCategoryIndex : currentFocus - 1);
+        break;
+      // navigate to the first category
+      case KeyboardKeys.Home:
+        focusCategory(0);
+        break;
+      // navigate to the last category
+      case KeyboardKeys.End:
+        focusCategory(lastCategoryIndex);
+        break;
+    }
+  };
+  var handleClick = function handleClick(categoryId, index) {
+    return function (event) {
       if (disableCategories) {
         event.preventDefault();
         return;
       }
-      var categoryId = event.currentTarget.getAttribute('data-category-id');
       if (onCategorySelected) {
         onCategorySelected(categoryId);
       }
-    });
-    var dynamicCategories = props.dynamicCategories;
-    var categories = defaultCategories;
-    if (dynamicCategories) {
-      categories = addNewCategories(categories, dynamicCategories);
-    }
-    _this.state = {
-      categories: categories
+      setCurrentFocus(index);
     };
-    return _this;
-  }
-  _createClass(CategorySelector, [{
-    key: "UNSAFE_componentWillUpdate",
-    value: function UNSAFE_componentWillUpdate(nextProps) {
-      if (this.props.dynamicCategories !== nextProps.dynamicCategories) {
-        this.setState({
-          categories: addNewCategories(defaultCategories, nextProps.dynamicCategories)
-        });
+  };
+  var categoriesSection;
+  if (categories) {
+    categoriesSection = jsx("div", {
+      role: "tablist",
+      "aria-label": formatMessage(messages.categoriesSelectorLabel),
+      "data-testid": categorySelectorComponentTestId,
+      ref: categoryRef,
+      css: categorySelectorTablist
+    }, categories.map(function (categoryId, index) {
+      var category = CategoryDescriptionMap[categoryId];
+      var categoryClasses = [categoryStyles];
+      if (categoryId === activeCategoryId) {
+        categoryClasses.push(active);
       }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-      var _this$props2 = this.props,
-        disableCategories = _this$props2.disableCategories,
-        intl = _this$props2.intl;
-      var categories = this.state.categories;
-      var categoriesSection;
-      if (categories) {
-        var formatMessage = intl.formatMessage;
-        categoriesSection = jsx("ul", {
-          "data-testid": categorySelectorComponentTestId
-        }, categories.map(function (categoryId) {
-          var category = CategoryDescriptionMap[categoryId];
-          var categoryClasses = [categoryStyles];
-          if (categoryId === _this2.props.activeCategoryId) {
-            categoryClasses.push(active);
-          }
-          if (disableCategories) {
-            categoryClasses.push(disable);
-          }
-          var Icon = category.icon;
-          var categoryName = formatMessage(messages[category.name]);
-          return jsx("li", {
-            key: category.id
-          }, jsx("button", {
-            "aria-label": categoryName,
-            "data-category-id": category.id,
-            disabled: disableCategories,
-            css: categoryClasses,
-            onClick: _this2.onClick,
-            title: categoryName,
-            type: "button",
-            "data-testid": categorySelectorCategoryTestId(categoryId)
-          }, jsx(Icon, {
-            label: categoryName
-          })));
-        }));
+      if (disableCategories) {
+        categoryClasses.push(disable);
       }
-      return jsx("div", {
-        css: categorySelector
-      }, categoriesSection);
-    }
-  }]);
-  return CategorySelector;
-}(PureComponent);
-_defineProperty(CategorySelector, "defaultProps", {
-  onCategorySelected: function onCategorySelected() {},
-  dynamicCategories: []
-});
-export default injectIntl(CategorySelector);
+      var Icon = category.icon;
+      var categoryName = formatMessage(messages[category.name]);
+      return jsx(Tooltip, {
+        content: categoryName,
+        position: "bottom",
+        key: category.id
+      }, jsx("button", {
+        type: "button",
+        id: "category-selector-".concat(category.id),
+        "data-focus-index": index,
+        "aria-label": categoryName,
+        "aria-controls": currentFocus === index ? RENDER_EMOJI_PICKER_LIST_TESTID : undefined,
+        "aria-selected": currentFocus === index ? true : false,
+        css: categoryClasses,
+        disabled: disableCategories,
+        onClick: handleClick(categoryId, index),
+        "data-testid": categorySelectorCategoryTestId(categoryId),
+        tabIndex: currentFocus === index ? 0 : -1,
+        onKeyDown: handleKeyDown,
+        role: "tab"
+      }, jsx(Icon, {
+        label: categoryName
+      })));
+    }));
+  }
+  return jsx("div", {
+    css: categorySelector
+  }, categoriesSection);
+};
+export default CategorySelector;

package/dist/esm/components/picker/CategoryTracker.js

@@ -30,34 +30,6 @@ var CategoryTracker = /*#__PURE__*/function () {
     value: function getRow(category) {
       return this.categoryToRow.get(category);
     }
-  }, {
-    key: "findNearestCategoryAbove",
-    value: function findNearestCategoryAbove(startIndex, list) {
-      var rows = Array.from(this.rowToCategory.keys()).sort(function (a, b) {
-        return a - b;
-      });
-      if (rows.length === 0) {
-        return;
-      }
-
-      // Return first category if list not yet rendered
-      // or the top row is above the first category
-      if (!list || rows[0] > startIndex) {
-        return this.rowToCategory.get(rows[0]);
-      }
-      var bounds = [0, rows.length - 1];
-      var index = Math.floor(rows.length / 2);
-      while (rows[index] !== startIndex && bounds[0] < bounds[1]) {
-        if (rows[index] > startIndex) {
-          bounds[1] = Math.max(index - 1, 0);
-        } else {
-          bounds[0] = index + 1;
-        }
-        index = Math.floor((bounds[0] + bounds[1]) / 2);
-      }
-      var headerRow = rows[rows[index] > startIndex ? Math.max(index - 1, 0) : index];
-      return this.rowToCategory.get(headerRow);
-    }
   }]);
   return CategoryTracker;
 }();

package/dist/esm/components/picker/EmojiPickerCategoryHeading.js

@@ -5,7 +5,6 @@ import { FormattedMessage } from 'react-intl-next';
 import { isMessagesKey } from '../../util/type-helpers';
 import { messages } from '../i18n';
 import { emojiCategoryTitle } from './styles';
-
 /**
  * Test id for wrapper Emoji Picker List div
  */
@@ -18,7 +17,8 @@ var EmojiPickerCategoryHeading = function EmojiPickerCategoryHeading(_ref) {
     id: id,
     "data-category-id": id,
     className: className,
-    "data-testid": RENDER_EMOJI_PICKER_CATEGORY_HEADING_TESTID
+    "data-testid": RENDER_EMOJI_PICKER_CATEGORY_HEADING_TESTID,
+    role: "rowheader"
   }, jsx("div", {
     css: emojiCategoryTitle
   }, isMessagesKey(title) ? jsx(FormattedMessage, messages[title]) : title));

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

@@ -7,12 +7,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { useCallback, useEffect, useMemo, useRef, useState, createRef, memo } from 'react';
 import { jsx } from '@emotion/react';
 import { unstable_batchedUpdates as batchedUpdates } from 'react-dom';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage, useIntl } from 'react-intl-next';
 import { getEmojiVariation } from '../../api/EmojiRepository';
 import { supportsUploadFeature } from '../../api/EmojiResource';
 import { customCategory, defaultEmojiPickerSize, frequentCategory } from '../../util/constants';
 import { containsEmojiId, isPromise /*, isEmojiIdEqual, isEmojiLoaded*/, isEmojiDescription } from '../../util/type-helpers';
-import { SearchSort } from '../../types';
+import { SearchSort, SearchSourceTypes } from '../../types';
 import { getToneEmoji } from '../../util/filters';
 import { uploadEmoji } from '../common/UploadEmoji';
 import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
@@ -21,8 +21,9 @@ import EmojiPickerFooter from './EmojiPickerFooter';
 import EmojiPickerList from './EmojiPickerList';
 import { createAndFireEventInElementsChannel, categoryClickedEvent, closedPickerEvent, deleteBeginEvent, deleteCancelEvent, deleteConfirmEvent, openedPickerEvent, pickerClickedEvent, pickerSearchedEvent, selectedFileEvent, uploadBeginButton, uploadCancelButton, uploadConfirmButton, toneSelectorClosedEvent, ufoExperiences } from '../../util/analytics';
 import { emojiPicker } from './styles';
-import { useDidMount } from '../hooks';
 import { useEmoji } from '../../hooks/useEmoji';
+import { useIsMounted } from '../../hooks/useIsMounted';
+import { messages } from '../i18n';
 var FREQUENTLY_USED_MAX = 16;
 var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   var onSelection = _ref.onSelection,
@@ -31,6 +32,8 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     createAnalyticsEvent = _ref.createAnalyticsEvent,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? defaultEmojiPickerSize : _ref$size;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var _useEmoji = useEmoji(),
     emojiProvider = _useEmoji.emojiProvider,
     isUploadSupported = _useEmoji.isUploadSupported;
@@ -95,12 +98,11 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   }, []);
   var openTime = useRef(0);
   var isMounting = useRef(true);
-  var didMount = useDidMount();
-  var updateAfterDidMount = useRef(true);
   var previousEmojiProvider = useRef(emojiProvider);
   var currentUser = useMemo(function () {
     return emojiProvider.getCurrentUser();
   }, [emojiProvider]);
+  var isMounted = useIsMounted();
   var fireAnalytics = useCallback(function (analyticsEvent) {
     if (createAnalyticsEvent) {
       createAndFireEventInElementsChannel(analyticsEvent)(createAnalyticsEvent);
@@ -204,7 +206,11 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       emojiToRender: emojiToRender,
       searchEmoji: searchResults.emojis
     });
-  }, [frequentlyUsedEmojis, query, setStateAfterEmojiChange]);
+    fireAnalytics(pickerSearchedEvent({
+      queryLength: searchQuery.length,
+      numMatches: searchResults.emojis.length
+    }));
+  }, [frequentlyUsedEmojis, query, setStateAfterEmojiChange, fireAnalytics]);
   var onProviderChange = useMemo(function () {
     return {
       result: onSearchResult
@@ -294,22 +300,22 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   var onFileChooserClicked = useCallback(function () {
     fireAnalytics(selectedFileEvent());
   }, [fireAnalytics]);
+  var scrollToTopOfList = useCallback(function () {
+    var _emojiPickerList$curr;
+    (_emojiPickerList$curr = emojiPickerList.current) === null || _emojiPickerList$curr === void 0 ? void 0 : _emojiPickerList$curr.scrollToTop();
+  }, [emojiPickerList]);
   var onSearch = useCallback(function (searchQuery) {
     var options = {
-      skinTone: selectedTone
+      skinTone: selectedTone,
+      source: SearchSourceTypes.PICKER
     };
-    if (query) {
-      ufoExperiences['emoji-searched'].start();
-      ufoExperiences['emoji-searched'].addMetadata({
-        queryLength: query.length,
-        source: 'EmojiPickerComponent'
-      });
-    }
     if (searchQuery !== query) {
       setQuery(searchQuery);
+      // scroll to top when search, which is search results section
+      scrollToTopOfList();
     }
-    updateEmojis(query, options);
-  }, [query, selectedTone, updateEmojis]);
+    updateEmojis(searchQuery, options);
+  }, [query, selectedTone, updateEmojis, scrollToTopOfList]);
   var onOpenUpload = useCallback(function () {
     // Prime upload token so it's ready when the user adds
     if (supportsUploadFeature(emojiProvider)) {
@@ -321,12 +327,12 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     });
     fireAnalytics(uploadBeginButton());
   }, [emojiProvider, fireAnalytics]);
-  var scrollToEndOfList = useCallback(function () {
+  var scrollToUploadedEmoji = useCallback(function () {
     if (emojiPickerList.current) {
       // Wait a tick to ensure repaint and updated height for picker list
       window.setTimeout(function () {
-        var _emojiPickerList$curr;
-        (_emojiPickerList$curr = emojiPickerList.current) === null || _emojiPickerList$curr === void 0 ? void 0 : _emojiPickerList$curr.scrollToBottom();
+        var _emojiPickerList$curr2;
+        (_emojiPickerList$curr2 = emojiPickerList.current) === null || _emojiPickerList$curr2 === void 0 ? void 0 : _emojiPickerList$curr2.scrollToRecentlyUploaded();
       }, 0);
     }
   }, [emojiPickerList]);
@@ -343,10 +349,10 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
         setSelectedEmoji(emojiDescription);
         setUploading(false);
       });
-      scrollToEndOfList();
+      scrollToUploadedEmoji();
     };
     uploadEmoji(upload, emojiProvider, errorSetter, onSuccess, fireAnalytics, retry);
-  }, [emojiProvider, fireAnalytics, scrollToEndOfList]);
+  }, [emojiProvider, fireAnalytics, scrollToUploadedEmoji]);
   var onTriggerDelete = useCallback(function (_emojiId, emoji) {
     if (_emojiId) {
       fireAnalytics(deleteBeginEvent({
@@ -397,11 +403,10 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   }
   useEffect(function () {
     // componentDidMount logic
-    if (didMount && updateAfterDidMount.current) {
+    if (!isMounted) {
       onComponentDidMount();
-      updateAfterDidMount.current = false;
     }
-  }, [didMount, onComponentDidMount]);
+  }, [onComponentDidMount, isMounted]);
   useEffect(function () {
     previousEmojiProvider.current.unsubscribe(onProviderChange);
     previousEmojiProvider.current = emojiProvider;
@@ -410,26 +415,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       emojiProvider.unsubscribe(onProviderChange);
     };
   }, [emojiProvider, onProviderChange]);
-  useEffect(function () {
-    // We changed provider which means we subscribed to filter results for a new subscriber.
-    // So we refresh the emoji display with onSearch and we do it here, after the new props have
-    // been set since onSearch leads to filter being called on the current emojiProvider.
-    // (Calling onSearch in a '...Will...' lifecycle method would lead to filter being called on
-    // an emojiProvider we have already unsubscribed from)
-    onSearch(query);
-  }, [emojiProvider, onSearch, query]);
-  useEffect(function () {
-    // Fire analytics event whenever query changes
-    fireAnalytics(pickerSearchedEvent({
-      queryLength: query.length,
-      numMatches: filteredEmojis.length
-    }));
-    ufoExperiences['emoji-searched'].success({
-      metadata: {
-        emojisLength: filteredEmojis.length
-      }
-    });
-  }, [filteredEmojis.length, fireAnalytics, query]);
   useEffect(function () {
     if (!frequentlyUsedEmojis.length || query) {
       setFilteredEmojis(searchEmojis);
@@ -467,7 +452,10 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   return jsx("div", {
     css: emojiPicker(showPreview, size),
     ref: onPickerRef,
-    "data-emoji-picker-container": true
+    "data-emoji-picker-container": true,
+    role: "dialog",
+    "aria-label": formatMessage(messages.emojiPickerTitle),
+    "aria-modal": true
   }, jsx(CategorySelector, {
     activeCategoryId: activeCategory,
     dynamicCategories: dynamicCategories,
@@ -499,7 +487,8 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onCloseDelete: onCloseDelete,
     onFileChooserClicked: onFileChooserClicked,
     onOpenUpload: onOpenUpload,
-    size: size
+    size: size,
+    activeCategoryId: activeCategory
   }), showPreview && jsx(EmojiPickerFooter, {
     selectedEmoji: selectedEmoji
   }));

package/dist/esm/components/picker/EmojiPickerEmojiRow.js

@@ -1,32 +1,60 @@
 /** @jsx jsx */
 import { memo } from 'react';
 import { jsx } from '@emotion/react';
+import { useIntl } from 'react-intl-next';
 import CachingEmoji from '../common/CachingEmoji';
 import { emojiItem, emojiPickerRow } from './styles';
+import { useEmojiPickerListContext } from '../../hooks/useEmojiPickerListContext';
+import { messages } from '../i18n';
 var EmojiPickerEmojiRow = function EmojiPickerEmojiRow(_ref) {
   var emojis = _ref.emojis,
     onSelected = _ref.onSelected,
     onMouseMove = _ref.onMouseMove,
+    onFocus = _ref.onFocus,
     title = _ref.title,
     showDelete = _ref.showDelete,
-    onDelete = _ref.onDelete;
+    onDelete = _ref.onDelete,
+    virtualItemContext = _ref.virtualItemContext;
+  var _useEmojiPickerListCo = useEmojiPickerListContext(),
+    currentEmojisFocus = _useEmojiPickerListCo.currentEmojisFocus,
+    setEmojisFocus = _useEmojiPickerListCo.setEmojisFocus;
+  var rowIndex = (virtualItemContext === null || virtualItemContext === void 0 ? void 0 : virtualItemContext.index) || 0;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var handleFocus = function handleFocus(index) {
+    return function (emojiId, emoji, event) {
+      setEmojisFocus({
+        rowIndex: rowIndex,
+        columnIndex: index
+      });
+      onFocus && onFocus(emojiId, emoji, event);
+    };
+  };
   return jsx("div", {
-    css: emojiPickerRow
-  }, emojis.map(function (emoji) {
+    css: emojiPickerRow,
+    role: "presentation"
+  }, emojis.map(function (emoji, index) {
     var shortName = emoji.shortName,
       id = emoji.id;
     var key = id ? "".concat(id, "-").concat(title) : "".concat(shortName, "-").concat(title);
+    var focus = currentEmojisFocus.rowIndex === rowIndex && currentEmojisFocus.columnIndex === index;
     return jsx("span", {
       css: emojiItem,
-      key: key
+      key: key,
+      role: "gridcell",
+      "aria-colindex": index + 1 // aria-colindex is 1 based
     }, jsx(CachingEmoji, {
       emoji: emoji,
       selectOnHover: true,
       onSelected: onSelected,
       onMouseMove: onMouseMove,
+      onFocus: handleFocus(index),
       showDelete: showDelete,
       onDelete: onDelete,
       placeholderSize: 24,
+      "data-focus-index": "".concat(rowIndex, "-").concat(index),
+      tabIndex: focus ? 0 : -1,
+      "aria-roledescription": formatMessage(messages.emojiButtonRoleDescription),
       shouldBeInteractive: true
     }));
   }));