@atlaskit/emoji 70.10.11 → 70.10.12

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/emoji
 
+## 70.10.12
+
+### Patch Changes
+
+- [`93fae868945b0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/93fae868945b0) -
+  Fix accessibility - inaccessible skin tones from keyboard navigation
+- Updated dependencies
+
 ## 70.10.11
 
 ### Patch Changes

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

@@ -10,6 +10,7 @@ exports.default = exports.EmojiRadioButton = void 0;
 require("./EmojiRadioButton.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _Emoji = _interopRequireDefault(require("./Emoji"));
 var _constants = require("../../util/constants");
 var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
@@ -19,6 +20,13 @@ var emojiRadio = {
   default: "_tzy4idpf _kqswstnw _154i14id _1ltv14id _3y8mfajl _157z1r31 _1dzmglyw _1sqm1o36 _fh6w1y54 _1i1213zc"
 };
 var handleKeyDown = function handleKeyDown(props, event) {
+  if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight') && (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh')) {
+    var _props$onArrowKey;
+    event.preventDefault();
+    event.stopPropagation();
+    (_props$onArrowKey = props.onArrowKey) === null || _props$onArrowKey === void 0 || _props$onArrowKey.call(props, event.key === 'ArrowRight' ? 1 : -1);
+    return;
+  }
   if (_constants.TONESELECTOR_KEYBOARD_KEYS_SUPPORTED.includes(event.key)) {
     var onSelected = props.onSelected;
     event.preventDefault();
@@ -48,6 +56,9 @@ var EmojiRadioButton = exports.EmojiRadioButton = /*#__PURE__*/(0, _react.forwar
     onKeyDown: function onKeyDown(event) {
       return handleKeyDown(props, event);
     },
+    onChange: (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? function (e) {
+      return e.preventDefault();
+    } : undefined,
     className: (0, _runtime.ax)([emojiRadio.default])
   }), /*#__PURE__*/_react.default.createElement(_Emoji.default, {
     emoji: emoji,

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

@@ -8,11 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toneSelectorTestId = exports.default = exports.ToneSelectorInternal = void 0;
 require("./ToneSelector.compiled.css");
-var _react = _interopRequireWildcard(require("react"));
-var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _analytics = require("../../util/analytics");
 var _setSkinToneAriaLabelText = require("./setSkinToneAriaLabelText");
@@ -39,6 +39,8 @@ var ToneSelectorInternal = exports.ToneSelectorInternal = function ToneSelectorI
     isVisible = props.isVisible;
   var isMounted = (0, _react.useRef)(false);
   var selectedToneRadioRef = (0, _react.useRef)(null);
+  // Refs for all radio inputs — used for FG-gated arrow-key focus management
+  var radioRefs = (0, _react.useRef)([]);
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var emojiToneCollection = (0, _react.useMemo)(function () {
@@ -71,6 +73,12 @@ var ToneSelectorInternal = exports.ToneSelectorInternal = function ToneSelectorI
       (0, _analytics.createAndFireEventInElementsChannel)(event)(createAnalyticsEvent);
     }
   };
+  var _onArrowKey = (0, _react.useCallback)(function (currentIndex, direction) {
+    var _radioRefs$current$ne;
+    var len = radioRefs.current.length;
+    var nextIndex = (currentIndex + direction + len) % len;
+    (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 || _radioRefs$current$ne.focus();
+  }, []);
   var onToneSelectedHandler = function onToneSelectedHandler(toneValue) {
     return function () {
       if (selectedTone === toneValue && onToneClose) {
@@ -88,14 +96,30 @@ var ToneSelectorInternal = exports.ToneSelectorInternal = function ToneSelectorI
     fireAnalyticsEvent((0, _analytics.toneSelectorOpenedEvent)({}));
   }
   isMounted.current = true;
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", {
     role: "radiogroup",
     "data-testid": toneSelectorTestId,
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(_i18n.messages.emojiSelectSkinToneListAriaLabelText),
     className: (0, _runtime.ax)([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
-  }, emojiToneCollection.map(function (tone) {
-    return /*#__PURE__*/React.createElement(_EmojiRadioButton.default, {
+  }, emojiToneCollection.map(function (tone, renderIndex) {
+    return (0, _platformFeatureFlags.fg)('platform_emoji_picker_refresh') ? /*#__PURE__*/_react.default.createElement(_EmojiRadioButton.default, {
+      ref: function ref(el) {
+        radioRefs.current[renderIndex] = el;
+        if (tone.isSelected && selectedToneRadioRef) {
+          selectedToneRadioRef.current = el;
+        }
+      },
+      defaultChecked: tone.isSelected,
+      ariaLabelText: tone.label,
+      key: "".concat(tone.id),
+      emoji: tone,
+      onArrowKey: function onArrowKey(direction) {
+        return _onArrowKey(renderIndex, direction);
+      },
+      onSelected: onToneSelectedHandler(tone.toneIndex),
+      selectOnHover: true
+    }) : /*#__PURE__*/_react.default.createElement(_EmojiRadioButton.default, {
       ref: tone.isSelected ? selectedToneRadioRef : null,
       defaultChecked: tone.isSelected,
       ariaLabelText: tone.label,

package/dist/cjs/util/analytics/analytics.js

@@ -20,7 +20,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "70.10.10"
+      packageVersion: "70.10.11"
     }, attributes)
   };
 };

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

@@ -2,6 +2,7 @@
 import "./EmojiRadioButton.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { memo, forwardRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Emoji from './Emoji';
 import { TONESELECTOR_KEYBOARD_KEYS_SUPPORTED } from '../../util/constants';
 import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -10,6 +11,13 @@ const emojiRadio = {
   default: "_tzy4idpf _kqswstnw _154i14id _1ltv14id _3y8mfajl _157z1r31 _1dzmglyw _1sqm1o36 _fh6w1y54 _1i1213zc"
 };
 const handleKeyDown = (props, event) => {
+  if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight') && fg('platform_emoji_picker_refresh')) {
+    var _props$onArrowKey;
+    event.preventDefault();
+    event.stopPropagation();
+    (_props$onArrowKey = props.onArrowKey) === null || _props$onArrowKey === void 0 ? void 0 : _props$onArrowKey.call(props, event.key === 'ArrowRight' ? 1 : -1);
+    return;
+  }
   if (TONESELECTOR_KEYBOARD_KEYS_SUPPORTED.includes(event.key)) {
     const {
       onSelected
@@ -41,6 +49,7 @@ export const EmojiRadioButton = /*#__PURE__*/forwardRef((props, ref) => {
       return (_props$onSelected = props.onSelected) === null || _props$onSelected === void 0 ? void 0 : _props$onSelected.call(props);
     },
     onKeyDown: event => handleKeyDown(props, event),
+    onChange: fg('platform_emoji_picker_refresh') ? e => e.preventDefault() : undefined,
     className: ax([emojiRadio.default])
   }), /*#__PURE__*/React.createElement(Emoji, {
     emoji: emoji,

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

@@ -1,8 +1,8 @@
 /* ToneSelector.tsx generated by @compiled/babel-plugin v0.39.1 */
 import "./ToneSelector.compiled.css";
-import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { memo, useEffect, useMemo, useRef } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireEventInElementsChannel, toneSelectedEvent, toneSelectorOpenedEvent } from '../../util/analytics';
 import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
@@ -28,6 +28,8 @@ export const ToneSelectorInternal = props => {
   } = props;
   const isMounted = useRef(false);
   const selectedToneRadioRef = useRef(null);
+  // Refs for all radio inputs — used for FG-gated arrow-key focus management
+  const radioRefs = useRef([]);
   const {
     formatMessage
   } = useIntl();
@@ -62,6 +64,12 @@ export const ToneSelectorInternal = props => {
       createAndFireEventInElementsChannel(event)(createAnalyticsEvent);
     }
   };
+  const onArrowKey = useCallback((currentIndex, direction) => {
+    var _radioRefs$current$ne;
+    const len = radioRefs.current.length;
+    const nextIndex = (currentIndex + direction + len) % len;
+    (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 ? void 0 : _radioRefs$current$ne.focus();
+  }, []);
   const onToneSelectedHandler = toneValue => () => {
     if (selectedTone === toneValue && onToneClose) {
       onToneClose();
@@ -83,8 +91,22 @@ export const ToneSelectorInternal = props => {
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(messages.emojiSelectSkinToneListAriaLabelText),
     className: ax([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
-  }, emojiToneCollection.map(tone => {
-    return /*#__PURE__*/React.createElement(EmojiRadioButton, {
+  }, emojiToneCollection.map((tone, renderIndex) => {
+    return fg('platform_emoji_picker_refresh') ? /*#__PURE__*/React.createElement(EmojiRadioButton, {
+      ref: el => {
+        radioRefs.current[renderIndex] = el;
+        if (tone.isSelected && selectedToneRadioRef) {
+          selectedToneRadioRef.current = el;
+        }
+      },
+      defaultChecked: tone.isSelected,
+      ariaLabelText: tone.label,
+      key: `${tone.id}`,
+      emoji: tone,
+      onArrowKey: direction => onArrowKey(renderIndex, direction),
+      onSelected: onToneSelectedHandler(tone.toneIndex),
+      selectOnHover: true
+    }) : /*#__PURE__*/React.createElement(EmojiRadioButton, {
       ref: tone.isSelected ? selectedToneRadioRef : null,
       defaultChecked: tone.isSelected,
       ariaLabelText: tone.label,

package/dist/es2019/util/analytics/analytics.js

@@ -9,7 +9,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "70.10.10",
+    packageVersion: "70.10.11",
     ...attributes
   }
 });

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

@@ -2,6 +2,7 @@
 import "./EmojiRadioButton.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { memo, forwardRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Emoji from './Emoji';
 import { TONESELECTOR_KEYBOARD_KEYS_SUPPORTED } from '../../util/constants';
 import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -10,6 +11,13 @@ var emojiRadio = {
   default: "_tzy4idpf _kqswstnw _154i14id _1ltv14id _3y8mfajl _157z1r31 _1dzmglyw _1sqm1o36 _fh6w1y54 _1i1213zc"
 };
 var handleKeyDown = function handleKeyDown(props, event) {
+  if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight') && fg('platform_emoji_picker_refresh')) {
+    var _props$onArrowKey;
+    event.preventDefault();
+    event.stopPropagation();
+    (_props$onArrowKey = props.onArrowKey) === null || _props$onArrowKey === void 0 || _props$onArrowKey.call(props, event.key === 'ArrowRight' ? 1 : -1);
+    return;
+  }
   if (TONESELECTOR_KEYBOARD_KEYS_SUPPORTED.includes(event.key)) {
     var onSelected = props.onSelected;
     event.preventDefault();
@@ -39,6 +47,9 @@ export var EmojiRadioButton = /*#__PURE__*/forwardRef(function (props, ref) {
     onKeyDown: function onKeyDown(event) {
       return handleKeyDown(props, event);
     },
+    onChange: fg('platform_emoji_picker_refresh') ? function (e) {
+      return e.preventDefault();
+    } : undefined,
     className: ax([emojiRadio.default])
   }), /*#__PURE__*/React.createElement(Emoji, {
     emoji: emoji,

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

@@ -2,11 +2,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import "./ToneSelector.compiled.css";
-import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { memo, useEffect, useMemo, useRef } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { createAndFireEventInElementsChannel, toneSelectedEvent, toneSelectorOpenedEvent } from '../../util/analytics';
 import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
@@ -30,6 +30,8 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
     isVisible = props.isVisible;
   var isMounted = useRef(false);
   var selectedToneRadioRef = useRef(null);
+  // Refs for all radio inputs — used for FG-gated arrow-key focus management
+  var radioRefs = useRef([]);
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var emojiToneCollection = useMemo(function () {
@@ -62,6 +64,12 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
       createAndFireEventInElementsChannel(event)(createAnalyticsEvent);
     }
   };
+  var _onArrowKey = useCallback(function (currentIndex, direction) {
+    var _radioRefs$current$ne;
+    var len = radioRefs.current.length;
+    var nextIndex = (currentIndex + direction + len) % len;
+    (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 || _radioRefs$current$ne.focus();
+  }, []);
   var onToneSelectedHandler = function onToneSelectedHandler(toneValue) {
     return function () {
       if (selectedTone === toneValue && onToneClose) {
@@ -85,8 +93,24 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(messages.emojiSelectSkinToneListAriaLabelText),
     className: ax([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
-  }, emojiToneCollection.map(function (tone) {
-    return /*#__PURE__*/React.createElement(EmojiRadioButton, {
+  }, emojiToneCollection.map(function (tone, renderIndex) {
+    return fg('platform_emoji_picker_refresh') ? /*#__PURE__*/React.createElement(EmojiRadioButton, {
+      ref: function ref(el) {
+        radioRefs.current[renderIndex] = el;
+        if (tone.isSelected && selectedToneRadioRef) {
+          selectedToneRadioRef.current = el;
+        }
+      },
+      defaultChecked: tone.isSelected,
+      ariaLabelText: tone.label,
+      key: "".concat(tone.id),
+      emoji: tone,
+      onArrowKey: function onArrowKey(direction) {
+        return _onArrowKey(renderIndex, direction);
+      },
+      onSelected: onToneSelectedHandler(tone.toneIndex),
+      selectOnHover: true
+    }) : /*#__PURE__*/React.createElement(EmojiRadioButton, {
       ref: tone.isSelected ? selectedToneRadioRef : null,
       defaultChecked: tone.isSelected,
       ariaLabelText: tone.label,

package/dist/esm/util/analytics/analytics.js

@@ -14,7 +14,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "70.10.10"
+      packageVersion: "70.10.11"
     }, attributes)
   };
 };

package/dist/types/components/common/EmojiRadioButton.d.ts

@@ -10,6 +10,7 @@ export interface Props {
     emoji: EmojiDescription;
     onSelected?: () => void;
     selectOnHover?: boolean;
+    onArrowKey?: (direction: -1 | 1) => void;
 }
 export declare const EmojiRadioButton: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLInputElement>>;
 declare const _default_1: React.MemoExoticComponent<React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLInputElement>>>;

package/dist/types-ts4.5/components/common/EmojiRadioButton.d.ts

@@ -10,6 +10,7 @@ export interface Props {
     emoji: EmojiDescription;
     onSelected?: () => void;
     selectOnHover?: boolean;
+    onArrowKey?: (direction: -1 | 1) => void;
 }
 export declare const EmojiRadioButton: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLInputElement>>;
 declare const _default_1: React.MemoExoticComponent<React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLInputElement>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "70.10.11",
+	"version": "70.10.12",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"