@atlaskit/emoji 67.1.0 → 67.2.1

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

@@ -1,22 +1,25 @@
 "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.ToneSelectorInternal = void 0;
+exports.toneSelectorTestId = exports.default = exports.ToneSelectorInternal = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _EmojiButton = _interopRequireDefault(require("./EmojiButton"));
+var _react = require("@emotion/react");
+var _react2 = require("react");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _analytics = require("../../util/analytics");
 var _setSkinToneAriaLabelText = require("./setSkinToneAriaLabelText");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _EmojiRadioButton = _interopRequireDefault(require("./EmojiRadioButton"));
+var _reactIntlNext = require("react-intl-next");
+var _i18n = require("../i18n");
+var _styles = require("./styles");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var toneSelectorTestId = 'tone-selector';
+exports.toneSelectorTestId = toneSelectorTestId;
 var extractAllTones = function extractAllTones(emoji) {
   if (emoji.skinVariations) {
     return [emoji].concat((0, _toConsumableArray2.default)(emoji.skinVariations));
@@ -26,24 +29,39 @@ var extractAllTones = function extractAllTones(emoji) {
 var ToneSelectorInternal = function ToneSelectorInternal(props) {
   var createAnalyticsEvent = props.createAnalyticsEvent,
     emoji = props.emoji,
-    previewEmojiId = props.previewEmojiId,
-    onToneSelected = props.onToneSelected;
-  var isMounted = (0, _react.useRef)(false);
-  var firstToneButtonRef = (0, _react.useRef)(null);
-  var emojiToneCollection = (0, _react.useMemo)(function () {
-    return extractAllTones(emoji).map(function (tone, index) {
+    onToneSelected = props.onToneSelected,
+    onToneClose = props.onToneClose,
+    selectedTone = props.selectedTone,
+    isVisible = props.isVisible;
+  var isMounted = (0, _react2.useRef)(false);
+  var selectedToneRadioRef = (0, _react2.useRef)(null);
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var emojiToneCollection = (0, _react2.useMemo)(function () {
+    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: (0, _setSkinToneAriaLabelText.setSkinToneAriaLabelText)(tone.name),
-        toneId: index
+        toneIndex: index
       });
     });
-  }, [emoji, previewEmojiId]);
-  (0, _react.useEffect)(function () {
-    if (firstToneButtonRef.current) {
-      firstToneButtonRef.current.focus();
+
+    // 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]);
+  (0, _react2.useEffect)(function () {
+    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) {
       (0, _analytics.createAndFireEventInElementsChannel)(event)(createAnalyticsEvent);
@@ -51,6 +69,10 @@ 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((0, _analytics.toneSelectedEvent)({
@@ -62,19 +84,25 @@ var ToneSelectorInternal = function ToneSelectorInternal(props) {
     fireAnalyticsEvent((0, _analytics.toneSelectorOpenedEvent)({}));
   }
   isMounted.current = true;
-  return /*#__PURE__*/_react.default.createElement("div", null, emojiToneCollection.map(function (tone) {
-    return /*#__PURE__*/_react.default.createElement(_EmojiButton.default, {
-      ref: tone.focused ? firstToneButtonRef : null,
-      shouldHideButton: tone.id === previewEmojiId,
+  return (0, _react.jsx)("div", {
+    role: "radiogroup",
+    "data-testid": toneSelectorTestId,
+    id: "emoji-picker-tone-selector",
+    "aria-label": formatMessage(_i18n.messages.emojiSelectSkinToneListAriaLabelText),
+    css: !isVisible && _styles.hidden
+  }, emojiToneCollection.map(function (tone) {
+    return (0, _react.jsx)(_EmojiRadioButton.default, {
+      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
     });
   }));
 };
 exports.ToneSelectorInternal = ToneSelectorInternal;
 var ToneSelector = (0, _analyticsNext.withAnalyticsEvents)()(ToneSelectorInternal);
-var _default = ToneSelector;
+var _default = /*#__PURE__*/(0, _react2.memo)(ToneSelector);
 exports.default = _default;

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

@@ -4,12 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uploadRetryButton = exports.uploadPreviewText = exports.uploadPreviewFooter = exports.uploadPreview = exports.uploadEmojiButton = exports.uploadChooseFileRow = exports.uploadChooseFileMessage = exports.uploadChooseFileEmojiName = exports.uploadChooseFileBrowse = exports.uploadAddRow = exports.submitDelete = exports.selectOnHoverStyles = exports.previewText = exports.previewImg = exports.previewButtonGroup = exports.preview = exports.placeholderContainerAnimated = exports.placeholderContainer = exports.placeholder = exports.hiddenToneButton = exports.emojiUploadTop = exports.emojiUploadBottom = exports.emojiUpload = exports.emojiToneSelectorContainer = exports.emojiStyles = exports.emojiSprite = exports.emojiShortName = exports.emojiScrollable = exports.emojiPreviewErrorMessage = exports.emojiPickerAddEmoji = exports.emojiNodeStyles = exports.emojiName = exports.emojiMainStyle = exports.emojiImage = exports.emojiDeleteErrorMessage = exports.emojiDeleteButton = exports.emojiContainer = exports.emojiChooseFileErrorMessage = exports.emojiButton = exports.emojiActionsWrapper = exports.deleteText = exports.deletePreview = exports.deleteFooter = exports.deleteButton = exports.commonSelectedStyles = exports.closeEmojiUploadButton = exports.cancelButton = exports.buttonSpinner = exports.bigEmojiPreview = exports.addCustomEmojiButton = exports.addCustomEmoji = void 0;
+exports.uploadRetryButton = exports.uploadPreviewText = exports.uploadPreviewFooter = exports.uploadPreview = exports.uploadEmojiButton = exports.uploadChooseFileRow = exports.uploadChooseFileMessage = exports.uploadChooseFileEmojiName = exports.uploadChooseFileBrowse = exports.uploadAddRow = exports.submitDelete = exports.selectOnHoverStyles = exports.previewText = exports.previewImg = exports.previewButtonGroup = exports.preview = exports.placeholderContainerAnimated = exports.placeholderContainer = exports.placeholder = exports.hidden = exports.emojiUploadTop = exports.emojiUploadBottom = exports.emojiUpload = exports.emojiToneSelectorContainer = exports.emojiStyles = exports.emojiSprite = exports.emojiShortName = exports.emojiScrollable = exports.emojiRadio = exports.emojiPreviewErrorMessage = exports.emojiPickerAddEmoji = exports.emojiNodeStyles = exports.emojiName = exports.emojiMainStyle = exports.emojiImage = exports.emojiDeleteErrorMessage = exports.emojiDeleteButton = exports.emojiContainer = exports.emojiChooseFileErrorMessage = exports.emojiButton = exports.emojiActionsWrapper = exports.deleteText = exports.deletePreview = exports.deleteFooter = exports.deleteButton = exports.commonSelectedStyles = exports.closeEmojiUploadButton = exports.cancelButton = exports.buttonSpinner = exports.bigEmojiPreview = exports.addCustomEmojiButton = exports.addCustomEmoji = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
-var _constants = require("@atlaskit/theme/constants");
-var _constants2 = require("../../util/constants");
+var _constants = require("../../util/constants");
 var _sharedStyles = require("../../util/shared-styles");
 var _colors = require("@atlaskit/theme/colors");
 var _css, _css2, _templateObject, _span, _css3, _css6, _input;
@@ -49,7 +48,7 @@ var emojiToneSelectorContainer = (0, _react.css)({
 });
 exports.emojiToneSelectorContainer = emojiToneSelectorContainer;
 var emojiStyles = (0, _react.css)((_css = {
-  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   backgroundColor: 'transparent',
   display: 'inline-block',
   verticalAlign: 'middle',
@@ -64,6 +63,10 @@ var emojiStyles = (0, _react.css)((_css = {
   visibility: 'visible'
 }), (0, _defineProperty2.default)(_css, "img", {
   display: 'block'
+}), (0, _defineProperty2.default)(_css, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(_colors.B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
 }), _css));
 exports.emojiStyles = emojiStyles;
 var emojiContainer = (0, _react.css)((_css2 = {
@@ -75,9 +78,13 @@ var emojiContainer = (0, _react.css)((_css2 = {
 }), (0, _defineProperty2.default)(_css2, ".".concat(emojiSprite), {
   background: 'transparent no-repeat',
   display: 'inline-block',
-  minHeight: "".concat(_constants2.defaultEmojiHeight, "px"),
-  minWidth: "".concat(_constants2.defaultEmojiHeight, "px"),
+  minHeight: "".concat(_constants.defaultEmojiHeight, "px"),
+  minWidth: "".concat(_constants.defaultEmojiHeight, "px"),
   verticalAlign: 'middle'
+}), (0, _defineProperty2.default)(_css2, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(_colors.B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
 }), _css2));
 exports.emojiContainer = emojiContainer;
 var placeholder = 'emoji-common-placeholder';
@@ -87,7 +94,7 @@ var placeholderContainer = (0, _react.css)({
   margin: '-1px 0',
   display: 'inline-block',
   background: "var(--ds-border, #f7f7f7)",
-  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   overflow: 'hidden',
   verticalAlign: 'middle',
   whiteSpace: 'nowrap',
@@ -107,16 +114,24 @@ var placeholderContainerAnimated = (0, _react.css)({
   }
 });
 exports.placeholderContainerAnimated = placeholderContainerAnimated;
+var hidden = (0, _react.css)({
+  opacity: 0,
+  visibility: 'hidden',
+  display: 'none'
+});
+exports.hidden = hidden;
 var emojiButton = (0, _react.css)((_css3 = {
   backgroundColor: 'transparent',
   border: '0',
+  borderRadius: "var(--ds-radius-100, 3px)",
   cursor: 'pointer',
-  padding: 0
+  padding: 0,
+  position: 'relative',
+  display: 'inline-block'
 }, (0, _defineProperty2.default)(_css3, '&::-moz-focus-inner', {
   border: '0 none',
   padding: 0
 }), (0, _defineProperty2.default)(_css3, '&>span', (_span = {
-  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
   padding: '6px'
 }, (0, _defineProperty2.default)(_span, "&>.".concat(emojiSprite), {
   height: '24px',
@@ -124,15 +139,29 @@ var emojiButton = (0, _react.css)((_css3 = {
 }), (0, _defineProperty2.default)(_span, "&>img", {
   height: '24px',
   width: '24px'
-}), _span)), _css3));
+}), _span)), (0, _defineProperty2.default)(_css3, '&:focus', {
+  boxShadow: "0 0 0 2px ".concat("var(--ds-border-focused, ".concat(_colors.B100, ")")),
+  transitionDuration: '0s, 0.2s',
+  outline: 'none'
+}), _css3));
 exports.emojiButton = emojiButton;
-var hiddenToneButton = (0, _react.css)({
-  // Hide currently selected tone that rendered in the ToneSelector to avoid duplication
-  display: 'none'
+var emojiRadio = (0, _react.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(_colors.B100, ")")),
+    transitionDuration: '0s, 0.2s',
+    outline: 'none'
+  }
 });
 
 // Emoji Preview
-exports.hiddenToneButton = hiddenToneButton;
+exports.emojiRadio = emojiRadio;
 var emojiPickerAddEmoji = 'emoji-picker-add-emoji';
 exports.emojiPickerAddEmoji = emojiPickerAddEmoji;
 var previewText = (0, _react.css)({
@@ -205,7 +234,7 @@ var previewImg = (0, _react.css)((_css6 = {
 exports.previewImg = previewImg;
 var emojiScrollable = (0, _react.css)({
   border: "1px solid ".concat("var(--ds-border, #fff)"),
-  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   display: 'block',
   margin: '0',
   overflowX: 'hidden',
@@ -279,7 +308,7 @@ var uploadPreview = (0, _react.css)({
   justifyContent: 'space-between',
   alignItems: 'center',
   background: "var(--ds-background-neutral, ".concat(_colors.N20, ")"),
-  borderRadius: "".concat((0, _constants.borderRadius)(), "px"),
+  borderRadius: "var(--ds-radius-100, 3px)",
   padding: '10px'
 });
 exports.uploadPreview = uploadPreview;

package/dist/cjs/components/i18n.js

@@ -28,8 +28,8 @@ var messages = (0, _reactIntlNext.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',
@@ -48,9 +48,14 @@ var messages = (0, _reactIntlNext.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.',
@@ -88,9 +93,24 @@ var messages = (0, _reactIntlNext.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',
@@ -175,6 +195,26 @@ var messages = (0, _reactIntlNext.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."
   }
 });
 exports.messages = messages;

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

@@ -6,24 +6,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortCategories = exports.default = exports.categorySelectorComponentTestId = exports.categorySelectorCategoryTestId = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
+var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _constants = require("../../util/constants");
 var _i18n = require("../i18n");
 var _categories = require("./categories");
 var _styles = require("./styles");
+var _usePrevious = require("../../hooks/usePrevious");
+var _EmojiPickerList = require("./EmojiPickerList");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+/** @jsx jsx */
+
 var sortCategories = function sortCategories(c1, c2) {
   return _categories.CategoryDescriptionMap[c1].order - _categories.CategoryDescriptionMap[c2].order;
 };
@@ -42,95 +39,120 @@ var categorySelectorCategoryTestId = function categorySelectorCategoryTestId(cat
   return "category-selector-".concat(categoryId);
 };
 exports.categorySelectorCategoryTestId = categorySelectorCategoryTestId;
-var CategorySelector = /*#__PURE__*/function (_PureComponent) {
-  (0, _inherits2.default)(CategorySelector, _PureComponent);
-  var _super = _createSuper(CategorySelector);
-  function CategorySelector(props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, CategorySelector);
-    _this = _super.call(this, props);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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 = (0, _react.useState)(addNewCategories(_constants.defaultCategories, dynamicCategories)),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    categories = _useState2[0],
+    setCategories = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    currentFocus = _useState4[0],
+    setCurrentFocus = _useState4[1];
+  var categoryRef = (0, _react.useRef)(null);
+  var prevDynamicCategories = (0, _usePrevious.usePrevious)(dynamicCategories);
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var updateCategories = (0, _react.useCallback)(function () {
+    var newCategories = addNewCategories(_constants.defaultCategories, dynamicCategories);
+    setCategories(newCategories);
+  }, [dynamicCategories]);
+  (0, _react.useEffect)(function () {
+    if (prevDynamicCategories !== dynamicCategories) {
+      updateCategories();
+    }
+  }, [prevDynamicCategories, dynamicCategories, updateCategories]);
+  var focusCategory = (0, _react.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 (!_constants.CATEGORYSELECTOR_KEYBOARD_KEYS_SUPPORTED.includes(e.key)) {
+      return;
+    }
+    e.preventDefault();
+    var lastCategoryIndex = categories.length - 1;
+    switch (e.key) {
+      // navigate to the right category
+      case _constants.KeyboardKeys.ArrowRight:
+        focusCategory(currentFocus === lastCategoryIndex ? 0 : currentFocus + 1);
+        break;
+      // navigate to the left category
+      case _constants.KeyboardKeys.ArrowLeft:
+        focusCategory(currentFocus === 0 ? lastCategoryIndex : currentFocus - 1);
+        break;
+      // navigate to the first category
+      case _constants.KeyboardKeys.Home:
+        focusCategory(0);
+        break;
+      // navigate to the last category
+      case _constants.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 = _constants.defaultCategories;
-    if (dynamicCategories) {
-      categories = addNewCategories(categories, dynamicCategories);
-    }
-    _this.state = {
-      categories: categories
+      setCurrentFocus(index);
     };
-    return _this;
-  }
-  (0, _createClass2.default)(CategorySelector, [{
-    key: "UNSAFE_componentWillUpdate",
-    value: function UNSAFE_componentWillUpdate(nextProps) {
-      if (this.props.dynamicCategories !== nextProps.dynamicCategories) {
-        this.setState({
-          categories: addNewCategories(_constants.defaultCategories, nextProps.dynamicCategories)
-        });
+  };
+  var categoriesSection;
+  if (categories) {
+    categoriesSection = (0, _react2.jsx)("div", {
+      role: "tablist",
+      "aria-label": formatMessage(_i18n.messages.categoriesSelectorLabel),
+      "data-testid": categorySelectorComponentTestId,
+      ref: categoryRef,
+      css: _styles.categorySelectorTablist
+    }, categories.map(function (categoryId, index) {
+      var category = _categories.CategoryDescriptionMap[categoryId];
+      var categoryClasses = [_styles.categoryStyles];
+      if (categoryId === activeCategoryId) {
+        categoryClasses.push(_styles.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 = (0, _react2.jsx)("ul", {
-          "data-testid": categorySelectorComponentTestId
-        }, categories.map(function (categoryId) {
-          var category = _categories.CategoryDescriptionMap[categoryId];
-          var categoryClasses = [_styles.categoryStyles];
-          if (categoryId === _this2.props.activeCategoryId) {
-            categoryClasses.push(_styles.active);
-          }
-          if (disableCategories) {
-            categoryClasses.push(_styles.disable);
-          }
-          var Icon = category.icon;
-          var categoryName = formatMessage(_i18n.messages[category.name]);
-          return (0, _react2.jsx)("li", {
-            key: category.id
-          }, (0, _react2.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)
-          }, (0, _react2.jsx)(Icon, {
-            label: categoryName
-          })));
-        }));
+      if (disableCategories) {
+        categoryClasses.push(_styles.disable);
       }
-      return (0, _react2.jsx)("div", {
-        css: _styles.categorySelector
-      }, categoriesSection);
-    }
-  }]);
-  return CategorySelector;
-}(_react.PureComponent);
-(0, _defineProperty2.default)(CategorySelector, "defaultProps", {
-  onCategorySelected: function onCategorySelected() {},
-  dynamicCategories: []
-});
-var _default = (0, _reactIntlNext.injectIntl)(CategorySelector);
+      var Icon = category.icon;
+      var categoryName = formatMessage(_i18n.messages[category.name]);
+      return (0, _react2.jsx)(_tooltip.default, {
+        content: categoryName,
+        position: "bottom",
+        key: category.id
+      }, (0, _react2.jsx)("button", {
+        type: "button",
+        id: "category-selector-".concat(category.id),
+        "data-focus-index": index,
+        "aria-label": categoryName,
+        "aria-controls": currentFocus === index ? _EmojiPickerList.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"
+      }, (0, _react2.jsx)(Icon, {
+        label: categoryName
+      })));
+    }));
+  }
+  return (0, _react2.jsx)("div", {
+    css: _styles.categorySelector
+  }, categoriesSection);
+};
+var _default = CategorySelector;
 exports.default = _default;

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

@@ -37,34 +37,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/cjs/components/picker/EmojiPickerCategoryHeading.js

@@ -24,7 +24,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"
   }, (0, _react.jsx)("div", {
     css: _styles.emojiCategoryTitle
   }, (0, _typeHelpers.isMessagesKey)(title) ? (0, _react.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages[title]) : title));