@atlaskit/emoji 69.3.4 → 69.3.5

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

@@ -15,7 +15,6 @@ import CachingEmoji from './CachingEmoji';
 import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
 import RetryableButton from './RetryableButton';
 import VisuallyHidden from '@atlaskit/visually-hidden';
-import { fg } from '@atlaskit/platform-feature-flags';
 const deleteFooter = null;
 const deletePreview = null;
 const deleteText = null;
@@ -55,22 +54,11 @@ class EmojiDeletePreview extends Component {
       error: false
     };
   }
-  UNSAFE_componentWillUpdate(nextProps) {
-    if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      if (nextProps.emoji.id !== this.props.emoji.id) {
-        this.setState({
-          error: false
-        });
-      }
-    }
-  }
   componentDidUpdate(prevProps) {
-    if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      if (prevProps.emoji.id !== this.props.emoji.id) {
-        this.setState({
-          error: false
-        });
-      }
+    if (prevProps.emoji.id !== this.props.emoji.id) {
+      this.setState({
+        error: false
+      });
     }
   }
   render() {

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

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Component } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 /**
  * A base class for components that don't want to start rendering
  * until the EmojiProvider is resolved.
@@ -26,16 +25,9 @@ export default class LoadingEmojiComponent extends Component {
       this.asyncLoadComponent();
     }
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      this.loadEmojiProvider(nextProps.emojiProvider);
-    }
-  }
   componentDidUpdate(prevProps) {
-    if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      if (this.props !== prevProps) {
-        this.loadEmojiProvider(this.props.emojiProvider);
-      }
+    if (this.props !== prevProps) {
+      this.loadEmojiProvider(this.props.emojiProvider);
     }
   }
   componentWillUnmount() {

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

@@ -16,12 +16,11 @@ import { uploadEmoji } from '../common/UploadEmoji';
 import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
 import CategorySelector from './CategorySelector';
 import EmojiPickerFooter from './EmojiPickerFooter';
-import { EmojiPickerVirtualListInternalOld as EmojiPickerListOld, EmojiPickerVirtualListInternalNew as EmojiPickerListNew } from './EmojiPickerList';
+import { EmojiPickerVirtualListInternal as EmojiPickerList } from './EmojiPickerList';
 import { createAndFireEventInElementsChannel, categoryClickedEvent, closedPickerEvent, deleteBeginEvent, deleteCancelEvent, deleteConfirmEvent, openedPickerEvent, pickerClickedEvent, pickerSearchedEvent, selectedFileEvent, uploadBeginButton, uploadCancelButton, uploadConfirmButton, toneSelectorClosedEvent, ufoExperiences } from '../../util/analytics';
 import { useEmoji } from '../../hooks/useEmoji';
 import { useIsMounted } from '../../hooks/useIsMounted';
 import { messages } from '../i18n';
-import { fg } from '@atlaskit/platform-feature-flags';
 const emojiPickerBoxShadow = "var(--ds-shadow-overlay, 0 3px 6px rgba(0, 0, 0, 0.2))";
 const emojiPickerHeight = 295;
 const emojiPickerHeightWithPreview = 349; // emojiPickerHeight + emojiPickerPreviewHeight;
@@ -68,7 +67,7 @@ const EmojiPickerComponent = ({
   const [uploadErrorMessage, setUploadErrorMessage] = useState();
   const [emojiToDelete, setEmojiToDelete] = useState();
   const [toneEmoji, setToneEmoji] = useState();
-  const emojiPickerList = useMemo(() => fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/createRef() : /*#__PURE__*/createRef(), []);
+  const emojiPickerList = useMemo(() => /*#__PURE__*/createRef(), []);
   const openTime = useRef(0);
   const isMounting = useRef(true);
   const previousEmojiProvider = useRef(emojiProvider);
@@ -443,35 +442,7 @@ const EmojiPickerComponent = ({
     dynamicCategories: dynamicCategories,
     disableCategories: disableCategories,
     onCategorySelected: onCategorySelected
-  }), fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/React.createElement(EmojiPickerListNew, {
-    emojis: filteredEmojis,
-    currentUser: currentUser,
-    onEmojiSelected: recordUsageOnSelection,
-    onEmojiActive: onEmojiActive,
-    onEmojiDelete: onTriggerDelete,
-    onCategoryActivated: onCategoryActivated,
-    onSearch: onSearch,
-    query: query,
-    selectedTone: selectedTone,
-    loading: loading,
-    ref: emojiPickerList,
-    initialUploadName: query,
-    onToneSelected: onToneSelected,
-    onToneSelectorCancelled: onToneSelectorCancelled,
-    toneEmoji: toneEmoji,
-    uploading: uploading,
-    emojiToDelete: emojiToDelete,
-    uploadErrorMessage: formattedErrorMessage,
-    uploadEnabled: isUploadSupported && !uploading,
-    onUploadEmoji: onUploadEmoji,
-    onUploadCancelled: onUploadCancelled,
-    onDeleteEmoji: onDeleteEmoji,
-    onCloseDelete: onCloseDelete,
-    onFileChooserClicked: onFileChooserClicked,
-    onOpenUpload: onOpenUpload,
-    size: size,
-    activeCategoryId: activeCategory
-  }) : /*#__PURE__*/React.createElement(EmojiPickerListOld, {
+  }), /*#__PURE__*/React.createElement(EmojiPickerList, {
     emojis: filteredEmojis,
     currentUser: currentUser,
     onEmojiSelected: recordUsageOnSelection,

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

@@ -1,5 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React, { createRef, PureComponent, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { customCategory, defaultEmojiPickerSize, frequentCategory, searchCategory, userCustomTitle, yourUploadsCategory } from '../../util/constants';
 import { CategoryDescriptionMap } from './categories';
 import CategoryTracker from './CategoryTracker';
@@ -22,327 +21,7 @@ const categoryClassname = 'emoji-category';
  */
 
 const byOrder = (orderableA, orderableB) => (orderableA.order || 0) - (orderableB.order || 0);
-export class EmojiPickerVirtualListInternalOld extends PureComponent {
-  constructor(_props) {
-    super(_props);
-    _defineProperty(this, "virtualItems", []);
-    _defineProperty(this, "categoryTracker", new CategoryTracker());
-    _defineProperty(this, "listRef", /*#__PURE__*/createRef());
-    _defineProperty(this, "onEmojiActive", (emojiId, emoji) => {
-      if (this.props.onEmojiActive) {
-        this.props.onEmojiActive(emojiId, emoji);
-      }
-    });
-    _defineProperty(this, "onSearch", value => {
-      if (this.props.onSearch) {
-        this.props.onSearch(value);
-      }
-    });
-    _defineProperty(this, "findEmojiRowAndColumnById", emojiId => {
-      let columnIndex = -1;
-      // for most of cases, it'd be in first emoji row, so should be quite fast to find in real world
-      let rowIndex = this.virtualItems.findIndex(rowItem => {
-        if (rowItem instanceof EmojisRowItem) {
-          // find uploaded emoji in each emoji row
-          columnIndex = rowItem.props.emojis.findIndex(emoji => emoji.id === emojiId);
-          return columnIndex !== -1;
-        }
-        return false;
-      });
-      return {
-        rowIndex,
-        columnIndex
-      };
-    });
-    _defineProperty(this, "buildVirtualItemFromGroup", group => {
-      const {
-        onEmojiSelected,
-        onEmojiDelete
-      } = this.props;
-      const items = [];
-      items.push(new CategoryHeadingItem({
-        id: group.category,
-        title: group.title,
-        className: categoryClassname
-      }));
-      let remainingEmojis = group.emojis;
-      while (remainingEmojis.length > 0) {
-        const rowEmojis = remainingEmojis.slice(0, sizes.emojiPerRow);
-        remainingEmojis = remainingEmojis.slice(sizes.emojiPerRow);
-        items.push(new EmojisRowItem({
-          category: group.category,
-          emojis: rowEmojis,
-          title: group.title,
-          showDelete: group.title === userCustomTitle,
-          onSelected: onEmojiSelected,
-          onDelete: onEmojiDelete,
-          onMouseMove: this.onEmojiActive,
-          onFocus: this.onEmojiActive
-        }));
-      }
-      return items;
-    });
-    _defineProperty(this, "buildVirtualItems", (props, _state) => {
-      const {
-        emojis,
-        loading,
-        query
-      } = props;
-      let items = [];
-      const prevFirstCategory = this.categoryTracker.getFirstCategory();
-      this.categoryTracker.reset();
-      if (loading) {
-        items.push(new LoadingItem());
-      } else {
-        if (query) {
-          const search = CategoryDescriptionMap.SEARCH;
-          // Only a single "result" category
-          items = [...items, ...this.buildVirtualItemFromGroup({
-            category: searchCategory,
-            title: search.name,
-            emojis,
-            order: search.order
-          })];
-        } else {
-          // Group by category
-
-          // Not searching show in categories.
-          this.allEmojiGroups.forEach(group => {
-            // Optimisation - avoid re-rendering unaffected groups for the current selectedShortcut
-            // by not passing it to irrelevant groups
-            this.categoryTracker.add(group.emojis[0].category, items.length);
-            items = [...items, ...this.buildVirtualItemFromGroup(group)];
-            if (group.category === yourUploadsCategory) {
-              this.lastYourUploadsRow = items.length - 1;
-            }
-          });
-        }
-      }
-
-      // make sure virtualItems is up-to-date before calling onRowsRendered
-      this.virtualItems = items;
-      if (!loading && !query) {
-        if (this.categoryTracker.getFirstCategory() !== prevFirstCategory) {
-          this.onRowsRendered({
-            startIndex: 0
-          });
-        }
-      }
-    });
-    _defineProperty(this, "addToCategoryMap", (categoryToGroupMap, emoji, category) => {
-      if (!categoryToGroupMap[category]) {
-        const categoryDefinition = CategoryDescriptionMap[category];
-        categoryToGroupMap[category] = {
-          emojis: [],
-          title: categoryDefinition.name,
-          category,
-          order: categoryDefinition.order
-        };
-      }
-      categoryToGroupMap[category].emojis.push(emoji);
-      return categoryToGroupMap;
-    });
-    _defineProperty(this, "groupByCategory", currentUser => (categoryToGroupMap, emoji) => {
-      this.addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
-      // separate user emojis
-      if (emoji.category === customCategory && currentUser && emoji.creatorUserId === currentUser.id) {
-        this.addToCategoryMap(categoryToGroupMap, emoji, yourUploadsCategory);
-      }
-      return categoryToGroupMap;
-    });
-    _defineProperty(this, "buildEmojiGroupedByCategory", (emojis, currentUser) => {
-      const categoryToGroupMap = emojis.reduce(this.groupByCategory(currentUser), {});
-      this.allEmojiGroups = Object.keys(categoryToGroupMap).map(key => categoryToGroupMap[key]).map(group => {
-        if (group.category !== frequentCategory) {
-          group.emojis.sort(byOrder);
-        }
-        return group;
-      }).sort(byOrder);
-    });
-    _defineProperty(this, "findCategoryToActivate", row => {
-      let category = null;
-      if (row instanceof CategoryHeadingItem) {
-        category = row.props.id;
-      } else if (row instanceof EmojisRowItem) {
-        category = row.props.category;
-      }
-
-      // your uploads is rendered, take it as upload category, so could be highlighted in category selector
-      if (category === yourUploadsCategory) {
-        return customCategory;
-        // search results is rendered, return null so won't be highlighted for category selector
-      } else if (category === searchCategory) {
-        return null;
-      }
-      return category;
-    });
-    /**
-     * onRowsRendered callback function
-     *
-     * Check the category of top of rendered row and inform category selector to change active category
-     * Rove index of emoji picker list
-     */
-    _defineProperty(this, "onRowsRendered", indexes => {
-      const {
-        startIndex
-      } = indexes;
-      const rowItem = this.virtualItems[startIndex];
-      const list = this.listRef.current;
-
-      // update tabIndex manually, startIndex is not 0 based here
-      if (rowItem instanceof CategoryHeadingItem) {
-        // if top of row rendered is category heading, update tabIndex for the next emoji row
-        list === null || list === void 0 ? void 0 : list.updateFocusIndex(startIndex + 1);
-      } else if (rowItem instanceof EmojisRowItem) {
-        // if top of row rendered is emoji row, update it's tabIndex.
-        list === null || list === void 0 ? void 0 : list.updateFocusIndex(startIndex);
-      }
-      if (!this.props.query) {
-        // Calculate category in view - only relevant if categories shown, i.e. no query
-        const currentCategory = this.findCategoryToActivate(rowItem);
-        if (currentCategory !== null && this.props.activeCategoryId !== currentCategory) {
-          if (this.props.onCategoryActivated) {
-            this.props.onCategoryActivated(currentCategory);
-          }
-        }
-      }
-    });
-    _defineProperty(this, "rowSize", index => {
-      var _this$virtualItems$in;
-      return ((_this$virtualItems$in = this.virtualItems[index]) === null || _this$virtualItems$in === void 0 ? void 0 : _this$virtualItems$in.height) || sizes.categoryHeadingHeight;
-    });
-    _defineProperty(this, "renderRow", context => {
-      return virtualItemRenderer(this.virtualItems, context);
-    });
-    /**
-     * After deleting emoji, we'll update the focus index to the first emoji of last row of your uploads, so when user navigate back focus will still work
-     * if last emoji in your uploads is deleted, the updated focus index will be outdated, as there will be no your uploads section
-     * however, it'll trigger onChange from VirtualList, which will update focus index automatically for us
-     */
-    _defineProperty(this, "handleOnCloseDelete", () => {
-      const list = this.listRef.current;
-      list === null || list === void 0 ? void 0 : list.updateFocusIndex(this.lastYourUploadsRow);
-      this.props.onCloseDelete();
-    });
-    this.lastYourUploadsRow = 0;
-    this.buildEmojiGroupedByCategory(_props.emojis, _props.currentUser);
-    this.buildVirtualItems(_props, this.state);
-  }
-  UNSAFE_componentWillUpdate(nextProps, nextState) {
-    if (this.props.emojis !== nextProps.emojis || this.props.selectedTone !== nextProps.selectedTone || this.props.loading !== nextProps.loading || this.props.query !== nextProps.query) {
-      if (!nextProps.query) {
-        // Only refresh if no query
-        this.buildEmojiGroupedByCategory(nextProps.emojis, nextProps.currentUser);
-      }
-      this.buildVirtualItems(nextProps, nextState);
-    }
-  }
-  /**
-   * Scrolls to a category in the list view
-   */
-  reveal(category) {
-    const row = this.categoryTracker.getRow(category);
-    this.scrollToRow(row);
-  }
-  scrollToBottom() {
-    this.scrollToRow(this.virtualItems.length);
-  }
-  scrollToTop() {
-    this.scrollToRow(0);
-  }
-  scrollToRow(index) {
-    var _this$listRef$current;
-    (_this$listRef$current = this.listRef.current) === null || _this$listRef$current === void 0 ? void 0 : _this$listRef$current.scrollToRow(index);
-  }
-  scrollToRecentlyUploaded(uploadedEmoji) {
-    // when search results is shown
-    if (this.props.query) {
-      const {
-        rowIndex,
-        columnIndex
-      } = this.findEmojiRowAndColumnById(uploadedEmoji.id);
-      if (rowIndex !== -1) {
-        var _this$listRef$current2;
-        (_this$listRef$current2 = this.listRef.current) === null || _this$listRef$current2 === void 0 ? void 0 : _this$listRef$current2.scrollToEmojiAndFocus(rowIndex, columnIndex);
-      }
-    } else {
-      // when seeing all emojis
-      const row = this.lastYourUploadsRow;
-      if (row > 0) {
-        var _this$listRef$current3;
-        (_this$listRef$current3 = this.listRef.current) === null || _this$listRef$current3 === void 0 ? void 0 : _this$listRef$current3.scrollToRowAndFocusLastEmoji(this.lastYourUploadsRow);
-      }
-    }
-  }
-  render() {
-    const {
-      query,
-      selectedTone,
-      onToneSelected,
-      onToneSelectorCancelled,
-      toneEmoji,
-      uploading,
-      uploadEnabled,
-      emojiToDelete,
-      initialUploadName,
-      uploadErrorMessage,
-      onUploadCancelled,
-      onUploadEmoji,
-      onDeleteEmoji,
-      onFileChooserClicked,
-      onOpenUpload,
-      size = defaultEmojiPickerSize,
-      emojis
-    } = this.props;
-    const virtualListHeight = sizes.listHeight + emojiPickerHeightOffset(size);
-    return /*#__PURE__*/React.createElement(EmojiPickerTabPanel, {
-      showSearchResults: !!query
-    }, /*#__PURE__*/React.createElement(EmojiActions, {
-      selectedTone: selectedTone,
-      onToneSelected: onToneSelected,
-      onToneSelectorCancelled: onToneSelectorCancelled,
-      toneEmoji: toneEmoji,
-      uploading: uploading,
-      uploadEnabled: uploadEnabled,
-      emojiToDelete: emojiToDelete,
-      initialUploadName: initialUploadName,
-      uploadErrorMessage: uploadErrorMessage,
-      onUploadCancelled: onUploadCancelled,
-      onUploadEmoji: onUploadEmoji,
-      onCloseDelete: this.handleOnCloseDelete,
-      onDeleteEmoji: onDeleteEmoji,
-      onFileChooserClicked: onFileChooserClicked,
-      onOpenUpload: onOpenUpload,
-      query: query,
-      onChange: this.onSearch,
-      resultsCount: emojis.length
-    }), /*#__PURE__*/React.createElement(EmojiPickerListContextProvider, {
-      initialEmojisFocus: {
-        rowIndex: 1,
-        columnIndex: 0
-      }
-    }, /*#__PURE__*/React.createElement(VirtualList, {
-      ref: this.listRef,
-      height: virtualListHeight,
-      overscanRowCount: 10,
-      rowCount: this.virtualItems.length,
-      rowHeight: this.rowSize,
-      rowRenderer: this.renderRow,
-      scrollToAlignment: "start",
-      width: sizes.listWidth,
-      onRowsRendered: this.onRowsRendered
-    })));
-  }
-}
-_defineProperty(EmojiPickerVirtualListInternalOld, "defaultProps", {
-  onEmojiSelected: () => {},
-  onEmojiActive: () => {},
-  onEmojiDelete: () => {},
-  onCategoryActivated: () => {},
-  onSearch: () => {},
-  size: defaultEmojiPickerSize
-});
-export const EmojiPickerVirtualListInternalNew = /*#__PURE__*/React.forwardRef((props, ref) => {
+export const EmojiPickerVirtualListInternal = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     emojis,
     currentUser,

package/dist/es2019/components/typeahead/EmojiTypeAheadComponent.js

@@ -12,7 +12,6 @@ import { toEmojiId } from '../../util/type-helpers';
 import { createRecordSelectionDefault } from '../common/RecordSelectionDefault';
 import EmojiList from './EmojiTypeAheadList';
 import { emojiTypeAhead } from './styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 const isFullShortName = query => query && query.length > 1 && query.charAt(0) === ':' && query.charAt(query.length - 1) === ':';
 const uniqueExactShortNameMatchIndex = (searchResult, query) => {
   if (!query) {
@@ -160,31 +159,16 @@ export default class EmojiTypeAheadComponent extends PureComponent {
     this.sessionId = uuid();
     this.selected = false;
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      const prevEmojiProvider = this.props.emojiProvider;
-      const nextEmojiProvider = nextProps.emojiProvider;
+  componentDidUpdate(prevProps) {
+    if (prevProps !== this.props) {
+      const prevEmojiProvider = prevProps.emojiProvider;
+      const nextEmojiProvider = this.props.emojiProvider;
       if (prevEmojiProvider !== nextEmojiProvider) {
         prevEmojiProvider.unsubscribe(this.onProviderChange);
         nextEmojiProvider.subscribe(this.onProviderChange);
-        this.onSearch(nextProps.query);
-      } else if (this.props.query !== nextProps.query) {
-        this.onSearch(nextProps.query);
-      }
-    }
-  }
-  componentDidUpdate(prevProps) {
-    if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      if (prevProps !== this.props) {
-        const prevEmojiProvider = prevProps.emojiProvider;
-        const nextEmojiProvider = this.props.emojiProvider;
-        if (prevEmojiProvider !== nextEmojiProvider) {
-          prevEmojiProvider.unsubscribe(this.onProviderChange);
-          nextEmojiProvider.subscribe(this.onProviderChange);
-          this.onSearch(this.props.query);
-        } else if (prevProps.query !== this.props.query) {
-          this.onSearch(this.props.query);
-        }
+        this.onSearch(this.props.query);
+      } else if (prevProps.query !== this.props.query) {
+        this.onSearch(this.props.query);
       }
     }
   }

package/dist/es2019/components/typeahead/EmojiTypeAheadList.js

@@ -6,7 +6,6 @@ import debug from '../../util/logger';
 import { actualMouseMove, mouseLocation } from '../../util/mouse';
 import Scrollable from '../common/Scrollable';
 import EmojiItem from './EmojiTypeAheadItem';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EmojiTypeAheadListContainer } from './EmojiTypeAheadListContainer';
 import { EmojiTypeAheadSpinner } from './EmojiTypeAheadSpinner';
 function wrapIndex(emojis, index) {
@@ -77,31 +76,6 @@ export default class EmojiTypeAheadList extends PureComponent {
       selectedIndex: 0
     };
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      // adjust selection
-      const {
-        emojis
-      } = nextProps;
-      const {
-        selectedKey
-      } = this.state;
-      if (!selectedKey) {
-        // go with default of selecting first item
-        return;
-      }
-      for (let i = 0; i < emojis.length; i++) {
-        if (selectedKey === emojis[i].id) {
-          this.setState({
-            selectedIndex: i
-          });
-          return;
-        }
-      }
-      // existing selection not in results, pick first
-      this.selectIndexNewEmoji(0, emojis);
-    }
-  }
   componentDidUpdate(prevProps) {
     const {
       emojis
@@ -114,24 +88,22 @@ export default class EmojiTypeAheadList extends PureComponent {
       const selectedEmoji = emojis[selectedIndex];
       this.revealItem(selectedEmoji.id || selectedEmoji.shortName);
     }
-    if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-      if (prevProps !== this.props) {
-        // adjust selection
-        if (!selectedKey) {
-          // go with default of selecting first item
+    if (prevProps !== this.props) {
+      // adjust selection
+      if (!selectedKey) {
+        // go with default of selecting first item
+        return;
+      }
+      for (let i = 0; i < emojis.length; i++) {
+        if (selectedKey === emojis[i].id) {
+          this.setState({
+            selectedIndex: i
+          });
           return;
         }
-        for (let i = 0; i < emojis.length; i++) {
-          if (selectedKey === emojis[i].id) {
-            this.setState({
-              selectedIndex: i
-            });
-            return;
-          }
-        }
-        // existing selection not in results, pick first
-        this.selectIndexNewEmoji(0, emojis);
       }
+      // existing selection not in results, pick first
+      this.selectIndexNewEmoji(0, emojis);
     }
   }
   // Internal

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

@@ -8,7 +8,7 @@ const createEvent = (eventType, action, actionSubject, actionSubjectId, attribut
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "69.3.3",
+    packageVersion: "69.3.4",
     ...attributes
   }
 });

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

@@ -22,7 +22,6 @@ import CachingEmoji from './CachingEmoji';
 import EmojiErrorMessage, { emojiErrorScreenreaderTestId } from './EmojiErrorMessage';
 import RetryableButton from './RetryableButton';
 import VisuallyHidden from '@atlaskit/visually-hidden';
-import { fg } from '@atlaskit/platform-feature-flags';
 var deleteFooter = null;
 var deletePreview = null;
 var deleteText = null;
@@ -66,25 +65,12 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
   }
   _inherits(EmojiDeletePreview, _Component);
   return _createClass(EmojiDeletePreview, [{
-    key: "UNSAFE_componentWillUpdate",
-    value: function UNSAFE_componentWillUpdate(nextProps) {
-      if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-        if (nextProps.emoji.id !== this.props.emoji.id) {
-          this.setState({
-            error: false
-          });
-        }
-      }
-    }
-  }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-        if (prevProps.emoji.id !== this.props.emoji.id) {
-          this.setState({
-            error: false
-          });
-        }
+      if (prevProps.emoji.id !== this.props.emoji.id) {
+        this.setState({
+          error: false
+        });
       }
     }
   }, {

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

@@ -7,7 +7,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { Component } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 /**
  * A base class for components that don't want to start rendering
  * until the EmojiProvider is resolved.
@@ -41,20 +40,11 @@ var LoadingEmojiComponent = /*#__PURE__*/function (_Component) {
         this.asyncLoadComponent();
       }
     }
-  }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (!fg('platform_editor_react18_elements_emoji') || !fg('platform_editor_react18_elements_emoji_jira_bb')) {
-        this.loadEmojiProvider(nextProps.emojiProvider);
-      }
-    }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if (fg('platform_editor_react18_elements_emoji') || fg('platform_editor_react18_elements_emoji_jira_bb')) {
-        if (this.props !== prevProps) {
-          this.loadEmojiProvider(this.props.emojiProvider);
-        }
+      if (this.props !== prevProps) {
+        this.loadEmojiProvider(this.props.emojiProvider);
       }
     }
   }, {