@atlaskit/emoji 72.0.8 → 72.1.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/emoji
 
+## 72.1.0
+
+### Minor Changes
+
+- [`67cb56528e699`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/67cb56528e699) -
+  Add emojiProviderLookupOrder as an optional override for the shortName-only emoji lookup priority
+
+### Patch Changes
+
+- Updated dependencies
+
+## 72.0.9
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 72.0.8
 
 ### Patch Changes

package/dist/cjs/api/EmojiRepository.js

@@ -26,7 +26,9 @@ var _getEmojiVariation = require("./getEmojiVariation");
 var _UsageFrequencyTracker = require("./internal/UsageFrequencyTracker");
 var _createSearchEmojiComparator = require("./internal/createSearchEmojiComparator");
 var _createUsageOnlyEmojiComparator = require("./internal/createUsageOnlyEmojiComparator");
-/* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
 // FS-1097 - duplicated in mentions - extract at some point into a shared library
 var Tokenizer = /*#__PURE__*/function () {
   function Tokenizer() {
@@ -77,9 +79,36 @@ var _addAllVariants = function addAllVariants(emoji, fnKey, map) {
     }
   }
 };
-var findByKey = function findByKey(map, key) {
+var findByKey = function findByKey(map, key, emojiProviderLookupOrder) {
   var emojis = map.get(key);
   if (emojis && emojis.length) {
+    if (emojiProviderLookupOrder !== null && emojiProviderLookupOrder !== void 0 && emojiProviderLookupOrder.length) {
+      var _iterator = _createForOfIteratorHelper(emojiProviderLookupOrder),
+        _step;
+      try {
+        var _loop = function _loop() {
+            var emojiType = _step.value;
+            var matchingEmoji = emojis.find(function (emoji) {
+              return emoji.type === emojiType;
+            });
+            if (matchingEmoji) {
+              return {
+                v: matchingEmoji
+              };
+            }
+          },
+          _ret;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _ret = _loop();
+          if (_ret) return _ret.v;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+
     // Priority is always to source from the last emoji set (last overrides first)
     return emojis[emojis.length - 1];
   }
@@ -189,8 +218,8 @@ var EmojiRepository = exports.default = /*#__PURE__*/function () {
      */
   }, {
     key: "findByShortName",
-    value: function findByShortName(shortName) {
-      return findByKey(this.shortNameMap, shortName);
+    value: function findByShortName(shortName, emojiProviderLookupOrder) {
+      return findByKey(this.shortNameMap, shortName, emojiProviderLookupOrder);
     }
 
     /**

package/dist/cjs/api/EmojiResource.js

@@ -275,17 +275,18 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
   }, {
     key: "fetchByEmojiId",
     value: function () {
-      var _fetchByEmojiId = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(emojiId, optimistic) {
-        var _emoji, provider, loader, loadEmoji, _emoji2, emoji, _t3;
+      var _fetchByEmojiId = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(emojiId, optimistic, emojiProviderLookupOrder) {
+        var shortNameLookupOrder, _emoji, provider, loader, loadEmoji, _emoji2, emoji, _t3;
         return _regenerator.default.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              shortNameLookupOrder = (0, _platformFeatureFlags.fg)('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined; // Check if repository exists and emoji is defined.
               if (!(this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository))) {
                 _context4.next = 3;
                 break;
               }
               _context4.next = 1;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 1:
               _emoji = _context4.sent;
               if (!_emoji) {
@@ -330,7 +331,7 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
               _context4.prev = 8;
               _t3 = _context4["catch"](4);
               _context4.next = 9;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 9:
               _emoji2 = _context4.sent;
               if (_emoji2) {
@@ -342,7 +343,7 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
               return _context4.abrupt("return", this.getMediaEmojiDescriptionURLWithInlineToken(_emoji2));
             case 11:
               _context4.next = 12;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 12:
               emoji = _context4.sent;
               if (emoji) {
@@ -358,7 +359,7 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
           }
         }, _callee4, this, [[4, 8]]);
       }));
-      function fetchByEmojiId(_x3, _x4) {
+      function fetchByEmojiId(_x3, _x4, _x5) {
         return _fetchByEmojiId.apply(this, arguments);
       }
       return fetchByEmojiId;
@@ -507,7 +508,7 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
           }
         }, _callee5, this);
       }));
-      function getMediaEmojiDescriptionURLWithInlineToken(_x5) {
+      function getMediaEmojiDescriptionURLWithInlineToken(_x6) {
         return _getMediaEmojiDescriptionURLWithInlineToken.apply(this, arguments);
       }
       return getMediaEmojiDescriptionURLWithInlineToken;
@@ -564,19 +565,19 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
     }
   }, {
     key: "findByShortName",
-    value: function findByShortName(shortName) {
+    value: function findByShortName(shortName, emojiProviderLookupOrder) {
       var _this4 = this;
       if (this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository)) {
         // Wait for all emoji to load before looking by shortName (to ensure correct priority)
-        return this.emojiRepository.findByShortName(shortName);
+        return this.emojiRepository.findByShortName(shortName, emojiProviderLookupOrder);
       }
       return this.retryIfLoading(function () {
-        return _this4.findByShortName(shortName);
+        return _this4.findByShortName(shortName, emojiProviderLookupOrder);
       }, undefined);
     }
   }, {
     key: "findByEmojiId",
-    value: function findByEmojiId(emojiId) {
+    value: function findByEmojiId(emojiId, emojiProviderLookupOrder) {
       var _this5 = this;
       var id = emojiId.id,
         shortName = emojiId.shortName;
@@ -594,7 +595,7 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
                 if (!emoji) {
                   // if not, fallback to searching by shortName to
                   // at least render an alternative
-                  return _this5.findByShortName(shortName);
+                  return _this5.findByShortName(shortName, emojiProviderLookupOrder);
                 }
                 _this5.addUnknownEmoji(emoji);
                 return emoji;
@@ -603,15 +604,15 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
 
             // if not, fallback to searching by shortName to
             // at least render an alternative
-            return this.findByShortName(shortName);
+            return this.findByShortName(shortName, emojiProviderLookupOrder);
           }
         } else {
           // no id fallback to shortName
-          return this.findByShortName(shortName);
+          return this.findByShortName(shortName, emojiProviderLookupOrder);
         }
       }
       return this.retryIfLoading(function () {
-        return _this5.findByEmojiId(emojiId);
+        return _this5.findByEmojiId(emojiId, emojiProviderLookupOrder);
       }, undefined);
     }
   }, {

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

@@ -40,6 +40,7 @@ var ResourcedEmojiComponentRenderStatesEnum = /*#__PURE__*/function (ResourcedEm
 var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
   var emojiProvider = _ref.emojiProvider,
     emojiId = _ref.emojiId,
+    emojiProviderLookupOrder = _ref.emojiProviderLookupOrder,
     _ref$showTooltip = _ref.showTooltip,
     showTooltip = _ref$showTooltip === void 0 ? false : _ref$showTooltip,
     _ref$customFallback = _ref.customFallback,
@@ -109,7 +110,7 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
             }) : emojiId; // A shortName-only optimistic request can resolve without an emoji before the catalogue loads.
             // Use the non-optimistic path so it waits for the catalogue and tokenizes custom emoji media.
             shouldFetchOptimistically = useUnicodeEmojis ? optimisticFetch && Boolean(emojiId.id) : optimisticFetch;
-            foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically);
+            foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically, (0, _platformFeatureFlags.fg)('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined);
             (0, _sampledUfoRenderedEmoji.sampledUfoRenderedEmoji)(emojiId).mark(_types.UfoEmojiTimings.METADATA_START);
             if ((0, _isPromise.isPromise)(foundEmoji)) {
               setLoaded(false);
@@ -166,7 +167,7 @@ var ResourcedEmojiComponent = exports.ResourcedEmojiComponent = function Resourc
     return function (_x, _x2) {
       return _ref2.apply(this, arguments);
     };
-  }(), [onEmojiLoadFail]);
+  }(), [emojiProviderLookupOrder, onEmojiLoadFail]);
   (0, _react.useEffect)(function () {
     if (!emojiId) {
       return;

package/dist/cjs/types.js

@@ -11,6 +11,11 @@ exports.UfoExperienceName = exports.UfoEmojiTimingsKeys = exports.UfoEmojiTiming
  * If not emoji can be found by id (e.g. a custom emoji has been removed),
  * fallback behaviour will be to attempt to find a matching emoji by shortName.
  */
+/**
+ * Preferred emoji provider type order when resolving an emoji by shortName.
+ * The first matching type wins. If no provided type matches, lookup falls back
+ * to the default provider ordering.
+ */
 /**
  * Sprite representation exposed from the EmojiResource.
  */

package/dist/cjs/util/analytics/createEvent.js

@@ -19,7 +19,7 @@ var createEvent = exports.createEvent = function createEvent(eventType, action,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "72.0.7"
+      packageVersion: "72.0.9"
     }, attributes)
   };
 };

package/dist/es2019/api/EmojiRepository.js

@@ -49,9 +49,18 @@ const addAllVariants = (emoji, fnKey, map) => {
     }
   }
 };
-const findByKey = (map, key) => {
+const findByKey = (map, key, emojiProviderLookupOrder) => {
   const emojis = map.get(key);
   if (emojis && emojis.length) {
+    if (emojiProviderLookupOrder !== null && emojiProviderLookupOrder !== void 0 && emojiProviderLookupOrder.length) {
+      for (const emojiType of emojiProviderLookupOrder) {
+        const matchingEmoji = emojis.find(emoji => emoji.type === emojiType);
+        if (matchingEmoji) {
+          return matchingEmoji;
+        }
+      }
+    }
+
     // Priority is always to source from the last emoji set (last overrides first)
     return emojis[emojis.length - 1];
   }
@@ -152,8 +161,8 @@ export default class EmojiRepository {
   /**
    * Returns the first matching emoji matching the shortName, or null if none found.
    */
-  findByShortName(shortName) {
-    return findByKey(this.shortNameMap, shortName);
+  findByShortName(shortName, emojiProviderLookupOrder) {
+    return findByKey(this.shortNameMap, shortName, emojiProviderLookupOrder);
   }
 
   /**

package/dist/es2019/api/EmojiResource.js

@@ -163,10 +163,12 @@ export class EmojiResource extends AbstractResource {
   onlyFetchOnDemand() {
     return this.fetchOnDemand;
   }
-  async fetchByEmojiId(emojiId, optimistic) {
+  async fetchByEmojiId(emojiId, optimistic, emojiProviderLookupOrder) {
+    const shortNameLookupOrder = fg('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined;
+
     // Check if repository exists and emoji is defined.
     if (this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository)) {
-      const emoji = await this.findByEmojiId(emojiId);
+      const emoji = await this.findByEmojiId(emojiId, shortNameLookupOrder);
       if (emoji) {
         return await this.getMediaEmojiDescriptionURLWithInlineToken(emoji);
       }
@@ -190,14 +192,14 @@ export class EmojiResource extends AbstractResource {
         }
         return this.getMediaEmojiDescriptionURLWithInlineToken(loadEmoji.emojis[0]);
       } catch {
-        const emoji = await this.findByEmojiId(emojiId);
+        const emoji = await this.findByEmojiId(emojiId, shortNameLookupOrder);
         if (!emoji) {
           return;
         }
         return this.getMediaEmojiDescriptionURLWithInlineToken(emoji);
       }
     }
-    const emoji = await this.findByEmojiId(emojiId);
+    const emoji = await this.findByEmojiId(emojiId, shortNameLookupOrder);
     if (!emoji) {
       return;
     }
@@ -361,14 +363,14 @@ export class EmojiResource extends AbstractResource {
       this.notifyNotReady();
     }
   }
-  findByShortName(shortName) {
+  findByShortName(shortName, emojiProviderLookupOrder) {
     if (this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository)) {
       // Wait for all emoji to load before looking by shortName (to ensure correct priority)
-      return this.emojiRepository.findByShortName(shortName);
+      return this.emojiRepository.findByShortName(shortName, emojiProviderLookupOrder);
     }
-    return this.retryIfLoading(() => this.findByShortName(shortName), undefined);
+    return this.retryIfLoading(() => this.findByShortName(shortName, emojiProviderLookupOrder), undefined);
   }
-  findByEmojiId(emojiId) {
+  findByEmojiId(emojiId, emojiProviderLookupOrder) {
     const {
       id,
       shortName
@@ -387,7 +389,7 @@ export class EmojiResource extends AbstractResource {
               if (!emoji) {
                 // if not, fallback to searching by shortName to
                 // at least render an alternative
-                return this.findByShortName(shortName);
+                return this.findByShortName(shortName, emojiProviderLookupOrder);
               }
               this.addUnknownEmoji(emoji);
               return emoji;
@@ -396,14 +398,14 @@ export class EmojiResource extends AbstractResource {
 
           // if not, fallback to searching by shortName to
           // at least render an alternative
-          return this.findByShortName(shortName);
+          return this.findByShortName(shortName, emojiProviderLookupOrder);
         }
       } else {
         // no id fallback to shortName
-        return this.findByShortName(shortName);
+        return this.findByShortName(shortName, emojiProviderLookupOrder);
       }
     }
-    return this.retryIfLoading(() => this.findByEmojiId(emojiId), undefined);
+    return this.retryIfLoading(() => this.findByEmojiId(emojiId, emojiProviderLookupOrder), undefined);
   }
   findById(id) {
     if (this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository)) {

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

@@ -25,6 +25,7 @@ var ResourcedEmojiComponentRenderStatesEnum = /*#__PURE__*/function (ResourcedEm
 export const ResourcedEmojiComponent = ({
   emojiProvider,
   emojiId,
+  emojiProviderLookupOrder,
   showTooltip = false,
   customFallback = undefined,
   fitToHeight = defaultEmojiHeight,
@@ -67,7 +68,7 @@ export const ResourcedEmojiComponent = ({
     // A shortName-only optimistic request can resolve without an emoji before the catalogue loads.
     // Use the non-optimistic path so it waits for the catalogue and tokenizes custom emoji media.
     const shouldFetchOptimistically = useUnicodeEmojis ? optimisticFetch && Boolean(emojiId.id) : optimisticFetch;
-    const foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically);
+    const foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically, fg('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined);
     sampledUfoRenderedEmoji(emojiId).mark(UfoEmojiTimings.METADATA_START);
     if (isPromise(foundEmoji)) {
       setLoaded(false);
@@ -115,7 +116,7 @@ export const ResourcedEmojiComponent = ({
       setLoaded(true);
       sampledUfoRenderedEmoji(emojiId).mark(UfoEmojiTimings.METADATA_END);
     }
-  }, [onEmojiLoadFail]);
+  }, [emojiProviderLookupOrder, onEmojiLoadFail]);
   useEffect(() => {
     if (!emojiId) {
       return;

package/dist/es2019/types.js

@@ -6,6 +6,12 @@
  * fallback behaviour will be to attempt to find a matching emoji by shortName.
  */
 
+/**
+ * Preferred emoji provider type order when resolving an emoji by shortName.
+ * The first matching type wins. If no provided type matches, lookup falls back
+ * to the default provider ordering.
+ */
+
 /**
  * Sprite representation exposed from the EmojiResource.
  */

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

@@ -7,7 +7,7 @@ export const createEvent = (eventType, action, actionSubject, actionSubjectId, a
   actionSubjectId,
   attributes: {
     packageName: "@atlaskit/emoji",
-    packageVersion: "72.0.7",
+    packageVersion: "72.0.9",
     ...attributes
   }
 });

package/dist/esm/api/EmojiRepository.js

@@ -2,6 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */
 import { Search, UnorderedSearchIndex } from 'js-search';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
@@ -64,9 +67,36 @@ var _addAllVariants = function addAllVariants(emoji, fnKey, map) {
     }
   }
 };
-var findByKey = function findByKey(map, key) {
+var findByKey = function findByKey(map, key, emojiProviderLookupOrder) {
   var emojis = map.get(key);
   if (emojis && emojis.length) {
+    if (emojiProviderLookupOrder !== null && emojiProviderLookupOrder !== void 0 && emojiProviderLookupOrder.length) {
+      var _iterator = _createForOfIteratorHelper(emojiProviderLookupOrder),
+        _step;
+      try {
+        var _loop = function _loop() {
+            var emojiType = _step.value;
+            var matchingEmoji = emojis.find(function (emoji) {
+              return emoji.type === emojiType;
+            });
+            if (matchingEmoji) {
+              return {
+                v: matchingEmoji
+              };
+            }
+          },
+          _ret;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          _ret = _loop();
+          if (_ret) return _ret.v;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+
     // Priority is always to source from the last emoji set (last overrides first)
     return emojis[emojis.length - 1];
   }
@@ -176,8 +206,8 @@ var EmojiRepository = /*#__PURE__*/function () {
      */
   }, {
     key: "findByShortName",
-    value: function findByShortName(shortName) {
-      return findByKey(this.shortNameMap, shortName);
+    value: function findByShortName(shortName, emojiProviderLookupOrder) {
+      return findByKey(this.shortNameMap, shortName, emojiProviderLookupOrder);
     }
 
     /**

package/dist/esm/api/EmojiResource.js

@@ -263,17 +263,18 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
   }, {
     key: "fetchByEmojiId",
     value: function () {
-      var _fetchByEmojiId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(emojiId, optimistic) {
-        var _emoji, provider, loader, loadEmoji, _emoji2, emoji, _t3;
+      var _fetchByEmojiId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(emojiId, optimistic, emojiProviderLookupOrder) {
+        var shortNameLookupOrder, _emoji, provider, loader, loadEmoji, _emoji2, emoji, _t3;
         return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              shortNameLookupOrder = fg('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined; // Check if repository exists and emoji is defined.
               if (!(this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository))) {
                 _context4.next = 3;
                 break;
               }
               _context4.next = 1;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 1:
               _emoji = _context4.sent;
               if (!_emoji) {
@@ -318,7 +319,7 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
               _context4.prev = 8;
               _t3 = _context4["catch"](4);
               _context4.next = 9;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 9:
               _emoji2 = _context4.sent;
               if (_emoji2) {
@@ -330,7 +331,7 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
               return _context4.abrupt("return", this.getMediaEmojiDescriptionURLWithInlineToken(_emoji2));
             case 11:
               _context4.next = 12;
-              return this.findByEmojiId(emojiId);
+              return this.findByEmojiId(emojiId, shortNameLookupOrder);
             case 12:
               emoji = _context4.sent;
               if (emoji) {
@@ -346,7 +347,7 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
           }
         }, _callee4, this, [[4, 8]]);
       }));
-      function fetchByEmojiId(_x3, _x4) {
+      function fetchByEmojiId(_x3, _x4, _x5) {
         return _fetchByEmojiId.apply(this, arguments);
       }
       return fetchByEmojiId;
@@ -495,7 +496,7 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
           }
         }, _callee5, this);
       }));
-      function getMediaEmojiDescriptionURLWithInlineToken(_x5) {
+      function getMediaEmojiDescriptionURLWithInlineToken(_x6) {
         return _getMediaEmojiDescriptionURLWithInlineToken.apply(this, arguments);
       }
       return getMediaEmojiDescriptionURLWithInlineToken;
@@ -552,19 +553,19 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
     }
   }, {
     key: "findByShortName",
-    value: function findByShortName(shortName) {
+    value: function findByShortName(shortName, emojiProviderLookupOrder) {
       var _this4 = this;
       if (this.isLoaded() && this.isRepositoryAvailable(this.emojiRepository)) {
         // Wait for all emoji to load before looking by shortName (to ensure correct priority)
-        return this.emojiRepository.findByShortName(shortName);
+        return this.emojiRepository.findByShortName(shortName, emojiProviderLookupOrder);
       }
       return this.retryIfLoading(function () {
-        return _this4.findByShortName(shortName);
+        return _this4.findByShortName(shortName, emojiProviderLookupOrder);
       }, undefined);
     }
   }, {
     key: "findByEmojiId",
-    value: function findByEmojiId(emojiId) {
+    value: function findByEmojiId(emojiId, emojiProviderLookupOrder) {
       var _this5 = this;
       var id = emojiId.id,
         shortName = emojiId.shortName;
@@ -582,7 +583,7 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
                 if (!emoji) {
                   // if not, fallback to searching by shortName to
                   // at least render an alternative
-                  return _this5.findByShortName(shortName);
+                  return _this5.findByShortName(shortName, emojiProviderLookupOrder);
                 }
                 _this5.addUnknownEmoji(emoji);
                 return emoji;
@@ -591,15 +592,15 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
 
             // if not, fallback to searching by shortName to
             // at least render an alternative
-            return this.findByShortName(shortName);
+            return this.findByShortName(shortName, emojiProviderLookupOrder);
           }
         } else {
           // no id fallback to shortName
-          return this.findByShortName(shortName);
+          return this.findByShortName(shortName, emojiProviderLookupOrder);
         }
       }
       return this.retryIfLoading(function () {
-        return _this5.findByEmojiId(emojiId);
+        return _this5.findByEmojiId(emojiId, emojiProviderLookupOrder);
       }, undefined);
     }
   }, {

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

@@ -31,6 +31,7 @@ var ResourcedEmojiComponentRenderStatesEnum = /*#__PURE__*/function (ResourcedEm
 export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
   var emojiProvider = _ref.emojiProvider,
     emojiId = _ref.emojiId,
+    emojiProviderLookupOrder = _ref.emojiProviderLookupOrder,
     _ref$showTooltip = _ref.showTooltip,
     showTooltip = _ref$showTooltip === void 0 ? false : _ref$showTooltip,
     _ref$customFallback = _ref.customFallback,
@@ -100,7 +101,7 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
             }) : emojiId; // A shortName-only optimistic request can resolve without an emoji before the catalogue loads.
             // Use the non-optimistic path so it waits for the catalogue and tokenizes custom emoji media.
             shouldFetchOptimistically = useUnicodeEmojis ? optimisticFetch && Boolean(emojiId.id) : optimisticFetch;
-            foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically);
+            foundEmoji = _emojiProvider.fetchByEmojiId(normalizedEmojiId, shouldFetchOptimistically, fg('platform_bitbucket_fix_shortname_and_ordering') ? emojiProviderLookupOrder : undefined);
             sampledUfoRenderedEmoji(emojiId).mark(UfoEmojiTimings.METADATA_START);
             if (isPromise(foundEmoji)) {
               setLoaded(false);
@@ -157,7 +158,7 @@ export var ResourcedEmojiComponent = function ResourcedEmojiComponent(_ref) {
     return function (_x, _x2) {
       return _ref2.apply(this, arguments);
     };
-  }(), [onEmojiLoadFail]);
+  }(), [emojiProviderLookupOrder, onEmojiLoadFail]);
   useEffect(function () {
     if (!emojiId) {
       return;

package/dist/esm/types.js

@@ -6,6 +6,12 @@
  * fallback behaviour will be to attempt to find a matching emoji by shortName.
  */
 
+/**
+ * Preferred emoji provider type order when resolving an emoji by shortName.
+ * The first matching type wins. If no provided type matches, lookup falls back
+ * to the default provider ordering.
+ */
+
 /**
  * Sprite representation exposed from the EmojiResource.
  */

package/dist/esm/util/analytics/createEvent.js

@@ -12,7 +12,7 @@ export var createEvent = function createEvent(eventType, action, actionSubject,
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "72.0.7"
+      packageVersion: "72.0.9"
     }, attributes)
   };
 };

package/dist/types/api/EmojiRepository.d.ts

@@ -1,5 +1,5 @@
 import type { CategoryId } from '../components/picker/categories';
-import { type EmojiDescription, type EmojiSearchResult, type OptionalEmojiDescription, type SearchOptions } from '../types';
+import { type EmojiDescription, type EmojiProviderLookupOrder, type EmojiSearchResult, type OptionalEmojiDescription, type SearchOptions } from '../types';
 import { UsageFrequencyTracker } from './internal/UsageFrequencyTracker';
 export default class EmojiRepository {
     private emojis;
@@ -33,7 +33,7 @@ export default class EmojiRepository {
     /**
      * Returns the first matching emoji matching the shortName, or null if none found.
      */
-    findByShortName(shortName: string): OptionalEmojiDescription;
+    findByShortName(shortName: string, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescription;
     /**
      * Returns the first matching emoji matching the id, or null if none found.
      */

package/dist/types/api/EmojiResource.d.ts

@@ -1,6 +1,6 @@
 import { AbstractResource, type OnProviderChange, type ServiceConfig } from '@atlaskit/util-service-support';
 import type { CategoryId } from '../components/picker/categories';
-import { type EmojiDescription, type EmojiId, type EmojiProvider, type EmojiResponse, type EmojiSearchResult, type EmojiUpload, type OptionalEmojiDescription, type OptionalEmojiDescriptionWithVariations, type OptionalUser, type SearchOptions, type ToneSelection, type UploadingEmojiProvider, type User } from '../types';
+import { type EmojiDescription, type EmojiId, type EmojiProvider, type EmojiProviderLookupOrder, type EmojiResponse, type EmojiSearchResult, type EmojiUpload, type OptionalEmojiDescription, type OptionalEmojiDescriptionWithVariations, type OptionalUser, type SearchOptions, type ToneSelection, type UploadingEmojiProvider, type User } from '../types';
 import EmojiRepository from './EmojiRepository';
 import type { OptimisticImageApiLoaderConfig, Options, SingleEmojiApiLoaderConfig, EmojiLoadSuccessCallback, EmojiLoadFailCallback } from './EmojiUtils';
 import SiteEmojiResource from './media/SiteEmojiResource';
@@ -97,7 +97,7 @@ export declare class EmojiResource extends AbstractResource<string, EmojiSearchR
     private fetchIndividualProvider;
     fetchEmojiProvider(force?: boolean): Promise<EmojiRepository | undefined>;
     onlyFetchOnDemand(): boolean;
-    fetchByEmojiId(emojiId: EmojiId, optimistic: boolean): Promise<OptionalEmojiDescriptionWithVariations>;
+    fetchByEmojiId(emojiId: EmojiId, optimistic: boolean, emojiProviderLookupOrder?: EmojiProviderLookupOrder): Promise<OptionalEmojiDescriptionWithVariations>;
     private getProviderType;
     protected initEmojiRepository(emojiResponses: EmojiResponse[]): void;
     protected initSiteEmojiResource(emojiResponse: EmojiResponse, provider: ServiceConfig): Promise<void>;
@@ -116,8 +116,8 @@ export declare class EmojiResource extends AbstractResource<string, EmojiSearchR
     loadMediaEmoji(emoji: EmojiDescription, useAlt?: boolean): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
     optimisticMediaRendering(emoji: EmojiDescription, useAlt?: boolean): boolean;
     filter(query?: string, options?: SearchOptions): void;
-    findByShortName(shortName: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
-    findByEmojiId(emojiId: EmojiId): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+    findByShortName(shortName: string, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+    findByEmojiId(emojiId: EmojiId, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
     findById(id: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
     /**
      * Synchronously reads the emoji type from the local cache for the given emojiId.

package/dist/types/components/common/ResourcedEmojiComponent.d.ts

@@ -7,7 +7,7 @@ import React from 'react';
 import type { StrictXCSSProp } from '@atlaskit/css';
 import type { EmojiProvider } from '../../api/EmojiResource';
 import type { EmojiLoadSuccessCallback, EmojiLoadFailCallback } from '../../api/EmojiUtils';
-import { type EmojiId } from '../../types';
+import { type EmojiId, type EmojiProviderLookupOrder } from '../../types';
 export interface BaseResourcedEmojiProps {
     /**
      * Custom Fallback allows a custom element or string to be rendered if an emoji fails to be fetched or found.
@@ -27,6 +27,11 @@ export interface BaseResourcedEmojiProps {
      * Emoji to display
      */
     emojiId: EmojiId;
+    /**
+     * Preferred emoji provider type order when resolving shortName-only emoji.
+     * The first matching type wins.
+     */
+    emojiProviderLookupOrder?: EmojiProviderLookupOrder;
     /**
      * Scales the emoji proportionally to provided hight.
      * Defaults to `undefined`.
@@ -85,5 +90,5 @@ export interface Props extends BaseResourcedEmojiProps {
      */
     onEmojiLoadSuccess?: EmojiLoadSuccessCallback;
 }
-export declare const ResourcedEmojiComponent: ({ emojiProvider, emojiId, showTooltip, customFallback, fitToHeight, ignoreWrapper, optimistic, optimisticImageURL, editorEmoji, renderUnicodeEmojiAsImage, pageTitleEmoji, placeholderXcss, onEmojiLoadSuccess, onEmojiLoadFail, }: Props) => React.JSX.Element;
+export declare const ResourcedEmojiComponent: ({ emojiProvider, emojiId, emojiProviderLookupOrder, showTooltip, customFallback, fitToHeight, ignoreWrapper, optimistic, optimisticImageURL, editorEmoji, renderUnicodeEmojiAsImage, pageTitleEmoji, placeholderXcss, onEmojiLoadSuccess, onEmojiLoadFail, }: Props) => React.JSX.Element;
 export default ResourcedEmojiComponent;

package/dist/types/resource.d.ts

@@ -7,6 +7,7 @@ export { default as EmojiResource } from './api/EmojiResource';
  * @deprecated Use `import type { EmojiProvider, UploadingEmojiProvider, EmojiResourceConfig, OnEmojiProviderChange } from '@atlaskit/emoji/emoji-resource'` instead.
  */
 export type { EmojiProvider, UploadingEmojiProvider, EmojiResourceConfig, OnEmojiProviderChange, } from './api/EmojiResource';
+export type { EmojiProviderLookupOrder } from './types';
 /**
  * @deprecated Use `import type { EmojiLoadSuccessCallback, EmojiLoadFailCallback } from '@atlaskit/emoji/emoji-utils'` instead.
  */

package/dist/types/types.d.ts

@@ -31,7 +31,7 @@ export interface EmojiProvider extends Provider<string, EmojiSearchResult, any,
      *
      * If the interface is not defined it will fail gracefully to findByEmojiId
      */
-    fetchByEmojiId(emojiId: EmojiId, optimistic: boolean): OptionalEmojiDescriptionWithVariations | Promise<OptionalEmojiDescriptionWithVariations>;
+    fetchByEmojiId(emojiId: EmojiId, optimistic: boolean, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescriptionWithVariations | Promise<OptionalEmojiDescriptionWithVariations>;
     /**
      * Fetches and returns emojiResource
      */
@@ -43,7 +43,7 @@ export interface EmojiProvider extends Provider<string, EmojiSearchResult, any,
      *
      * Will load media api images before returning.
      */
-    findByEmojiId(emojiId: EmojiId): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+    findByEmojiId(emojiId: EmojiId, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
     /**
      * Return the emoji that matches the supplied id or undefined. As with findByEmojiId, this call should load
      * the media api images before returning.
@@ -54,7 +54,7 @@ export interface EmojiProvider extends Provider<string, EmojiSearchResult, any,
      *
      * Will load media api images before returning.
      */
-    findByShortName(shortName: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+    findByShortName(shortName: string, emojiProviderLookupOrder?: EmojiProviderLookupOrder): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
     /**
      * Finds emojis belonging to specified category.
      *
@@ -65,6 +65,17 @@ export interface EmojiProvider extends Provider<string, EmojiSearchResult, any,
      * Returns a map matching ascii representations to their corresponding EmojiDescription.
      */
     getAsciiMap(): Promise<Map<string, EmojiDescription>>;
+    /**
+     * Synchronously reads the emoji type (e.g. 'STANDARD', 'SITE', 'ATLASSIAN') from the
+     * local cache for the given emojiId, without making any network requests.
+     *
+     * Returns `undefined` when the emoji is not yet in the cache or no repository has been
+     * initialised. This is an optional method — callers must fall back gracefully when it is
+     * absent (e.g. in mock or legacy providers).
+     *
+     * Optional.
+     */
+    getCachedEmojiType?(emojiId: EmojiId): string | undefined;
     /**
      * Returns the logged user passed by the Product
      */
@@ -81,17 +92,6 @@ export interface EmojiProvider extends Provider<string, EmojiSearchResult, any,
      * Returns a constructed URL to fetch emoji media asset if 'optimisticImageApi' config has been provided
      */
     getOptimisticImageURL(emojiId: EmojiId): string | undefined;
-    /**
-     * Synchronously reads the emoji type (e.g. 'STANDARD', 'SITE', 'ATLASSIAN') from the
-     * local cache for the given emojiId, without making any network requests.
-     *
-     * Returns `undefined` when the emoji is not yet in the cache or no repository has been
-     * initialised. This is an optional method — callers must fall back gracefully when it is
-     * absent (e.g. in mock or legacy providers).
-     *
-     * Optional.
-     */
-    getCachedEmojiType?(emojiId: EmojiId): string | undefined;
     /**
      * Used by the picker and typeahead to obtain a skin tone preference
      * if the user has previously selected one via the Tone Selector
@@ -176,6 +176,12 @@ export interface EmojiId {
     id?: string;
     shortName: string;
 }
+/**
+ * Preferred emoji provider type order when resolving an emoji by shortName.
+ * The first matching type wins. If no provided type matches, lookup falls back
+ * to the default provider ordering.
+ */
+export type EmojiProviderLookupOrder = string[];
 export interface SpriteSheet {
     column: number;
     height: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "72.0.8",
+	"version": "72.1.0",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,30 +32,30 @@
 		"@atlaskit/afm-i18n-platform-elements-emoji": "2.200.0",
 		"@atlaskit/analytics-next": "^12.3.0",
 		"@atlaskit/browser-apis": "^1.2.0",
-		"@atlaskit/button": "^25.1.0",
+		"@atlaskit/button": "^25.2.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
-		"@atlaskit/form": "^17.0.0",
-		"@atlaskit/heading": "^7.0.0",
-		"@atlaskit/icon": "^37.4.0",
-		"@atlaskit/icon-lab": "^7.6.0",
-		"@atlaskit/image": "^5.0.0",
-		"@atlaskit/logo": "^21.4.0",
-		"@atlaskit/media-client": "^37.3.0",
-		"@atlaskit/media-client-react": "^6.1.0",
+		"@atlaskit/form": "^17.1.0",
+		"@atlaskit/heading": "^7.1.0",
+		"@atlaskit/icon": "^37.5.0",
+		"@atlaskit/icon-lab": "^7.7.0",
+		"@atlaskit/image": "^5.1.0",
+		"@atlaskit/logo": "^21.5.0",
+		"@atlaskit/media-client": "^37.5.0",
+		"@atlaskit/media-client-react": "^6.2.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^3.0.0",
-		"@atlaskit/primitives": "^22.3.0",
-		"@atlaskit/radio": "^10.0.0",
-		"@atlaskit/spinner": "^20.2.0",
-		"@atlaskit/textfield": "^10.0.0",
-		"@atlaskit/theme": "^28.0.0",
-		"@atlaskit/tmp-editor-statsig": "^155.0.0",
-		"@atlaskit/tokens": "^16.7.0",
-		"@atlaskit/tooltip": "^24.1.0",
+		"@atlaskit/primitives": "^22.4.0",
+		"@atlaskit/radio": "^10.1.0",
+		"@atlaskit/spinner": "^20.3.0",
+		"@atlaskit/textfield": "^10.1.0",
+		"@atlaskit/theme": "^28.1.0",
+		"@atlaskit/tmp-editor-statsig": "^157.0.0",
+		"@atlaskit/tokens": "^16.8.0",
+		"@atlaskit/tooltip": "^24.2.0",
 		"@atlaskit/ufo": "^1.0.0",
 		"@atlaskit/util-service-support": "^7.2.0",
-		"@atlaskit/visually-hidden": "^4.2.0",
+		"@atlaskit/visually-hidden": "^4.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"@tanstack/react-virtual": "3.0.0-beta.60",
@@ -131,6 +131,10 @@
 		"platform_emoji_keep_picker_open_on_upload": {
 			"type": "boolean"
 		},
+		"platform_bitbucket_fix_shortname_and_ordering": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"add_emoji_media_size_to_media_file_upload_request": {
 			"type": "boolean"
 		},

package/report.api.md

@@ -48,6 +48,7 @@ export interface AltRepresentations {
 interface BaseResourcedEmojiProps {
 	customFallback?: JSX.Element | string;
 	emojiId: EmojiId;
+	emojiProviderLookupOrder?: EmojiProviderLookupOrder;
 	fitToHeight?: number;
 	optimistic?: boolean;
 	optimisticImageURL?: string;
@@ -170,6 +171,9 @@ export interface EmojiId {
 	shortName: string;
 }
 
+// @public
+export type EmojiProviderLookupOrder = string[];
+
 // @public (undocumented)
 export const emojiImage = 'emoji-common-emoji-image';
 
@@ -258,11 +262,18 @@ export interface EmojiProvider
 	fetchByEmojiId(
 		emojiId: EmojiId,
 		optimistic: boolean,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
 	): OptionalEmojiDescriptionWithVariations | Promise<OptionalEmojiDescriptionWithVariations>;
 	fetchEmojiProvider(force?: boolean): Promise<EmojiRepository | undefined>;
-	findByEmojiId(emojiId: EmojiId): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+	findByEmojiId(
+		emojiId: EmojiId,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
+	): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
 	findById(id: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
-	findByShortName(shortName: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+	findByShortName(
+		shortName: string,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
+	): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
 	findInCategory(categoryId: string): Promise<EmojiDescription[]>;
 	getAsciiMap(): Promise<Map<string, EmojiDescription>>;
 	getCurrentUser(): OptionalUser;
@@ -292,7 +303,10 @@ export class EmojiRepository {
 	// (undocumented)
 	findByAsciiRepresentation(asciiEmoji: string): OptionalEmojiDescription;
 	findById(id: string): OptionalEmojiDescription;
-	findByShortName(shortName: string): OptionalEmojiDescription;
+	findByShortName(
+		shortName: string,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
+	): OptionalEmojiDescription;
 	// (undocumented)
 	findInCategory(categoryId: CategoryId): EmojiDescription[];
 	// (undocumented)
@@ -352,6 +366,7 @@ class EmojiResource_2
 	fetchByEmojiId(
 		emojiId: EmojiId,
 		optimistic: boolean,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
 	): Promise<OptionalEmojiDescriptionWithVariations>;
 	// (undocumented)
 	fetchEmojiProvider(force?: boolean): Promise<EmojiRepository | undefined>;
@@ -360,11 +375,17 @@ class EmojiResource_2
 	// (undocumented)
 	filter(query?: string, options?: SearchOptions): void;
 	// (undocumented)
-	findByEmojiId(emojiId: EmojiId): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+	findByEmojiId(
+		emojiId: EmojiId,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
+	): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
 	// (undocumented)
 	findById(id: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
 	// (undocumented)
-	findByShortName(shortName: string): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
+	findByShortName(
+		shortName: string,
+		emojiProviderLookupOrder?: EmojiProviderLookupOrder,
+	): OptionalEmojiDescription | Promise<OptionalEmojiDescription>;
 	// (undocumented)
 	findInCategory(categoryId: CategoryId): Promise<EmojiDescription[]>;
 	// (undocumented)