@atlaskit/emoji 73.0.2 → 73.0.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/emoji
 
+## 73.0.4
+
+### Patch Changes
+
+- [`ab72bd9e98147`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ab72bd9e98147) -
+  Clean up: emoji_decorative_label
+
+## 73.0.3
+
+### Patch Changes
+
+- [`e54e1541aa52f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e54e1541aa52f) -
+  Fix the skin-tone selector closing when focus moves between its controls or when clicking a tone
+  behind `platform_emoji_skin_tone_blur_fix` when `platform_suppression_removal_fix_reactions` is
+  enabled.
+
 ## 73.0.2
 
 ### Patch Changes

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

@@ -13,7 +13,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _types = require("../../types");
@@ -102,7 +101,7 @@ var EmojiNodeWrapper = exports.EmojiNodeWrapper = /*#__PURE__*/(0, _react.forwar
     isDecorative = props.isDecorative,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var intl = (0, _react.useContext)(_reactIntl.IntlContext);
-  var isAriaLabelEmpty = editorEmoji || isDecorative && (0, _fg.fg)('emoji_decorative_label');
+  var isAriaLabelEmpty = editorEmoji || isDecorative;
   var ariaLabel;
   if (isAriaLabelEmpty) {
     ariaLabel = undefined;

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

@@ -256,6 +256,11 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
     }
     setShowToneSelector(false);
   }, [shouldUseProductivityColorControl, showToneSelector, onToneSelectorCancelled]);
+  var onBlurHandler = (0, _react.useCallback)(function (event) {
+    if (!(0, _fg.fg)('platform_emoji_skin_tone_blur_fix') || !event.currentTarget.contains(event.relatedTarget)) {
+      onMouseLeaveHandler();
+    }
+  }, [onMouseLeaveHandler]);
   (0, _react.useEffect)(function () {
     if (shouldUseProductivityColorControl && showToneSelector) {
       wasProductivityColorSelectorOpen.current = true;
@@ -309,7 +314,7 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
   return (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)() ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: (0, _fg.fg)('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: (0, _fg.fg)('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug"])
   }, /*#__PURE__*/React.createElement("div", {
     className: (0, _runtime.ax)(["_1e0c1txw _1bahesu3 _4cvr1h6o"])
@@ -327,7 +332,7 @@ var EmojiActions = exports.EmojiActions = function EmojiActions(props) {
   })))) : /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: (0, _fg.fg)('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: (0, _fg.fg)('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug _n7zl1uh4 _16qsjgpa"])
   }, /*#__PURE__*/React.createElement("div", {
     className: (0, _runtime.ax)(["_1e0c1txw _1bahesu3 _4cvr1h6o"])

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

@@ -12,7 +12,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _browserApis = require("@atlaskit/browser-apis");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _shouldUseAltRepresentation = require("../../api/shouldUseAltRepresentation");
 var _useInView3 = require("../../hooks/useInView");
@@ -142,7 +141,7 @@ var ImageEmoji = exports.ImageEmoji = function ImageEmoji(props) {
       onBeforeLoad();
     }
   }, [inView, onBeforeLoad]);
-  var imgAlt = isDecorative && (0, _fg.fg)('emoji_decorative_label') ? '' : emoji.name || emoji.shortName || '';
+  var imgAlt = isDecorative ? '' : emoji.name || emoji.shortName || '';
   var emojiNode = /*#__PURE__*/_react.default.createElement("img", (0, _extends2.default)({
     loading: disableLazyLoad ? 'eager' : 'lazy',
     src: src,

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

@@ -13,6 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _analytics = require("../../util/analytics/analytics");
 var _toneSelectedEvent = require("../../util/analytics/toneSelectedEvent");
 var _toneSelectorOpenedEvent = require("../../util/analytics/toneSelectorOpenedEvent");
@@ -80,6 +81,12 @@ var ToneSelectorInternal = exports.ToneSelectorInternal = function ToneSelectorI
     var nextIndex = (currentIndex + direction + len) % len;
     (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 || _radioRefs$current$ne.focus();
   }, []);
+  var onMouseDownHandler = (0, _react.useCallback)(function (event) {
+    if ((0, _fg.fg)('platform_emoji_skin_tone_blur_fix')) {
+      // Keep focus inside the selector until the label activates its radio.
+      event.preventDefault();
+    }
+  }, []);
   var onToneSelectedHandler = function onToneSelectedHandler(toneValue) {
     return function () {
       if (selectedTone === toneValue && onToneClose) {
@@ -99,9 +106,11 @@ var ToneSelectorInternal = exports.ToneSelectorInternal = function ToneSelectorI
   isMounted.current = true;
   return /*#__PURE__*/_react.default.createElement("div", {
     role: "radiogroup",
+    tabIndex: (0, _fg.fg)('platform_emoji_skin_tone_blur_fix') ? -1 : undefined,
     "data-testid": _ToneSelector.toneSelectorTestId,
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(_i18n.messages.emojiSelectSkinToneListAriaLabelText),
+    onMouseDown: onMouseDownHandler,
     className: (0, _runtime.ax)([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
   }, emojiToneCollection.map(function (tone, renderIndex) {
     return (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)() ? /*#__PURE__*/_react.default.createElement(_EmojiRadioButton.default, {

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

@@ -19,7 +19,7 @@ var createEvent = exports.createEvent = function createEvent(eventType, action,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "73.0.1"
+      packageVersion: "73.0.3"
     }, attributes)
   };
 };

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

@@ -4,7 +4,6 @@ import "./Emoji.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useContext, forwardRef } from 'react';
 import { IntlContext } from 'react-intl';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { UfoEmojiTimings } from '../../types';
@@ -100,7 +99,7 @@ export const EmojiNodeWrapper = /*#__PURE__*/forwardRef((props, ref) => {
     ...other
   } = props;
   const intl = useContext(IntlContext);
-  const isAriaLabelEmpty = editorEmoji || isDecorative && fg('emoji_decorative_label');
+  const isAriaLabelEmpty = editorEmoji || isDecorative;
   let ariaLabel;
   if (isAriaLabelEmpty) {
     ariaLabel = undefined;

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

@@ -238,6 +238,11 @@ export const EmojiActions = props => {
     }
     setShowToneSelector(false);
   }, [shouldUseProductivityColorControl, showToneSelector, onToneSelectorCancelled]);
+  const onBlurHandler = useCallback(event => {
+    if (!fg('platform_emoji_skin_tone_blur_fix') || !event.currentTarget.contains(event.relatedTarget)) {
+      onMouseLeaveHandler();
+    }
+  }, [onMouseLeaveHandler]);
   useEffect(() => {
     if (shouldUseProductivityColorControl && showToneSelector) {
       wasProductivityColorSelectorOpen.current = true;
@@ -291,7 +296,7 @@ export const EmojiActions = props => {
   return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: fg('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: fg('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: ax(["_16jlidpf _1o9zidpf _i0dl1wug"])
   }, /*#__PURE__*/React.createElement("div", {
     className: ax(["_1e0c1txw _1bahesu3 _4cvr1h6o"])
@@ -309,7 +314,7 @@ export const EmojiActions = props => {
   })))) : /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: fg('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: fg('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: ax(["_16jlidpf _1o9zidpf _i0dl1wug _n7zl1uh4 _16qsjgpa"])
   }, /*#__PURE__*/React.createElement("div", {
     className: ax(["_1e0c1txw _1bahesu3 _4cvr1h6o"])

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

@@ -3,7 +3,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useCallback, useMemo } from 'react';
 import { getDocument } from '@atlaskit/browser-apis';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { shouldUseAltRepresentation } from '../../api/shouldUseAltRepresentation';
 import { useInView } from '../../hooks/useInView';
@@ -127,7 +126,7 @@ export const ImageEmoji = props => {
       onBeforeLoad();
     }
   }, [inView, onBeforeLoad]);
-  const imgAlt = isDecorative && fg('emoji_decorative_label') ? '' : emoji.name || emoji.shortName || '';
+  const imgAlt = isDecorative ? '' : emoji.name || emoji.shortName || '';
   const emojiNode = /*#__PURE__*/React.createElement("img", _extends({
     loading: disableLazyLoad ? 'eager' : 'lazy',
     src: src,

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

@@ -3,6 +3,7 @@ import "./ToneSelectorInternal.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createAndFireEventInElementsChannel } from '../../util/analytics/analytics';
 import { toneSelectedEvent } from '../../util/analytics/toneSelectedEvent';
 import { toneSelectorOpenedEvent } from '../../util/analytics/toneSelectorOpenedEvent';
@@ -71,6 +72,12 @@ export const ToneSelectorInternal = props => {
     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 onMouseDownHandler = useCallback(event => {
+    if (fg('platform_emoji_skin_tone_blur_fix')) {
+      // Keep focus inside the selector until the label activates its radio.
+      event.preventDefault();
+    }
+  }, []);
   const onToneSelectedHandler = toneValue => () => {
     if (selectedTone === toneValue && onToneClose) {
       onToneClose();
@@ -88,9 +95,11 @@ export const ToneSelectorInternal = props => {
   isMounted.current = true;
   return /*#__PURE__*/React.createElement("div", {
     role: "radiogroup",
+    tabIndex: fg('platform_emoji_skin_tone_blur_fix') ? -1 : undefined,
     "data-testid": toneSelectorTestId,
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(messages.emojiSelectSkinToneListAriaLabelText),
+    onMouseDown: onMouseDownHandler,
     className: ax([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
   }, emojiToneCollection.map((tone, renderIndex) => {
     return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement(EmojiRadioButton, {

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

@@ -7,7 +7,7 @@ export const createEvent = (eventType, action, actionSubject, actionSubjectId, a
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "73.0.1",
+    packageVersion: "73.0.3",
     ...attributes
   }
 });

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

@@ -6,7 +6,6 @@ import "./Emoji.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useContext, forwardRef } from 'react';
 import { IntlContext } from 'react-intl';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { UfoEmojiTimings } from '../../types';
@@ -93,7 +92,7 @@ export var EmojiNodeWrapper = /*#__PURE__*/forwardRef(function (props, ref) {
     isDecorative = props.isDecorative,
     other = _objectWithoutProperties(props, _excluded);
   var intl = useContext(IntlContext);
-  var isAriaLabelEmpty = editorEmoji || isDecorative && fg('emoji_decorative_label');
+  var isAriaLabelEmpty = editorEmoji || isDecorative;
   var ariaLabel;
   if (isAriaLabelEmpty) {
     ariaLabel = undefined;

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

@@ -247,6 +247,11 @@ export var EmojiActions = function EmojiActions(props) {
     }
     setShowToneSelector(false);
   }, [shouldUseProductivityColorControl, showToneSelector, onToneSelectorCancelled]);
+  var onBlurHandler = useCallback(function (event) {
+    if (!fg('platform_emoji_skin_tone_blur_fix') || !event.currentTarget.contains(event.relatedTarget)) {
+      onMouseLeaveHandler();
+    }
+  }, [onMouseLeaveHandler]);
   useEffect(function () {
     if (shouldUseProductivityColorControl && showToneSelector) {
       wasProductivityColorSelectorOpen.current = true;
@@ -300,7 +305,7 @@ export var EmojiActions = function EmojiActions(props) {
   return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: fg('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: fg('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: ax(["_16jlidpf _1o9zidpf _i0dl1wug"])
   }, /*#__PURE__*/React.createElement("div", {
     className: ax(["_1e0c1txw _1bahesu3 _4cvr1h6o"])
@@ -318,7 +323,7 @@ export var EmojiActions = function EmojiActions(props) {
   })))) : /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
-    onBlur: fg('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,
+    onBlur: fg('platform_suppression_removal_fix_reactions') ? onBlurHandler : undefined,
     className: ax(["_16jlidpf _1o9zidpf _i0dl1wug _n7zl1uh4 _16qsjgpa"])
   }, /*#__PURE__*/React.createElement("div", {
     className: ax(["_1e0c1txw _1bahesu3 _4cvr1h6o"])

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

@@ -4,7 +4,6 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useCallback, useMemo } from 'react';
 import { getDocument } from '@atlaskit/browser-apis';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { shouldUseAltRepresentation } from '../../api/shouldUseAltRepresentation';
 import { useInView } from '../../hooks/useInView';
@@ -133,7 +132,7 @@ export var ImageEmoji = function ImageEmoji(props) {
       onBeforeLoad();
     }
   }, [inView, onBeforeLoad]);
-  var imgAlt = isDecorative && fg('emoji_decorative_label') ? '' : emoji.name || emoji.shortName || '';
+  var imgAlt = isDecorative ? '' : emoji.name || emoji.shortName || '';
   var emojiNode = /*#__PURE__*/React.createElement("img", _extends({
     loading: disableLazyLoad ? 'eager' : 'lazy',
     src: src,

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

@@ -7,6 +7,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createAndFireEventInElementsChannel } from '../../util/analytics/analytics';
 import { toneSelectedEvent } from '../../util/analytics/toneSelectedEvent';
 import { toneSelectorOpenedEvent } from '../../util/analytics/toneSelectorOpenedEvent';
@@ -71,6 +72,12 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
     var nextIndex = (currentIndex + direction + len) % len;
     (_radioRefs$current$ne = radioRefs.current[nextIndex]) === null || _radioRefs$current$ne === void 0 || _radioRefs$current$ne.focus();
   }, []);
+  var onMouseDownHandler = useCallback(function (event) {
+    if (fg('platform_emoji_skin_tone_blur_fix')) {
+      // Keep focus inside the selector until the label activates its radio.
+      event.preventDefault();
+    }
+  }, []);
   var onToneSelectedHandler = function onToneSelectedHandler(toneValue) {
     return function () {
       if (selectedTone === toneValue && onToneClose) {
@@ -90,9 +97,11 @@ export var ToneSelectorInternal = function ToneSelectorInternal(props) {
   isMounted.current = true;
   return /*#__PURE__*/React.createElement("div", {
     role: "radiogroup",
+    tabIndex: fg('platform_emoji_skin_tone_blur_fix') ? -1 : undefined,
     "data-testid": toneSelectorTestId,
     id: "emoji-picker-tone-selector",
     "aria-label": formatMessage(messages.emojiSelectSkinToneListAriaLabelText),
+    onMouseDown: onMouseDownHandler,
     className: ax([!isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])
   }, emojiToneCollection.map(function (tone, renderIndex) {
     return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement(EmojiRadioButton, {

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

@@ -12,7 +12,7 @@ export var createEvent = function createEvent(eventType, action, actionSubject,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "73.0.1"
+      packageVersion: "73.0.3"
     }, attributes)
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "73.0.2",
+	"version": "73.0.4",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 		"@atlaskit/afm-i18n-platform-elements-emoji": "2.270.0",
 		"@atlaskit/analytics-next": "^12.6.0",
 		"@atlaskit/browser-apis": "^1.2.0",
-		"@atlaskit/button": "^25.4.0",
+		"@atlaskit/button": "^25.5.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/feature-gate-js-client": "^7.0.0",
 		"@atlaskit/form": "^18.2.0",
@@ -79,13 +79,17 @@
 	"devDependencies": {
 		"@af/integration-testing": "workspace:^",
 		"@af/visual-regression": "workspace:^",
+		"@atlaskit/docs": "^12.3.0",
+		"@atlaskit/editor-test-helpers": "workspace:^",
 		"@atlaskit/media-core": "^39.0.0",
+		"@atlaskit/popup": "^10.0.0",
+		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/ssr": "workspace:^",
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/a11y-jest-testing": "^0.17.0",
 		"@atlassian/experiment-test-utils": "^0.2.0",
 		"@atlassian/feature-flags-test-utils": "^1.3.0",
-		"@atlassian/ufo": "^1.0.0",
+		"@atlassian/ufo": "^1.1.0",
 		"@atlassian/ufo-experimental": "^1.1.0",
 		"@atlassian/workbench": "workspace:*",
 		"@emotion/jest": "^11.8.0",
@@ -127,6 +131,9 @@
 		"platform_suppression_removal_fix_reactions": {
 			"type": "boolean"
 		},
+		"platform_emoji_skin_tone_blur_fix": {
+			"type": "boolean"
+		},
 		"platform_bitbucket_fix_shortname_and_ordering": {
 			"type": "boolean"
 		},
@@ -135,9 +142,6 @@
 		},
 		"platform_teamoji_26_refresh_emoji_picker_user_id": {
 			"type": "boolean"
-		},
-		"emoji_decorative_label": {
-			"type": "boolean"
 		}
 	},
 	"platform-experiments": {