@atlaskit/emoji 67.1.0 → 67.2.1

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

@@ -2,11 +2,17 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React, { useEffect, useMemo, useRef } from 'react';
-import EmojiButton from './EmojiButton';
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import { memo, useEffect, useMemo, useRef } from 'react';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireEventInElementsChannel, toneSelectedEvent, toneSelectorOpenedEvent } from '../../util/analytics';
 import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
+import EmojiRadioButton from './EmojiRadioButton';
+import { useIntl } from 'react-intl-next';
+import { messages } from '../i18n';
+import { hidden } from './styles';
+export var toneSelectorTestId = 'tone-selector';
 var extractAllTones = function extractAllTones(emoji) {
   if (emoji.skinVariations) {
     return [emoji].concat(_toConsumableArray(emoji.skinVariations));
@@ -16,24 +22,39 @@ var extractAllTones = function extractAllTones(emoji) {
 export var ToneSelectorInternal = function ToneSelectorInternal(props) {
   var createAnalyticsEvent = props.createAnalyticsEvent,
     emoji = props.emoji,
-    previewEmojiId = props.previewEmojiId,
-    onToneSelected = props.onToneSelected;
+    onToneSelected = props.onToneSelected,
+    onToneClose = props.onToneClose,
+    selectedTone = props.selectedTone,
+    isVisible = props.isVisible;
   var isMounted = useRef(false);
-  var firstToneButtonRef = useRef(null);
+  var selectedToneRadioRef = useRef(null);
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var emojiToneCollection = useMemo(function () {
-    return extractAllTones(emoji).map(function (tone, index) {
+    var selectedToneIndex = -1;
+    var toneColletion = extractAllTones(emoji).map(function (tone, index) {
+      var isSelected = index === selectedTone;
+      if (isSelected) {
+        selectedToneIndex = index;
+      }
       return _objectSpread(_objectSpread({}, tone), {}, {
-        focused: tone.id !== previewEmojiId,
+        isSelected: isSelected,
         label: setSkinToneAriaLabelText(tone.name),
-        toneId: index
+        toneIndex: index
       });
     });
-  }, [emoji, previewEmojiId]);
+
+    // push description of selected tone to the end of the array
+    // so that it gets rendered last/rightmost
+    toneColletion.push(toneColletion.splice(selectedToneIndex, 1)[0]);
+    return toneColletion;
+  }, [emoji, selectedTone]);
   useEffect(function () {
-    if (firstToneButtonRef.current) {
-      firstToneButtonRef.current.focus();
+    if (isVisible) {
+      var _selectedToneRadioRef;
+      (_selectedToneRadioRef = selectedToneRadioRef.current) === null || _selectedToneRadioRef === void 0 ? void 0 : _selectedToneRadioRef.focus();
     }
-  }, [firstToneButtonRef]);
+  }, [isVisible, selectedToneRadioRef]);
   var fireAnalyticsEvent = function fireAnalyticsEvent(event) {
     if (createAnalyticsEvent) {
       createAndFireEventInElementsChannel(event)(createAnalyticsEvent);
@@ -41,6 +62,10 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
   };
   var onToneSelectedHandler = function onToneSelectedHandler(toneValue) {
     return function () {
+      if (selectedTone === toneValue && onToneClose) {
+        onToneClose();
+        return;
+      }
       onToneSelected(toneValue);
       var toneList = ['default', 'light', 'mediumLight', 'medium', 'mediumDark', 'dark'];
       fireAnalyticsEvent(toneSelectedEvent({
@@ -52,17 +77,23 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
     fireAnalyticsEvent(toneSelectorOpenedEvent({}));
   }
   isMounted.current = true;
-  return /*#__PURE__*/React.createElement("div", null, emojiToneCollection.map(function (tone) {
-    return /*#__PURE__*/React.createElement(EmojiButton, {
-      ref: tone.focused ? firstToneButtonRef : null,
-      shouldHideButton: tone.id === previewEmojiId,
+  return jsx("div", {
+    role: "radiogroup",
+    "data-testid": toneSelectorTestId,
+    id: "emoji-picker-tone-selector",
+    "aria-label": formatMessage(messages.emojiSelectSkinToneListAriaLabelText),
+    css: !isVisible && hidden
+  }, emojiToneCollection.map(function (tone) {
+    return jsx(EmojiRadioButton, {
+      ref: tone.isSelected ? selectedToneRadioRef : null,
+      defaultChecked: tone.isSelected,
       ariaLabelText: tone.label,
       key: "".concat(tone.id),
-      onSelected: onToneSelectedHandler(tone.toneId),
       emoji: tone,
+      onSelected: onToneSelectedHandler(tone.toneIndex),
       selectOnHover: true
     });
   }));
 };
 var ToneSelector = withAnalyticsEvents()(ToneSelectorInternal);
-export default ToneSelector;
+export default /*#__PURE__*/memo(ToneSelector);

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

@@ -2,10 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _css, _css2, _templateObject, _span, _css3, _css6, _input;
 import { css, keyframes } from '@emotion/react';
-import { borderRadius } from '@atlaskit/theme/constants';
 import { defaultEmojiHeight } from '../../util/constants';
 import { akEmojiSelectedBackgroundColor } from '../../util/shared-styles';
-import { N20, N200, N20A, N300, N900, R300, R400 } from '@atlaskit/theme/colors';
+import { B100, N20, N200, N20A, N300, N900, R300, R400 } from '@atlaskit/theme/colors';
 export var commonSelectedStyles = 'emoji-common-selected';
 export var selectOnHoverStyles = 'emoji-common-select-on-hover';
 export var emojiSprite = 'emoji-common-emoji-sprite';
@@ -33,7 +32,7 @@ export var emojiToneSelectorContainer = css({
   padding: '10px 10px 11px 0'
 });
 export var emojiStyles = css((_css = {
-  borderRadius: "".concat(borderRadius(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   backgroundColor: 'transparent',
   display: 'inline-block',
   verticalAlign: 'middle',
@@ -48,6 +47,10 @@ export var emojiStyles = css((_css = {
   visibility: 'visible'
 }), _defineProperty(_css, "img", {
   display: 'block'
+}), _defineProperty(_css, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
 }), _css));
 export var emojiContainer = css((_css2 = {
   display: 'inline-block',
@@ -61,6 +64,10 @@ export var emojiContainer = css((_css2 = {
   minHeight: "".concat(defaultEmojiHeight, "px"),
   minWidth: "".concat(defaultEmojiHeight, "px"),
   verticalAlign: 'middle'
+}), _defineProperty(_css2, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
 }), _css2));
 export var placeholder = 'emoji-common-placeholder';
 export var placeholderContainer = css({
@@ -68,7 +75,7 @@ export var placeholderContainer = css({
   margin: '-1px 0',
   display: 'inline-block',
   background: "var(--ds-border, #f7f7f7)",
-  borderRadius: "".concat(borderRadius(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   overflow: 'hidden',
   verticalAlign: 'middle',
   whiteSpace: 'nowrap',
@@ -86,16 +93,23 @@ export var placeholderContainerAnimated = css({
     animation: "".concat(easeSweep, " 1s cubic-bezier(0.4, 0.0, 0.2, 1) infinite")
   }
 });
+export var hidden = css({
+  opacity: 0,
+  visibility: 'hidden',
+  display: 'none'
+});
 export var emojiButton = css((_css3 = {
   backgroundColor: 'transparent',
   border: '0',
+  borderRadius: "var(--ds-radius-100, 3px)",
   cursor: 'pointer',
-  padding: 0
+  padding: 0,
+  position: 'relative',
+  display: 'inline-block'
 }, _defineProperty(_css3, '&::-moz-focus-inner', {
   border: '0 none',
   padding: 0
 }), _defineProperty(_css3, '&>span', (_span = {
-  borderRadius: "".concat(borderRadius(), "px"),
   padding: '6px'
 }, _defineProperty(_span, "&>.".concat(emojiSprite), {
   height: '24px',
@@ -103,10 +117,24 @@ export var emojiButton = css((_css3 = {
 }), _defineProperty(_span, "&>img", {
   height: '24px',
   width: '24px'
-}), _span)), _css3));
-export var hiddenToneButton = css({
-  // Hide currently selected tone that rendered in the ToneSelector to avoid duplication
-  display: 'none'
+}), _span)), _defineProperty(_css3, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
+}), _css3));
+export var emojiRadio = css({
+  opacity: 0,
+  position: 'absolute',
+  top: '-10px',
+  left: '-10px',
+  '+span': {
+    borderRadius: "var(--ds-radius-100, 3px)"
+  },
+  '&:focus + span': {
+    boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(B100, ")")),
+    transitionDuration: '0s, 0.2s',
+    outline: 'none'
+  }
 });
 
 // Emoji Preview
@@ -177,7 +205,7 @@ export var previewImg = css((_css6 = {
 
 export var emojiScrollable = css({
   border: "1px solid ".concat("var(--ds-border, #fff)"),
-  borderRadius: "".concat(borderRadius(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   display: 'block',
   margin: '0',
   overflowX: 'hidden',
@@ -242,7 +270,7 @@ export var uploadPreview = css({
   justifyContent: 'space-between',
   alignItems: 'center',
   background: "var(--ds-background-neutral, ".concat(N20, ")"),
-  borderRadius: "".concat(borderRadius(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   padding: '10px'
 });
 export var uploadPreviewText = css({

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,7 +7,7 @@ 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';
@@ -22,7 +22,8 @@ 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 { useEmoji } from '../../hooks/useEmoji';
-import { useIsMounted } from '../hooks';
+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;
@@ -324,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$curr2;
-        (_emojiPickerList$curr2 = emojiPickerList.current) === null || _emojiPickerList$curr2 === void 0 ? void 0 : _emojiPickerList$curr2.scrollToBottom();
+        (_emojiPickerList$curr2 = emojiPickerList.current) === null || _emojiPickerList$curr2 === void 0 ? void 0 : _emojiPickerList$curr2.scrollToRecentlyUploaded();
       }, 0);
     }
   }, [emojiPickerList]);
@@ -346,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({
@@ -449,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,