@atlaskit/emoji 70.14.3 → 70.15.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/emoji
 
+## 70.15.0
+
+### Minor Changes
+
+- [`d35341f95a68e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d35341f95a68e) -
+  The label for the change emoji button includes emoji shortname
+
 ## 70.14.3
 
 ### Patch Changes

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

@@ -14,6 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
+var _reactIntl = require("react-intl");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _EmojiUtils = require("../../api/EmojiUtils");
 var _constants = require("../../util/constants");
@@ -28,6 +29,7 @@ var _useInView3 = require("../../hooks/useInView");
 var _ufoExperiences = require("../../util/analytics/ufoExperiences");
 var _DeletableEmojiTooltipContent = require("./DeletableEmojiTooltipContent");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _browserApis = require("@atlaskit/browser-apis");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _i18n = require("../i18n");
 var _excluded = ["emoji", "fitToHeight", "selected", "selectOnHover", "className", "showTooltip", "showDelete", "shouldBeInteractive", "tabIndex", "onSelected", "onMouseMove", "onFocus", "onDelete", "onLoadError", "onLoadSuccess", "disableLazyLoad", "autoWidth", "children", "type", "editorEmoji"];
@@ -268,9 +270,9 @@ var ImageEmoji = exports.ImageEmoji = function ImageEmoji(props) {
     }
   }, [ufoExp]);
   var onMouseOver = (0, _react.useCallback)(function (e) {
-    var _document$activeEleme;
+    var _getDocument;
     // only disable tooltip when not on focus
-    if (!((_document$activeEleme = document.activeElement) !== null && _document$activeEleme !== void 0 && _document$activeEleme.contains(e.target))) {
+    if (!((_getDocument = (0, _browserApis.getDocument)()) !== null && _getDocument !== void 0 && (_getDocument = _getDocument.activeElement) !== null && _getDocument !== void 0 && _getDocument.contains(e.target))) {
       e.stopPropagation();
     }
   }, []);
@@ -361,7 +363,10 @@ var EmojiNodeWrapper = exports.EmojiNodeWrapper = /*#__PURE__*/(0, _react.forwar
     type = props.type,
     editorEmoji = props.editorEmoji,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var ariaLabel = (0, _platformFeatureFlags.fg)('platform_change_emoji_button_label') ? _i18n.messages.changeEmojiButtonLabel.defaultMessage : editorEmoji ? undefined : emoji.shortName;
+  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
+  }) : editorEmoji ? undefined : emoji.shortName;
   return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({
     role: editorEmoji ? undefined : shouldBeInteractive ? 'button' : ariaLabel ? 'img' : 'presentation',
     "aria-label": ariaLabel,

package/dist/cjs/components/i18n.js

@@ -261,9 +261,9 @@ var messages = exports.messages = (0, _reactIntl.defineMessages)({
     defaultMessage: 'emoji button',
     description: "Aria roledescription for emoji button, used in emoji picker."
   },
-  changeEmojiButtonLabel: {
-    id: 'fabric.emoji.change.button.label',
-    defaultMessage: 'Change emoji',
+  changeEmojiShortnameButtonLabel: {
+    id: 'fabric.emoji.change.shortname.button.label',
+    defaultMessage: 'Change emoji, currently {shortName}',
     description: 'Aria label for the button in page title used to change emoji'
   },
   error: {

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.14.2"
+      packageVersion: "70.14.3"
     }, attributes)
   };
 };

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

@@ -2,7 +2,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import "./Emoji.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { useEffect, useCallback, useMemo, forwardRef } from 'react';
+import React, { useEffect, useCallback, useContext, useMemo, forwardRef } from 'react';
+import { IntlContext } from 'react-intl';
 import Tooltip from '@atlaskit/tooltip';
 import { shouldUseAltRepresentation } from '../../api/EmojiUtils';
 import { defaultEmojiHeight, deleteEmojiLabel, EMOJI_KEYBOARD_KEYS_SUPPORTED, KeyboardKeys, SAMPLING_RATE_EMOJI_RENDERED_EXP } from '../../util/constants';
@@ -17,6 +18,7 @@ import { useInView } from '../../hooks/useInView';
 import { hasUfoMarked } from '../../util/analytics/ufoExperiences';
 import { DeletableEmojiTooltipContent, DeletableEmojiTooltipContentForScreenReader } from './DeletableEmojiTooltipContent';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getDocument } from '@atlaskit/browser-apis';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { messages } from '../i18n';
 const emojiSpriteContainer = null;
@@ -263,9 +265,9 @@ export const ImageEmoji = props => {
     }
   }, [ufoExp]);
   const onMouseOver = useCallback(e => {
-    var _document$activeEleme;
+    var _getDocument, _getDocument$activeEl;
     // only disable tooltip when not on focus
-    if (!((_document$activeEleme = document.activeElement) !== null && _document$activeEleme !== void 0 && _document$activeEleme.contains(e.target))) {
+    if (!((_getDocument = getDocument()) !== null && _getDocument !== void 0 && (_getDocument$activeEl = _getDocument.activeElement) !== null && _getDocument$activeEl !== void 0 && _getDocument$activeEl.contains(e.target))) {
       e.stopPropagation();
     }
   }, []);
@@ -355,7 +357,10 @@ export const EmojiNodeWrapper = /*#__PURE__*/forwardRef((props, ref) => {
     editorEmoji,
     ...other
   } = props;
-  const ariaLabel = fg('platform_change_emoji_button_label') ? messages.changeEmojiButtonLabel.defaultMessage : editorEmoji ? undefined : emoji.shortName;
+  const intl = useContext(IntlContext);
+  const ariaLabel = intl && fg('platform_change_emoji_button_label') ? intl.formatMessage(messages.changeEmojiShortnameButtonLabel, {
+    shortName: emoji.shortName
+  }) : editorEmoji ? undefined : emoji.shortName;
   return /*#__PURE__*/React.createElement("span", _extends({
     role: editorEmoji ? undefined : shouldBeInteractive ? 'button' : ariaLabel ? 'img' : 'presentation',
     "aria-label": ariaLabel,

package/dist/es2019/components/i18n.js

@@ -255,9 +255,9 @@ export const messages = defineMessages({
     defaultMessage: 'emoji button',
     description: `Aria roledescription for emoji button, used in emoji picker.`
   },
-  changeEmojiButtonLabel: {
-    id: 'fabric.emoji.change.button.label',
-    defaultMessage: 'Change emoji',
+  changeEmojiShortnameButtonLabel: {
+    id: 'fabric.emoji.change.shortname.button.label',
+    defaultMessage: 'Change emoji, currently {shortName}',
     description: 'Aria label for the button in page title used to change emoji'
   },
   error: {

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.14.2",
+    packageVersion: "70.14.3",
     ...attributes
   }
 });

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

@@ -8,7 +8,8 @@ import "./Emoji.compiled.css";
 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 React, { useEffect, useCallback, useMemo, forwardRef } from 'react';
+import React, { useEffect, useCallback, useContext, useMemo, forwardRef } from 'react';
+import { IntlContext } from 'react-intl';
 import Tooltip from '@atlaskit/tooltip';
 import { shouldUseAltRepresentation } from '../../api/EmojiUtils';
 import { defaultEmojiHeight, deleteEmojiLabel, EMOJI_KEYBOARD_KEYS_SUPPORTED, KeyboardKeys, SAMPLING_RATE_EMOJI_RENDERED_EXP } from '../../util/constants';
@@ -23,6 +24,7 @@ import { useInView } from '../../hooks/useInView';
 import { hasUfoMarked } from '../../util/analytics/ufoExperiences';
 import { DeletableEmojiTooltipContent, DeletableEmojiTooltipContentForScreenReader } from './DeletableEmojiTooltipContent';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getDocument } from '@atlaskit/browser-apis';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { messages } from '../i18n';
 var emojiSpriteContainer = null;
@@ -259,9 +261,9 @@ export var ImageEmoji = function ImageEmoji(props) {
     }
   }, [ufoExp]);
   var onMouseOver = useCallback(function (e) {
-    var _document$activeEleme;
+    var _getDocument;
     // only disable tooltip when not on focus
-    if (!((_document$activeEleme = document.activeElement) !== null && _document$activeEleme !== void 0 && _document$activeEleme.contains(e.target))) {
+    if (!((_getDocument = getDocument()) !== null && _getDocument !== void 0 && (_getDocument = _getDocument.activeElement) !== null && _getDocument !== void 0 && _getDocument.contains(e.target))) {
       e.stopPropagation();
     }
   }, []);
@@ -352,7 +354,10 @@ export var EmojiNodeWrapper = /*#__PURE__*/forwardRef(function (props, ref) {
     type = props.type,
     editorEmoji = props.editorEmoji,
     other = _objectWithoutProperties(props, _excluded);
-  var ariaLabel = fg('platform_change_emoji_button_label') ? messages.changeEmojiButtonLabel.defaultMessage : editorEmoji ? undefined : emoji.shortName;
+  var intl = useContext(IntlContext);
+  var ariaLabel = intl && fg('platform_change_emoji_button_label') ? intl.formatMessage(messages.changeEmojiShortnameButtonLabel, {
+    shortName: emoji.shortName
+  }) : editorEmoji ? undefined : emoji.shortName;
   return /*#__PURE__*/React.createElement("span", _extends({
     role: editorEmoji ? undefined : shouldBeInteractive ? 'button' : ariaLabel ? 'img' : 'presentation',
     "aria-label": ariaLabel,

package/dist/esm/components/i18n.js

@@ -255,9 +255,9 @@ export var messages = defineMessages({
     defaultMessage: 'emoji button',
     description: "Aria roledescription for emoji button, used in emoji picker."
   },
-  changeEmojiButtonLabel: {
-    id: 'fabric.emoji.change.button.label',
-    defaultMessage: 'Change emoji',
+  changeEmojiShortnameButtonLabel: {
+    id: 'fabric.emoji.change.shortname.button.label',
+    defaultMessage: 'Change emoji, currently {shortName}',
     description: 'Aria label for the button in page title used to change emoji'
   },
   error: {

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.14.2"
+      packageVersion: "70.14.3"
     }, attributes)
   };
 };

package/dist/types/components/i18n.d.ts

@@ -34,7 +34,7 @@ export declare const messages: {
         description: string;
         id: string;
     };
-    changeEmojiButtonLabel: {
+    changeEmojiShortnameButtonLabel: {
         defaultMessage: string;
         description: string;
         id: string;

package/dist/types-ts4.5/components/i18n.d.ts

@@ -34,7 +34,7 @@ export declare const messages: {
         description: string;
         id: string;
     };
-    changeEmojiButtonLabel: {
+    changeEmojiShortnameButtonLabel: {
         defaultMessage: string;
         description: string;
         id: string;

package/package.json

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