@atlaskit/emoji 69.3.4 → 69.3.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/emoji
 
+## 69.3.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 69.3.5
+
+### Patch Changes
+
+- [#178513](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/178513)
+  [`1641aa82d30af`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1641aa82d30af) -
+  [ED-27981] Cleans up react 18 emoji feature flag
+- Updated dependencies
+
 ## 69.3.4
 
 ### Patch Changes

package/afm-volt/tsconfig.json

@@ -0,0 +1,78 @@
+{
+	"extends": "../../../../tsconfig.entry-points.volt.json",
+	"compilerOptions": {
+		"declaration": true,
+		"target": "es5",
+		"outDir": "../../../../../volt/tsDist/@atlaskit__emoji/app",
+		"rootDir": "../",
+		"composite": true
+	},
+	"include": [
+		"../src/**/*.ts",
+		"../src/**/*.tsx"
+	],
+	"exclude": [
+		"../src/**/__tests__/*",
+		"../src/**/*.test.*",
+		"../src/**/test.*"
+	],
+	"references": [
+		{
+			"path": "../../../analytics/analytics-next/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/button/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/css/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/heading/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/icon/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../media/media-client/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../media/media-client-react/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../platform/feature-flags/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../platform/feature-flags-react/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/primitives/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../react-ufo/atlaskit/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/spinner/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/textfield/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/theme/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tokens/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/tooltip/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../data/ufo-external/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../util-service-support/afm-volt/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-volt/tsconfig.json"
+		}
+	]
+}

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

@@ -28,7 +28,6 @@ var _CachingEmoji = _interopRequireDefault(require("./CachingEmoji"));
 var _EmojiErrorMessage = _interopRequireWildcard(require("./EmojiErrorMessage"));
 var _RetryableButton = _interopRequireDefault(require("./RetryableButton"));
 var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
@@ -75,25 +74,12 @@ var EmojiDeletePreview = /*#__PURE__*/function (_Component) {
   }
   (0, _inherits2.default)(EmojiDeletePreview, _Component);
   return (0, _createClass2.default)(EmojiDeletePreview, [{
-    key: "UNSAFE_componentWillUpdate",
-    value: function UNSAFE_componentWillUpdate(nextProps) {
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.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 ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.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/cjs/components/common/LoadingEmojiComponent.js

@@ -12,7 +12,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 /**
@@ -48,20 +47,11 @@ var LoadingEmojiComponent = exports.default = /*#__PURE__*/function (_Component)
         this.asyncLoadComponent();
       }
     }
-  }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
-        this.loadEmojiProvider(nextProps.emojiProvider);
-      }
-    }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.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);
       }
     }
   }, {

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

@@ -32,7 +32,6 @@ var _analytics = require("../../util/analytics");
 var _useEmoji2 = require("../../hooks/useEmoji");
 var _useIsMounted = require("../../hooks/useIsMounted");
 var _i18n = require("../i18n");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -123,7 +122,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     toneEmoji = _useState26[0],
     setToneEmoji = _useState26[1];
   var emojiPickerList = (0, _react.useMemo)(function () {
-    return (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/(0, _react.createRef)() : /*#__PURE__*/(0, _react.createRef)();
+    return /*#__PURE__*/(0, _react.createRef)();
   }, []);
   var openTime = (0, _react.useRef)(0);
   var isMounting = (0, _react.useRef)(true);
@@ -510,35 +509,7 @@ var EmojiPickerComponent = function EmojiPickerComponent(_ref) {
     dynamicCategories: dynamicCategories,
     disableCategories: disableCategories,
     onCategorySelected: onCategorySelected
-  }), (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb') ? /*#__PURE__*/React.createElement(_EmojiPickerList.EmojiPickerVirtualListInternalNew, {
-    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(_EmojiPickerList.EmojiPickerVirtualListInternalOld, {
+  }), /*#__PURE__*/React.createElement(_EmojiPickerList.EmojiPickerVirtualListInternal, {
     emojis: filteredEmojis,
     currentUser: currentUser,
     onEmojiSelected: recordUsageOnSelection,

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

@@ -5,15 +5,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RENDER_EMOJI_PICKER_LIST_TESTID = exports.EmojiPickerVirtualListInternalOld = exports.EmojiPickerVirtualListInternalNew = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+exports.RENDER_EMOJI_PICKER_LIST_TESTID = exports.EmojiPickerVirtualListInternal = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _constants = require("../../util/constants");
 var _categories = require("./categories");
@@ -26,8 +20,6 @@ var _VirtualList = require("./VirtualList");
 var _EmojiPickerListContext = require("../../context/EmojiPickerListContext");
 var _EmojiPickerTabPanel = _interopRequireDefault(require("./EmojiPickerTabPanel"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 /**
  * Test id for wrapper Emoji Picker List div
  */
@@ -41,347 +33,7 @@ var categoryClassname = 'emoji-category';
 var byOrder = function byOrder(orderableA, orderableB) {
   return (orderableA.order || 0) - (orderableB.order || 0);
 };
-var EmojiPickerVirtualListInternalOld = exports.EmojiPickerVirtualListInternalOld = /*#__PURE__*/function (_PureComponent) {
-  function EmojiPickerVirtualListInternalOld(_props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, EmojiPickerVirtualListInternalOld);
-    _this = _callSuper(this, EmojiPickerVirtualListInternalOld, [_props]);
-    (0, _defineProperty2.default)(_this, "virtualItems", []);
-    (0, _defineProperty2.default)(_this, "categoryTracker", new _CategoryTracker.default());
-    (0, _defineProperty2.default)(_this, "listRef", /*#__PURE__*/(0, _react.createRef)());
-    (0, _defineProperty2.default)(_this, "onEmojiActive", function (emojiId, emoji) {
-      if (_this.props.onEmojiActive) {
-        _this.props.onEmojiActive(emojiId, emoji);
-      }
-    });
-    (0, _defineProperty2.default)(_this, "onSearch", function (value) {
-      if (_this.props.onSearch) {
-        _this.props.onSearch(value);
-      }
-    });
-    (0, _defineProperty2.default)(_this, "findEmojiRowAndColumnById", function (emojiId) {
-      var columnIndex = -1;
-      // for most of cases, it'd be in first emoji row, so should be quite fast to find in real world
-      var rowIndex = _this.virtualItems.findIndex(function (rowItem) {
-        if (rowItem instanceof _EmojiPickerVirtualItems.EmojisRowItem) {
-          // find uploaded emoji in each emoji row
-          columnIndex = rowItem.props.emojis.findIndex(function (emoji) {
-            return emoji.id === emojiId;
-          });
-          return columnIndex !== -1;
-        }
-        return false;
-      });
-      return {
-        rowIndex: rowIndex,
-        columnIndex: columnIndex
-      };
-    });
-    (0, _defineProperty2.default)(_this, "buildVirtualItemFromGroup", function (group) {
-      var _this$props = _this.props,
-        onEmojiSelected = _this$props.onEmojiSelected,
-        onEmojiDelete = _this$props.onEmojiDelete;
-      var items = [];
-      items.push(new _EmojiPickerVirtualItems.CategoryHeadingItem({
-        id: group.category,
-        title: group.title,
-        className: categoryClassname
-      }));
-      var remainingEmojis = group.emojis;
-      while (remainingEmojis.length > 0) {
-        var rowEmojis = remainingEmojis.slice(0, _EmojiPickerSizes.sizes.emojiPerRow);
-        remainingEmojis = remainingEmojis.slice(_EmojiPickerSizes.sizes.emojiPerRow);
-        items.push(new _EmojiPickerVirtualItems.EmojisRowItem({
-          category: group.category,
-          emojis: rowEmojis,
-          title: group.title,
-          showDelete: group.title === _constants.userCustomTitle,
-          onSelected: onEmojiSelected,
-          onDelete: onEmojiDelete,
-          onMouseMove: _this.onEmojiActive,
-          onFocus: _this.onEmojiActive
-        }));
-      }
-      return items;
-    });
-    (0, _defineProperty2.default)(_this, "buildVirtualItems", function (props, _state) {
-      var emojis = props.emojis,
-        loading = props.loading,
-        query = props.query;
-      var items = [];
-      var prevFirstCategory = _this.categoryTracker.getFirstCategory();
-      _this.categoryTracker.reset();
-      if (loading) {
-        items.push(new _EmojiPickerVirtualItems.LoadingItem());
-      } else {
-        if (query) {
-          var search = _categories.CategoryDescriptionMap.SEARCH;
-          // Only a single "result" category
-          items = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(_this.buildVirtualItemFromGroup({
-            category: _constants.searchCategory,
-            title: search.name,
-            emojis: emojis,
-            order: search.order
-          })));
-        } else {
-          // Group by category
-
-          // Not searching show in categories.
-          _this.allEmojiGroups.forEach(function (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 = [].concat((0, _toConsumableArray2.default)(items), (0, _toConsumableArray2.default)(_this.buildVirtualItemFromGroup(group)));
-            if (group.category === _constants.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
-          });
-        }
-      }
-    });
-    (0, _defineProperty2.default)(_this, "addToCategoryMap", function (categoryToGroupMap, emoji, category) {
-      if (!categoryToGroupMap[category]) {
-        var categoryDefinition = _categories.CategoryDescriptionMap[category];
-        categoryToGroupMap[category] = {
-          emojis: [],
-          title: categoryDefinition.name,
-          category: category,
-          order: categoryDefinition.order
-        };
-      }
-      categoryToGroupMap[category].emojis.push(emoji);
-      return categoryToGroupMap;
-    });
-    (0, _defineProperty2.default)(_this, "groupByCategory", function (currentUser) {
-      return function (categoryToGroupMap, emoji) {
-        _this.addToCategoryMap(categoryToGroupMap, emoji, emoji.category);
-        // separate user emojis
-        if (emoji.category === _constants.customCategory && currentUser && emoji.creatorUserId === currentUser.id) {
-          _this.addToCategoryMap(categoryToGroupMap, emoji, _constants.yourUploadsCategory);
-        }
-        return categoryToGroupMap;
-      };
-    });
-    (0, _defineProperty2.default)(_this, "buildEmojiGroupedByCategory", function (emojis, currentUser) {
-      var categoryToGroupMap = emojis.reduce(_this.groupByCategory(currentUser), {});
-      _this.allEmojiGroups = Object.keys(categoryToGroupMap).map(function (key) {
-        return categoryToGroupMap[key];
-      }).map(function (group) {
-        if (group.category !== _constants.frequentCategory) {
-          group.emojis.sort(byOrder);
-        }
-        return group;
-      }).sort(byOrder);
-    });
-    (0, _defineProperty2.default)(_this, "findCategoryToActivate", function (row) {
-      var category = null;
-      if (row instanceof _EmojiPickerVirtualItems.CategoryHeadingItem) {
-        category = row.props.id;
-      } else if (row instanceof _EmojiPickerVirtualItems.EmojisRowItem) {
-        category = row.props.category;
-      }
-
-      // your uploads is rendered, take it as upload category, so could be highlighted in category selector
-      if (category === _constants.yourUploadsCategory) {
-        return _constants.customCategory;
-        // search results is rendered, return null so won't be highlighted for category selector
-      } else if (category === _constants.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
-     */
-    (0, _defineProperty2.default)(_this, "onRowsRendered", function (indexes) {
-      var startIndex = indexes.startIndex;
-      var rowItem = _this.virtualItems[startIndex];
-      var list = _this.listRef.current;
-
-      // update tabIndex manually, startIndex is not 0 based here
-      if (rowItem instanceof _EmojiPickerVirtualItems.CategoryHeadingItem) {
-        // if top of row rendered is category heading, update tabIndex for the next emoji row
-        list === null || list === void 0 || list.updateFocusIndex(startIndex + 1);
-      } else if (rowItem instanceof _EmojiPickerVirtualItems.EmojisRowItem) {
-        // if top of row rendered is emoji row, update it's tabIndex.
-        list === null || list === void 0 || list.updateFocusIndex(startIndex);
-      }
-      if (!_this.props.query) {
-        // Calculate category in view - only relevant if categories shown, i.e. no query
-        var currentCategory = _this.findCategoryToActivate(rowItem);
-        if (currentCategory !== null && _this.props.activeCategoryId !== currentCategory) {
-          if (_this.props.onCategoryActivated) {
-            _this.props.onCategoryActivated(currentCategory);
-          }
-        }
-      }
-    });
-    (0, _defineProperty2.default)(_this, "rowSize", function (index) {
-      var _this$virtualItems$in;
-      return ((_this$virtualItems$in = _this.virtualItems[index]) === null || _this$virtualItems$in === void 0 ? void 0 : _this$virtualItems$in.height) || _EmojiPickerSizes.sizes.categoryHeadingHeight;
-    });
-    (0, _defineProperty2.default)(_this, "renderRow", function (context) {
-      return (0, _EmojiPickerVirtualItems.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
-     */
-    (0, _defineProperty2.default)(_this, "handleOnCloseDelete", function () {
-      var list = _this.listRef.current;
-      list === null || list === void 0 || list.updateFocusIndex(_this.lastYourUploadsRow);
-      _this.props.onCloseDelete();
-    });
-    _this.lastYourUploadsRow = 0;
-    _this.buildEmojiGroupedByCategory(_props.emojis, _props.currentUser);
-    _this.buildVirtualItems(_props, _this.state);
-    return _this;
-  }
-  (0, _inherits2.default)(EmojiPickerVirtualListInternalOld, _PureComponent);
-  return (0, _createClass2.default)(EmojiPickerVirtualListInternalOld, [{
-    key: "UNSAFE_componentWillUpdate",
-    value: function 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);
-      }
-    }
-  }, {
-    key: "reveal",
-    value:
-    /**
-     * Scrolls to a category in the list view
-     */
-    function reveal(category) {
-      var row = this.categoryTracker.getRow(category);
-      this.scrollToRow(row);
-    }
-  }, {
-    key: "scrollToBottom",
-    value: function scrollToBottom() {
-      this.scrollToRow(this.virtualItems.length);
-    }
-  }, {
-    key: "scrollToTop",
-    value: function scrollToTop() {
-      this.scrollToRow(0);
-    }
-  }, {
-    key: "scrollToRow",
-    value: function scrollToRow(index) {
-      var _this$listRef$current;
-      (_this$listRef$current = this.listRef.current) === null || _this$listRef$current === void 0 || _this$listRef$current.scrollToRow(index);
-    }
-  }, {
-    key: "scrollToRecentlyUploaded",
-    value: function scrollToRecentlyUploaded(uploadedEmoji) {
-      // when search results is shown
-      if (this.props.query) {
-        var _this$findEmojiRowAnd = this.findEmojiRowAndColumnById(uploadedEmoji.id),
-          rowIndex = _this$findEmojiRowAnd.rowIndex,
-          columnIndex = _this$findEmojiRowAnd.columnIndex;
-        if (rowIndex !== -1) {
-          var _this$listRef$current2;
-          (_this$listRef$current2 = this.listRef.current) === null || _this$listRef$current2 === void 0 || _this$listRef$current2.scrollToEmojiAndFocus(rowIndex, columnIndex);
-        }
-      } else {
-        // when seeing all emojis
-        var row = this.lastYourUploadsRow;
-        if (row > 0) {
-          var _this$listRef$current3;
-          (_this$listRef$current3 = this.listRef.current) === null || _this$listRef$current3 === void 0 || _this$listRef$current3.scrollToRowAndFocusLastEmoji(this.lastYourUploadsRow);
-        }
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        query = _this$props2.query,
-        selectedTone = _this$props2.selectedTone,
-        onToneSelected = _this$props2.onToneSelected,
-        onToneSelectorCancelled = _this$props2.onToneSelectorCancelled,
-        toneEmoji = _this$props2.toneEmoji,
-        uploading = _this$props2.uploading,
-        uploadEnabled = _this$props2.uploadEnabled,
-        emojiToDelete = _this$props2.emojiToDelete,
-        initialUploadName = _this$props2.initialUploadName,
-        uploadErrorMessage = _this$props2.uploadErrorMessage,
-        onUploadCancelled = _this$props2.onUploadCancelled,
-        onUploadEmoji = _this$props2.onUploadEmoji,
-        onDeleteEmoji = _this$props2.onDeleteEmoji,
-        onFileChooserClicked = _this$props2.onFileChooserClicked,
-        onOpenUpload = _this$props2.onOpenUpload,
-        _this$props2$size = _this$props2.size,
-        size = _this$props2$size === void 0 ? _constants.defaultEmojiPickerSize : _this$props2$size,
-        emojis = _this$props2.emojis;
-      var virtualListHeight = _EmojiPickerSizes.sizes.listHeight + (0, _utils.emojiPickerHeightOffset)(size);
-      return /*#__PURE__*/_react.default.createElement(_EmojiPickerTabPanel.default, {
-        showSearchResults: !!query
-      }, /*#__PURE__*/_react.default.createElement(_EmojiActions.default, {
-        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.default.createElement(_EmojiPickerListContext.EmojiPickerListContextProvider, {
-        initialEmojisFocus: {
-          rowIndex: 1,
-          columnIndex: 0
-        }
-      }, /*#__PURE__*/_react.default.createElement(_VirtualList.VirtualList, {
-        ref: this.listRef,
-        height: virtualListHeight,
-        overscanRowCount: 10,
-        rowCount: this.virtualItems.length,
-        rowHeight: this.rowSize,
-        rowRenderer: this.renderRow,
-        scrollToAlignment: "start",
-        width: _EmojiPickerSizes.sizes.listWidth,
-        onRowsRendered: this.onRowsRendered
-      })));
-    }
-  }]);
-}(_react.PureComponent);
-(0, _defineProperty2.default)(EmojiPickerVirtualListInternalOld, "defaultProps", {
-  onEmojiSelected: function onEmojiSelected() {},
-  onEmojiActive: function onEmojiActive() {},
-  onEmojiDelete: function onEmojiDelete() {},
-  onCategoryActivated: function onCategoryActivated() {},
-  onSearch: function onSearch() {},
-  size: _constants.defaultEmojiPickerSize
-});
-var EmojiPickerVirtualListInternalNew = exports.EmojiPickerVirtualListInternalNew = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+var EmojiPickerVirtualListInternal = exports.EmojiPickerVirtualListInternal = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var emojis = props.emojis,
     currentUser = props.currentUser,
     _props$onEmojiSelecte = props.onEmojiSelected,

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

@@ -24,7 +24,6 @@ var _typeHelpers = require("../../util/type-helpers");
 var _RecordSelectionDefault = require("../common/RecordSelectionDefault");
 var _EmojiTypeAheadList = _interopRequireDefault(require("./EmojiTypeAheadList"));
 var _styles = require("./styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
@@ -191,34 +190,17 @@ var EmojiTypeAheadComponent = exports.default = /*#__PURE__*/function (_PureComp
       this.selected = false;
     }
   }, {
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || !(0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
-        var prevEmojiProvider = this.props.emojiProvider;
-        var nextEmojiProvider = nextProps.emojiProvider;
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps !== this.props) {
+        var prevEmojiProvider = prevProps.emojiProvider;
+        var 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);
-        }
-      }
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji') || (0, _platformFeatureFlags.fg)('platform_editor_react18_elements_emoji_jira_bb')) {
-        if (prevProps !== this.props) {
-          var prevEmojiProvider = prevProps.emojiProvider;
-          var 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);
         }
       }
     }