@atlaskit/emoji 67.0.3 → 67.0.5

package/dist/esm/api/media/MediaEmojiCache.js

@@ -5,21 +5,15 @@ import { convertMediaToImageEmoji, isMediaRepresentation, isPromise } from '../.
 import MediaImageLoader from './MediaImageLoader';
 import debug from '../../util/logger';
 import { LRUMap } from 'lru_map';
-
 var getRequiredRepresentation = function getRequiredRepresentation(emoji, useAlt) {
   return useAlt ? emoji.altRepresentation : emoji.representation;
 };
-
 var isUnsupportedBrowser = function isUnsupportedBrowser() {
-  var isIE =
-  /*@cc_on!@*/
-  false || !!document.documentMode; // Internet Explorer 6-11
-
+  var isIE = /*@cc_on!@*/false || !!document.documentMode; // Internet Explorer 6-11
   var isEdge = !isIE && !!window.StyleMedia; // Edge 20+
 
   return isIE || isEdge;
 };
-
 /**
  * For browsers that support caching for resources
  * regardless of originally supplied headers (basically everything but Firefox).
@@ -27,35 +21,26 @@ var isUnsupportedBrowser = function isUnsupportedBrowser() {
 export var BrowserCacheStrategy = /*#__PURE__*/function () {
   function BrowserCacheStrategy(mediaImageLoader) {
     _classCallCheck(this, BrowserCacheStrategy);
-
     _defineProperty(this, "cachedImageUrls", new Set());
-
     debug('BrowserCacheStrategy');
     this.mediaImageLoader = mediaImageLoader;
   }
-
   _createClass(BrowserCacheStrategy, [{
     key: "loadEmoji",
     value: function loadEmoji(emoji, useAlt) {
       var _this = this;
-
       var representation = getRequiredRepresentation(emoji, useAlt);
-
       if (!isMediaRepresentation(representation)) {
         return emoji;
       }
-
       var mediaPath = representation.mediaPath;
-
       if (this.cachedImageUrls.has(mediaPath)) {
         // Already cached
         return emoji;
       }
-
       return this.mediaImageLoader.loadMediaImage(mediaPath).then(function () {
         // Media is loaded, can use original URL now, so just return original emoji
         _this.cachedImageUrls.add(mediaPath);
-
         return emoji;
       }).catch(function () {
         return undefined;
@@ -75,9 +60,9 @@ export var BrowserCacheStrategy = /*#__PURE__*/function () {
       if (isUnsupportedBrowser()) {
         return Promise.resolve(false);
       }
-
       return mediaImageLoader.loadMediaImage(mediaPath).then(function () {
-        return (// Image should be cached in browser, if supported it should be accessible from the cache by an <img/>
+        return (
+          // Image should be cached in browser, if supported it should be accessible from the cache by an <img/>
           // Try to load without via image to confirm this support (this fails in Firefox)
           new Promise(function (resolve) {
             var img = new Image();
@@ -95,12 +80,12 @@ export var BrowserCacheStrategy = /*#__PURE__*/function () {
       });
     }
   }]);
-
   return BrowserCacheStrategy;
 }();
-var maxImageCached = 1000; // Don't cache images large than this - dataUrl size in characters
-
+var maxImageCached = 1000;
+// Don't cache images large than this - dataUrl size in characters
 var maxImageSize = 10000;
+
 /**
  * For browsers that do no cache images without equivalent headers (e.g. Firefox).
  *
@@ -110,46 +95,37 @@ var maxImageSize = 10000;
  * Images are still cached by the browser, but loading in asynchronous with
  * small delay noticable to the end user.
  */
-
 export var MemoryCacheStrategy = /*#__PURE__*/function () {
   function MemoryCacheStrategy(mediaImageLoader) {
     _classCallCheck(this, MemoryCacheStrategy);
-
     debug('MemoryCacheStrategy');
     this.mediaImageLoader = mediaImageLoader;
     this.dataURLCache = new LRUMap(maxImageCached);
   }
-
   _createClass(MemoryCacheStrategy, [{
     key: "loadEmoji",
     value: function loadEmoji(emoji, useAlt) {
       var _this2 = this;
-
       var representation = getRequiredRepresentation(emoji, useAlt);
-
       if (!isMediaRepresentation(representation)) {
         return emoji;
       }
-
       var mediaPath = representation.mediaPath;
       var dataURL = this.dataURLCache.get(mediaPath);
-
       if (dataURL) {
         // Already cached
         return convertMediaToImageEmoji(emoji, dataURL, useAlt);
-      } // Not cached, load
-
+      }
 
+      // Not cached, load
       return this.mediaImageLoader.loadMediaImage(mediaPath).then(function (dataURL) {
         var loadedEmoji = convertMediaToImageEmoji(emoji, dataURL, useAlt);
-
         if (dataURL.length <= maxImageSize) {
           // Only cache if not large than max size
           _this2.dataURLCache.set(mediaPath, dataURL);
         } else {
           debug('No caching as image is too large', dataURL.length, dataURL.slice(0, 15), emoji.shortName);
         }
-
         return loadedEmoji;
       }).catch(function () {
         return undefined;
@@ -161,9 +137,9 @@ export var MemoryCacheStrategy = /*#__PURE__*/function () {
       return false;
     }
   }]);
-
   return MemoryCacheStrategy;
 }();
+
 /**
  * Provides a cache for Media Emoji.
  *
@@ -171,29 +147,22 @@ export var MemoryCacheStrategy = /*#__PURE__*/function () {
  *
  * Otherwise, they are loaded and returned via a promise.
  */
-
 var MediaEmojiCache = /*#__PURE__*/function () {
   function MediaEmojiCache(tokenManager) {
     _classCallCheck(this, MediaEmojiCache);
-
     _defineProperty(this, "waitingInitUrls", []);
-
     debug('MediaEmojiCache');
     this.mediaImageLoader = new MediaImageLoader(tokenManager);
   }
-
   _createClass(MediaEmojiCache, [{
     key: "loadEmoji",
     value: function loadEmoji(emoji, useAlt) {
       var representation = getRequiredRepresentation(emoji, useAlt);
-
       if (!isMediaRepresentation(representation)) {
         return emoji;
       }
-
       var mediaPath = representation.mediaPath;
       var emojiCache = this.getCache(mediaPath);
-
       if (isPromise(emojiCache)) {
         // Promise based
         return emojiCache.then(function (cache) {
@@ -202,14 +171,12 @@ var MediaEmojiCache = /*#__PURE__*/function () {
           return undefined;
         });
       }
-
       return emojiCache.loadEmoji(emoji, useAlt);
     }
   }, {
     key: "optimisticRendering",
     value: function optimisticRendering(url) {
       var emojiCache = this.getCache(url);
-
       if (isPromise(emojiCache)) {
         // Promise based
         return emojiCache.then(function (cache) {
@@ -218,20 +185,16 @@ var MediaEmojiCache = /*#__PURE__*/function () {
           return false;
         });
       }
-
       return emojiCache.optimisticRendering();
     }
   }, {
     key: "getCache",
     value: function getCache(url) {
       var _this3 = this;
-
       if (this.cache) {
         return this.cache;
       }
-
       this.waitingInitUrls.push(url);
-
       if (!this.cacheLoading) {
         this.cacheLoading = this.initCache().then(function (cache) {
           _this3.cache = cache;
@@ -242,37 +205,28 @@ var MediaEmojiCache = /*#__PURE__*/function () {
           throw err;
         });
       }
-
       return this.cacheLoading;
     }
   }, {
     key: "initCache",
     value: function initCache() {
       var _this4 = this;
-
       var url = this.waitingInitUrls.pop();
-
       if (!url) {
         return Promise.reject('Unable to initialise cache based on provided url(s)');
       }
-
       return BrowserCacheStrategy.supported(url, this.mediaImageLoader).then(function (supported) {
         _this4.waitingInitUrls = []; // clear
-
         _this4.cacheLoading = undefined;
-
         if (supported) {
           return new BrowserCacheStrategy(_this4.mediaImageLoader);
         }
-
         return new MemoryCacheStrategy(_this4.mediaImageLoader);
       }).catch(function () {
         return _this4.initCache();
       });
     }
   }]);
-
   return MediaEmojiCache;
 }();
-
 export { MediaEmojiCache as default };

package/dist/esm/api/media/MediaImageLoader.js

@@ -5,47 +5,35 @@ import { imageAcceptHeader } from '../../util/image';
 var defaultConcurrentDownloadLimit = 16;
 var backoffMaxDelayInMillis = 600;
 var defaultMaxRetriesOnNotFound = 2;
-
 var MediaImageLoader = /*#__PURE__*/function () {
   function MediaImageLoader(tokenManager, options) {
     _classCallCheck(this, MediaImageLoader);
-
     _defineProperty(this, "mediaImageQueue", []);
-
     _defineProperty(this, "activeProcessing", 0);
-
     _defineProperty(this, "pendingRequests", new Map());
-
     this.concurrentDownloadLimit = options && options.concurrentDownloadLimit || defaultConcurrentDownloadLimit;
     this.tokenManager = tokenManager;
   }
-
   _createClass(MediaImageLoader, [{
     key: "loadMediaImage",
     value: function loadMediaImage(url) {
       var _this = this;
-
       var maybePending = this.pendingRequests.get(url);
-
       if (maybePending !== undefined) {
         return maybePending;
       }
-
       var pending = new Promise(function (resolve, reject) {
         _this.mediaImageQueue.push({
           url: url,
           resolve: resolve,
           reject: reject
         });
-
         _this.processFromQueue();
       }).then(function (result) {
         _this.pendingRequests.delete(url);
-
         return result;
       }).catch(function (error) {
         _this.pendingRequests.delete(url);
-
         throw error;
       });
       this.pendingRequests.set(url, pending);
@@ -65,34 +53,26 @@ var MediaImageLoader = /*#__PURE__*/function () {
     key: "processFromQueue",
     value: function processFromQueue() {
       var _this2 = this;
-
       var _loop = function _loop() {
         _this2.activeProcessing++;
-
         var item = _this2.mediaImageQueue.shift();
-
         var url = item.url,
-            resolve = item.resolve,
-            reject = item.reject;
-
+          resolve = item.resolve,
+          reject = item.reject;
         _this2.tokenManager.getToken('read', false).then(function (token) {
           _this2.requestMediaEmoji(url, token, true).then(function (dataURL) {
             resolve(dataURL);
-
             _this2.completedItem();
           }).catch(function (error) {
             reject(error);
-
             _this2.completedItem();
           });
         }).catch(function (error) {
           // Failed to load, just resolve to original emoji
           reject(error);
-
           _this2.completedItem();
         });
       };
-
       while (this.activeProcessing < this.concurrentDownloadLimit && this.mediaImageQueue.length > 0) {
         _loop();
       }
@@ -114,7 +94,6 @@ var MediaImageLoader = /*#__PURE__*/function () {
     key: "requestMediaEmoji",
     value: function requestMediaEmoji(url, token, retryOnAuthError) {
       var _this3 = this;
-
       var retriesOnNotFound = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : defaultMaxRetriesOnNotFound;
       return imageAcceptHeader().then(function (acceptHeader) {
         // Media REST API: https://media-api-internal.atlassian.io/api.html#file__fileId__image_get
@@ -142,7 +121,6 @@ var MediaImageLoader = /*#__PURE__*/function () {
               return _this3.readBlob(blob);
             });
           }
-
           throw new Error("Unable to load media image. Status=".concat(response.status, " ").concat(response.statusText));
         });
       });
@@ -151,8 +129,9 @@ var MediaImageLoader = /*#__PURE__*/function () {
     key: "readBlob",
     value: function readBlob(blob) {
       return new Promise(function (resolve, reject) {
-        var reader = new FileReader(); // TODO: [ts30] Add proper handling for null and ArrayBuffer
+        var reader = new FileReader();
 
+        // TODO: [ts30] Add proper handling for null and ArrayBuffer
         reader.addEventListener('load', function () {
           return resolve(reader.result);
         });
@@ -163,8 +142,6 @@ var MediaImageLoader = /*#__PURE__*/function () {
       });
     }
   }]);
-
   return MediaImageLoader;
 }();
-
 export { MediaImageLoader as default };

package/dist/esm/api/media/SiteEmojiResource.js

@@ -5,11 +5,8 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["altRepresentations"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { utils as serviceUtils } from '@atlaskit/util-service-support';
 import { getMediaClient } from '@atlaskit/media-client';
 import { buildEmojiDescriptionWithAltRepresentation, isMediaRepresentation, isMediaEmoji, convertImageToMediaRepresentation, isLoadedMediaEmoji } from '../../util/type-helpers';
@@ -19,19 +16,17 @@ import TokenManager from './TokenManager';
 import debug from '../../util/logger';
 // Assume media is 95% of total upload time.
 export var mediaProportionOfProgress = 95 / 100;
-
 var SiteEmojiResource = /*#__PURE__*/function () {
   // @ts-ignore: I am not being read from, should I be deleted???
+
   function SiteEmojiResource(siteServiceConfig, mediaApiToken) {
     var _this = this;
-
     _classCallCheck(this, SiteEmojiResource);
-
     _defineProperty(this, "postToEmojiService", function (upload, fileId) {
       var shortName = upload.shortName,
-          name = upload.name;
+        name = upload.name;
       var width = upload.width,
-          height = upload.height;
+        height = upload.height;
       var requestInit = {
         method: 'POST',
         headers: {
@@ -49,36 +44,30 @@ var SiteEmojiResource = /*#__PURE__*/function () {
         requestInit: requestInit
       }).then(function (response) {
         var emojis = response.emojis;
-
         if (emojis.length) {
           var _emojis$ = emojis[0],
-              altRepresentations = _emojis$.altRepresentations,
-              emoji = _objectWithoutProperties(_emojis$, _excluded);
-
+            altRepresentations = _emojis$.altRepresentations,
+            emoji = _objectWithoutProperties(_emojis$, _excluded);
           var _response = _objectSpread(_objectSpread({}, emoji), {}, {
             representation: convertImageToMediaRepresentation(emoji.representation)
           });
-
           var altRepresentation = getAltRepresentation(altRepresentations || {});
           var imgAltRepresentation = altRepresentation ? convertImageToMediaRepresentation(altRepresentation) : undefined;
           return buildEmojiDescriptionWithAltRepresentation(_response, imgAltRepresentation);
         }
-
         throw new Error('No emoji returns from upload. Upload failed.');
       });
     });
-
     this.siteServiceConfig = siteServiceConfig;
     this.mediaApiToken = mediaApiToken;
     this.tokenManager = new TokenManager(siteServiceConfig);
     this.tokenManager.addToken('read', mediaApiToken);
     this.mediaEmojiCache = new MediaEmojiCache(this.tokenManager);
   }
+
   /**
    * Will generate an emoji media path that is inclusive of client and token within the query parameter
    */
-
-
   _createClass(SiteEmojiResource, [{
     key: "generateTokenisedMediaURL",
     value: function () {
@@ -92,28 +81,21 @@ var SiteEmojiResource = /*#__PURE__*/function () {
                   _context.next = 9;
                   break;
                 }
-
                 currentMediaPathURL = new URL(emoji.representation.mediaPath);
                 currentMediaPathPARAMS = currentMediaPathURL.searchParams;
                 _context.next = 5;
                 return this.tokenManager.getToken('read');
-
               case 5:
                 readToken = _context.sent;
-
                 if (currentMediaPathPARAMS.get('token') !== readToken.jwt) {
                   currentMediaPathPARAMS.set('token', readToken.jwt);
                 }
-
                 if (currentMediaPathPARAMS.get('client') !== readToken.clientId) {
                   currentMediaPathPARAMS.set('client', readToken.clientId);
                 }
-
                 return _context.abrupt("return", currentMediaPathURL.toString());
-
               case 9:
                 throw Error('Emoji resource is not of type Media Representation');
-
               case 10:
               case "end":
                 return _context.stop();
@@ -121,36 +103,30 @@ var SiteEmojiResource = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-
       function generateTokenisedMediaURL(_x) {
         return _generateTokenisedMediaURL.apply(this, arguments);
       }
-
       return generateTokenisedMediaURL;
     }()
     /**
      * Will load media emoji, returning a new EmojiDescription if, for example,
      * the URL has changed.
      */
-
   }, {
     key: "loadMediaEmoji",
     value: function loadMediaEmoji(emoji, useAlt) {
       if (!isMediaEmoji(emoji)) {
         throw new Error('Only supported for media emoji');
       }
-
       return this.mediaEmojiCache.loadEmoji(emoji, useAlt);
     }
   }, {
     key: "optimisticRendering",
     value: function optimisticRendering(emoji, useAlt) {
       var representation = useAlt ? emoji.altRepresentation : emoji.representation;
-
       if (!isMediaRepresentation(representation)) {
         throw new Error('Only supported for media emoji');
       }
-
       var mediaPath = representation.mediaPath;
       return this.mediaEmojiCache.optimisticRendering(mediaPath);
     }
@@ -158,7 +134,6 @@ var SiteEmojiResource = /*#__PURE__*/function () {
     key: "uploadEmoji",
     value: function uploadEmoji(upload) {
       var _this2 = this;
-
       var retry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var progressCallback = arguments.length > 2 ? arguments[2] : undefined;
       var startTime = Date.now();
@@ -167,8 +142,8 @@ var SiteEmojiResource = /*#__PURE__*/function () {
         debug('upload token load time', tokenLoadTime);
         return new Promise(function (resolve, reject) {
           var url = uploadToken.url,
-              clientId = uploadToken.clientId,
-              collectionName = uploadToken.collectionName;
+            clientId = uploadToken.clientId,
+            collectionName = uploadToken.collectionName;
           var mediaClient = getMediaClient({
             authProvider: function authProvider() {
               return Promise.resolve({
@@ -193,7 +168,6 @@ var SiteEmojiResource = /*#__PURE__*/function () {
                 var totalUploadTime = Date.now() - startTime;
                 var mediaUploadTime = totalUploadTime - tokenLoadTime;
                 debug('total upload / media upload times', totalUploadTime, mediaUploadTime);
-
                 _this2.postToEmojiService(upload, state.id).then(function (emoji) {
                   resolve(emoji);
                 }).catch(function (httpError) {
@@ -208,12 +182,12 @@ var SiteEmojiResource = /*#__PURE__*/function () {
         });
       });
     }
+
     /**
      * Check if the MediaEmojiResource has been able to initialise an uploadToken. Retrieving an upload token
      * is asynchronous so the Promise will need to resolve before the state is known. If the token retrieval
      * completes with failure then the Promise will resolve to false.
      */
-
   }, {
     key: "hasUploadToken",
     value: function hasUploadToken() {
@@ -238,7 +212,6 @@ var SiteEmojiResource = /*#__PURE__*/function () {
       if (!emojiId.id) {
         return Promise.reject(false);
       }
-
       var path = "../".concat(encodeURIComponent(emojiId.id));
       return emojiRequest(this.siteServiceConfig, {
         path: path
@@ -250,23 +223,21 @@ var SiteEmojiResource = /*#__PURE__*/function () {
         return undefined;
       });
     }
+
     /**
      * Calls to site-scoped EmojiResource to delete emoji
      * @param emoji media emoji to delete
      * @returns Promise.resolve() if success and Promise.reject() for failure
      */
-
   }, {
     key: "deleteEmoji",
     value: function deleteEmoji(emoji) {
       if (!isMediaEmoji(emoji) && !isLoadedMediaEmoji(emoji)) {
         return Promise.reject(false);
       }
-
       if (!emoji.id) {
         return Promise.reject(false);
       }
-
       var path = "".concat(encodeURIComponent(emoji.id));
       var requestInit = {
         method: 'DELETE'
@@ -274,17 +245,17 @@ var SiteEmojiResource = /*#__PURE__*/function () {
       return serviceUtils.requestService(this.siteServiceConfig, {
         path: path,
         requestInit: requestInit
-      }) // Successful delete on Promise.resolve
+      })
+      // Successful delete on Promise.resolve
       .then(function () {
         return true;
-      }) // Unsuccessful delete on Promise.reject
+      })
+      // Unsuccessful delete on Promise.reject
       .catch(function () {
         return false;
       });
     }
   }]);
-
   return SiteEmojiResource;
 }();
-
 export { SiteEmojiResource as default };

package/dist/esm/api/media/TokenManager.js

@@ -1,27 +1,23 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import { utils as serviceUtils } from '@atlaskit/util-service-support'; // expire 30 seconds early to factor in latency, slow services, etc
+import { utils as serviceUtils } from '@atlaskit/util-service-support';
 
+// expire 30 seconds early to factor in latency, slow services, etc
 export var EXPIRES_AT_LATENCY_IN_SECONDS = 30;
-
 var TokenManager = /*#__PURE__*/function () {
   function TokenManager(siteServiceConfig) {
     _classCallCheck(this, TokenManager);
-
     this.siteServiceConfig = siteServiceConfig;
     this.tokens = new Map();
   }
-
   _createClass(TokenManager, [{
     key: "isValidToken",
     value: function isValidToken(mediaApiToken) {
       var nowInSeconds = Date.now() / 1000;
       var expiresAt = mediaApiToken.expiresAt - EXPIRES_AT_LATENCY_IN_SECONDS;
-
       if (nowInSeconds < expiresAt) {
         return true;
       }
-
       return false;
     }
   }, {
@@ -42,29 +38,25 @@ var TokenManager = /*#__PURE__*/function () {
     key: "getToken",
     value: function getToken(type, forceRefresh) {
       var tokenDetail = this.tokens.get(type);
-
       if (!tokenDetail) {
         tokenDetail = {};
         this.tokens.set(type, tokenDetail);
       }
-
       var _tokenDetail = tokenDetail,
-          mediaApiToken = _tokenDetail.mediaApiToken,
-          activeTokenRefresh = _tokenDetail.activeTokenRefresh;
-
+        mediaApiToken = _tokenDetail.mediaApiToken,
+        activeTokenRefresh = _tokenDetail.activeTokenRefresh;
       if (mediaApiToken) {
         if (this.isValidToken(mediaApiToken) && !forceRefresh) {
           // still valid
           return Promise.resolve(mediaApiToken);
         }
-
         if (activeTokenRefresh) {
           // refresh token promise already active, return that
           return activeTokenRefresh;
         }
-      } // request a new token and track the promise for future requests until completed
-
+      }
 
+      // request a new token and track the promise for future requests until completed
       tokenDetail.activeTokenRefresh = this.fetchNewToken(type).then(function (token) {
         tokenDetail.mediaApiToken = token;
         tokenDetail.activeTokenRefresh = undefined;
@@ -73,8 +65,6 @@ var TokenManager = /*#__PURE__*/function () {
       return tokenDetail.activeTokenRefresh;
     }
   }]);
-
   return TokenManager;
 }();
-
 export { TokenManager as default };