@atlaskit/emoji 73.3.3 → 73.3.4

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

@@ -38,8 +38,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';
@@ -55,7 +54,6 @@ const emojiPickerHeightDeleteRefresh = 339;
 const emojiPickerWidth = 350;
 const emojiPickerMinHeight = 260;
 const heightOffset = 80;
-const emojiPicker = null;
 const emojiPickerNew = null;
 const emojiPickerWrapper = null;
 
@@ -116,14 +114,13 @@ const EmojiPickerComponent = ({
     emojiProvider,
     isUploadSupported
   } = useEmoji();
-  const isTeamojiExperimentEnabled = isRefreshEmojiPickerEnabled();
   const [filteredEmojis, setFilteredEmojis] = useState([]);
   const [searchEmojis, setSearchEmojis] = useState([]);
   const [frequentlyUsedEmojis, setFrequentlyUsedEmojis] = useState([]);
   const [query, setQuery] = useState('');
   const [dynamicCategories, setDynamicCategories] = useState([]);
   const [selectedTone, setSelectedTone] = useState(!hideToneSelector ? emojiProvider.getSelectedTone() : undefined);
-  const [selectedProductivityColor, setSelectedProductivityColor] = useState(() => isTeamojiExperimentEnabled ? getStoredProductivityColor() : defaultProductivityColor);
+  const [selectedProductivityColor, setSelectedProductivityColor] = useState(() => getStoredProductivityColor());
   const [loading, setLoading] = useState(true);
   const [uploading, setUploading] = useState(false);
   const [selectedEmoji, setSelectedEmoji] = useState();
@@ -141,11 +138,9 @@ const EmojiPickerComponent = ({
   const isProgrammaticScroll = useRef(false);
   const pickerRef = useRef(null);
   const setPickerRef = useCallback(el => {
-    if (isTeamojiExperimentEnabled) {
-      pickerRef.current = el;
-    }
+    pickerRef.current = el;
     onPickerRef === null || onPickerRef === void 0 ? void 0 : onPickerRef(el);
-  }, [isTeamojiExperimentEnabled, onPickerRef]);
+  }, [onPickerRef]);
   const currentUser = useMemo(() => {
     return emojiProvider.getCurrentUser();
   }, [emojiProvider]);
@@ -162,7 +157,7 @@ const EmojiPickerComponent = ({
   }, [selectedEmoji]);
   const uploadEnabled = isUploadSupported && !uploading;
   const onEmojiLeave = useCallback(() => {
-    if (isRefreshEmojiPickerEnabled() && uploadEnabled) {
+    if (uploadEnabled) {
       setSelectedEmoji(undefined);
     }
   }, [uploadEnabled]);
@@ -170,16 +165,16 @@ const EmojiPickerComponent = ({
     // 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;
       }
     }
@@ -196,12 +191,10 @@ const EmojiPickerComponent = ({
       setUploadErrorMessage(undefined);
     });
     fireAnalytics(uploadCancelButton());
-    if (isRefreshEmojiPickerEnabled()) {
-      setTimeout(() => {
-        var _getDocument, _getDocument$getEleme;
-        (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : (_getDocument$getEleme = _getDocument.getElementById('add-custom-emoji')) === null || _getDocument$getEleme === void 0 ? void 0 : _getDocument$getEleme.focus();
-      }, 0);
-    }
+    setTimeout(() => {
+      var _getDocument, _getDocument$getEleme;
+      (_getDocument = getDocument()) === null || _getDocument === void 0 ? void 0 : (_getDocument$getEleme = _getDocument.getElementById('add-custom-emoji')) === null || _getDocument$getEleme === void 0 ? void 0 : _getDocument$getEleme.focus();
+    }, 0);
   }, [fireAnalytics]);
   const getDynamicCategories = useCallback(() => {
     if (!emojiProvider.calculateDynamicCategories) {
@@ -248,7 +241,7 @@ const EmojiPickerComponent = ({
   }, [filteredEmojis.length, getDynamicCategories, onDynamicCategoryChange, selectedEmoji]);
   const onFrequentEmojiResult = useCallback(frequentEmoji => {
     // change the category of each of the featured emoji
-    const visibleFrequentEmoji = isTeamojiExperimentEnabled ? filterHiddenEmojis(frequentEmoji) : frequentEmoji;
+    const visibleFrequentEmoji = filterHiddenEmojis(frequentEmoji);
     const recategorised = visibleFrequentEmoji.map(emoji => {
       const clone = JSON.parse(JSON.stringify(emoji));
       clone.category = frequentCategory;
@@ -257,11 +250,11 @@ const EmojiPickerComponent = ({
     setStateAfterEmojiChange({
       frequentEmoji: recategorised
     });
-  }, [isTeamojiExperimentEnabled, setStateAfterEmojiChange]);
+  }, [setStateAfterEmojiChange]);
   const onSearchResult = useCallback(searchResults => {
     const frequentlyUsedEmoji = frequentlyUsedEmojis || [];
     const searchQuery = searchResults.query || '';
-    const visibleSearchEmojis = isTeamojiExperimentEnabled ? filterHiddenEmojis(searchResults.emojis) : searchResults.emojis;
+    const 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
@@ -283,7 +276,7 @@ const EmojiPickerComponent = ({
       queryLength: searchQuery.length,
       numMatches: visibleSearchEmojis.length
     }));
-  }, [frequentlyUsedEmojis, isTeamojiExperimentEnabled, query, setStateAfterEmojiChange, fireAnalytics]);
+  }, [frequentlyUsedEmojis, query, setStateAfterEmojiChange, fireAnalytics]);
   const onProviderChange = useMemo(() => {
     return {
       result: onSearchResult
@@ -346,37 +339,29 @@ const EmojiPickerComponent = ({
     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(emojisInCategory => {
       if (!disableCategories) {
         let newSelectedEmoji;
-        const visibleEmojisInCategory = isTeamojiExperimentEnabled ? filterHiddenEmojis(emojisInCategory || []) : emojisInCategory || [];
+        const 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(() => {
-              isProgrammaticScroll.current = false;
-            }, 300);
-          }
+          isProgrammaticScroll.current = true;
+          emojiPickerList.current.reveal(categoryId, true);
+          // Clear the flag after the scroll animation has settled.
+          setTimeout(() => {
+            isProgrammaticScroll.current = false;
+          }, 300);
         }
         batchedUpdates(() => {
           setActiveCategory(categoryId);
@@ -387,7 +372,7 @@ const EmojiPickerComponent = ({
         }));
       }
     });
-  }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, isTeamojiExperimentEnabled, selectedTone, uploading, emojiToDelete]);
+  }, [disableCategories, emojiPickerList, emojiProvider, fireAnalytics, selectedTone, uploading, emojiToDelete]);
   const recordUsageOnSelection = useMemo(() => createRecordSelectionDefault(emojiProvider, onSelectWrapper, analytic => fireAnalytics(analytic(SearchSourceTypes.PICKER))), [emojiProvider, fireAnalytics, onSelectWrapper]);
   const formattedErrorMessage = useMemo(() => uploadErrorMessage ? /*#__PURE__*/React.createElement(FormattedMessage, uploadErrorMessage) : null, [uploadErrorMessage]);
   const onFileChooserClicked = useCallback(() => {
@@ -404,7 +389,7 @@ const EmojiPickerComponent = ({
     };
     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);
@@ -420,7 +405,7 @@ const EmojiPickerComponent = ({
   // cannot reach underlying page drop handlers (e.g. the Confluence editor).
   useEffect(() => {
     var _getDocument2;
-    if (!uploading || !isRefreshEmojiPickerEnabled()) {
+    if (!uploading) {
       return;
     }
     const body = (_getDocument2 = getDocument()) === null || _getDocument2 === void 0 ? void 0 : _getDocument2.body;
@@ -481,13 +466,11 @@ const EmojiPickerComponent = ({
       });
       scrollToUploadedEmoji(emojiDescription);
     };
-    if (isRefreshEmojiPickerEnabled()) {
-      const uploadShortName = `:${upload.name.toLowerCase()}:`;
-      const existing = await emojiProvider.findByShortName(uploadShortName);
-      if (existing) {
-        errorSetter(messages.emojiDuplicateName);
-        return;
-      }
+    const uploadShortName = `:${upload.name.toLowerCase()}:`;
+    const existing = await emojiProvider.findByShortName(uploadShortName);
+    if (existing) {
+      errorSetter(messages.emojiDuplicateName);
+      return;
     }
     uploadEmoji(upload, emojiProvider, errorSetter, onSuccess, fireAnalytics, retry);
   }, [emojiProvider, fireAnalytics, scrollToUploadedEmoji]);
@@ -600,9 +583,9 @@ const EmojiPickerComponent = ({
       emojiProvider.unsubscribe(onProviderChange);
     };
   }, [emojiProvider, onProviderChange]);
-  const showPreview = isRefreshEmojiPickerEnabled() ? !uploading : selectedEmoji && !uploading;
-  const shouldRenderFooter = showPreview && !(emojiToDelete && isRefreshEmojiPickerEnabled()) && !(query && filteredEmojis.length === 0 && isRefreshEmojiPickerEnabled()) && (Boolean(selectedEmoji) || uploadEnabled || !isRefreshEmojiPickerEnabled());
-  const useFooterSpaceForList = showPreview && !selectedEmoji && !uploadEnabled && !emojiToDelete && !(query && filteredEmojis.length === 0) && isRefreshEmojiPickerEnabled();
+  const showPreview = !uploading;
+  const shouldRenderFooter = showPreview && !emojiToDelete && !(query && filteredEmojis.length === 0) && (Boolean(selectedEmoji) || uploadEnabled);
+  const 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.
@@ -613,7 +596,7 @@ const EmojiPickerComponent = ({
     role: "dialog",
     "aria-label": formatMessage(messages.emojiPickerTitle),
     "aria-modal": true,
-    className: ax([isRefreshEmojiPickerEnabled() ? "_19itahnd _2rko1mok _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _c71l1y6z _kqswh2mm" : "_19itahnd _2rkofajl _1e0c1txw _2lx21bp4 _1bah1yb4 _bfhk1bhr _16qs130s _4t3iaq3k _1bsb1edt _1ul91edt _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 _4t3iaq3k _1bsb1edt _1ul91edt _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"])
   }, /*#__PURE__*/React.createElement("div", {
     role: "presentation",
     onKeyPress: suppressKeyPress,
@@ -621,7 +604,7 @@ const EmojiPickerComponent = ({
     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
@@ -636,13 +619,13 @@ const EmojiPickerComponent = ({
     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/es2019/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';
 const emojiItem = null;
@@ -29,7 +28,7 @@ const EmojiPickerEmojiRow = ({
   const {
     formatMessage
   } = useIntl();
-  const preventFocusOnMouseDown = isTeamoji26RefreshEmojiPickerEnabledNoExposure();
+  const preventFocusOnMouseDown = true;
   const handleFocus = index => (emojiId, emoji, event) => {
     setEmojisFocus({
       rowIndex,

package/dist/es2019/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/es2019/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';
 const emojiPickerFooter = null;
-const emojiPickerFooterWithTopShadow = null;
 const emojiPickerFooterWithTopShadowNew = null;
 const emojiPreviewContainerStyles = {
   emojiPreviewContainer: "_ca0qv77o _u5f3v77o _n3tdv77o _19bvv77o"
@@ -21,7 +19,7 @@ const EmojiPickerFooter = ({
   uploadEnabled
 }) => {
   const 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, {
@@ -32,11 +30,6 @@ const EmojiPickerFooter = ({
     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
   }));
 };
 const _default_1 = /*#__PURE__*/memo(EmojiPickerFooter);

package/dist/es2019/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/es2019/components/picker/EmojiPickerInternal.js

@@ -6,15 +6,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';
-const isRefreshEmojiPickerEnabled = () => {
-  return isTeamoji26RefreshEmojiPickerEnabled();
-};
-const emojiPicker = null;
 const emojiPickerNew = null;
 export class EmojiPickerInternal extends LoadingEmojiComponent {
   constructor(props) {
@@ -38,12 +33,9 @@ export class EmojiPickerInternal extends LoadingEmojiComponent {
       }
     };
     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());
   }
   renderLoaded(loadedEmojiProvider, EmojiPickerComponent) {

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

@@ -5,9 +5,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';
@@ -87,13 +86,12 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
   const [activeAtlassianSubcategory, setActiveAtlassianSubcategory] = useState(null);
   const categoryTracker = useMemo(() => new CategoryTracker(), []);
   const [categoriesChanged, setCategoriesChanged] = useState(false);
-  const isTeamojiExperimentEnabled = isRefreshEmojiPickerEnabled();
-  const visibleEmojis = useMemo(() => isTeamojiExperimentEnabled ? filterHiddenEmojis(emojis) : emojis, [emojis, isTeamojiExperimentEnabled]);
-  const productivityColorPreviewEmojis = useMemo(() => isTeamojiExperimentEnabled ? getProductivityColorPreviewEmojis(visibleEmojis) : {}, [isTeamojiExperimentEnabled, visibleEmojis]);
+  const visibleEmojis = useMemo(() => filterHiddenEmojis(emojis), [emojis]);
+  const productivityColorPreviewEmojis = useMemo(() => getProductivityColorPreviewEmojis(visibleEmojis), [visibleEmojis]);
   const addToCategoryMap = useCallback((categoryToGroupMap, emoji, category) => {
     var _categoryToGroupMap$c;
     if (!categoryToGroupMap[category]) {
-      const categoryDefinition = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew[category] : CategoryDescriptionMap[category];
+      const categoryDefinition = CategoryDescriptionMapNew[category];
       if (!categoryDefinition) {
         return categoryToGroupMap;
       }
@@ -106,9 +104,9 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     }
     (_categoryToGroupMap$c = categoryToGroupMap[category]) === null || _categoryToGroupMap$c === void 0 ? void 0 : _categoryToGroupMap$c.emojis.push(emoji);
     return categoryToGroupMap;
-  }, [isTeamojiExperimentEnabled]);
+  }, []);
   const groupByCategory = useCallback(currentUser => (categoryToGroupMap, emoji) => {
-    if (isTeamojiExperimentEnabled && emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
+    if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
       addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
       const group = categoryToGroupMap[atlassianCategory];
       if (group) {
@@ -126,8 +124,6 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
         }
         subcategory.emojis.push(emoji);
       }
-    } else if (emoji.type === 'ATLASSIAN' && emoji.category !== frequentCategory) {
-      addToCategoryMap(categoryToGroupMap, emoji, atlassianCategory);
     } else {
       addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
     }
@@ -136,7 +132,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       addToCategoryMap(categoryToGroupMap, emoji, yourUploadsCategory);
     }
     return categoryToGroupMap;
-  }, [addToCategoryMap, isTeamojiExperimentEnabled]);
+  }, [addToCategoryMap]);
   const findAtlassianSubcategoryToActivate = useCallback(startIndex => {
     const row = virtualItems[startIndex];
     if (row instanceof CategoryHeadingItem && row.props.id === atlassianCategory) {
@@ -173,11 +169,9 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     if (!query) {
       // Calculate category in view - only relevant if categories shown, i.e. no query
       const currentCategory = findCategoryToActivate(rowItem);
-      if (isTeamojiExperimentEnabled) {
-        const currentAtlassianSubcategory = findAtlassianSubcategoryToActivate(startIndex);
-        if (activeAtlassianSubcategory !== currentAtlassianSubcategory) {
-          setActiveAtlassianSubcategory(currentAtlassianSubcategory);
-        }
+      const currentAtlassianSubcategory = findAtlassianSubcategoryToActivate(startIndex);
+      if (activeAtlassianSubcategory !== currentAtlassianSubcategory) {
+        setActiveAtlassianSubcategory(currentAtlassianSubcategory);
       }
       if (currentCategory !== null && activeCategoryId !== currentCategory) {
         if (onCategoryActivated) {
@@ -185,11 +179,11 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
         }
       }
     }
-  }, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate, isTeamojiExperimentEnabled, onCategoryActivated]);
+  }, [virtualItems, query, activeAtlassianSubcategory, activeCategoryId, findAtlassianSubcategoryToActivate, onCategoryActivated]);
   const buildEmojiGroupedByCategory = useCallback((emojis, currentUser) => {
     const categoryToGroupMap = emojis.reduce(groupByCategory(currentUser), {});
     setAllEmojiGroups(Object.keys(categoryToGroupMap).map(key => categoryToGroupMap[key]).map(group => {
-      if (isTeamojiExperimentEnabled && selectedProductivityColor) {
+      if (selectedProductivityColor) {
         var _group$subcategories;
         group.emojis = filterProductivityEmojisByColor(group.emojis, selectedProductivityColor);
         (_group$subcategories = group.subcategories) === null || _group$subcategories === void 0 ? void 0 : _group$subcategories.forEach(subcategory => {
@@ -205,7 +199,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       }
       return group;
     }).sort(byOrder));
-  }, [groupByCategory, isTeamojiExperimentEnabled, selectedProductivityColor]);
+  }, [groupByCategory, selectedProductivityColor]);
   const buildEmojiRows = useCallback((items, category, title, emojis, showDelete) => {
     let remainingEmojis = emojis;
     while (remainingEmojis.length > 0) {
@@ -220,14 +214,14 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
         onDelete: onEmojiDelete,
         onMouseMove: onEmojiActive,
         onFocus: onEmojiActive,
-        onMouseLeave: isTeamojiExperimentEnabled ? onEmojiLeave : undefined
+        onMouseLeave: onEmojiLeave
       }));
     }
-  }, [isTeamojiExperimentEnabled, onEmojiActive, onEmojiDelete, onEmojiLeave, onEmojiSelected]);
+  }, [onEmojiActive, onEmojiDelete, onEmojiLeave, onEmojiSelected]);
   const buildVirtualItemFromGroup = useCallback(group => {
     var _group$subcategories3;
     const items = [];
-    const hasAtlassianSubcategories = isTeamojiExperimentEnabled && group.category === atlassianCategory && !!((_group$subcategories3 = group.subcategories) !== null && _group$subcategories3 !== void 0 && _group$subcategories3.length);
+    const 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,
@@ -262,7 +256,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       buildEmojiRows(items, group.category, group.title, group.emojis, group.title === userCustomTitle);
     }
     return items;
-  }, [buildEmojiRows, isTeamojiExperimentEnabled]);
+  }, [buildEmojiRows]);
   const buildVirtualItems = useCallback(() => {
     let items = [];
     const prevFirstCategory = categoryTracker.getFirstCategory();
@@ -271,8 +265,8 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       items.push(new LoadingItem());
     } else {
       if (query) {
-        const search = isTeamojiExperimentEnabled ? CategoryDescriptionMapNew.SEARCH : CategoryDescriptionMap.SEARCH;
-        if (visibleEmojis.length === 0 && isTeamojiExperimentEnabled) {
+        const 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,
@@ -299,7 +293,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
         allEmojiGroups.forEach(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 = [...items, ...buildVirtualItemFromGroup(group)];
           if (group.category === yourUploadsCategory) {
             setLastYourUploadsRow(items.length - 1);
@@ -316,7 +310,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
       }
     }
     // 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]);
   const findCategoryToActivate = row => {
     let category = null;
     if (row instanceof CategoryHeadingItem) {
@@ -437,12 +431,12 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [virtualItems, categoriesChanged]);
   const virtualListHeight = useMemo(() => {
-    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, {
@@ -450,10 +444,10 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     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,
@@ -466,7 +460,7 @@ export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((pro
     onDeleteEmoji: onDeleteEmoji,
     onFileChooserClicked: onFileChooserClicked,
     onOpenUpload: onOpenUpload,
-    onProductivityColorSelected: isTeamojiExperimentEnabled ? onProductivityColorSelected : undefined,
+    onProductivityColorSelected: onProductivityColorSelected,
     query: query,
     onChange: onSearch,
     resultsCount: visibleEmojis.length,

package/dist/es2019/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/es2019/components/picker/EmojiPickerListSearch.js

@@ -8,13 +8,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';
-const input = null;
 const inputNew = null;
 const textFieldWrapperNew = null;
 const pickerSearch = null;
-const searchIcon = null;
 const searchIconNew = null;
 const hidden = null;
 export const emojiPickerSearchTestId = 'emoji-picker-search';
@@ -50,7 +47,7 @@ export const 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",
@@ -71,24 +68,5 @@ export const 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: `${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/es2019/components/picker/EmojiPickerSizes.js

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

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

@@ -5,7 +5,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';
 const virtualList = null;
 const virtualRowStyle = null;
 export const virtualListScrollContainerTestId = 'virtual-list-scroll-container';
@@ -54,7 +53,7 @@ export const VirtualList = /*#__PURE__*/React.forwardRef((props, ref) => {
     const elemBottom = elementRect.bottom;
     const parentTop = parentRect.top;
     const parentBottom = parentRect.bottom;
-    const isVisible = isRefreshEmojiPickerEnabled() ? elemTop >= parentTop && elemBottom <= parentBottom : elemBottom > parentTop && elemTop < parentBottom;
+    const isVisible = elemTop >= parentTop && elemBottom <= parentBottom;
     return isVisible;
   };
   const getFirstVisibleListElementIndex = useCallback(() => {
@@ -71,7 +70,7 @@ export const VirtualList = /*#__PURE__*/React.forwardRef((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]);
 
   /**