@atlaskit/emoji 71.15.18 → 71.16.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/emoji
 
+## 71.16.0
+
+### Minor Changes
+
+- [`ef1f56f6c307e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef1f56f6c307e) -
+  Gated behind `add_emoji_media_size_to_media_file_upload_request`, emoji uploads pass file size to
+  media upload requests when enabled.
+
 ## 71.15.18
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mediaProportionOfProgress = exports.default = void 0;
+exports.mediaProportionOfProgress = exports.getDataUrlSizeInBytes = exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -14,6 +14,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utilServiceSupport = require("@atlaskit/util-service-support");
 var _mediaClientReact = require("@atlaskit/media-client-react");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _typeHelpers = require("../../util/type-helpers");
 var _MediaEmojiCache = _interopRequireDefault(require("./MediaEmojiCache"));
 var _EmojiUtils = require("../EmojiUtils");
@@ -24,6 +25,27 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 // Assume media is 95% of total upload time.
 var mediaProportionOfProgress = exports.mediaProportionOfProgress = 95 / 100;
+var getDataUrlSizeInBytes = exports.getDataUrlSizeInBytes = function getDataUrlSizeInBytes(dataURL) {
+  var separatorIndex = dataURL.indexOf(',');
+  if (separatorIndex === -1) {
+    return undefined;
+  }
+  var metadata = dataURL.slice(0, separatorIndex);
+  var data = dataURL.slice(separatorIndex + 1);
+  if (!data) {
+    return undefined;
+  }
+  if (metadata.includes(';base64')) {
+    var _data$match;
+    var padding = ((_data$match = data.match(/=*$/)) === null || _data$match === void 0 ? void 0 : _data$match[0].length) || 0;
+    return Math.floor(data.length * 3 / 4) - padding;
+  }
+  try {
+    return new TextEncoder().encode(decodeURIComponent(data)).length;
+  } catch (_unused) {
+    return data.length;
+  }
+};
 var SiteEmojiResource = exports.default = /*#__PURE__*/function () {
   // @ts-ignore: I am not being read from, should I be deleted???
 
@@ -188,11 +210,14 @@ var SiteEmojiResource = exports.default = /*#__PURE__*/function () {
             },
             useSha256ForUploads: true
           });
-          var subscription = mediaClient.file.upload({
+          var size = (0, _fg.fg)('add_emoji_media_size_to_media_file_upload_request') ? getDataUrlSizeInBytes(upload.dataURL) : undefined;
+          var subscription = mediaClient.file.upload(_objectSpread({
             content: upload.dataURL,
             name: upload.filename,
             collection: collectionName
-          }).subscribe({
+          }, size !== undefined ? {
+            size: size
+          } : {})).subscribe({
             next: function next(state) {
               if (state.status === 'uploading' && progressCallback) {
                 progressCallback({

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.15.17"
+      packageVersion: "71.15.18"
     }, attributes)
   };
 };

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

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { utils as serviceUtils } from '@atlaskit/util-service-support';
 import { getMediaClient } from '@atlaskit/media-client-react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { buildEmojiDescriptionWithAltRepresentation, isMediaRepresentation, isMediaEmoji, convertImageToMediaRepresentation, isLoadedMediaEmoji } from '../../util/type-helpers';
 import MediaEmojiCache from './MediaEmojiCache';
 import { denormaliseEmojiServiceResponse, emojiRequest, getAltRepresentation } from '../EmojiUtils';
@@ -8,6 +9,27 @@ import TokenManager from './TokenManager';
 import debug from '../../util/logger';
 // Assume media is 95% of total upload time.
 export const mediaProportionOfProgress = 95 / 100;
+export const getDataUrlSizeInBytes = dataURL => {
+  const separatorIndex = dataURL.indexOf(',');
+  if (separatorIndex === -1) {
+    return undefined;
+  }
+  const metadata = dataURL.slice(0, separatorIndex);
+  const data = dataURL.slice(separatorIndex + 1);
+  if (!data) {
+    return undefined;
+  }
+  if (metadata.includes(';base64')) {
+    var _data$match;
+    const padding = ((_data$match = data.match(/=*$/)) === null || _data$match === void 0 ? void 0 : _data$match[0].length) || 0;
+    return Math.floor(data.length * 3 / 4) - padding;
+  }
+  try {
+    return new TextEncoder().encode(decodeURIComponent(data)).length;
+  } catch {
+    return data.length;
+  }
+};
 export default class SiteEmojiResource {
   // @ts-ignore: I am not being read from, should I be deleted???
 
@@ -145,10 +167,14 @@ export default class SiteEmojiResource {
           }),
           useSha256ForUploads: true
         });
+        const size = fg('add_emoji_media_size_to_media_file_upload_request') ? getDataUrlSizeInBytes(upload.dataURL) : undefined;
         const subscription = mediaClient.file.upload({
           content: upload.dataURL,
           name: upload.filename,
-          collection: collectionName
+          collection: collectionName,
+          ...(size !== undefined ? {
+            size
+          } : {})
         }).subscribe({
           next: state => {
             if (state.status === 'uploading' && progressCallback) {

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.15.17",
+    packageVersion: "71.15.18",
     ...attributes
   }
 });

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

@@ -10,6 +10,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import { utils as serviceUtils } from '@atlaskit/util-service-support';
 import { getMediaClient } from '@atlaskit/media-client-react';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { buildEmojiDescriptionWithAltRepresentation, isMediaRepresentation, isMediaEmoji, convertImageToMediaRepresentation, isLoadedMediaEmoji } from '../../util/type-helpers';
 import MediaEmojiCache from './MediaEmojiCache';
 import { denormaliseEmojiServiceResponse, emojiRequest, getAltRepresentation } from '../EmojiUtils';
@@ -17,6 +18,27 @@ import TokenManager from './TokenManager';
 import debug from '../../util/logger';
 // Assume media is 95% of total upload time.
 export var mediaProportionOfProgress = 95 / 100;
+export var getDataUrlSizeInBytes = function getDataUrlSizeInBytes(dataURL) {
+  var separatorIndex = dataURL.indexOf(',');
+  if (separatorIndex === -1) {
+    return undefined;
+  }
+  var metadata = dataURL.slice(0, separatorIndex);
+  var data = dataURL.slice(separatorIndex + 1);
+  if (!data) {
+    return undefined;
+  }
+  if (metadata.includes(';base64')) {
+    var _data$match;
+    var padding = ((_data$match = data.match(/=*$/)) === null || _data$match === void 0 ? void 0 : _data$match[0].length) || 0;
+    return Math.floor(data.length * 3 / 4) - padding;
+  }
+  try {
+    return new TextEncoder().encode(decodeURIComponent(data)).length;
+  } catch (_unused) {
+    return data.length;
+  }
+};
 var SiteEmojiResource = /*#__PURE__*/function () {
   // @ts-ignore: I am not being read from, should I be deleted???
 
@@ -181,11 +203,14 @@ var SiteEmojiResource = /*#__PURE__*/function () {
             },
             useSha256ForUploads: true
           });
-          var subscription = mediaClient.file.upload({
+          var size = fg('add_emoji_media_size_to_media_file_upload_request') ? getDataUrlSizeInBytes(upload.dataURL) : undefined;
+          var subscription = mediaClient.file.upload(_objectSpread({
             content: upload.dataURL,
             name: upload.filename,
             collection: collectionName
-          }).subscribe({
+          }, size !== undefined ? {
+            size: size
+          } : {})).subscribe({
             next: function next(state) {
               if (state.status === 'uploading' && progressCallback) {
                 progressCallback({

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.15.17"
+      packageVersion: "71.15.18"
     }, attributes)
   };
 };

package/dist/types/api/media/SiteEmojiResource.d.ts

@@ -15,6 +15,7 @@ type TokenisedEmojiRepresentation = {
     representation?: EmojiRepresentation;
 };
 export declare const mediaProportionOfProgress: number;
+export declare const getDataUrlSizeInBytes: (dataURL: string) => number | undefined;
 export default class SiteEmojiResource {
     private siteServiceConfig;
     private mediaApiToken;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/emoji",
-	"version": "71.15.18",
+	"version": "71.16.0",
 	"description": "Fabric emoji React components",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -134,6 +134,9 @@
 		"platform_emoji_keep_picker_open_on_upload": {
 			"type": "boolean"
 		},
+		"add_emoji_media_size_to_media_file_upload_request": {
+			"type": "boolean"
+		},
 		"use-elements-stargate-emoji-path": {
 			"type": "boolean"
 		},