@atlaskit/emoji 71.4.2 → 71.4.4

package/dist/cjs/components/picker/EmojiPickerEmojiRow.js

@@ -13,7 +13,6 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _reactIntl = require("react-intl");
 var _CachingEmoji = _interopRequireDefault(require("../common/CachingEmoji"));
 var _useEmojiPickerListContext = require("../../hooks/useEmojiPickerListContext");
@@ -23,7 +22,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var emojiItem = null;
 var emojiPickerRow = null;
 var emojiPickerRowList = null;
-var teamojiRefreshExperimentName = 'platform_teamoji_26_refresh_emoji_picker';
 var EmojiPickerEmojiRow = function EmojiPickerEmojiRow(_ref) {
   var emojis = _ref.emojis,
     onSelected = _ref.onSelected,
@@ -41,7 +39,7 @@ var EmojiPickerEmojiRow = function EmojiPickerEmojiRow(_ref) {
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var fitToHeight = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_use_unicode_emojis', 'isEnabled', true) ? 24 : undefined;
-  var preventFocusOnMouseDown = _featureGateJsClient.default.getExperimentValue(teamojiRefreshExperimentName, 'isEnabled', false);
+  var preventFocusOnMouseDown = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', true);
   var handleFocus = function handleFocus(index) {
     return function (emojiId, emoji, event) {
       setEmojisFocus({

package/dist/cjs/components/picker/EmojiPickerFooter.js

@@ -1,7 +1,6 @@
 /* EmojiPickerFooter.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
@@ -13,9 +12,9 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
 var _compiled = require("@atlaskit/primitives/compiled");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _EmojiPreviewComponent = require("../common/EmojiPreviewComponent");
 var _AddEmoji = require("../common/AddEmoji");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 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 emojiPickerFooter = null;
 var emojiPickerFooterWithTopShadow = null;
@@ -29,7 +28,7 @@ var EmojiPickerFooter = function EmojiPickerFooter(_ref) {
     onOpenUpload = _ref.onOpenUpload,
     uploadEnabled = _ref.uploadEnabled;
   var intl = (0, _reactIntl.useIntl)();
-  return _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+  return (0, _expVal.expVal)('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiPickerFooterTestId,
     className: (0, _runtime.ax)(["_16jlidpf _1o9zidpf _i0dl1wug", "_x3doia51"])
   }, selectedEmoji ? /*#__PURE__*/React.createElement(_compiled.Box, {

package/dist/cjs/components/picker/EmojiPickerList.js

@@ -9,8 +9,8 @@ exports.RENDER_EMOJI_PICKER_LIST_TESTID = exports.EmojiPickerVirtualListInternal
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _reactIntl = require("react-intl");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _react = _interopRequireWildcard(require("react"));
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _constants = require("../../util/constants");
 var _productivityColors = require("../../util/productivity-colors");
 var _hiddenEmojis = require("../../util/hidden-emojis");
@@ -106,7 +106,7 @@ var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     categoriesChanged = _useState8[0],
     setCategoriesChanged = _useState8[1];
-  var isTeamojiExperimentEnabled = _featureGateJsClient.default.getExperimentValue(teamojiRefreshExperimentName, 'isEnabled', false);
+  var isTeamojiExperimentEnabled = (0, _expVal.expVal)(teamojiRefreshExperimentName, 'isEnabled', false);
   var visibleEmojis = (0, _react.useMemo)(function () {
     return isTeamojiExperimentEnabled ? (0, _hiddenEmojis.filterHiddenEmojis)(emojis) : emojis;
   }, [emojis, isTeamojiExperimentEnabled]);

package/dist/cjs/components/picker/EmojiPickerListSearch.js

@@ -17,8 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _useDebounce = require("use-debounce");
 var _constants = require("../../util/constants");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _i18n = require("../i18n");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 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 input = null;
 var inputNew = null;
@@ -71,7 +71,7 @@ var EmojiPickerListSearch = exports.EmojiPickerListSearch = function EmojiPicker
     role: "status"
   }, dirty ? query === '' ? formatMessage(_i18n.messages.searchResultsStatusSeeAll) : formatMessage(_i18n.messages.searchResultsStatus, {
     count: resultsCount
-  }) : null), _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/_react.default.createElement("div", {
+  }) : null), (0, _expVal.expVal)('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _runtime.ax)(["_n6341l7x _18z11b66"])
   }, /*#__PURE__*/_react.default.createElement(_textfield.default, {
     role: "searchbox",

package/dist/cjs/components/picker/VirtualList.js

@@ -14,7 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _reactVirtual = require("@tanstack/react-virtual");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _useEmojiPickerListContext = require("../../hooks/useEmojiPickerListContext");
 var _constants = require("../../util/constants");
 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); }
@@ -65,7 +65,7 @@ var VirtualList = exports.VirtualList = /*#__PURE__*/_react.default.forwardRef(f
     var elemBottom = elementRect.bottom;
     var parentTop = parentRect.top;
     var parentBottom = parentRect.bottom;
-    var isVisible = _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? elemTop >= parentTop && elemBottom <= parentBottom : elemBottom > parentTop && elemTop < parentBottom;
+    var isVisible = (0, _expVal.expVal)('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? elemTop >= parentTop && elemBottom <= parentBottom : elemBottom > parentTop && elemTop < parentBottom;
     return isVisible;
   };
   var getFirstVisibleListElementIndex = (0, _react.useCallback)(function () {
@@ -84,7 +84,7 @@ var VirtualList = exports.VirtualList = /*#__PURE__*/_react.default.forwardRef(f
       var _virtualList$firstVis;
       return ((_virtualList$firstVis = virtualList[firstVisibleIndex]) === null || _virtualList$firstVis === void 0 ? void 0 : _virtualList$firstVis.index) || 0;
     }
-    return _featureGateJsClient.default.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? ((_virtualList$ = virtualList[0]) === null || _virtualList$ === void 0 ? void 0 : _virtualList$.index) || 0 : 0;
+    return (0, _expVal.expVal)('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? ((_virtualList$ = virtualList[0]) === null || _virtualList$ === void 0 ? void 0 : _virtualList$.index) || 0 : 0;
   }, [rowVirtualizer]);
 
   /**

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: "71.4.1"
+      packageVersion: "71.4.3"
     }, attributes)
   };
 };

package/dist/cjs/util/emojiIdToEmoji.js

@@ -11,36 +11,25 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 var KEYCAP_COMBINING = 0x20e3;
 var VARIATION_SELECTOR_16 = 0xfe0f;
 var VARIATION_SELECTOR_15 = 0xfe0e;
+var EMOJI_MODIFIER_START = 0x1f3fb;
+var EMOJI_MODIFIER_END = 0x1f3ff;
+var REGIONAL_INDICATOR_START = 0x1f1e6;
+var REGIONAL_INDICATOR_END = 0x1f1ff;
+var FLAG_BASES = new Set([0x1f38c, 0x1f3c1, 0x1f3f3, 0x1f3f4, 0x1f6a9]);
 
-// Text-presentation-default emoji: BMP characters (U+0000–U+FFFF) that are
-// valid emoji but lack the Emoji_Presentation property render as text without
-// U+FE0F. Supplementary-plane characters (U+10000+) always render as emoji
-// regardless of the Emoji_Presentation property, so we skip those.
-//
-// This set is derived from Unicode 14.0 emoji-data.txt: all BMP code points
-// that have the Emoji property but NOT the Emoji_Presentation property.
-// Using an explicit lookup table avoids the \p{} Unicode property escape
-// syntax (TS1501) which requires a specific TypeScript build target.
-var TEXT_DEFAULT_EMOJI = new Set([0x0023, 0x002a, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x00a9, 0x00ae, 0x203c, 0x2049, 0x2122, 0x2139, 0x2194, 0x2195, 0x2196, 0x2197, 0x2198, 0x2199, 0x21a9, 0x21aa, 0x2328, 0x23cf, 0x23ed, 0x23ee, 0x23ef, 0x23f1, 0x23f2, 0x23f8, 0x23f9, 0x23fa, 0x24c2, 0x25aa, 0x25ab, 0x25b6, 0x25c0, 0x25fb, 0x25fc, 0x2600, 0x2601, 0x2602, 0x2603, 0x2604, 0x260e, 0x2611, 0x2618, 0x261d, 0x2620, 0x2622, 0x2623, 0x2626, 0x262a, 0x262e, 0x262f, 0x2638, 0x2639, 0x263a, 0x2640, 0x2642, 0x265f, 0x2660, 0x2663, 0x2665, 0x2666, 0x2668, 0x267b, 0x267e, 0x2692, 0x2694, 0x2695, 0x2696, 0x2697, 0x2699, 0x269b, 0x269c, 0x26a0, 0x26a7, 0x26b0, 0x26b1, 0x26c8, 0x26cf, 0x26d1, 0x26d3, 0x26e9, 0x26f0, 0x26f1, 0x26f4, 0x26f7, 0x26f8, 0x26f9, 0x2702, 0x2708, 0x2709, 0x270c, 0x270d, 0x270f, 0x2712, 0x2714, 0x2716, 0x271d, 0x2721, 0x2733, 0x2734, 0x2744, 0x2747, 0x2763, 0x2764, 0x27a1, 0x2934, 0x2935, 0x2b05, 0x2b06, 0x2b07, 0x3030, 0x303d, 0x3297, 0x3299]);
-
-/**
- * Converts an emoji ID (a hyphen-separated string of hex Unicode code points,
- * e.g. `"1f44d"`, `"1f44d-1f3fb"`, `"1f468-200d-1f469-200d-1f467"`) into its
- * corresponding Unicode string.
- *
- * Special handling:
- * - Keycap sequences: U+20E3 (COMBINING ENCLOSING KEYCAP) must be preceded by
- *   U+FE0F (VARIATION SELECTOR-16) to form a well-defined keycap emoji.
- * - Text-default emoji (characters whose default presentation is text) must be
- *   followed by U+FE0F to force emoji presentation.
- *
- * @returns The Unicode string for the emoji, or `undefined` if the input is
- *   invalid (empty string, non-hex segments, or out-of-range code points).
- */
-function emojiIdToEmoji(id) {
-  if (!id) {
-    return undefined;
-  }
+// Emoji variation bases from Unicode 14.0 emoji-variation-sequences.txt.
+// These are the code points with a defined U+FE0F emoji-style variant.
+var EMOJI_VARIATION_BASES = new Set([0x0023, 0x002a, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x00a9, 0x00ae, 0x203c, 0x2049, 0x2122, 0x2139, 0x2194, 0x2195, 0x2196, 0x2197, 0x2198, 0x2199, 0x21a9, 0x21aa, 0x2328, 0x23cf, 0x23ed, 0x23ee, 0x23ef, 0x23f1, 0x23f2, 0x23f8, 0x23f9, 0x23fa, 0x24c2, 0x25aa, 0x25ab, 0x25b6, 0x25c0, 0x25fb, 0x25fc, 0x2600, 0x2601, 0x2602, 0x2603, 0x2604, 0x260e, 0x2611, 0x2618, 0x261d, 0x2620, 0x2622, 0x2623, 0x2626, 0x262a, 0x262e, 0x262f, 0x2638, 0x2639, 0x263a, 0x2640, 0x2642, 0x265f, 0x2660, 0x2663, 0x2665, 0x2666, 0x2668, 0x267b, 0x267e, 0x2692, 0x2694, 0x2695, 0x2696, 0x2697, 0x2699, 0x269b, 0x269c, 0x26a0, 0x26a7, 0x26b0, 0x26b1, 0x26c8, 0x26cf, 0x26d1, 0x26d3, 0x26e9, 0x26f0, 0x26f1, 0x26f4, 0x26f7, 0x26f8, 0x26f9, 0x2702, 0x2708, 0x2709, 0x270c, 0x270d, 0x270f, 0x2712, 0x2714, 0x2716, 0x271d, 0x2721, 0x2733, 0x2734, 0x2744, 0x2747, 0x2763, 0x2764, 0x27a1, 0x2934, 0x2935, 0x2b05, 0x2b06, 0x2b07, 0x3030, 0x303d, 0x3297, 0x3299, 0x1f170, 0x1f171, 0x1f17e, 0x1f17f, 0x1f202, 0x1f237, 0x1f321, 0x1f324, 0x1f325, 0x1f326, 0x1f327, 0x1f328, 0x1f329, 0x1f32a, 0x1f32b, 0x1f32c, 0x1f336, 0x1f37d, 0x1f396, 0x1f397, 0x1f399, 0x1f39a, 0x1f39b, 0x1f39e, 0x1f39f, 0x1f3cb, 0x1f3cc, 0x1f3cd, 0x1f3ce, 0x1f3d4, 0x1f3d5, 0x1f3d6, 0x1f3d7, 0x1f3d8, 0x1f3d9, 0x1f3da, 0x1f3db, 0x1f3dc, 0x1f3dd, 0x1f3de, 0x1f3df, 0x1f3f3, 0x1f3f5, 0x1f3f7, 0x1f43f, 0x1f441, 0x1f4fd, 0x1f549, 0x1f54a, 0x1f56f, 0x1f570, 0x1f573, 0x1f574, 0x1f575, 0x1f576, 0x1f577, 0x1f578, 0x1f579, 0x1f587, 0x1f58a, 0x1f58b, 0x1f58c, 0x1f58d, 0x1f590, 0x1f5a5, 0x1f5a8, 0x1f5b1, 0x1f5b2, 0x1f5bc, 0x1f5c2, 0x1f5c3, 0x1f5c4, 0x1f5d1, 0x1f5d2, 0x1f5d3, 0x1f5dc, 0x1f5dd, 0x1f5de, 0x1f5e1, 0x1f5e3, 0x1f5e8, 0x1f5ef, 0x1f5f3, 0x1f5fa, 0x1f6cb, 0x1f6cd, 0x1f6ce, 0x1f6cf, 0x1f6e0, 0x1f6e1, 0x1f6e2, 0x1f6e3, 0x1f6e4, 0x1f6e5, 0x1f6e9, 0x1f6f0, 0x1f6f3, 0x231a, 0x231b, 0x23e9, 0x23ea, 0x23f3, 0x25fd, 0x25fe, 0x2614, 0x2615, 0x2648, 0x2649, 0x264a, 0x264b, 0x264c, 0x264d, 0x264e, 0x264f, 0x2650, 0x2651, 0x2652, 0x2653, 0x267f, 0x2693, 0x26a1, 0x26aa, 0x26ab, 0x26bd, 0x26be, 0x26c4, 0x26c5, 0x26d4, 0x26ea, 0x26f2, 0x26f3, 0x26f5, 0x26fa, 0x26fd, 0x2753, 0x2757, 0x2b1b, 0x2b1c, 0x2b50, 0x2b55, 0x1f004, 0x1f21a, 0x1f22f, 0x1f30d, 0x1f30e, 0x1f30f, 0x1f315, 0x1f31c, 0x1f378, 0x1f393, 0x1f3a7, 0x1f3ac, 0x1f3ad, 0x1f3ae, 0x1f3c2, 0x1f3c4, 0x1f3c6, 0x1f3ca, 0x1f3e0, 0x1f3ed, 0x1f408, 0x1f415, 0x1f41f, 0x1f426, 0x1f442, 0x1f446, 0x1f447, 0x1f448, 0x1f449, 0x1f44d, 0x1f44e, 0x1f453, 0x1f46a, 0x1f47d, 0x1f4a3, 0x1f4b0, 0x1f4b3, 0x1f4bb, 0x1f4bf, 0x1f4cb, 0x1f4da, 0x1f4df, 0x1f4e4, 0x1f4e5, 0x1f4e6, 0x1f4ea, 0x1f4eb, 0x1f4ec, 0x1f4ed, 0x1f4f7, 0x1f4f9, 0x1f4fa, 0x1f4fb, 0x1f508, 0x1f50d, 0x1f512, 0x1f513, 0x1f550, 0x1f551, 0x1f552, 0x1f553, 0x1f554, 0x1f555, 0x1f556, 0x1f557, 0x1f558, 0x1f559, 0x1f55a, 0x1f55b, 0x1f55c, 0x1f55d, 0x1f55e, 0x1f55f, 0x1f560, 0x1f561, 0x1f562, 0x1f563, 0x1f564, 0x1f565, 0x1f566, 0x1f567, 0x1f610, 0x1f687, 0x1f68d, 0x1f691, 0x1f694, 0x1f698, 0x1f6ad, 0x1f6b2, 0x1f6b9, 0x1f6ba, 0x1f6bc]);
+var isEmojiModifier = function isEmojiModifier(codePoint) {
+  return typeof codePoint === 'number' && codePoint >= EMOJI_MODIFIER_START && codePoint <= EMOJI_MODIFIER_END;
+};
+var shouldAddEmojiPresentationSelector = function shouldAddEmojiPresentationSelector(codePoint, nextCodePoint) {
+  return EMOJI_VARIATION_BASES.has(codePoint) && nextCodePoint !== VARIATION_SELECTOR_16 && nextCodePoint !== VARIATION_SELECTOR_15 && nextCodePoint !== KEYCAP_COMBINING && !isEmojiModifier(nextCodePoint);
+};
+var isRegionalIndicator = function isRegionalIndicator(codePoint) {
+  return codePoint >= REGIONAL_INDICATOR_START && codePoint <= REGIONAL_INDICATOR_END;
+};
+var parseEmojiIdCodePoints = function parseEmojiIdCodePoints(id) {
   var segments = id.split('-');
   var codePoints = [];
   var _iterator = _createForOfIteratorHelper(segments),
@@ -51,19 +40,53 @@ function emojiIdToEmoji(id) {
       if (!/^[0-9a-fA-F]+$/.test(segment)) {
         return undefined;
       }
-      var _cp = parseInt(segment, 16);
-      // Valid Unicode scalar values: 0x0000–0x10FFFF, excluding surrogates 0xD800–0xDFFF
-      if (isNaN(_cp) || _cp < 0 || _cp > 0x10ffff || _cp >= 0xd800 && _cp <= 0xdfff) {
+      var cp = parseInt(segment, 16);
+      // Valid Unicode scalar values: U+0000–U+10FFFF, excluding surrogates.
+      if (isNaN(cp) || cp < 0 || cp > 0x10ffff || cp >= 0xd800 && cp <= 0xdfff) {
         return undefined;
       }
-      codePoints.push(_cp);
+      codePoints.push(cp);
     }
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
-  if (codePoints.length === 0) {
+  return codePoints.length ? codePoints : undefined;
+};
+var isFlagEmoji = function isFlagEmoji(codePoints) {
+  if (codePoints.length === 2 && codePoints.every(isRegionalIndicator)) {
+    return true;
+  }
+  return FLAG_BASES.has(codePoints[0]);
+};
+
+/**
+ * Converts an emoji ID (a hyphen-separated string of hex Unicode code points,
+ * e.g. `"1f44d"`, `"1f44d-1f3fb"`, `"1f468-200d-1f469-200d-1f467"`) into its
+ * corresponding Unicode string.
+ *
+ * Special handling:
+ * - Keycap sequences: U+20E3 (COMBINING ENCLOSING KEYCAP) must be preceded by
+ *   U+FE0F (VARIATION SELECTOR-16) to form a well-defined keycap emoji.
+ * - Emoji variation bases are followed by U+FE0F to force emoji presentation.
+ * - Flags return `undefined` so callers use Twemoji instead of native emoji.
+ *
+ * @returns The Unicode string for the emoji, or `undefined` if the input is
+ *   invalid (empty string, non-hex segments, or out-of-range code points).
+ */
+function emojiIdToEmoji(id) {
+  if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_use_unicode_emojis', 'isEnabled', true)) {
+    return undefined;
+  }
+  if (!id) {
+    return undefined;
+  }
+  var codePoints = parseEmojiIdCodePoints(id);
+  if (!codePoints) {
+    return undefined;
+  }
+  if (isFlagEmoji(codePoints)) {
     return undefined;
   }
   var processedCodePoints = [];
@@ -77,22 +100,11 @@ function emojiIdToEmoji(id) {
     if (next === KEYCAP_COMBINING && cp !== VARIATION_SELECTOR_16) {
       processedCodePoints.push(VARIATION_SELECTOR_16);
     }
-  }
 
-  // Text-presentation-default emoji: characters that are valid emoji but whose
-  // default rendering is text (e.g. ☪ ☺ ☢ etc.) must be followed by
-  // U+FE0F (VARIATION SELECTOR-16) to force emoji presentation.
-  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_use_unicode_emojis', 'isEnabled', true)) {
-    var lastCodePoint = processedCodePoints[processedCodePoints.length - 1];
-    var alreadyHasVariationSelector = lastCodePoint === VARIATION_SELECTOR_16 || lastCodePoint === VARIATION_SELECTOR_15 ||
-    // Keycap sequences end with U+20E3 — they already have U+FE0F inserted inline
-    // and must not have another variation selector appended at the end.
-    lastCodePoint === KEYCAP_COMBINING;
-    if (!alreadyHasVariationSelector) {
-      var baseCodePoint = codePoints[0];
-      if (codePoints.length === 1 && baseCodePoint <= 0xffff && TEXT_DEFAULT_EMOJI.has(baseCodePoint)) {
-        processedCodePoints.push(VARIATION_SELECTOR_16);
-      }
+    // Emoji variation bases need U+FE0F immediately after the base code point,
+    // including when the base appears inside a ZWJ sequence.
+    if (shouldAddEmojiPresentationSelector(cp, next)) {
+      processedCodePoints.push(VARIATION_SELECTOR_16);
     }
   }
   try {

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

@@ -5,9 +5,9 @@ import { ax, ix } from "@compiled/react/runtime";
 import Button from '@atlaskit/button/standard-button';
 import CrossCircleIcon from '@atlaskit/icon/core/cross-circle';
 import { deleteEmojiLabel } from '../../util/constants';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { emojiDeleteButton } from './styles';
 import { Box } from '@atlaskit/primitives/compiled';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 const styles = {
   boxWrapperStyle: "_1bsbf6fq _4t3if6fq"
 };
@@ -19,7 +19,7 @@ const refreshedDeleteButton = null;
  */
 export const RENDER_EMOJI_DELETE_BUTTON_TESTID = 'render-emoji-delete-button';
 const DeleteButton = props => {
-  const isRefreshEnabled = FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false);
+  const isRefreshEnabled = expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false);
   return /*#__PURE__*/React.createElement("span", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: ax(["_3um015vq _1e0c1txw _kqswstnw _154ix0bf _1xi2x0bf _1pbykb7n _13t3idpf", isRefreshEnabled && "_154ir5cr _1xi2r5cr", emojiDeleteButton]),

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

@@ -469,27 +469,35 @@ export const EmojiNodeWrapper = /*#__PURE__*/forwardRef((props, ref) => {
   const ariaLabel = intl && fg('platform_change_emoji_button_label') ? intl.formatMessage(messages.changeEmojiShortnameButtonLabel, {
     shortName: (_emoji$name = emoji.name) !== null && _emoji$name !== void 0 ? _emoji$name : emoji.shortName
   }) : editorEmoji ? undefined : emoji.shortName;
-  return /*#__PURE__*/React.createElement("span", _extends({
+  const tooltipContent = showTooltip && expValEquals('platform_editor_emoji_hover_show_tooltip', 'isEnabled', true) ? emoji.shortName || emoji.name || undefined : undefined;
+  const emojiSpan = /*#__PURE__*/React.createElement("span", _extends({
     role: editorEmoji ? undefined : shouldBeInteractive ? 'button' : ariaLabel ? 'img' : 'presentation',
     "aria-label": ariaLabel,
     ref: ref,
     "data-testid": `${type}-emoji-${emoji.shortName}`,
     "data-emoji-type": type,
-    tabIndex: shouldBeInteractive ? tabIndex || 0 : undefined,
+    tabIndex: shouldBeInteractive ? tabIndex || 0 : tooltipContent ? 0 : undefined,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: ax([type === 'sprite' ? "_19pk1n1a _2hwxidpf _otyr1n1a _18u0idpf _1e0c1o8l _jr50g2xd _ylp71o8l _pkaxgktf _1hdcgktf _109tnkob _tn8j1dpa _3naf1dpa _nt751r31 _49pcglyw _1hvw1o36 _7ehi1y54 _491113zc" : type === 'unicode' ? "_19pk1n1a _2hwxidpf _otyr1n1a _18u0idpf _bfhk1j28 _1e0c1o8l _s7n4nkob _tn8j1dpa _3naf1dpa _160jewfl _1theewfl _1kogh2mm _qyp0ewfl _nt751r31 _49pcglyw _1hvw1o36 _7ehi1y54 _491113zc" : "_2rkofajl _19pk1n1a _2hwxidpf _otyr1n1a _18u0idpf _bfhk1j28 _1e0c1o8l _s7n4nkob _v4pn1ule _tn8j1dpa _3naf1dpa _160jewfl _1theewfl _1kogh2mm _qyp0ewfl _nt751r31 _49pcglyw _1hvw1o36 _7ehi1y54 _491113zc", className]),
-    onKeyDown: event => handleKeyDown(props, event),
-    onMouseDown: event => {
+    onKeyDown: shouldBeInteractive || !expValEquals('platform_editor_emoji_hover_show_tooltip', 'isEnabled', true) ? event => handleKeyDown(props, event) : undefined,
+    onMouseDown: shouldBeInteractive || !expValEquals('platform_editor_emoji_hover_show_tooltip', 'isEnabled', true) ? event => {
       handleMouseDown(props, event);
-    },
+    } : undefined,
     onMouseEnter: event => {
       handleMouseMove(props, event);
     },
     onFocus: event => {
       handleFocus(props, event);
     },
-    title: showTooltip ? emoji.shortName : undefined // TODO: COLLAB-2351 - use @atlaskit/Tooltip in future for non-deletable emoji if enabled showTooltip
+    title: showTooltip && !expValEquals('platform_editor_emoji_hover_show_tooltip', 'isEnabled', true) ? emoji.shortName : undefined
   }, other), children);
+  if (tooltipContent) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      content: tooltipContent,
+      tag: "span"
+    }, emojiSpan);
+  }
+  return emojiSpan;
 });
 export const Emoji = props => {
   const {

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

@@ -5,6 +5,7 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { Fragment, useState, useRef, memo, useLayoutEffect, useCallback, useEffect } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import EmojiDeletePreview from './EmojiDeletePreview';
 import EmojiUploadPicker from './EmojiUploadPicker';
@@ -19,7 +20,6 @@ import AddIcon from '@atlaskit/icon/core/add';
 import { setSkinToneAriaLabelText } from './setSkinToneAriaLabelText';
 import { emojiPickerAddEmoji } from './styles';
 import { DEFAULT_TONE } from '../../util/constants';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { Box } from '@atlaskit/primitives/compiled';
 import { layers } from '@atlaskit/theme/constants';
 const styles = {
@@ -131,9 +131,7 @@ const TonesWrapper = props => {
       openProductivityColorSelectorWithKeyboard.current = true;
     }
   }, []);
-  const shouldShowProductivityColorSelector = !!(activeCategoryId === 'ATLASSIAN' && productivityColorPreviewEmojis && selectedProductivityColor && onProductivityColorSelected &&
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
+  const shouldShowProductivityColorSelector = !!(activeCategoryId === 'ATLASSIAN' && productivityColorPreviewEmojis && selectedProductivityColor && onProductivityColorSelected && expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
   if (shouldShowProductivityColorSelector) {
     const previewEmoji = (productivityColorPreviewEmojis === null || productivityColorPreviewEmojis === void 0 ? void 0 : productivityColorPreviewEmojis[selectedProductivityColor]) || Object.values(productivityColorPreviewEmojis || {})[0];
     if (!previewEmoji) {
@@ -212,9 +210,7 @@ export const EmojiActions = props => {
   } = props;
   const [showToneSelector, setShowToneSelector] = useState(false);
   const wasProductivityColorSelectorOpen = useRef(false);
-  const shouldUseProductivityColorControl = !!(props.activeCategoryId === 'ATLASSIAN' && props.productivityColorPreviewEmojis && props.selectedProductivityColor && props.onProductivityColorSelected &&
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
+  const shouldUseProductivityColorControl = !!(props.activeCategoryId === 'ATLASSIAN' && props.productivityColorPreviewEmojis && props.selectedProductivityColor && props.onProductivityColorSelected && expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false));
   const onToneOpenHandler = useCallback(() => setShowToneSelector(true), []);
   const onToneCloseHandler = useCallback(() => setShowToneSelector(false), []);
   const onToneToggleHandler = useCallback(() => {
@@ -246,8 +242,7 @@ export const EmojiActions = props => {
     }
   }, [shouldUseProductivityColorControl, showToneSelector]);
   if (uploading) {
-    // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-    return FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+    return expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
       className: ax(["_16jlidpf _1o9zidpf _i0dl1wug"])
     }, /*#__PURE__*/React.createElement(EmojiUploadPicker, {
       onUploadCancelled: onUploadCancelled,
@@ -266,8 +261,7 @@ export const EmojiActions = props => {
     }));
   }
   if (emojiToDelete) {
-    // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-    return FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+    return expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
       className: ax(["_16jlidpf _1o9zidpf _i0dl1wug"])
     }, /*#__PURE__*/React.createElement(EmojiDeletePreview, {
       emoji: emojiToDelete,
@@ -281,9 +275,7 @@ export const EmojiActions = props => {
       onCloseDelete: onCloseDelete
     }));
   }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+  return expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiActionsTestId,
     onMouseLeave: onMouseLeaveHandler,
     onBlur: fg('platform_suppression_removal_fix_reactions') ? onMouseLeaveHandler : undefined,

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

@@ -5,12 +5,12 @@ import "./EmojiDeletePreview.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { Component } from 'react';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import AkButton from '@atlaskit/button/new';
 import Heading from '@atlaskit/heading';
 import { Box, Text } from '@atlaskit/primitives/compiled';
 import FocusLock from 'react-focus-lock';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { messages } from '../i18n';
 import CachingEmoji from './CachingEmoji';
 import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
@@ -78,7 +78,7 @@ class EmojiDeletePreview extends Component {
     const {
       formatMessage
     } = intl;
-    if (FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+    if (expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
       return /*#__PURE__*/React.createElement(FocusLock, {
         noFocusGuards: true
       }, /*#__PURE__*/React.createElement("div", {

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

@@ -5,8 +5,8 @@ import { ax, ix } from "@compiled/react/runtime";
 import Tooltip from '@atlaskit/tooltip';
 import ErrorIcon from '@atlaskit/icon/core/status-error';
 import { ErrorMessage } from '@atlaskit/form';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { useIntl } from 'react-intl';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { messages } from '../i18n';
 const errorMessageStyles = {
   chooseFile: "_1e0c1txw _syaz1tmw _u5f319bv _1bah1y6m",
@@ -38,7 +38,7 @@ const EmojiErrorMessage = props => {
     label: formatMessage(messages.error),
     spacing: "spacious",
     testId: emojiErrorIconTestId
-  }))) : FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+  }))) : expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiErrorMessageTestId
   }, /*#__PURE__*/React.createElement(ErrorMessage, null, message)) : /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiErrorMessageTestId,

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

@@ -2,7 +2,6 @@
 import "./EmojiRadioButton.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { memo, forwardRef } from 'react';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import Emoji from './Emoji';
 import { TONESELECTOR_KEYBOARD_KEYS_SUPPORTED } from '../../util/constants';
 import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -12,7 +11,7 @@ const emojiRadio = {
   default: "_tzy4idpf _kqswstnw _154i14id _1ltv14id _3y8mfajl _157z1r31 _1dzmglyw _1sqm1o36 _fh6w1y54 _1i1213zc"
 };
 const handleKeyDown = (props, event) => {
-  if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight') && FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+  if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight') && expValEqualsNoExposure('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', true)) {
     var _props$onArrowKey;
     event.preventDefault();
     event.stopPropagation();
@@ -51,7 +50,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: FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? e => e.preventDefault() : undefined,
+    onChange: expValEqualsNoExposure('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', true) ? e => e.preventDefault() : undefined,
     className: ax([emojiRadio.default])
   }), /*#__PURE__*/React.createElement(Emoji, {
     emoji: emoji,

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

@@ -9,7 +9,6 @@ import CrossIcon from '@atlaskit/icon/core/cross';
 import AkButton from '@atlaskit/button/standard-button';
 import { Text } from '@atlaskit/primitives/compiled';
 import FocusLock from 'react-focus-lock';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import * as ImageUtil from '../../util/image';
 import debug from '../../util/logger';
 import { messages } from '../i18n';
@@ -18,6 +17,7 @@ import EmojiUploadPreview from './EmojiUploadPreview';
 import FileChooser from './FileChooser';
 import { UploadStatus } from './internal-types';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import Button from '@atlaskit/button/new';
 import { Box } from '@atlaskit/primitives/compiled';
 import { getDocument } from '@atlaskit/browser-apis';
@@ -56,7 +56,7 @@ const toDefaultUploadName = fileName => {
   return sanitizeName(nameWithoutExtension).slice(0, maxNameLength);
 };
 const isSupportedEmojiUploadFileType = file => {
-  if (!FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+  if (!expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
     return true;
   }
   if (supportedEmojiUploadMimeTypes.has(file.type)) {
@@ -103,7 +103,7 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
   const emojiChooseFileTitleNew = formatMessage(messages.emojiChooseFileDndTitle);
   const isUploading = uploadStatus === UploadStatus.Uploading;
   const addEmojiDisabled = !previewImage || !name || isUploading;
-  return FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
+  return expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("div", {
     "data-testid": uploadEmojiComponentTestId,
     className: ax(["_ca0qu2gc _u5f3pxbi _n3tdu2gc _19bvpxbi _1e0c1txw _2lx21bp4 _1bah1b1v"])
   }, /*#__PURE__*/React.createElement("div", {
@@ -114,7 +114,7 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
   }, previewImage ? /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiPreviewTitle) : /*#__PURE__*/React.createElement(FormattedMessage, messages.addCustomEmojiLabel))), /*#__PURE__*/React.createElement("div", {
     className: ax(["_zulp12x7 _1e0c1txw _2lx21bp4 _1tker0r7"])
   }, /*#__PURE__*/React.createElement(Box, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, () => /*#__PURE__*/React.createElement(FileChooser, {
-    label: FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? emojiChooseFileTitleNew : emojiChooseFileTitle,
+    label: expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? emojiChooseFileTitleNew : emojiChooseFileTitle,
     onChange: onChooseFile,
     onClick: onClick,
     accept: "image/png,image/jpeg,image/gif",
@@ -197,7 +197,7 @@ const ChooseEmojiFile = /*#__PURE__*/memo(props => {
     id: "new-emoji-name-input",
     "aria-required": true
   })), /*#__PURE__*/React.createElement(Text, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.emojiChooseFileScreenReaderDescription, () => /*#__PURE__*/React.createElement(FileChooser, {
-    label: FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? emojiChooseFileTitleNew : emojiChooseFileTitle,
+    label: expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? emojiChooseFileTitleNew : emojiChooseFileTitle,
     onChange: onChooseFile,
     onClick: onClick,
     accept: "image/png,image/jpeg,image/gif",
@@ -301,7 +301,7 @@ const EmojiUploadPicker = props => {
   const onFileLoad = useCallback(file => async f => {
     try {
       setFilename(file.name);
-      if (!name && FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+      if (!name && expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
         setName(toDefaultUploadName(file.name));
       }
       await ImageUtil.parseImage(f.target.result);
@@ -354,8 +354,8 @@ const EmojiUploadPicker = props => {
   const onChooseFileClicked = () => {
     onFileChooserClicked && onFileChooserClicked();
   };
-  const isDuplicateNameError = errorMessage !== null && errorMessage !== undefined && FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false);
-  const content = name && previewImage && !FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement(EmojiUploadPreview, {
+  const isDuplicateNameError = errorMessage !== null && errorMessage !== undefined && expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false);
+  const content = name && previewImage && !expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement(EmojiUploadPreview, {
     errorMessage: errorMessage,
     name: name,
     onAddEmoji: onAddEmoji,
@@ -375,7 +375,7 @@ const EmojiUploadPicker = props => {
     nameErrorMessage: isDuplicateNameError ? errorMessage : undefined,
     intl: intl
   });
-  return disableFocusLock || FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? content : /*#__PURE__*/React.createElement(FocusLock, {
+  return disableFocusLock || expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? content : /*#__PURE__*/React.createElement(FocusLock, {
     noFocusGuards: true
   }, content);
 };

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

@@ -4,9 +4,9 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import Button from '@atlaskit/button/new';
 import UploadIcon from '@atlaskit/icon/core/upload';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import { dropTargetForExternal } from '@atlaskit/pragmatic-drag-and-drop/external/adapter';
 import { containsFiles, getFiles } from '@atlaskit/pragmatic-drag-and-drop/external/file';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 export const chooseFileButtonTestId = 'choose-file-button';
 export const fileUploadInputTestId = 'file-upload';
 export const dropzoneTestId = 'file-dropzone';
@@ -60,7 +60,7 @@ const FileChooser = props => {
   }, [onChange]);
   useEffect(() => {
     const element = dropzoneRef.current;
-    if (!element || !FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+    if (!element || !expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
       return;
     }
     const suppressNativeFileDrop = event => {
@@ -161,7 +161,7 @@ const FileChooser = props => {
     },
     "data-testid": fileUploadInputTestId
   });
-  if (FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
+  if (expVal('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false)) {
     return /*#__PURE__*/React.createElement("div", {
       ref: dropzoneRef,
       "data-testid": dropzoneTestId,

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

@@ -3,7 +3,6 @@ import "./TonePreviewButton.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { forwardRef, memo } from 'react';
-import FeatureGates from '@atlaskit/feature-gate-js-client';
 import Emoji from './Emoji';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 export const tonePreviewTestId = 'tone-preview';
@@ -23,7 +22,7 @@ export const TonePreviewButton = /*#__PURE__*/forwardRef((props, ref) => {
     isVisible = true
   } = props;
   const fitToHeight = expValEqualsNoExposure('platform_use_unicode_emojis', 'isEnabled', true) ? 24 : undefined;
-  return FeatureGates.getExperimentValue('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', false) ? /*#__PURE__*/React.createElement("button", {
+  return expValEqualsNoExposure('platform_teamoji_26_refresh_emoji_picker', 'isEnabled', true) ? /*#__PURE__*/React.createElement("button", {
     ref: ref,
     onClick: onSelected,
     onKeyDown: onKeyDown,