@atlaskit/emoji 72.4.32 → 72.4.34

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/emoji
 
+## 72.4.34
+
+### Patch Changes
+
+- [`b94ae37dcc0f8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b94ae37dcc0f8) -
+  Cleanup `experiment` `tef_fix_a11y_keyboard_control_emoji_picker`. The emoji picker now always
+  moves initial keyboard focus to the active category instead of autofocusing the search field.
+- Updated dependencies
+
+## 72.4.33
+
+### Patch Changes
+
+- [`8883a41b1e85a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8883a41b1e85a) -
+  Remove the `platform_emoji_keep_picker_open_on_upload` gate. Keep the emoji picker open during
+  upload actions.
+- Updated dependencies
+
 ## 72.4.32
 
 ### Patch Changes

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

@@ -13,9 +13,7 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
 var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _i18n = require("../i18n");
-var _isRefreshEmojiPickerEnabled = require("./isRefreshEmojiPickerEnabled");
 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 emojiActionsTestId = exports.emojiActionsTestId = 'emoji-actions';
 var uploadEmojiTestId = exports.uploadEmojiTestId = 'upload-emoji';
@@ -27,10 +25,8 @@ var AddOwnEmoji = exports.AddOwnEmoji = function AddOwnEmoji(props) {
   var onOpenUpload = props.onOpenUpload,
     uploadEnabled = props.uploadEnabled;
   var handleOpenUpload = (0, _react.useCallback)(function (event) {
-    if ((0, _fg.fg)('platform_emoji_keep_picker_open_on_upload') || (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(_react.Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -14,11 +14,9 @@ var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _add = _interopRequireDefault(require("@atlaskit/icon/core/add"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _i18n = require("../i18n");
 var _EmojiActions = require("./EmojiActions");
-var _isRefreshEmojiPickerEnabled = require("./isRefreshEmojiPickerEnabled");
 var _styles = require("./styles");
 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 styles = {
@@ -30,10 +28,8 @@ var AddOwnEmoji = exports.AddOwnEmoji = function AddOwnEmoji(props) {
   var onOpenUpload = props.onOpenUpload,
     uploadEnabled = props.uploadEnabled;
   var handleOpenUpload = (0, _react.useCallback)(function (event) {
-    if ((0, _fg.fg)('platform_emoji_keep_picker_open_on_upload') || (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(_react.Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -21,7 +21,6 @@ var _button = _interopRequireDefault(require("@atlaskit/button/default/button"))
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _cross = _interopRequireDefault(require("@atlaskit/icon/core/cross"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
 var ImageUtil = _interopRequireWildcard(require("../../util/image"));
@@ -409,10 +408,8 @@ var EmojiUploadPicker = function EmojiUploadPicker(props) {
     }
   }, [cancelChooseFile, errorOnUpload, onFileLoad, onUploadPreviewErrorChange]);
   var cancelUpload = (0, _react.useCallback)(function (event) {
-    if ((0, _fg.fg)('platform_emoji_keep_picker_open_on_upload') || (0, _isRefreshEmojiPickerEnabled.isRefreshEmojiPickerEnabled)()) {
-      event === null || event === void 0 || event.preventDefault();
-      event === null || event === void 0 || event.stopPropagation();
-    }
+    event === null || event === void 0 || event.preventDefault();
+    event === null || event === void 0 || event.stopPropagation();
     clearUploadPicker();
     onUploadCancelled();
     onUploadPreviewErrorChange === null || onUploadPreviewErrorChange === void 0 || onUploadPreviewErrorChange(false);

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

@@ -14,7 +14,6 @@ var _runtime = require("@compiled/react/runtime");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _reactIntl = require("react-intl");
 var _css = require("@atlaskit/css");
-var _featureGates = _interopRequireDefault(require("@atlaskit/feature-gate-js-client/feature-gates"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _usePrevious = require("../../hooks/usePrevious");
@@ -27,14 +26,6 @@ var _EmojiPickerList = require("./EmojiPickerList");
 var _sortCategories = require("./sortCategories");
 var _sortCategoriesNew = require("./sortCategoriesNew");
 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 isEmojiPickerInitialFocusFixEnabled = function isEmojiPickerInitialFocusFixEnabled() {
-  if (!_featureGates.default.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return _featureGates.default.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 var styles = {
   commonCategory: "_2rko12b0 _v564h5h4 _189eidpf _bfhksm61 _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t",
   commonCategoryNew: "_v564h5h4 _189eidpf _bfhksm61 _ca0qu2gc _n3tdu2gc _19bv12x7 _u5f312x7 _1e0c1txw _4cvr1h6o _1bah1h6o",
@@ -92,7 +83,7 @@ var CategorySelector = function CategorySelector(props) {
   }, [categoryRef, setCurrentFocus]);
   (0, _react.useEffect)(function () {
     var _categoryRef$current2, _categoryRef$current3;
-    if (hasSetInitialFocus.current || !isEmojiPickerInitialFocusFixEnabled() || !activeCategoryId) {
+    if (hasSetInitialFocus.current || !activeCategoryId) {
       return;
     }
     var activeCategoryIndex = categories.indexOf(activeCategoryId);

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

@@ -13,7 +13,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _useDebounce = require("use-debounce");
-var _featureGates = _interopRequireDefault(require("@atlaskit/feature-gate-js-client/feature-gates"));
 var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
 var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
 var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden/visually-hidden"));
@@ -21,14 +20,6 @@ var _constants = require("../../util/constants");
 var _isRefreshEmojiPickerEnabled = require("../common/isRefreshEmojiPickerEnabled");
 var _i18n = require("../i18n");
 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 isEmojiPickerInitialFocusFixEnabled = function isEmojiPickerInitialFocusFixEnabled() {
-  if (!_featureGates.default.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return _featureGates.default.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 var input = null;
 var inputNew = null;
 var textFieldWrapperNew = null;
@@ -64,17 +55,6 @@ var EmojiPickerListSearch = exports.EmojiPickerListSearch = function EmojiPicker
   var handleOnChange = function handleOnChange(e) {
     debouncedSearch(e.target.value);
   };
-  (0, _react.useLayoutEffect)(function () {
-    if (isEmojiPickerInitialFocusFixEnabled()) {
-      return;
-    }
-    requestAnimationFrame(function () {
-      if (textRef) {
-        var _textRef$current;
-        (_textRef$current = textRef.current) === null || _textRef$current === void 0 || _textRef$current.focus();
-      }
-    });
-  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     style: style,
     className: (0, _runtime.ax)(["_vchhusvi _ca0qutpp _n3tdutpp _19bvutpp _u5f3utpp _1bsb1osq", !isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])

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

@@ -13,7 +13,6 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _useThemeObserver2 = require("@atlaskit/tokens/use-theme-observer");
 var _i18n = require("../i18n");
 var _SearchNoResultDark = _interopRequireDefault(require("./assets/spot/search-no-result/SearchNoResultDark"));
@@ -27,10 +26,8 @@ var EmojiPickerNoResults = function EmojiPickerNoResults(_ref) {
   var _useThemeObserver = (0, _useThemeObserver2.useThemeObserver)(),
     colorMode = _useThemeObserver.colorMode;
   var handleOpenUpload = (0, _react.useCallback)(function (event) {
-    if ((0, _fg.fg)('platform_emoji_keep_picker_open_on_upload')) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement("div", {

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

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

@@ -5,9 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { Fragment, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import Button from '@atlaskit/button/default/button';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { messages } from '../i18n';
-import { isRefreshEmojiPickerEnabled } from './isRefreshEmojiPickerEnabled';
 export const emojiActionsTestId = 'emoji-actions';
 export const uploadEmojiTestId = 'upload-emoji';
 const addCustomEmoji = null;
@@ -20,10 +18,8 @@ export const AddOwnEmoji = props => {
     uploadEnabled
   } = props;
   const handleOpenUpload = useCallback(event => {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -6,11 +6,9 @@ import { Fragment, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import AkButton from '@atlaskit/button/standard-button';
 import AddIcon from '@atlaskit/icon/core/add';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box } from '@atlaskit/primitives/compiled';
 import { messages } from '../i18n';
 import { uploadEmojiTestId } from './EmojiActions';
-import { isRefreshEmojiPickerEnabled } from './isRefreshEmojiPickerEnabled';
 import { emojiPickerAddEmoji } from './styles';
 const styles = {
   icon: "_18u0r5cr _2hwx1i6y"
@@ -23,10 +21,8 @@ export const AddOwnEmoji = props => {
     uploadEnabled
   } = props;
   const handleOpenUpload = useCallback(event => {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -10,7 +10,6 @@ import Button from '@atlaskit/button/default/button';
 import AkButton from '@atlaskit/button/standard-button';
 import CrossIcon from '@atlaskit/icon/core/cross';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Text } from '@atlaskit/primitives/compiled';
 import { Box } from '@atlaskit/primitives/compiled';
 import TextField from '@atlaskit/textfield/text-field';
@@ -360,10 +359,8 @@ const EmojiUploadPicker = props => {
     }
   }, [cancelChooseFile, errorOnUpload, onFileLoad, onUploadPreviewErrorChange]);
   const cancelUpload = useCallback(event => {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event === null || event === void 0 ? void 0 : event.preventDefault();
-      event === null || event === void 0 ? void 0 : event.stopPropagation();
-    }
+    event === null || event === void 0 ? void 0 : event.preventDefault();
+    event === null || event === void 0 ? void 0 : event.stopPropagation();
     clearUploadPicker();
     onUploadCancelled();
     onUploadPreviewErrorChange === null || onUploadPreviewErrorChange === void 0 ? void 0 : onUploadPreviewErrorChange(false);

package/dist/es2019/components/picker/CategorySelector.js

@@ -5,7 +5,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { cx } from '@atlaskit/css';
-import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import { Pressable } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { usePrevious } from '../../hooks/usePrevious';
@@ -17,14 +16,6 @@ import { categorySelectorCategoryTestId } from './categorySelectorCategoryTestId
 import { RENDER_EMOJI_PICKER_LIST_TESTID } from './EmojiPickerList';
 import { sortCategories } from './sortCategories';
 import { sortCategoriesNew } from './sortCategoriesNew';
-const isEmojiPickerInitialFocusFixEnabled = () => {
-  if (!FeatureGates.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return FeatureGates.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 const styles = {
   commonCategory: "_2rko12b0 _v564h5h4 _189eidpf _bfhksm61 _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t",
   commonCategoryNew: "_v564h5h4 _189eidpf _bfhksm61 _ca0qu2gc _n3tdu2gc _19bv12x7 _u5f312x7 _1e0c1txw _4cvr1h6o _1bah1h6o",
@@ -77,7 +68,7 @@ const CategorySelector = props => {
   }, [categoryRef, setCurrentFocus]);
   useEffect(() => {
     var _categoryRef$current2, _categoryRef$current3;
-    if (hasSetInitialFocus.current || !isEmojiPickerInitialFocusFixEnabled() || !activeCategoryId) {
+    if (hasSetInitialFocus.current || !activeCategoryId) {
       return;
     }
     const activeCategoryIndex = categories.indexOf(activeCategoryId);

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

@@ -1,24 +1,15 @@
 /* EmojiPickerListSearch.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./EmojiPickerListSearch.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { useLayoutEffect, useRef, useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useDebouncedCallback } from 'use-debounce';
-import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import SearchIcon from '@atlaskit/icon/core/search';
 import TextField from '@atlaskit/textfield/text-field';
 import VisuallyHidden from '@atlaskit/visually-hidden/visually-hidden';
 import { EMOJI_SEARCH_DEBOUNCE } from '../../util/constants';
 import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
 import { messages } from '../i18n';
-const isEmojiPickerInitialFocusFixEnabled = () => {
-  if (!FeatureGates.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return FeatureGates.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 const input = null;
 const inputNew = null;
 const textFieldWrapperNew = null;
@@ -51,17 +42,6 @@ export const EmojiPickerListSearch = props => {
   const handleOnChange = e => {
     debouncedSearch(e.target.value);
   };
-  useLayoutEffect(() => {
-    if (isEmojiPickerInitialFocusFixEnabled()) {
-      return;
-    }
-    requestAnimationFrame(() => {
-      if (textRef) {
-        var _textRef$current;
-        (_textRef$current = textRef.current) === null || _textRef$current === void 0 ? void 0 : _textRef$current.focus();
-      }
-    });
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     style: style,
     className: ax(["_vchhusvi _ca0qutpp _n3tdutpp _19bvutpp _u5f3utpp _1bsb1osq", !isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])

package/dist/es2019/components/picker/EmojiPickerNoResults.js

@@ -5,7 +5,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import AkButton from '@atlaskit/button/standard-button';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useThemeObserver } from '@atlaskit/tokens/use-theme-observer';
 import { messages } from '../i18n';
 import SearchNoResultDark from './assets/spot/search-no-result/SearchNoResultDark';
@@ -20,10 +19,8 @@ const EmojiPickerNoResults = ({
     colorMode
   } = useThemeObserver();
   const handleOpenUpload = useCallback(event => {
-    if (fg('platform_emoji_keep_picker_open_on_upload')) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement("div", {

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

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

@@ -5,9 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { Fragment, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import Button from '@atlaskit/button/default/button';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { messages } from '../i18n';
-import { isRefreshEmojiPickerEnabled } from './isRefreshEmojiPickerEnabled';
 export var emojiActionsTestId = 'emoji-actions';
 export var uploadEmojiTestId = 'upload-emoji';
 var addCustomEmoji = null;
@@ -18,10 +16,8 @@ export var AddOwnEmoji = function AddOwnEmoji(props) {
   var onOpenUpload = props.onOpenUpload,
     uploadEnabled = props.uploadEnabled;
   var handleOpenUpload = useCallback(function (event) {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -6,11 +6,9 @@ import { Fragment, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import AkButton from '@atlaskit/button/standard-button';
 import AddIcon from '@atlaskit/icon/core/add';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box } from '@atlaskit/primitives/compiled';
 import { messages } from '../i18n';
 import { uploadEmojiTestId } from './EmojiActions';
-import { isRefreshEmojiPickerEnabled } from './isRefreshEmojiPickerEnabled';
 import { emojiPickerAddEmoji } from './styles';
 var styles = {
   icon: "_18u0r5cr _2hwx1i6y"
@@ -21,10 +19,8 @@ export var AddOwnEmoji = function AddOwnEmoji(props) {
   var onOpenUpload = props.onOpenUpload,
     uploadEnabled = props.uploadEnabled;
   var handleOpenUpload = useCallback(function (event) {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement(Fragment, null, uploadEnabled && /*#__PURE__*/React.createElement("div", {

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

@@ -13,7 +13,6 @@ import Button from '@atlaskit/button/default/button';
 import AkButton from '@atlaskit/button/standard-button';
 import CrossIcon from '@atlaskit/icon/core/cross';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Text } from '@atlaskit/primitives/compiled';
 import { Box } from '@atlaskit/primitives/compiled';
 import TextField from '@atlaskit/textfield/text-field';
@@ -401,10 +400,8 @@ var EmojiUploadPicker = function EmojiUploadPicker(props) {
     }
   }, [cancelChooseFile, errorOnUpload, onFileLoad, onUploadPreviewErrorChange]);
   var cancelUpload = useCallback(function (event) {
-    if (fg('platform_emoji_keep_picker_open_on_upload') || isRefreshEmojiPickerEnabled()) {
-      event === null || event === void 0 || event.preventDefault();
-      event === null || event === void 0 || event.stopPropagation();
-    }
+    event === null || event === void 0 || event.preventDefault();
+    event === null || event === void 0 || event.stopPropagation();
     clearUploadPicker();
     onUploadCancelled();
     onUploadPreviewErrorChange === null || onUploadPreviewErrorChange === void 0 || onUploadPreviewErrorChange(false);

package/dist/esm/components/picker/CategorySelector.js

@@ -6,7 +6,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { cx } from '@atlaskit/css';
-import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import { Pressable } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { usePrevious } from '../../hooks/usePrevious';
@@ -18,14 +17,6 @@ import { categorySelectorCategoryTestId } from './categorySelectorCategoryTestId
 import { RENDER_EMOJI_PICKER_LIST_TESTID } from './EmojiPickerList';
 import { sortCategories } from './sortCategories';
 import { sortCategoriesNew } from './sortCategoriesNew';
-var isEmojiPickerInitialFocusFixEnabled = function isEmojiPickerInitialFocusFixEnabled() {
-  if (!FeatureGates.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return FeatureGates.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 var styles = {
   commonCategory: "_2rko12b0 _v564h5h4 _189eidpf _bfhksm61 _ca0qze3t _n3tdze3t _19bvze3t _u5f3ze3t",
   commonCategoryNew: "_v564h5h4 _189eidpf _bfhksm61 _ca0qu2gc _n3tdu2gc _19bv12x7 _u5f312x7 _1e0c1txw _4cvr1h6o _1bah1h6o",
@@ -83,7 +74,7 @@ var CategorySelector = function CategorySelector(props) {
   }, [categoryRef, setCurrentFocus]);
   useEffect(function () {
     var _categoryRef$current2, _categoryRef$current3;
-    if (hasSetInitialFocus.current || !isEmojiPickerInitialFocusFixEnabled() || !activeCategoryId) {
+    if (hasSetInitialFocus.current || !activeCategoryId) {
       return;
     }
     var activeCategoryIndex = categories.indexOf(activeCategoryId);

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

@@ -2,24 +2,15 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./EmojiPickerListSearch.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { useLayoutEffect, useRef, useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useDebouncedCallback } from 'use-debounce';
-import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import SearchIcon from '@atlaskit/icon/core/search';
 import TextField from '@atlaskit/textfield/text-field';
 import VisuallyHidden from '@atlaskit/visually-hidden/visually-hidden';
 import { EMOJI_SEARCH_DEBOUNCE } from '../../util/constants';
 import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
 import { messages } from '../i18n';
-var isEmojiPickerInitialFocusFixEnabled = function isEmojiPickerInitialFocusFixEnabled() {
-  if (!FeatureGates.initializeCompleted()) {
-    return false;
-  }
-
-  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
-  return FeatureGates.getExperimentValue('tef_fix_a11y_keyboard_control_emoji_picker', 'isEnabled', false);
-};
 var input = null;
 var inputNew = null;
 var textFieldWrapperNew = null;
@@ -55,17 +46,6 @@ export var EmojiPickerListSearch = function EmojiPickerListSearch(props) {
   var handleOnChange = function handleOnChange(e) {
     debouncedSearch(e.target.value);
   };
-  useLayoutEffect(function () {
-    if (isEmojiPickerInitialFocusFixEnabled()) {
-      return;
-    }
-    requestAnimationFrame(function () {
-      if (textRef) {
-        var _textRef$current;
-        (_textRef$current = textRef.current) === null || _textRef$current === void 0 || _textRef$current.focus();
-      }
-    });
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     style: style,
     className: ax(["_vchhusvi _ca0qutpp _n3tdutpp _19bvutpp _u5f3utpp _1bsb1osq", !isVisible && "_tzy4idpf _3um015vq _1e0cglyw"])

package/dist/esm/components/picker/EmojiPickerNoResults.js

@@ -5,7 +5,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import AkButton from '@atlaskit/button/standard-button';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { useThemeObserver } from '@atlaskit/tokens/use-theme-observer';
 import { messages } from '../i18n';
 import SearchNoResultDark from './assets/spot/search-no-result/SearchNoResultDark';
@@ -18,10 +17,8 @@ var EmojiPickerNoResults = function EmojiPickerNoResults(_ref) {
   var _useThemeObserver = useThemeObserver(),
     colorMode = _useThemeObserver.colorMode;
   var handleOpenUpload = useCallback(function (event) {
-    if (fg('platform_emoji_keep_picker_open_on_upload')) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
+    event.preventDefault();
+    event.stopPropagation();
     onOpenUpload();
   }, [onOpenUpload]);
   return /*#__PURE__*/React.createElement("div", {

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "72.4.32",
+	"version": "72.4.34",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -54,9 +54,9 @@
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^218.0.0",
+		"@atlaskit/tmp-editor-statsig": "^219.0.0",
 		"@atlaskit/tokens": "^20.1.0",
-		"@atlaskit/tooltip": "^24.3.0",
+		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/ufo": "^2.0.0",
 		"@atlaskit/util-service-support": "^7.4.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
@@ -126,9 +126,6 @@
 		"platform_suppression_removal_fix_reactions": {
 			"type": "boolean"
 		},
-		"platform_emoji_keep_picker_open_on_upload": {
-			"type": "boolean"
-		},
 		"platform_bitbucket_fix_shortname_and_ordering": {
 			"type": "boolean"
 		},
@@ -143,10 +140,6 @@
 		}
 	},
 	"platform-experiments": {
-		"tef_fix_a11y_keyboard_control_emoji_picker": {
-			"param": "isEnabled",
-			"defaultValue": false
-		},
 		"platform_teamoji_26_refresh_emoji_picker": {
 			"param": "isEnabled",
 			"defaultValue": false