@atlaskit/emoji 70.17.0 → 70.17.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/emoji
 
+## 70.17.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 70.17.1
+
+### Patch Changes
+
+- [`0f549097540b7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f549097540b7) -
+  Fix Unicode emoji rendering for standard emoji skin tone variations.
+
 ## 70.17.0
 
 ### Minor Changes

package/dist/cjs/api/EmojiUtils.js

@@ -117,6 +117,13 @@ var denormaliseServiceRepresentation = exports.denormaliseServiceRepresentation
 var denormaliseServiceAltRepresentation = exports.denormaliseServiceAltRepresentation = function denormaliseServiceAltRepresentation(altReps, meta) {
   return !altReps || Object.keys(altReps).length === 0 ? undefined : denormaliseServiceRepresentation(getAltRepresentation(altReps), meta);
 };
+var denormaliseStandardRepresentation = function denormaliseStandardRepresentation(emoji, meta) {
+  var unicodeEmoji = (0, _emojiIdToEmoji.emojiIdToEmoji)(emoji.id);
+  var useUnicodeRepresentation = !!(emoji.id && emoji.type === _types.ProviderTypes.STANDARD && unicodeEmoji && (0, _platformFeatureFlags.fg)('platform_twemoji_removal_unicode_emojis'));
+  return useUnicodeRepresentation ? {
+    unicodeEmoji: unicodeEmoji
+  } : denormaliseServiceRepresentation(emoji.representation, meta);
+};
 var denormaliseSkinEmoji = exports.denormaliseSkinEmoji = function denormaliseSkinEmoji(emoji, meta) {
   if (!emoji.skinVariations) {
     return [];
@@ -124,12 +131,12 @@ var denormaliseSkinEmoji = exports.denormaliseSkinEmoji = function denormaliseSk
   var skinEmoji = emoji.skinVariations;
   var baseId = emoji.id;
   return skinEmoji.map(function (skin) {
-    var representation = skin.representation,
+    var _representation = skin.representation,
       altRepresentations = skin.altRepresentations,
       other = (0, _objectWithoutProperties2.default)(skin, _excluded3);
     return _objectSpread({
       baseId: baseId,
-      representation: denormaliseServiceRepresentation(representation, meta),
+      representation: denormaliseStandardRepresentation(skin, meta),
       altRepresentation: denormaliseServiceAltRepresentation(altRepresentations, meta)
     }, other);
   });
@@ -141,11 +148,7 @@ var denormaliseSkinEmoji = exports.denormaliseSkinEmoji = function denormaliseSk
  */
 var denormaliseEmojiServiceResponse = exports.denormaliseEmojiServiceResponse = function denormaliseEmojiServiceResponse(emojiData) {
   var emojis = emojiData.emojis.map(function (emoji) {
-    var unicodeEmoji = (0, _emojiIdToEmoji.emojiIdToEmoji)(emoji.id);
-    var useUnicodeRepresentation = !!(emoji.id && emoji.type === _types.ProviderTypes.STANDARD && unicodeEmoji && (0, _platformFeatureFlags.fg)('platform_twemoji_removal_unicode_emojis'));
-    var newRepresentation = useUnicodeRepresentation ? {
-      unicodeEmoji: unicodeEmoji
-    } : denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
+    var newRepresentation = denormaliseStandardRepresentation(emoji, emojiData.meta);
     var altRepresentation = denormaliseServiceAltRepresentation(emoji.altRepresentations, emojiData.meta);
     var newSkinVariations = denormaliseSkinEmoji(emoji, emojiData.meta);
 

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

package/dist/es2019/api/EmojiUtils.js

@@ -107,6 +107,13 @@ export const denormaliseServiceRepresentation = (representation, meta) => {
 export const denormaliseServiceAltRepresentation = (altReps, meta) => {
   return !altReps || Object.keys(altReps).length === 0 ? undefined : denormaliseServiceRepresentation(getAltRepresentation(altReps), meta);
 };
+const denormaliseStandardRepresentation = (emoji, meta) => {
+  const unicodeEmoji = emojiIdToEmoji(emoji.id);
+  const useUnicodeRepresentation = !!(emoji.id && emoji.type === ProviderTypes.STANDARD && unicodeEmoji && fg('platform_twemoji_removal_unicode_emojis'));
+  return useUnicodeRepresentation ? {
+    unicodeEmoji
+  } : denormaliseServiceRepresentation(emoji.representation, meta);
+};
 export const denormaliseSkinEmoji = (emoji, meta) => {
   if (!emoji.skinVariations) {
     return [];
@@ -115,13 +122,13 @@ export const denormaliseSkinEmoji = (emoji, meta) => {
   const baseId = emoji.id;
   return skinEmoji.map(skin => {
     const {
-      representation,
+      representation: _representation,
       altRepresentations,
       ...other
     } = skin;
     return {
       baseId: baseId,
-      representation: denormaliseServiceRepresentation(representation, meta),
+      representation: denormaliseStandardRepresentation(skin, meta),
       altRepresentation: denormaliseServiceAltRepresentation(altRepresentations, meta),
       ...other
     };
@@ -134,11 +141,7 @@ export const denormaliseSkinEmoji = (emoji, meta) => {
  */
 export const denormaliseEmojiServiceResponse = emojiData => {
   const emojis = emojiData.emojis.map(emoji => {
-    const unicodeEmoji = emojiIdToEmoji(emoji.id);
-    const useUnicodeRepresentation = !!(emoji.id && emoji.type === ProviderTypes.STANDARD && unicodeEmoji && fg('platform_twemoji_removal_unicode_emojis'));
-    const newRepresentation = useUnicodeRepresentation ? {
-      unicodeEmoji
-    } : denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
+    const newRepresentation = denormaliseStandardRepresentation(emoji, emojiData.meta);
     const altRepresentation = denormaliseServiceAltRepresentation(emoji.altRepresentations, emojiData.meta);
     const newSkinVariations = denormaliseSkinEmoji(emoji, emojiData.meta);
 

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

package/dist/esm/api/EmojiUtils.js

@@ -110,6 +110,13 @@ export var denormaliseServiceRepresentation = function denormaliseServiceReprese
 export var denormaliseServiceAltRepresentation = function denormaliseServiceAltRepresentation(altReps, meta) {
   return !altReps || Object.keys(altReps).length === 0 ? undefined : denormaliseServiceRepresentation(getAltRepresentation(altReps), meta);
 };
+var denormaliseStandardRepresentation = function denormaliseStandardRepresentation(emoji, meta) {
+  var unicodeEmoji = emojiIdToEmoji(emoji.id);
+  var useUnicodeRepresentation = !!(emoji.id && emoji.type === ProviderTypes.STANDARD && unicodeEmoji && fg('platform_twemoji_removal_unicode_emojis'));
+  return useUnicodeRepresentation ? {
+    unicodeEmoji: unicodeEmoji
+  } : denormaliseServiceRepresentation(emoji.representation, meta);
+};
 export var denormaliseSkinEmoji = function denormaliseSkinEmoji(emoji, meta) {
   if (!emoji.skinVariations) {
     return [];
@@ -117,12 +124,12 @@ export var denormaliseSkinEmoji = function denormaliseSkinEmoji(emoji, meta) {
   var skinEmoji = emoji.skinVariations;
   var baseId = emoji.id;
   return skinEmoji.map(function (skin) {
-    var representation = skin.representation,
+    var _representation = skin.representation,
       altRepresentations = skin.altRepresentations,
       other = _objectWithoutProperties(skin, _excluded3);
     return _objectSpread({
       baseId: baseId,
-      representation: denormaliseServiceRepresentation(representation, meta),
+      representation: denormaliseStandardRepresentation(skin, meta),
       altRepresentation: denormaliseServiceAltRepresentation(altRepresentations, meta)
     }, other);
   });
@@ -134,11 +141,7 @@ export var denormaliseSkinEmoji = function denormaliseSkinEmoji(emoji, meta) {
  */
 export var denormaliseEmojiServiceResponse = function denormaliseEmojiServiceResponse(emojiData) {
   var emojis = emojiData.emojis.map(function (emoji) {
-    var unicodeEmoji = emojiIdToEmoji(emoji.id);
-    var useUnicodeRepresentation = !!(emoji.id && emoji.type === ProviderTypes.STANDARD && unicodeEmoji && fg('platform_twemoji_removal_unicode_emojis'));
-    var newRepresentation = useUnicodeRepresentation ? {
-      unicodeEmoji: unicodeEmoji
-    } : denormaliseServiceRepresentation(emoji.representation, emojiData.meta);
+    var newRepresentation = denormaliseStandardRepresentation(emoji, emojiData.meta);
     var altRepresentation = denormaliseServiceAltRepresentation(emoji.altRepresentations, emojiData.meta);
     var newSkinVariations = denormaliseSkinEmoji(emoji, emojiData.meta);
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "70.17.0",
+	"version": "70.17.2",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/spinner": "^19.1.0",
 		"@atlaskit/textfield": "^8.3.0",
-		"@atlaskit/tmp-editor-statsig": "^94.0.0",
+		"@atlaskit/tmp-editor-statsig": "^95.0.0",
 		"@atlaskit/tokens": "^13.3.0",
 		"@atlaskit/tooltip": "^22.6.0",
 		"@atlaskit/ufo": "^0.5.0",