@atlaskit/emoji 73.3.2 → 73.3.4

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

@@ -45,8 +45,7 @@ import { filterHiddenEmojis } from '../../util/filter-hidden-emojis';
 import { getToneEmoji } from '../../util/get-tone-emoji';
 import { isEmojiDescription } from '../../util/is-emoji-description';
 import { isPromise } from '../../util/is-promise';
-import { defaultProductivityColor, getStoredProductivityColor, storeProductivityColor } from '../../util/productivity-colors';
-import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
+import { getStoredProductivityColor, storeProductivityColor } from '../../util/productivity-colors';
 import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
 import { uploadEmoji } from '../common/UploadEmoji';
 import { messages } from '../i18n';
@@ -62,7 +61,6 @@ var emojiPickerHeightDeleteRefresh = 339;
 var emojiPickerWidth = 350;
 var emojiPickerMinHeight = 260;
 var heightOffset = 80;
-var emojiPicker = null;
 var emojiPickerNew = null;
 var emojiPickerWrapper = null;
 
@@ -121,7 +119,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   var _useEmoji = useEmoji(),
     emojiProvider = _useEmoji.emojiProvider,
     isUploadSupported = _useEmoji.isUploadSupported;
-  var isTeamojiExperimentEnabled = isRefreshEmojiPickerEnabled();
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     filteredEmojis = _useState2[0],
@@ -147,7 +144,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     selectedTone = _useState10[0],
     setSelectedTone = _useState10[1];
   var _useState11 = useState(function () {
-      return isTeamojiExperimentEnabled ? getStoredProductivityColor() : defaultProductivityColor;
+      return getStoredProductivityColor();
     }),
     _useState12 = _slicedToArray(_useState11, 2),
     selectedProductivityColor = _useState12[0],
@@ -198,11 +195,9 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   var isProgrammaticScroll = useRef(false);
   var pickerRef = useRef(null);
   var setPickerRef = useCallback(function (el) {
-    if (isTeamojiExperimentEnabled) {
-      pickerRef.current = el;
-    }
+    pickerRef.current = el;
     onPickerRef === null || onPickerRef === void 0 || onPickerRef(el);
-  }, [isTeamojiExperimentEnabled, onPickerRef]);
+  }, [onPickerRef]);
   var currentUser = useMemo(function () {
     return emojiProvider.getCurrentUser();
   }, [emojiProvider]);
@@ -219,7 +214,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   }, [selectedEmoji]);
   var uploadEnabled = isUploadSupported && !uploading;
   var onEmojiLeave = useCallback(function () {
-    if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
+    if (uploadEnabled) {
       setSelectedEmoji(undefined);
     }
   }, [uploadEnabled]);
@@ -227,16 +222,16 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     // Ignore scroll-driven category changes while a programmatic reveal()
     // scroll is in progress — they would flicker the indicator through
     // intermediate categories before landing on the correct one.
-    if (isProgrammaticScroll.current && isRefreshEmojiPickerEnabled()) {
+    if (isProgrammaticScroll.current) {
       return;
     }
     // Ignore scroll-driven category changes while the upload or delete screen is open
-    if ((uploading || emojiToDelete) && isRefreshEmojiPickerEnabled()) {
+    if (uploading || emojiToDelete) {
       return;
     }
     if (activeCategory !== category) {
       setActiveCategory(category);
-      if (!query && isRefreshEmojiPickerEnabled()) {
+      if (!query) {
         lastNonSearchCategory.current = category;
       }
     }
@@ -253,12 +248,10 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       setUploadErrorMessage(undefined);
     });
     fireAnalytics(uploadCancelButton());
-    if (isRefreshEmojiPickerEnabled()) {
-      setTimeout(function () {
-        var _getDocument;
-        (_getDocument = getDocument()) === null || _getDocument === void 0 || (_getDocument = _getDocument.getElementById('add-custom-emoji')) === null || _getDocument === void 0 || _getDocument.focus();
-      }, 0);
-    }
+    setTimeout(function () {
+      var _getDocument;
+      (_getDocument = getDocument()) === null || _getDocument === void 0 || (_getDocument = _getDocument.getElementById('add-custom-emoji')) === null || _getDocument === void 0 || _getDocument.focus();
+    }, 0);
   }, [fireAnalytics]);
   var getDynamicCategories = useCallback(function () {
     if (!emojiProvider.calculateDynamicCategories) {
@@ -304,7 +297,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   }, [filteredEmojis.length, getDynamicCategories, onDynamicCategoryChange, selectedEmoji]);
   var onFrequentEmojiResult = useCallback(function (frequentEmoji) {
     // change the category of each of the featured emoji
-    var visibleFrequentEmoji = isTeamojiExperimentEnabled ? filterHiddenEmojis(frequentEmoji) : frequentEmoji;
+    var visibleFrequentEmoji = filterHiddenEmojis(frequentEmoji);
     var recategorised = visibleFrequentEmoji.map(function (emoji) {
       var clone = JSON.parse(JSON.stringify(emoji));
       clone.category = frequentCategory;
@@ -313,11 +306,11 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     setStateAfterEmojiChange({
       frequentEmoji: recategorised
     });
-  }, [isTeamojiExperimentEnabled, setStateAfterEmojiChange]);
+  }, [setStateAfterEmojiChange]);
   var onSearchResult = useCallback(function (searchResults) {
     var frequentlyUsedEmoji = frequentlyUsedEmojis || [];
     var searchQuery = searchResults.query || '';
-    var visibleSearchEmojis = isTeamojiExperimentEnabled ? filterHiddenEmojis(searchResults.emojis) : searchResults.emojis;
+    var visibleSearchEmojis = filterHiddenEmojis(searchResults.emojis);
 
     /**
      * If there is no user search in the EmojiPicker then it should display all emoji received from the EmojiRepository and should
@@ -339,7 +332,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       queryLength: searchQuery.length,
       numMatches: visibleSearchEmojis.length
     }));
-  }, [frequentlyUsedEmojis, isTeamojiExperimentEnabled, query, setStateAfterEmojiChange, fireAnalytics]);
+  }, [frequentlyUsedEmojis, query, setStateAfterEmojiChange, fireAnalytics]);
   var onProviderChange = useMemo(function () {
     return {
       result: onSearchResult
@@ -401,37 +394,29 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     if (!categoryId) {
       return;
     }
-
-    // If the upload or delete screen is open, close it when a category is selected
-    if (isRefreshEmojiPickerEnabled()) {
-      if (uploading) {
-        setUploading(false);
-        setUploadErrorMessage(undefined);
-      }
-      if (emojiToDelete) {
-        setEmojiToDelete(undefined);
-      }
+    if (uploading) {
+      setUploading(false);
+      setUploadErrorMessage(undefined);
+    }
+    if (emojiToDelete) {
+      setEmojiToDelete(undefined);
     }
     emojiProvider.findInCategory(categoryId).then(function (emojisInCategory) {
       if (!disableCategories) {
         var newSelectedEmoji;
-        var visibleEmojisInCategory = isTeamojiExperimentEnabled ? filterHiddenEmojis(emojisInCategory || []) : emojisInCategory || [];
+        var visibleEmojisInCategory = filterHiddenEmojis(emojisInCategory || []);
         if (visibleEmojisInCategory.length > 0) {
           newSelectedEmoji = getEmojiVariation(visibleEmojisInCategory[0], {
             skinTone: selectedTone
           });
         }
         if (emojiPickerList.current) {
-          if (isTeamojiExperimentEnabled) {
-            isProgrammaticScroll.current = true;
-          }
-          emojiPickerList.current.reveal(categoryId, isTeamojiExperimentEnabled);
-          if (isTeamojiExperimentEnabled) {
-            // Clear the flag after the scroll animation has settled.
-            setTimeout(function () {
-              isProgrammaticScroll.current = false;
-            }, 300);
-          }
+          isProgrammaticScroll.current = true;
+          emojiPickerList.current.reveal(categoryId, true);
+          // Clear the flag after the scroll animation has settled.
+          setTimeout(function () {
+            isProgrammaticScroll.current = false;
+          }, 300);
         }
         batchedUpdates(function () {
           setActiveCategory(categoryId);
@@ -442,7 +427,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
         }));
       }
     });
-  }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, isTeamojiExperimentEnabled, selectedTone, uploading, emojiToDelete]);
+  }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
   var recordUsageOnSelection = useMemo(function () {
     return createRecordSelectionDefault(emojiProvider, onSelectWrapper, function (analytic) {
       return fireAnalytics(analytic(SearchSourceTypes.PICKER));
@@ -465,7 +450,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     };
     if (searchQuery !== query) {
       // Capture the active category before entering search so we can keep it highlighted
-      if (!query && searchQuery && isRefreshEmojiPickerEnabled()) {
+      if (!query && searchQuery) {
         lastNonSearchCategory.current = activeCategory;
       }
       setQuery(searchQuery);
@@ -481,7 +466,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
   // cannot reach underlying page drop handlers (e.g. the Confluence editor).
   useEffect(function () {
     var _getDocument2;
-    if (!uploading || !isRefreshEmojiPickerEnabled()) {
+    if (!uploading) {
       return;
     }
     var body = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.body;
@@ -551,10 +536,6 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
               });
               scrollToUploadedEmoji(emojiDescription);
             };
-            if (!isRefreshEmojiPickerEnabled()) {
-              _context.next = 2;
-              break;
-            }
             uploadShortName = ":".concat(upload.name.toLowerCase(), ":");
             _context.next = 1;
             return emojiProvider.findByShortName(uploadShortName);
@@ -689,9 +670,9 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
       emojiProvider.unsubscribe(onProviderChange);
     };
   }, [emojiProvider, onProviderChange]);
-  var showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
-  var shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
-  var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
+  var showPreview = !uploading;
+  var shouldRenderFooter = showPreview && !emojiToDelete && !(query && filteredEmojis.length === 0) && (Boolean(selectedEmoji) || uploadEnabled);
+  var useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0);
 
   // When the AI emoji section is shown in the upload panel, grow the picker so
   // the section isn't clipped by the fixed upload height.
@@ -702,7 +683,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     role: "dialog",
     "aria-label": formatMessage(messages.emojiPickerTitle),
     "aria-modal": true,
-    className: ax([isRefreshEmojiPickerEnabled() ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete && isRefreshEmojiPickerEnabled() ? withDeleteRefreshHeight[size] : uploading && isRefreshEmojiPickerEnabled() ? hasUploadPreviewError ? withUploadRefreshAndPreviewErrorHeight[size] : withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled() ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size], showAiUpload && "_4t3ikbql _c71l8k0t"]),
+    className: ax(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iuxo9 _1bsb10mj _1ul910mj _c71l1y6z _kqswh2mm", !!emojiToDelete ? withDeleteRefreshHeight[size] : uploading ? hasUploadPreviewError ? withUploadRefreshAndPreviewErrorHeight[size] : withUploadRefreshHeight[size] : query && filteredEmojis.length === 0 ? withNoResultsRefreshHeight[size] : showPreview ? withPreviewHeight[size] : withoutPreviewHeight[size], showAiUpload && "_4t3ikbql _c71l8k0t"]),
     style: {
       "--_19dn98e": ix("".concat(emojiPickerHeight, "px")),
       "--_gsvyy7": ix("".concat(emojiPickerWidth, "px"))
@@ -714,7 +695,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onKeyDown: suppressKeyPress,
     className: ax(["_16jlkb7n _1o9zkb7n _i0dlf1ug _1reo15vq _18m915vq _1e0c1txw _2lx21bp4 _1bah1yb4 _1tkeidpf", showAiUpload && "_1reo15vq _18m91wug"])
   }, /*#__PURE__*/React.createElement(CategorySelector, {
-    activeCategoryId: (uploading || emojiToDelete) && isRefreshEmojiPickerEnabled() ? null : activeCategory,
+    activeCategoryId: uploading || emojiToDelete ? null : activeCategory,
     dynamicCategories: dynamicCategories,
     disableCategories: disableCategories,
     onCategorySelected: onCategorySelected
@@ -729,13 +710,13 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     onSearch: onSearch,
     query: query,
     selectedTone: selectedTone,
-    selectedProductivityColor: isTeamojiExperimentEnabled ? selectedProductivityColor : undefined,
+    selectedProductivityColor: selectedProductivityColor,
     loading: loading,
     ref: emojiPickerList,
     initialUploadName: query,
     onToneSelected: onToneSelected,
     onToneSelectorCancelled: onToneSelectorCancelled,
-    onProductivityColorSelected: isTeamojiExperimentEnabled ? onProductivityColorSelected : undefined,
+    onProductivityColorSelected: onProductivityColorSelected,
     toneEmoji: toneEmoji,
     uploading: uploading,
     emojiToDelete: emojiToDelete,

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

@@ -5,7 +5,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import { memo } from 'react';
 import { useIntl } from 'react-intl';
 import { useEmojiPickerListContext } from '../../hooks/useEmojiPickerListContext';
-import { isTeamoji26RefreshEmojiPickerEnabledNoExposure } from '../../util/teamoji26RefreshEmojiPicker';
 import CachingEmoji from '../common/CachingEmoji';
 import { messages } from '../i18n';
 var emojiItem = null;
@@ -26,7 +25,7 @@ var EmojiPickerEmojiRow = function EmojiPickerEmojiRow(_ref) {
   var rowIndex = (virtualItemContext === null || virtualItemContext === void 0 ? void 0 : virtualItemContext.index) || 0;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var preventFocusOnMouseDown = isTeamoji26RefreshEmojiPickerEnabledNoExposure();
+  var preventFocusOnMouseDown = true;
   var handleFocus = function handleFocus(index) {
     return function (emojiId, emoji, event) {
       setEmojisFocus({

package/dist/esm/components/picker/EmojiPickerFooter.compiled.css

@@ -1,6 +1,4 @@
-._x3do1uh4{border-top:var(--ds-border-width-selected,2px) solid var(--ds-border,#0b120e24)}
 ._x3doia51{border-top:var(--ds-border-width,1px) solid var(--ds-border,#0b120e24)}._16jlidpf{flex-grow:0}
-._16qsvjqj{box-shadow:0 -1px 1px 0 var(--ds-border,#0b120e24)}
 ._19bvv77o{padding-left:var(--ds-space-025,2px)}
 ._1o9zidpf{flex-shrink:0}
 ._ca0qv77o{padding-top:var(--ds-space-025,2px)}

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

@@ -7,9 +7,7 @@ import { useIntl } from 'react-intl';
 import { Box } from '@atlaskit/primitives/compiled/box';
 import { AddOwnEmoji } from '../common/AddEmoji';
 import { EmojiPreviewComponent } from '../common/EmojiPreviewComponent';
-import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
 var emojiPickerFooter = null;
-var emojiPickerFooterWithTopShadow = null;
 var emojiPickerFooterWithTopShadowNew = null;
 var emojiPreviewContainerStyles = {
   emojiPreviewContainer: "_ca0qv77o _u5f3v77o _n3tdv77o _19bvv77o"
@@ -20,7 +18,7 @@ var EmojiPickerFooter = function EmojiPickerFooter(_ref) {
     onOpenUpload = _ref.onOpenUpload,
     uploadEnabled = _ref.uploadEnabled;
   var intl = useIntl();
-  return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", {
     "data-testid": emojiPickerFooterTestId,
     className: ax(["_16jlidpf _1o9zidpf _i0dl1wug", "_x3doia51"])
   }, selectedEmoji ? /*#__PURE__*/React.createElement(Box, {
@@ -31,11 +29,6 @@ var EmojiPickerFooter = function EmojiPickerFooter(_ref) {
     onOpenUpload: onOpenUpload,
     uploadEnabled: uploadEnabled,
     intl: intl
-  })) : /*#__PURE__*/React.createElement("div", {
-    "data-testid": emojiPickerFooterTestId,
-    className: ax(["_16jlidpf _1o9zidpf _i0dl1wug", "_x3do1uh4 _16qsvjqj"])
-  }, selectedEmoji && /*#__PURE__*/React.createElement(EmojiPreviewComponent, {
-    emoji: selectedEmoji
   }));
 };
 var _default_1 = /*#__PURE__*/memo(EmojiPickerFooter);

package/dist/esm/components/picker/EmojiPickerInternal.compiled.css

@@ -1,6 +1,5 @@
 ._19itahnd{border:var(--ds-border,#0b120e24) var(--ds-border-width,1px) solid}
-._2rko1mok{border-radius:var(--ds-radius-large,8px)}
-._2rkofajl{border-radius:var(--ds-radius-small,3px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko1mok{border-radius:var(--ds-radius-large,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._1bah1yb4{justify-content:space-between}
 ._1bsb1edt{width:350px}
 ._1e0c1txw{display:flex}

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

@@ -15,15 +15,10 @@ import React from 'react';
 import { EmojiCommonProvider } from '../../context/EmojiCommonProvider';
 import { ufoExperiences } from '../../util/analytics/ufoExperiences';
 import { defaultEmojiPickerSize } from '../../util/constants';
-import { isTeamoji26RefreshEmojiPickerEnabled } from '../../util/teamoji26RefreshEmojiPicker';
 import LoadingEmojiComponent from '../common/LoadingEmojiComponent';
 import { UfoErrorBoundary } from '../common/UfoErrorBoundary';
 import { emojiPickerLoader } from './emojiPickerLoader';
 import { LoadingItem } from './LoadingItem';
-var isRefreshEmojiPickerEnabled = function isRefreshEmojiPickerEnabled() {
-  return isTeamoji26RefreshEmojiPickerEnabled();
-};
-var emojiPicker = null;
 var emojiPickerNew = null;
 export var EmojiPickerInternal = /*#__PURE__*/function (_LoadingEmojiComponen) {
   function EmojiPickerInternal(props) {
@@ -57,12 +52,9 @@ export var EmojiPickerInternal = /*#__PURE__*/function (_LoadingEmojiComponen) {
         }
       };
       ufoExperiences['emoji-picker-opened'].markFMP();
-      return isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement("div", {
         ref: handlePickerRef,
         className: ax(["_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
-      }, item.renderItem()) : /*#__PURE__*/React.createElement("div", {
-        ref: handlePickerRef,
-        className: ax(["_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iixjv _1bsb1edt _1ul91edt _1tke5x59 _c71l1y6z"])
       }, item.renderItem());
     }
   }, {

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

@@ -7,9 +7,8 @@ import { customCategory, defaultEmojiPickerSize, emojiPickerPreviewHeight, frequ
 import { filterHiddenEmojis } from '../../util/filter-hidden-emojis';
 import { filterProductivityEmojisByColor, getProductivityColorPreviewEmojis } from '../../util/productivity-colors';
 import EmojiActions from '../common/EmojiActions';
-import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
 import { messages } from '../i18n';
-import { CategoryDescriptionMap, CategoryDescriptionMapNew } from './categories';
+import { CategoryDescriptionMapNew } from './categories';
 import { CategoryHeadingItem } from './CategoryHeadingItem';
 import CategoryTracker from './CategoryTracker';
 import { emojiPickerHeightOffset } from './emojiPickerHeightOffset';
@@ -111,17 +110,16 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     _useState0 = _slicedToArray(_useState9, 2),
     categoriesChanged = _useState0[0],
     setCategoriesChanged = _useState0[1];
-  var isTeamojiExperimentEnabled = isRefreshEmojiPickerEnabled();
   var visibleEmojis = useMemo(function () {
-    return isTeamojiExperimentEnabled ? filterHiddenEmojis(emojis) : emojis;
-  }, [emojis, isTeamojiExperimentEnabled]);
+    return filterHiddenEmojis(emojis);
+  }, [emojis]);
   var productivityColorPreviewEmojis = useMemo(function () {
-    return isTeamojiExperimentEnabled ? getProductivityColorPreviewEmojis(visibleEmojis) : {};
-  }, [isTeamojiExperimentEnabled, visibleEmojis]);
+    return getProductivityColorPreviewEmojis(visibleEmojis);
+  }, [visibleEmojis]);
   var addToCategoryMap = useCallback(function (categoryToGroupMap, emoji, category) {
     var _categoryToGroupMap$c;
     if (!categoryToGroupMap[category]) {
-      var categoryDefinition = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew[category] : CategoryDescriptionMap[category];
+      var categoryDefinition = CategoryDescriptionMapNew[category];
       if (!categoryDefinition) {
         return categoryToGroupMap;
       }
@@ -134,10 +132,10 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     }
     (_categoryToGroupMap$c = categoryToGroupMap[category]) === null || _categoryToGroupMap$c === void 0 || _categoryToGroupMap$c.emojis.push(emoji);
     return categoryToGroupMap;
-  }, [isTeamojiExperimentEnabled]);
+  }, []);
   var groupByCategory = useCallback(function (currentUser) {
     return function (categoryToGroupMap, emoji) {
-      if (isTeamojiExperimentEnabled && emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
+      if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
         addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
         var group = categoryToGroupMap[atlassianCategory];
         if (group) {
@@ -157,8 +155,6 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
           }
           subcategory.emojis.push(emoji);
         }
-      } else if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
-        addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
       } else {
         addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
       }
@@ -168,7 +164,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
       }
       return categoryToGroupMap;
     };
-  }, [addToCategoryMap, isTeamojiExperimentEnabled]);
+  }, [addToCategoryMap]);
   var findAtlassianSubcategoryToActivate = useCallback(function (startIndex) {
     var row = virtualItems[startIndex];
     if (row instanceof CategoryHeadingItem && row.props.id === atlassianCategory) {
@@ -205,11 +201,9 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     if (!query) {
       // Calculate category in view - only relevant if categories shown, i.e. no query
       var currentCategory = findCategoryToActivate(rowItem);
-      if (isTeamojiExperimentEnabled) {
-        var currentAtlassianSubcategory = findAtlassianSubcategoryToActivate(startIndex);
-        if (activeAtlassianSubcategory !== currentAtlassianSubcategory) {
-          setActiveAtlassianSubcategory(currentAtlassianSubcategory);
-        }
+      var currentAtlassianSubcategory = findAtlassianSubcategoryToActivate(startIndex);
+      if (activeAtlassianSubcategory !== currentAtlassianSubcategory) {
+        setActiveAtlassianSubcategory(currentAtlassianSubcategory);
       }
       if (currentCategory !== null && activeCategoryId !== currentCategory) {
         if (onCategoryActivated) {
@@ -217,13 +211,13 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
         }
       }
     }
-  }, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate, isTeamojiExperimentEnabled, onCategoryActivated]);
+  }, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate, onCategoryActivated]);
   var buildEmojiGroupedByCategory = useCallback(function (emojis, currentUser) {
     var categoryToGroupMap = emojis.reduce(groupByCategory(currentUser), {});
     setAllEmojiGroups(Object.keys(categoryToGroupMap).map(function (key) {
       return categoryToGroupMap[key];
     }).map(function (group) {
-      if (isTeamojiExperimentEnabled && selectedProductivityColor) {
+      if (selectedProductivityColor) {
         var _group$subcategories;
         group.emojis = filterProductivityEmojisByColor(group.emojis, selectedProductivityColor);
         (_group$subcategories = group.subcategories) === null || _group$subcategories === void 0 || _group$subcategories.forEach(function (subcategory) {
@@ -239,7 +233,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
       }
       return group;
     }).sort(byOrder));
-  }, [groupByCategory, isTeamojiExperimentEnabled, selectedProductivityColor]);
+  }, [groupByCategory, selectedProductivityColor]);
   var buildEmojiRows = useCallback(function (items, category, title, emojis, showDelete) {
     var remainingEmojis = emojis;
     while (remainingEmojis.length > 0) {
@@ -254,14 +248,14 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
         onDelete: onEmojiDelete,
         onMouseMove: onEmojiActive,
         onFocus: onEmojiActive,
-        onMouseLeave: isTeamojiExperimentEnabled ? onEmojiLeave : undefined
+        onMouseLeave: onEmojiLeave
       }));
     }
-  }, [isTeamojiExperimentEnabled, onEmojiActive, onEmojiDelete, onEmojiLeave, onEmojiSelected]);
+  }, [onEmojiActive, onEmojiDelete, onEmojiLeave, onEmojiSelected]);
   var buildVirtualItemFromGroup = useCallback(function (group) {
     var _group$subcategories3;
     var items = [];
-    var hasAtlassianSubcategories = isTeamojiExperimentEnabled && group.category === atlassianCategory && !!((_group$subcategories3 = group.subcategories) !== null && _group$subcategories3 !== void 0 && _group$subcategories3.length);
+    var hasAtlassianSubcategories = group.category === atlassianCategory && !!((_group$subcategories3 = group.subcategories) !== null && _group$subcategories3 !== void 0 && _group$subcategories3.length);
     if (!hasAtlassianSubcategories) {
       items.push(new CategoryHeadingItem({
         id: group.category,
@@ -296,7 +290,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
       buildEmojiRows(items, group.category, group.title, group.emojis, group.title === userCustomTitle);
     }
     return items;
-  }, [buildEmojiRows, isTeamojiExperimentEnabled]);
+  }, [buildEmojiRows]);
   var buildVirtualItems = useCallback(function () {
     var items = [];
     var prevFirstCategory = categoryTracker.getFirstCategory();
@@ -305,8 +299,8 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
       items.push(new LoadingItem());
     } else {
       if (query) {
-        var search = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew.SEARCH : CategoryDescriptionMap.SEARCH;
-        if (visibleEmojis.length === 0 && isTeamojiExperimentEnabled) {
+        var search = CategoryDescriptionMapNew.SEARCH;
+        if (visibleEmojis.length === 0) {
           // Show a "No results" category heading, then a no-results illustration below it
           items.push(new CategoryHeadingItem({
             id: searchCategory,
@@ -333,7 +327,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
         allEmojiGroups.forEach(function (group) {
           // Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
           // by not passing it to irrelevant groups
-          categoryTracker.add(isTeamojiExperimentEnabled || group.category === atlassianCategory ? group.category : group.emojis[0].category, items.length);
+          categoryTracker.add(group.category, items.length);
           items = [].concat(_toConsumableArray(items), _toConsumableArray(buildVirtualItemFromGroup(group)));
           if (group.category === yourUploadsCategory) {
             setLastYourUploadsRow(items.length - 1);
@@ -350,7 +344,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allEmojiGroups, buildVirtualItemFromGroup, formatMessage, isTeamojiExperimentEnabled, loading, onOpenUpload, query, uploadEnabled, visibleEmojis]);
+  }, [allEmojiGroups, buildVirtualItemFromGroup, formatMessage, loading, onOpenUpload, query, uploadEnabled, visibleEmojis]);
   var findCategoryToActivate = function findCategoryToActivate(row) {
     var category = null;
     if (row instanceof CategoryHeadingItem) {
@@ -474,12 +468,12 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [virtualItems, categoriesChanged]);
   var virtualListHeight = useMemo(function () {
-    if (query && visibleEmojis.length === 0 && isTeamojiExperimentEnabled) {
+    if (query && visibleEmojis.length === 0) {
       // No-results state: expand the list height to fit heading + illustration without scrolling
       return sizes.categoryHeadingHeight + sizes.noResultsHeight + emojiPickerHeightOffset(size);
     }
-    return isTeamojiExperimentEnabled ? sizes.listHeightNew + emojiPickerHeightOffset(size) + (useFooterSpaceForList ? emojiPickerPreviewHeight : 0) : sizes.listHeight + emojiPickerHeightOffset(size);
-  }, [size, query, visibleEmojis.length, isTeamojiExperimentEnabled, useFooterSpaceForList]);
+    return sizes.listHeightNew + emojiPickerHeightOffset(size) + (useFooterSpaceForList ? emojiPickerPreviewHeight : 0);
+  }, [size, query, visibleEmojis.length, useFooterSpaceForList]);
   return /*#__PURE__*/React.createElement(EmojiPickerTabPanel, {
     showSearchResults: !!query
   }, /*#__PURE__*/React.createElement(EmojiActions, {
@@ -487,10 +481,10 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     onToneSelected: onToneSelected,
     onToneSelectorCancelled: onToneSelectorCancelled,
     toneEmoji: toneEmoji,
-    activeCategoryId: isTeamojiExperimentEnabled ? activeCategoryId : undefined,
-    activeAtlassianSubcategory: isTeamojiExperimentEnabled ? activeAtlassianSubcategory : undefined,
-    productivityColorPreviewEmojis: isTeamojiExperimentEnabled ? productivityColorPreviewEmojis : undefined,
-    selectedProductivityColor: isTeamojiExperimentEnabled ? selectedProductivityColor : undefined,
+    activeCategoryId: activeCategoryId,
+    activeAtlassianSubcategory: activeAtlassianSubcategory,
+    productivityColorPreviewEmojis: productivityColorPreviewEmojis,
+    selectedProductivityColor: selectedProductivityColor,
     uploading: uploading,
     uploadEnabled: uploadEnabled,
     emojiToDelete: emojiToDelete,
@@ -503,7 +497,7 @@ export var EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef(functi
     onDeleteEmoji: onDeleteEmoji,
     onFileChooserClicked: onFileChooserClicked,
     onOpenUpload: onOpenUpload,
-    onProductivityColorSelected: isTeamojiExperimentEnabled ? onProductivityColorSelected : undefined,
+    onProductivityColorSelected: onProductivityColorSelected,
     query: query,
     onChange: onSearch,
     resultsCount: visibleEmojis.length,

package/dist/esm/components/picker/EmojiPickerListSearch.compiled.css

@@ -9,7 +9,6 @@
 ._1bsb1osq{width:100%}
 ._1e0cglyw{display:none}
 ._1goxglyw::-ms-clear{display:none}
-._1q51t94y{padding-block-start:1px}
 ._1q51yh40{padding-block-start:2px}
 ._1qu2glyw{outline-style:none}
 ._3um015vq{visibility:hidden}

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

@@ -9,13 +9,10 @@ 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 input = null;
 var inputNew = null;
 var textFieldWrapperNew = null;
 var pickerSearch = null;
-var searchIcon = null;
 var searchIconNew = null;
 var hidden = null;
 export var emojiPickerSearchTestId = 'emoji-picker-search';
@@ -54,7 +51,7 @@ export var EmojiPickerListSearch = function EmojiPickerListSearch(props) {
     role: "status"
   }, dirty ? query === '' ? formatMessage(messages.searchResultsStatusSeeAll) : formatMessage(messages.searchResultsStatus, {
     count: resultsCount
-  }) : null), isRefreshEmojiPickerEnabled() ? /*#__PURE__*/React.createElement("div", {
+  }) : null), /*#__PURE__*/React.createElement("div", {
     className: ax(["_n6341l7x _18z11b66"])
   }, /*#__PURE__*/React.createElement(TextField, {
     role: "searchbox",
@@ -75,24 +72,5 @@ export var EmojiPickerListSearch = function EmojiPickerListSearch(props) {
     ref: textRef,
     isCompact: true,
     className: ax(["_11c8fhey _12ji1r31 _1qu2glyw _12y31o36 _vchhusvi _syaz1kw7 _80om1kw7 _1q51yh40 _y4tize3t _85i5v77o _bozg12x7 _1bsb1osq _13xeglyw _1goxglyw"])
-  })) : /*#__PURE__*/React.createElement(TextField, {
-    role: "searchbox",
-    "aria-label": formatMessage(messages.searchLabel),
-    autoComplete: "off",
-    name: "search",
-    placeholder: "".concat(formatMessage(messages.searchPlaceholder), "..."),
-    defaultValue: query || '',
-    onChange: handleOnChange,
-    elemBeforeInput: /*#__PURE__*/React.createElement("span", {
-      className: ax(["_tzy4105o _18u01i6y"])
-    }, /*#__PURE__*/React.createElement(SearchIcon, {
-      color: "currentColor",
-      spacing: "spacious",
-      label: ""
-    })),
-    testId: emojiPickerSearchTestId,
-    ref: textRef,
-    isCompact: true,
-    className: ax(["_11c8fhey _12ji1r31 _1qu2glyw _12y31o36 _vchhusvi _syaz1kw7 _80om1kw7 _1q51t94y _y4tize3t _85i5v77o _bozg12x7 _1bsb1osq _13xeglyw _1goxglyw"])
-  }));
+  })));
 };

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

@@ -1,6 +1,5 @@
-import { emojiPickerListHeight, emojiPickerListHeightNew, emojiPickerWidth } from '../../util/constants';
+import { emojiPickerListHeightNew, emojiPickerWidth } from '../../util/constants';
 export var sizes = {
-  listHeight: emojiPickerListHeight,
   listHeightNew: emojiPickerListHeightNew,
   listWidth: emojiPickerWidth,
   searchHeight: 52,

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

@@ -8,7 +8,6 @@ import React, { useCallback, useImperativeHandle } from 'react';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import { useEmojiPickerListContext } from '../../hooks/useEmojiPickerListContext';
 import { EMOJIPICKERLIST_KEYBOARD_KEYS_SUPPORTED, EMOJI_LIST_COLUMNS, EMOJI_LIST_PAGE_COUNT, KeyboardNavigationDirection, KeyboardKeys } from '../../util/constants';
-import { isRefreshEmojiPickerEnabled } from '../common/isRefreshEmojiPickerEnabled';
 var virtualList = null;
 var virtualRowStyle = null;
 export var virtualListScrollContainerTestId = 'virtual-list-scroll-container';
@@ -54,7 +53,7 @@ export var VirtualList = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var elemBottom = elementRect.bottom;
     var parentTop = parentRect.top;
     var parentBottom = parentRect.bottom;
-    var isVisible = isRefreshEmojiPickerEnabled() ? elemTop >= parentTop && elemBottom <= parentBottom : elemBottom > parentTop && elemTop < parentBottom;
+    var isVisible = elemTop >= parentTop && elemBottom <= parentBottom;
     return isVisible;
   };
   var getFirstVisibleListElementIndex = useCallback(function () {
@@ -73,7 +72,7 @@ export var VirtualList = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var _virtualList$firstVis;
       return ((_virtualList$firstVis = virtualList[firstVisibleIndex]) === null || _virtualList$firstVis === void 0 ? void 0 : _virtualList$firstVis.index) || 0;
     }
-    return isRefreshEmojiPickerEnabled() ? ((_virtualList$ = virtualList[0]) === null || _virtualList$ === void 0 ? void 0 : _virtualList$.index) || 0 : 0;
+    return ((_virtualList$ = virtualList[0]) === null || _virtualList$ === void 0 ? void 0 : _virtualList$.index) || 0;
   }, [rowVirtualizer]);
 
   /**