@atlaskit/emoji 71.9.7 → 71.9.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/emoji
 
+## 71.9.9
+
+### Patch Changes
+
+- Updated dependencies
+
+## 71.9.8
+
+### Patch Changes
+
+- [`2ec64503b032d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2ec64503b032d) -
+  Add teamoji parameter when fetching Atlassian emoji metadata
+- Updated dependencies
+
 ## 71.9.7
 
 ### Patch Changes

package/dist/cjs/api/EmojiResource.js

@@ -15,6 +15,7 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _featureGates = _interopRequireDefault(require("@atlaskit/feature-gate-js-client/feature-gates"));
 var _utilServiceSupport = require("@atlaskit/util-service-support");
 var _constants = require("../util/constants");
 var _logger = _interopRequireDefault(require("../util/logger"));
@@ -31,6 +32,27 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var 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; })(); }
 function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+var teamoji26RefreshEmojiPickerExperimentName = 'platform_teamoji_26_refresh_emoji_picker';
+var teamoji26QueryParam = 'useTeamoji26=true';
+var isTeamoji26RefreshEmojiPickerEnabled = function isTeamoji26RefreshEmojiPickerEnabled() {
+  if (!_featureGates.default.initializeCompleted()) {
+    return false;
+  }
+
+  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
+  return _featureGates.default.getExperimentValue(teamoji26RefreshEmojiPickerExperimentName, 'isEnabled', false);
+};
+var addTeamoji26QueryParam = function addTeamoji26QueryParam(url) {
+  if (!url.includes('/atlassian') || /[?&]useTeamoji26=/.test(url)) {
+    return url;
+  }
+  var hashIndex = url.indexOf('#');
+  var urlWithoutHash = hashIndex === -1 ? url : url.slice(0, hashIndex);
+  var hash = hashIndex === -1 ? '' : url.slice(hashIndex);
+  var separator = urlWithoutHash.includes('?') ? '&' : '?';
+  return "".concat(urlWithoutHash).concat(separator).concat(teamoji26QueryParam).concat(hash);
+};
+
 // Re-exporting to not cause a breaking change
 // Re-exporting to not cause a breaking change
 
@@ -71,25 +93,28 @@ var EmojiResource = exports.EmojiResource = /*#__PURE__*/function (_AbstractReso
       return url.replace('/gateway/api/emoji', '/gateway/api/elements/emoji');
     };
     var stargateEmojiPathEnabled = (0, _platformFeatureFlags.fg)('use-elements-stargate-emoji-path');
+    var teamoji26RefreshEmojiPickerEnabled = isTeamoji26RefreshEmojiPickerEnabled();
     var singleEmojiApi = config.singleEmojiApi;
     var optimisticImageApi = config.optimisticImageApi;
-    _this.emojiProviderConfig = stargateEmojiPathEnabled ? _objectSpread(_objectSpread({}, config), {}, {
-      providers: config.providers.map(function (provider) {
-        return _objectSpread(_objectSpread({}, provider), {}, {
-          url: rewriteEmojiGatewayPath(provider.url)
-        });
-      }),
-      singleEmojiApi: singleEmojiApi ? _objectSpread(_objectSpread({}, singleEmojiApi), {}, {
+    var providers = config.providers.map(function (provider) {
+      var rewrittenUrl = stargateEmojiPathEnabled ? rewriteEmojiGatewayPath(provider.url) : provider.url;
+      return _objectSpread(_objectSpread({}, provider), {}, {
+        url: teamoji26RefreshEmojiPickerEnabled ? addTeamoji26QueryParam(rewrittenUrl) : rewrittenUrl
+      });
+    });
+    _this.emojiProviderConfig = _objectSpread(_objectSpread({}, config), {}, {
+      providers: providers,
+      singleEmojiApi: stargateEmojiPathEnabled && singleEmojiApi ? _objectSpread(_objectSpread({}, singleEmojiApi), {}, {
         getUrl: function getUrl(emojiId) {
           return rewriteEmojiGatewayPath(singleEmojiApi.getUrl(emojiId));
         }
-      }) : undefined,
-      optimisticImageApi: optimisticImageApi ? _objectSpread(_objectSpread({}, optimisticImageApi), {}, {
+      }) : singleEmojiApi,
+      optimisticImageApi: stargateEmojiPathEnabled && optimisticImageApi ? _objectSpread(_objectSpread({}, optimisticImageApi), {}, {
         getUrl: function getUrl(emojiId) {
           return rewriteEmojiGatewayPath(optimisticImageApi.getUrl(emojiId));
         }
-      }) : undefined
-    }) : config;
+      }) : optimisticImageApi
+    });
     _this.recordConfig = config.recordConfig;
     _this.currentUser = config.currentUser;
     if ((0, _storageAvailable.default)('localStorage')) {

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

@@ -20,7 +20,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "71.9.6"
+      packageVersion: "71.9.8"
     }, attributes)
   };
 };

package/dist/es2019/api/EmojiResource.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { fg } from '@atlaskit/platform-feature-flags';
+import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import { AbstractResource, utils as serviceUtils } from '@atlaskit/util-service-support';
 import { SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP, selectedToneStorageKey } from '../util/constants';
 import debug from '../util/logger';
@@ -11,6 +12,26 @@ import EmojiRepository from './EmojiRepository';
 import SiteEmojiResource from './media/SiteEmojiResource';
 import { sampledUfoEmojiResourceFetched, ufoExperiences } from '../util/analytics/ufoExperiences';
 import { promiseWithTimeout } from '../util/timed-promise';
+const teamoji26RefreshEmojiPickerExperimentName = 'platform_teamoji_26_refresh_emoji_picker';
+const teamoji26QueryParam = 'useTeamoji26=true';
+const isTeamoji26RefreshEmojiPickerEnabled = () => {
+  if (!FeatureGates.initializeCompleted()) {
+    return false;
+  }
+
+  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
+  return FeatureGates.getExperimentValue(teamoji26RefreshEmojiPickerExperimentName, 'isEnabled', false);
+};
+const addTeamoji26QueryParam = url => {
+  if (!url.includes('/atlassian') || /[?&]useTeamoji26=/.test(url)) {
+    return url;
+  }
+  const hashIndex = url.indexOf('#');
+  const urlWithoutHash = hashIndex === -1 ? url : url.slice(0, hashIndex);
+  const hash = hashIndex === -1 ? '' : url.slice(hashIndex);
+  const separator = urlWithoutHash.includes('?') ? '&' : '?';
+  return `${urlWithoutHash}${separator}${teamoji26QueryParam}${hash}`;
+};
 
 // Re-exporting to not cause a breaking change
 // Re-exporting to not cause a breaking change
@@ -46,23 +67,28 @@ export class EmojiResource extends AbstractResource {
     _defineProperty(this, "isLoaded", () => this.initialLoaders !== 0 && this.activeLoaders === 0);
     const rewriteEmojiGatewayPath = url => url.replace('/gateway/api/emoji', '/gateway/api/elements/emoji');
     const stargateEmojiPathEnabled = fg('use-elements-stargate-emoji-path');
+    const teamoji26RefreshEmojiPickerEnabled = isTeamoji26RefreshEmojiPickerEnabled();
     const singleEmojiApi = config.singleEmojiApi;
     const optimisticImageApi = config.optimisticImageApi;
-    this.emojiProviderConfig = stargateEmojiPathEnabled ? {
-      ...config,
-      providers: config.providers.map(provider => ({
+    const providers = config.providers.map(provider => {
+      const rewrittenUrl = stargateEmojiPathEnabled ? rewriteEmojiGatewayPath(provider.url) : provider.url;
+      return {
         ...provider,
-        url: rewriteEmojiGatewayPath(provider.url)
-      })),
-      singleEmojiApi: singleEmojiApi ? {
+        url: teamoji26RefreshEmojiPickerEnabled ? addTeamoji26QueryParam(rewrittenUrl) : rewrittenUrl
+      };
+    });
+    this.emojiProviderConfig = {
+      ...config,
+      providers,
+      singleEmojiApi: stargateEmojiPathEnabled && singleEmojiApi ? {
         ...singleEmojiApi,
         getUrl: emojiId => rewriteEmojiGatewayPath(singleEmojiApi.getUrl(emojiId))
-      } : undefined,
-      optimisticImageApi: optimisticImageApi ? {
+      } : singleEmojiApi,
+      optimisticImageApi: stargateEmojiPathEnabled && optimisticImageApi ? {
         ...optimisticImageApi,
         getUrl: emojiId => rewriteEmojiGatewayPath(optimisticImageApi.getUrl(emojiId))
-      } : undefined
-    } : config;
+      } : optimisticImageApi
+    };
     this.recordConfig = config.recordConfig;
     this.currentUser = config.currentUser;
     if (storageAvailable('localStorage')) {

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

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

package/dist/esm/api/EmojiResource.js

@@ -13,6 +13,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 import { fg } from '@atlaskit/platform-feature-flags';
+import FeatureGates from '@atlaskit/feature-gate-js-client/feature-gates';
 import { AbstractResource, utils as serviceUtils } from '@atlaskit/util-service-support';
 import { SAMPLING_RATE_EMOJI_RESOURCE_FETCHED_EXP, selectedToneStorageKey } from '../util/constants';
 import debug from '../util/logger';
@@ -24,6 +25,26 @@ import EmojiRepository from './EmojiRepository';
 import SiteEmojiResource from './media/SiteEmojiResource';
 import { sampledUfoEmojiResourceFetched, ufoExperiences } from '../util/analytics/ufoExperiences';
 import { promiseWithTimeout } from '../util/timed-promise';
+var teamoji26RefreshEmojiPickerExperimentName = 'platform_teamoji_26_refresh_emoji_picker';
+var teamoji26QueryParam = 'useTeamoji26=true';
+var isTeamoji26RefreshEmojiPickerEnabled = function isTeamoji26RefreshEmojiPickerEnabled() {
+  if (!FeatureGates.initializeCompleted()) {
+    return false;
+  }
+
+  // eslint-disable-next-line @atlaskit/platform/use-recommended-utils
+  return FeatureGates.getExperimentValue(teamoji26RefreshEmojiPickerExperimentName, 'isEnabled', false);
+};
+var addTeamoji26QueryParam = function addTeamoji26QueryParam(url) {
+  if (!url.includes('/atlassian') || /[?&]useTeamoji26=/.test(url)) {
+    return url;
+  }
+  var hashIndex = url.indexOf('#');
+  var urlWithoutHash = hashIndex === -1 ? url : url.slice(0, hashIndex);
+  var hash = hashIndex === -1 ? '' : url.slice(hashIndex);
+  var separator = urlWithoutHash.includes('?') ? '&' : '?';
+  return "".concat(urlWithoutHash).concat(separator).concat(teamoji26QueryParam).concat(hash);
+};
 
 // Re-exporting to not cause a breaking change
 // Re-exporting to not cause a breaking change
@@ -65,25 +86,28 @@ export var EmojiResource = /*#__PURE__*/function (_AbstractResource) {
       return url.replace('/gateway/api/emoji', '/gateway/api/elements/emoji');
     };
     var stargateEmojiPathEnabled = fg('use-elements-stargate-emoji-path');
+    var teamoji26RefreshEmojiPickerEnabled = isTeamoji26RefreshEmojiPickerEnabled();
     var singleEmojiApi = config.singleEmojiApi;
     var optimisticImageApi = config.optimisticImageApi;
-    _this.emojiProviderConfig = stargateEmojiPathEnabled ? _objectSpread(_objectSpread({}, config), {}, {
-      providers: config.providers.map(function (provider) {
-        return _objectSpread(_objectSpread({}, provider), {}, {
-          url: rewriteEmojiGatewayPath(provider.url)
-        });
-      }),
-      singleEmojiApi: singleEmojiApi ? _objectSpread(_objectSpread({}, singleEmojiApi), {}, {
+    var providers = config.providers.map(function (provider) {
+      var rewrittenUrl = stargateEmojiPathEnabled ? rewriteEmojiGatewayPath(provider.url) : provider.url;
+      return _objectSpread(_objectSpread({}, provider), {}, {
+        url: teamoji26RefreshEmojiPickerEnabled ? addTeamoji26QueryParam(rewrittenUrl) : rewrittenUrl
+      });
+    });
+    _this.emojiProviderConfig = _objectSpread(_objectSpread({}, config), {}, {
+      providers: providers,
+      singleEmojiApi: stargateEmojiPathEnabled && singleEmojiApi ? _objectSpread(_objectSpread({}, singleEmojiApi), {}, {
         getUrl: function getUrl(emojiId) {
           return rewriteEmojiGatewayPath(singleEmojiApi.getUrl(emojiId));
         }
-      }) : undefined,
-      optimisticImageApi: optimisticImageApi ? _objectSpread(_objectSpread({}, optimisticImageApi), {}, {
+      }) : singleEmojiApi,
+      optimisticImageApi: stargateEmojiPathEnabled && optimisticImageApi ? _objectSpread(_objectSpread({}, optimisticImageApi), {}, {
         getUrl: function getUrl(emojiId) {
           return rewriteEmojiGatewayPath(optimisticImageApi.getUrl(emojiId));
         }
-      }) : undefined
-    }) : config;
+      }) : optimisticImageApi
+    });
     _this.recordConfig = config.recordConfig;
     _this.currentUser = config.currentUser;
     if (storageAvailable('localStorage')) {

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

@@ -14,7 +14,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread({
       packageName: "@atlaskit/emoji",
-      packageVersion: "71.9.6"
+      packageVersion: "71.9.8"
     }, attributes)
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "71.9.7",
+	"version": "71.9.9",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -50,7 +50,7 @@
 		"@atlaskit/spinner": "^20.1.0",
 		"@atlaskit/textfield": "^9.1.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tmp-editor-statsig": "^126.2.0",
+		"@atlaskit/tmp-editor-statsig": "^128.0.0",
 		"@atlaskit/tokens": "^16.0.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@atlaskit/ufo": "^1.0.0",