@atlaskit/emoji 71.0.0 → 71.0.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/emoji
 
+## 71.0.1
+
+### Patch Changes
+
+- [`371b9fd7ee6fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/371b9fd7ee6fb) -
+  Colour instead of skin tone picker when it is Atlassian emojis
+- Updated dependencies
+
 ## 71.0.0
 
 ### Major Changes

package/afm-cc/tsconfig.json

@@ -67,6 +67,9 @@
 		{
 			"path": "../../../design-system/primitives/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/radio/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/spinner/afm-cc/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -67,6 +67,9 @@
 		{
 			"path": "../../../design-system/primitives/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/radio/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../design-system/spinner/afm-products/tsconfig.json"
 		},

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

@@ -341,6 +341,7 @@ var ImageEmoji = exports.ImageEmoji = function ImageEmoji(props) {
   );
 };
 var EmojiNodeWrapper = exports.EmojiNodeWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _emoji$name;
   var emoji = props.emoji,
     fitToHeight = props.fitToHeight,
     selected = props.selected,
@@ -365,7 +366,7 @@ var EmojiNodeWrapper = exports.EmojiNodeWrapper = /*#__PURE__*/(0, _react.forwar
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var intl = (0, _react.useContext)(_reactIntl.IntlContext);
   var ariaLabel = intl && (0, _platformFeatureFlags.fg)('platform_change_emoji_button_label') ? intl.formatMessage(_i18n.messages.changeEmojiShortnameButtonLabel, {
-    shortName: emoji.shortName
+    shortName: (_emoji$name = emoji.name) !== null && _emoji$name !== void 0 ? _emoji$name : emoji.shortName
   }) : editorEmoji ? undefined : emoji.shortName;
   return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
     role: editorEmoji ? undefined : shouldBeInteractive ? 'button' : ariaLabel ? 'img' : 'presentation',

package/dist/cjs/components/common/EmojiActions.compiled.css

@@ -1,9 +1,13 @@
 
+._19itia51{border:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}
+._2rkofajl{border-radius:var(--ds-radius-small,3px)}
 ._n7zl1uh4{border-bottom:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}._16jlidpf{flex-grow:0}
 ._16jlkb7n{flex-grow:1}
+._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._16qsjgpa{box-shadow:0 1px 1px 0 var(--ds-border,#0b120e24)}
 ._18u019bv{margin-left:10px}
 ._18u0r5cr{margin-left:var(--ds-space-negative-050,-4px)}
+._19bv12x7{padding-left:var(--ds-space-075,6px)}
 ._19bvidpf{padding-left:0}
 ._1bahesu3{justify-content:flex-end}
 ._1e0c1txw{display:flex}
@@ -12,10 +16,14 @@
 ._1wpz1h6o{align-self:center}
 ._2hwx1i6y{margin-right:var(--ds-space-negative-025,-2px)}
 ._4cvr1h6o{align-items:center}
+._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
+._ca0q12x7{padding-top:var(--ds-space-075,6px)}
 ._ca0q1skh{padding-top:11px}
 ._i0dl1wug{flex-basis:auto}
 ._i0dlf1ug{flex-basis:0%}
+._n3td12x7{padding-bottom:var(--ds-space-075,6px)}
 ._n3td1crf{padding-bottom:9pt}
 ._otyr19bv{margin-bottom:10px}
 ._p12f3sup{max-width:285px}
+._u5f312x7{padding-right:var(--ds-space-075,6px)}
 ._u5f319bv{padding-right:10px}

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

@@ -19,6 +19,8 @@ var _EmojiDeletePreview = _interopRequireDefault(require("./EmojiDeletePreview")
 var _EmojiUploadPicker = _interopRequireDefault(require("./EmojiUploadPicker"));
 var _TonePreviewButton = _interopRequireDefault(require("./TonePreviewButton"));
 var _ToneSelector = _interopRequireDefault(require("./ToneSelector"));
+var _ProductivityColorSelector = _interopRequireWildcard(require("./ProductivityColorSelector"));
+var _Popup = _interopRequireDefault(require("./Popup"));
 var _EmojiPickerListSearch = require("../picker/EmojiPickerListSearch");
 var _i18n = require("../i18n");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
@@ -36,6 +38,7 @@ var addCustomEmoji = null;
 var addCustomEmojiButton = null;
 var emojiActionsWrapper = null;
 var emojiToneSelectorContainer = null;
+var productivityColorPopup = null;
 var previewFooter = null;
 var previewFooterNew = null;
 var emojiActionsTestId = exports.emojiActionsTestId = 'emoji-actions';
@@ -77,11 +80,17 @@ var AddOwnEmoji = exports.AddOwnEmoji = function AddOwnEmoji(props) {
   })));
 };
 var TonesWrapper = function TonesWrapper(props) {
-  var toneEmoji = props.toneEmoji,
+  var activeCategoryId = props.activeCategoryId,
+    onProductivityColorSelected = props.onProductivityColorSelected,
+    productivityColorPreviewEmojis = props.productivityColorPreviewEmojis,
+    selectedProductivityColor = props.selectedProductivityColor,
+    toneEmoji = props.toneEmoji,
     _props$selectedTone = props.selectedTone,
     selectedTone = _props$selectedTone === void 0 ? _constants.DEFAULT_TONE : _props$selectedTone,
     intl = props.intl,
+    onToneClose = props.onToneClose,
     onToneOpen = props.onToneOpen,
+    onToneToggle = props.onToneToggle,
     showToneSelector = props.showToneSelector;
   var formatMessage = intl.formatMessage;
   var tonePreviewButtonRef = (0, _react.useRef)(null);
@@ -108,6 +117,41 @@ var TonesWrapper = function TonesWrapper(props) {
     onToneSelected(toneValue);
     setFocusTonePreviewButton(true);
   }, [props]);
+  var onProductivityColorSelectedHandler = (0, _react.useCallback)(function (color) {
+    onProductivityColorSelected === null || onProductivityColorSelected === void 0 || onProductivityColorSelected(color);
+    onToneClose();
+    setFocusTonePreviewButton(true);
+  }, [onProductivityColorSelected, onToneClose]);
+  var shouldShowProductivityColorSelector = !!(activeCategoryId === 'ATLASSIAN' && productivityColorPreviewEmojis && selectedProductivityColor && onProductivityColorSelected && _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
+  if (shouldShowProductivityColorSelector) {
+    var previewEmoji = (productivityColorPreviewEmojis === null || productivityColorPreviewEmojis === void 0 ? void 0 : productivityColorPreviewEmojis[selectedProductivityColor]) || Object.values(productivityColorPreviewEmojis || {})[0];
+    if (!previewEmoji) {
+      return null;
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dlf1ug _ca0q1skh _u5f319bv _n3td1crf _19bvidpf _1e0c1txw _1bahesu3"])
+    }, showToneSelector && tonePreviewButtonRef.current && /*#__PURE__*/React.createElement(_Popup.default, {
+      target: tonePreviewButtonRef.current,
+      relativePosition: "below",
+      horizontalAlign: "end-to-start",
+      offsetY: 4,
+      zIndex: 510
+    }, /*#__PURE__*/React.createElement("div", {
+      className: (0, _runtime.ax)(["_19itia51 _2rkofajl _bfhk1bhr _16qs130s _ca0q12x7 _u5f312x7 _n3td12x7 _19bv12x7"])
+    }, /*#__PURE__*/React.createElement(_ProductivityColorSelector.default, {
+      colorPreviewEmojis: productivityColorPreviewEmojis,
+      selectedColor: selectedProductivityColor,
+      onColorSelected: onProductivityColorSelectedHandler
+    }))), /*#__PURE__*/React.createElement(_TonePreviewButton.default, {
+      ref: tonePreviewButtonRef,
+      ariaControls: _ProductivityColorSelector.productivityColorSelectorId,
+      ariaExpanded: showToneSelector,
+      emoji: previewEmoji,
+      selectOnHover: true,
+      onSelected: onToneToggle,
+      ariaLabelText: formatMessage(_i18n.messages.emojiSelectColorButtonAriaLabelText)
+    }));
+  }
   if (!toneEmoji) {
     return null;
   }
@@ -156,12 +200,19 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     showToneSelector = _useState4[0],
     setShowToneSelector = _useState4[1];
+  var wasProductivityColorSelectorOpen = (0, _react.useRef)(false);
+  var shouldUseProductivityColorControl = !!(props.activeCategoryId === 'ATLASSIAN' && props.productivityColorPreviewEmojis && props.selectedProductivityColor && props.onProductivityColorSelected && _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
   var onToneOpenHandler = (0, _react.useCallback)(function () {
     return setShowToneSelector(true);
   }, []);
   var onToneCloseHandler = (0, _react.useCallback)(function () {
     return setShowToneSelector(false);
   }, []);
+  var onToneToggleHandler = (0, _react.useCallback)(function () {
+    setShowToneSelector(function (isOpen) {
+      return !isOpen;
+    });
+  }, []);
   var onToneSelectedHandler = (0, _react.useCallback)(function (toneValue) {
     setShowToneSelector(false);
     if (onToneSelected) {
@@ -169,11 +220,24 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
     }
   }, [onToneSelected]);
   var onMouseLeaveHandler = (0, _react.useCallback)(function () {
+    if (shouldUseProductivityColorControl) {
+      return;
+    }
     if (showToneSelector && onToneSelectorCancelled) {
       onToneSelectorCancelled();
     }
     setShowToneSelector(false);
-  }, [showToneSelector, onToneSelectorCancelled]);
+  }, [shouldUseProductivityColorControl, showToneSelector, onToneSelectorCancelled]);
+  (0, _react.useEffect)(function () {
+    if (shouldUseProductivityColorControl && showToneSelector) {
+      wasProductivityColorSelectorOpen.current = true;
+      return;
+    }
+    if (!shouldUseProductivityColorControl && wasProductivityColorSelectorOpen.current) {
+      setShowToneSelector(false);
+      wasProductivityColorSelectorOpen.current = false;
+    }
+  }, [shouldUseProductivityColorControl, showToneSelector]);
   if (uploading) {
     return _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
       className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug"])
@@ -219,11 +283,12 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
     onChange: onChange,
     query: query,
     resultsCount: resultsCount,
-    isVisible: !showToneSelector
+    isVisible: !showToneSelector || shouldUseProductivityColorControl
   }), /*#__PURE__*/React.createElement(TonesWrapper, (0, _extends2.default)({}, props, {
     onToneOpen: onToneOpenHandler,
     onToneClose: onToneCloseHandler,
     onToneSelected: onToneSelectedHandler,
+    onToneToggle: onToneToggleHandler,
     showToneSelector: showToneSelector
   })))) : /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
@@ -241,6 +306,7 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
     onToneOpen: onToneOpenHandler,
     onToneClose: onToneCloseHandler,
     onToneSelected: onToneSelectedHandler,
+    onToneToggle: onToneToggleHandler,
     showToneSelector: showToneSelector
   }))), /*#__PURE__*/React.createElement(AddOwnEmoji, props));
 };

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

@@ -20,6 +20,8 @@ var getTargetNode = function getTargetNode(target) {
 var Popup = function Popup(props) {
   var _props$relativePositi = props.relativePosition,
     relativePosition = _props$relativePositi === void 0 ? 'auto' : _props$relativePositi,
+    _props$horizontalAlig = props.horizontalAlign,
+    horizontalAlign = _props$horizontalAlig === void 0 ? 'start' : _props$horizontalAlig,
     _props$offsetX = props.offsetX,
     offsetX = _props$offsetX === void 0 ? 0 : _props$offsetX,
     _props$offsetY = props.offsetY,
@@ -33,17 +35,27 @@ var Popup = function Popup(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     debounced = _useState2[0],
     setDebounced = _useState2[1];
+  var getLeftPosition = (0, _react.useCallback)(function (box) {
+    if (horizontalAlign === 'end-to-start') {
+      return box.left - 152;
+    }
+    if (horizontalAlign === 'end') {
+      var _popup$current;
+      return box.right - (((_popup$current = popup.current) === null || _popup$current === void 0 ? void 0 : _popup$current.offsetWidth) || 0) + (offsetX || 0);
+    }
+    return box.left + (offsetX || 0);
+  }, [horizontalAlign, offsetX]);
   var applyBelowPosition = (0, _react.useCallback)(function () {
     var targetNode = getTargetNode(target);
     if (targetNode && popup.current) {
       var box = targetNode.getBoundingClientRect();
       var top = box.bottom + (offsetY || 0);
-      var left = box.left + (offsetX || 0);
+      var left = getLeftPosition(box);
       popup.current.style.top = "".concat(top, "px");
       popup.current.style.bottom = '';
       popup.current.style.left = "".concat(left, "px");
     }
-  }, [offsetX, offsetY, target]);
+  }, [getLeftPosition, offsetY, target]);
   var applyAbovePosition = (0, _react.useCallback)(function () {
     if (typeof window === 'undefined') {
       return;
@@ -52,12 +64,12 @@ var Popup = function Popup(props) {
     if (targetNode && popup.current) {
       var box = targetNode.getBoundingClientRect();
       var bottom = window.innerHeight - box.top + (offsetY || 0);
-      var left = box.left + (offsetX || 0);
+      var left = getLeftPosition(box);
       popup.current.style.top = '';
       popup.current.style.bottom = "".concat(bottom, "px");
       popup.current.style.left = "".concat(left, "px");
     }
-  }, [offsetX, offsetY, target]);
+  }, [getLeftPosition, offsetY, target]);
   var applyAbsolutePosition = (0, _react.useCallback)(function () {
     if (typeof window === 'undefined') {
       return;
@@ -112,6 +124,9 @@ var Popup = function Popup(props) {
     }
     applyAbsolutePosition();
     renderPopup();
+    if (horizontalAlign !== 'start') {
+      applyAbsolutePosition();
+    }
     return function () {
       if (typeof window === 'undefined') {
         return;
@@ -122,7 +137,7 @@ var Popup = function Popup(props) {
         document.body.removeChild(popup.current);
       }
     };
-  }, [applyAbsolutePosition, handleResize, renderPopup]);
+  }, [applyAbsolutePosition, handleResize, horizontalAlign, renderPopup]);
   return /*#__PURE__*/_react.default.createElement("div", null);
 };
 var _default = exports.default = Popup;

package/dist/cjs/components/common/ProductivityColorSelector.compiled.css

@@ -0,0 +1,59 @@
+
+._1355fajl input+span{border-radius:var(--ds-radius-small,3px)}
+._19itidpf{border:0}
+._zulp1b66{gap:var(--ds-space-050,4px)}._1030zwfg input+span{height:2pc}
+._12hvze3t input{margin-right:var(--ds-space-0,0)}
+._12ultlke input{cursor:pointer}
+._13yj1o36 input:focus+span{outline-width:medium}
+._17muzwfg label{height:2pc}
+._18m915vq{overflow-y:hidden}
+._18u0ze3t{margin-left:var(--ds-space-0,0)}
+._19bvidpf{padding-left:0}
+._19pkze3t{margin-top:var(--ds-space-0,0)}
+._1bah1h6o{justify-content:center}
+._1bsbt94y{width:1px}
+._1bsbzwfg{width:2pc}
+._1e0c11p5{display:grid}
+._1e0c1txw{display:flex}
+._1e7sidpf input{opacity:0}
+._1eq11h6o label{align-items:center}
+._1nn0kb7n input{z-index:1}
+._1p1fzwfg label{width:2pc}
+._1pi91y54 input:focus+span{box-shadow:0 0 0 2px var(--ds-border-focused,#4688ec)}
+._1reo15vq{overflow-x:hidden}
+._1rgfze3t input{margin-left:var(--ds-space-0,0)}
+._1rgq13zc input:focus+span{transition-duration:0s,.2s}
+._1ul9idpf{min-width:0}
+._1vzltlke label{cursor:pointer}
+._1wqq1h6o label{justify-content:center}
+._2hwxze3t{margin-right:var(--ds-space-0,0)}
+._2x4gze3t input{margin-top:var(--ds-space-0,0)}
+._2z051y6t{grid-template-rows:repeat(2,2pc)}
+._4cvr1h6o{align-items:center}
+._4t3it94y{height:1px}
+._4t3izwfg{height:2pc}
+._5hv9zwfg input{width:2pc}
+._6rawzwfg input+span{width:2pc}
+._6vsr1h6o input+span{justify-content:center}
+._7kzvidpf input+span{padding-inline-end:0}
+._8qdiidpf input+span{padding-block-start:0}
+._ca0qidpf{padding-top:0}
+._ecyuidpf input+span{padding-block-end:0}
+._ev8ridpf input+span{padding-inline-start:0}
+._hxs6glyw input:focus+span{outline-style:none}
+._khufstnw input{position:absolute}
+._kqswh2mm{position:relative}
+._kqswstnw{position:absolute}
+._n3tdidpf{padding-bottom:0}
+._ngzz1txw input+span{display:flex}
+._o5721q9c{white-space:nowrap}
+._ogtohxbz{clip:rect(0 0 0 0)}
+._otyrze3t{margin-bottom:var(--ds-space-0,0)}
+._pytkzwfg input{height:2pc}
+._smb7plhp input:hover+span{background-color:var(--ds-background-neutral-hovered,#0b120e24)}
+._soq51h6o input+span{align-items:center}
+._szw2w5lj input:checked+span{box-shadow:0 0 0 2px var(--ds-border-selected,#1868db)}
+._tnsm1r31 input:focus+span{outline-color:currentColor}
+._u5f3idpf{padding-right:0}
+._x5bdze3t input{margin-bottom:var(--ds-space-0,0)}
+._yv0e1bbt{grid-template-columns:repeat(5,2pc)}

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

@@ -0,0 +1,112 @@
+/* ProductivityColorSelector.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.productivityColorSelectorTestId = exports.productivityColorSelectorId = exports.default = exports.ProductivityColorSelector = void 0;
+require("./ProductivityColorSelector.compiled.css");
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
+var _runtime = require("@compiled/react/runtime");
+var _reactIntl = require("react-intl");
+var _radio = require("@atlaskit/radio");
+var _productivityColors = require("../../util/productivity-colors");
+var _i18n = require("../i18n");
+var _Emoji = _interopRequireDefault(require("./Emoji"));
+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 productivityColorSelectorTestId = exports.productivityColorSelectorTestId = 'productivity-color-selector';
+var productivityColorSelectorId = exports.productivityColorSelectorId = 'emoji-picker-productivity-color-selector';
+var selectorGrid = null;
+var visuallyHiddenLegend = null;
+var colorOption = null;
+var colorOptionEmoji = null;
+var getColorLabel = function getColorLabel(color) {
+  return "".concat(color.charAt(0).toUpperCase()).concat(color.slice(1), " productivity emoji colour");
+};
+var ProductivityColorSelector = exports.ProductivityColorSelector = function ProductivityColorSelector(_ref) {
+  var colorPreviewEmojis = _ref.colorPreviewEmojis,
+    onColorSelected = _ref.onColorSelected,
+    selectedColor = _ref.selectedColor;
+  var intl = (0, _react.useContext)(_reactIntl.IntlContext);
+  var radioRefs = (0, _react.useRef)([]);
+  var hasFocusedSelectedColor = (0, _react.useRef)(false);
+  var availableColors = _productivityColors.productivityColors.filter(function (color) {
+    return colorPreviewEmojis[color];
+  });
+  var colorSelectorAriaLabel = intl ? intl.formatMessage(_i18n.messages.emojiSelectColorListAriaLabelText) : _i18n.messages.emojiSelectColorListAriaLabelText.defaultMessage;
+  if (!availableColors.length) {
+    return null;
+  }
+  var onArrowKey = function onArrowKey(currentIndex, direction) {
+    var _radioRefs$current$ne;
+    var nextIndex = (currentIndex + direction + availableColors.length) % availableColors.length;
+    (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 || _radioRefs$current$ne.focus();
+  };
+  var stopPickerDismissal = function stopPickerDismissal(event) {
+    event.stopPropagation();
+  };
+  return /*#__PURE__*/React.createElement("fieldset", {
+    id: productivityColorSelectorId,
+    "data-testid": productivityColorSelectorTestId,
+    className: (0, _runtime.ax)(["_19itidpf _zulp1b66 _ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _1e0c11p5 _yv0e1bbt _2z051y6t _19pkze3t _2hwxze3t _otyrze3t _18u0ze3t _1ul9idpf"])
+  }, /*#__PURE__*/React.createElement("legend", {
+    className: (0, _runtime.ax)(["_19itidpf _1reo15vq _18m915vq _ca0qidpf _u5f3idpf _n3tdidpf _19bvidpf _ogtohxbz _4t3it94y _kqswstnw _o5721q9c _1bsbt94y"])
+  }, colorSelectorAriaLabel), availableColors.map(function (color, index) {
+    var emoji = colorPreviewEmojis[color];
+    if (!emoji) {
+      return null;
+    }
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === 'ArrowLeft' || event.key === 'ArrowUp') {
+        event.preventDefault();
+        onArrowKey(index, -1);
+      }
+      if (event.key === 'ArrowRight' || event.key === 'ArrowDown') {
+        event.preventDefault();
+        onArrowKey(index, 1);
+      }
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        onColorSelected(color);
+      }
+    };
+    return /*#__PURE__*/React.createElement("div", {
+      key: color,
+      className: (0, _runtime.ax)(["_4t3izwfg _kqswh2mm _1bsbzwfg _1355fajl _soq51h6o _ngzz1txw _1030zwfg _6vsr1h6o _ecyuidpf _8qdiidpf _7kzvidpf _ev8ridpf _6rawzwfg _tnsm1r31 _hxs6glyw _13yj1o36 _1pi91y54 _1rgq13zc _1eq11h6o _1vzltlke _17muzwfg _1wqq1h6o _1p1fzwfg _12ultlke _pytkzwfg _2x4gze3t _12hvze3t _x5bdze3t _1rgfze3t _1e7sidpf _khufstnw _5hv9zwfg _1nn0kb7n _smb7plhp _szw2w5lj"])
+    }, /*#__PURE__*/React.createElement(_radio.Radio, {
+      ref: function ref(el) {
+        radioRefs.current[index] = el;
+        if (selectedColor === color) {
+          if (el && !hasFocusedSelectedColor.current) {
+            el.focus();
+            hasFocusedSelectedColor.current = true;
+          }
+        }
+      },
+      ariaLabel: getColorLabel(color),
+      name: "productivity-emoji-colour",
+      isChecked: selectedColor === color,
+      onChange: function onChange() {
+        return onColorSelected(color);
+      },
+      onClick: stopPickerDismissal,
+      onKeyDown: handleKeyDown,
+      onMouseDown: stopPickerDismissal,
+      testId: "productivity-color-".concat(color),
+      value: color,
+      label: /*#__PURE__*/React.createElement("span", {
+        className: (0, _runtime.ax)(["_4cvr1h6o _1e0c1txw _4t3izwfg _1bah1h6o _1bsbzwfg"])
+      }, /*#__PURE__*/React.createElement(_Emoji.default, {
+        emoji: emoji,
+        shouldBeInteractive: false,
+        "aria-hidden": true,
+        fitToHeight: 24
+      }))
+    }));
+  }));
+};
+var _default_1 = /*#__PURE__*/(0, _react.memo)(ProductivityColorSelector);
+var _default = exports.default = _default_1;

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

@@ -22,6 +22,8 @@ var emojiButtonOutline = null;
 var TonePreviewButton = exports.TonePreviewButton = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var emoji = props.emoji,
     selectOnHover = props.selectOnHover,
+    _props$ariaControls = props.ariaControls,
+    ariaControls = _props$ariaControls === void 0 ? 'emoji-picker-tone-selector' : _props$ariaControls,
     ariaLabelText = props.ariaLabelText,
     ariaExpanded = props.ariaExpanded,
     onSelected = props.onSelected,
@@ -33,7 +35,7 @@ var TonePreviewButton = exports.TonePreviewButton = /*#__PURE__*/(0, _react.forw
     onClick: onSelected,
     "aria-label": ariaLabelText,
     "aria-expanded": ariaExpanded,
-    "aria-controls": "emoji-picker-tone-selector"
+    "aria-controls": ariaControls
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: {
@@ -53,7 +55,7 @@ var TonePreviewButton = exports.TonePreviewButton = /*#__PURE__*/(0, _react.forw
     onClick: onSelected,
     "aria-label": ariaLabelText,
     "aria-expanded": ariaExpanded,
-    "aria-controls": "emoji-picker-tone-selector"
+    "aria-controls": ariaControls
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: {

package/dist/cjs/components/i18n.js

@@ -71,6 +71,16 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
     defaultMessage: 'Choose your skin tone, {selectedTone} selected',
     description: 'Message indicating the purpose of the skin tone selection button and the selected tone'
   },
+  emojiSelectColorButtonAriaLabelText: {
+    id: 'fabric.emoji.select.color.ariaLabel',
+    defaultMessage: 'Productivity emoji color selector',
+    description: 'Message indicating the purpose of the color selection button and the selected color'
+  },
+  emojiSelectColorListAriaLabelText: {
+    id: 'fabric.emoji.select.color.list.ariaLabel',
+    defaultMessage: 'Productivity emoji colour selector',
+    description: 'Message indicating the purpose of the productivity emoji color list selector'
+  },
   emojiSelectSkinToneListAriaLabelText: {
     id: 'fabric.emoji.select.skin.list.ariaLabel',
     defaultMessage: 'Skin tone selector',