@atlaskit/media-viewer 52.7.5 → 52.8.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/media-viewer
 
+## 52.8.0
+
+### Minor Changes
+
+- [`c90ccf0c600ee`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c90ccf0c600ee) -
+  Enable cross product/cross client copy and paste of Media files by including clientId during Copy
+  operations.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 52.7.5
 
 ### Patch Changes

package/dist/cjs/analytics/index.js

@@ -10,7 +10,7 @@ exports.packageVersion = exports.packageName = void 0;
 var _analytics = require("@atlaskit/media-common/analytics");
 var componentName = exports.component = exports.componentName = 'mediaViewer';
 var packageName = exports.packageName = "@atlaskit/media-viewer";
-var packageVersion = exports.packageVersion = "52.7.4";
+var packageVersion = exports.packageVersion = "52.7.5";
 function getFileAttributes(fileState) {
   if (!fileState) {
     return {

package/dist/cjs/analytics/ufoExperiences.js

@@ -13,7 +13,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "52.7.4";
+var packageVersion = "52.7.5";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/cjs/viewers/image/index.js

@@ -60,7 +60,7 @@ var ImageViewer = exports.ImageViewer = /*#__PURE__*/function (_BaseViewer) {
     key: "init",
     value: function () {
       var _init = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _this$props, fileState, mediaClient, collectionName, traceContext, controller, orientation, objectUrl, originalBinaryImageUrl, isLocalFileReference, preview, _yield$preview, value, origin, item, response, imgError;
+        var _this$props, fileState, mediaClient, collectionName, traceContext, controller, orientation, objectUrl, originalBinaryImageUrl, isLocalFileReference, clientId, preview, _yield$preview, value, origin, item, response, imgError;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -75,37 +75,48 @@ var ImageViewer = exports.ImageViewer = /*#__PURE__*/function (_BaseViewer) {
               _context.prev = 4;
               orientation = 1;
               isLocalFileReference = false;
+              _context.prev = 7;
+              _context.next = 10;
+              return mediaClient.getClientId(collectionName);
+            case 10:
+              clientId = _context.sent;
+              _context.next = 15;
+              break;
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](7);
+            case 15:
               preview = fileState.preview;
               if (!preview) {
-                _context.next = 25;
+                _context.next = 33;
                 break;
               }
-              _context.next = 11;
+              _context.next = 19;
               return preview;
-            case 11:
+            case 19:
               _yield$preview = _context.sent;
               value = _yield$preview.value;
               origin = _yield$preview.origin;
               if (!(value instanceof Blob)) {
-                _context.next = 22;
+                _context.next = 30;
                 break;
               }
-              _context.next = 17;
+              _context.next = 25;
               return (0, _mediaUi.getOrientation)(value);
-            case 17:
+            case 25:
               orientation = _context.sent;
               objectUrl = URL.createObjectURL(value);
               isLocalFileReference = origin === 'local';
-              _context.next = 23;
+              _context.next = 31;
               break;
-            case 22:
+            case 30:
               objectUrl = value;
-            case 23:
-              _context.next = 38;
+            case 31:
+              _context.next = 46;
               break;
-            case 25:
+            case 33:
               if (!(0, _mediaClient.isImageRepresentationReady)(fileState)) {
-                _context.next = 36;
+                _context.next = 44;
                 break;
               }
               item = processedFileStateToMediaItem(fileState);
@@ -116,56 +127,57 @@ var ImageViewer = exports.ImageViewer = /*#__PURE__*/function (_BaseViewer) {
               this.cancelImageFetch = function () {
                 return controller === null || controller === void 0 ? void 0 : controller.abort();
               };
-              _context.t0 = URL;
-              _context.next = 32;
+              _context.t1 = URL;
+              _context.next = 40;
               return response;
-            case 32:
-              _context.t1 = _context.sent;
-              objectUrl = _context.t0.createObjectURL.call(_context.t0, _context.t1);
-              _context.next = 38;
+            case 40:
+              _context.t2 = _context.sent;
+              objectUrl = _context.t1.createObjectURL.call(_context.t1, _context.t2);
+              _context.next = 46;
               break;
-            case 36:
+            case 44:
               this.setState({
                 content: _domain.Outcome.pending()
               });
               return _context.abrupt("return");
-            case 38:
+            case 46:
               if (!(!isLocalFileReference &&
               // objectUrl at this point is binary file already
               !(0, _mediaClient.isErrorFileState)(fileState) && fileState.status !== 'uploading' && fileState.mediaType === 'image' && (0, _mediaCommon.isImageMimeTypeSupportedByBrowser)(fileState.mimeType))) {
-                _context.next = 42;
+                _context.next = 50;
                 break;
               }
-              _context.next = 41;
+              _context.next = 49;
               return mediaClient.file.getFileBinaryURL(fileState.id, collectionName);
-            case 41:
+            case 49:
               originalBinaryImageUrl = _context.sent;
-            case 42:
+            case 50:
               this.setState({
                 content: _domain.Outcome.successful({
                   objectUrl: objectUrl,
                   orientation: orientation,
-                  originalBinaryImageUrl: originalBinaryImageUrl
+                  originalBinaryImageUrl: originalBinaryImageUrl,
+                  clientId: clientId
                 })
               });
-              _context.next = 48;
+              _context.next = 56;
               break;
-            case 45:
-              _context.prev = 45;
-              _context.t2 = _context["catch"](4);
+            case 53:
+              _context.prev = 53;
+              _context.t3 = _context["catch"](4);
               // TODO : properly handle aborted requests (MS-2843)
               if (!(controller !== null && controller !== void 0 && controller.signal.aborted)) {
-                imgError = new _errors.MediaViewerError('imageviewer-fetch-url', _context.t2 instanceof Error ? _context.t2 : undefined);
+                imgError = new _errors.MediaViewerError('imageviewer-fetch-url', _context.t3 instanceof Error ? _context.t3 : undefined);
                 this.setState({
                   content: _domain.Outcome.failed(imgError)
                 });
                 this.props.onError(imgError);
               }
-            case 48:
+            case 56:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 45]]);
+        }, _callee, this, [[4, 53], [7, 13]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -194,6 +206,7 @@ var ImageViewer = exports.ImageViewer = /*#__PURE__*/function (_BaseViewer) {
   }, {
     key: "renderSuccessful",
     value: function renderSuccessful(content) {
+      var _content$clientId;
       var _this$props2 = this.props,
         item = _this$props2.item,
         onClose = _this$props2.onClose,
@@ -205,7 +218,8 @@ var ImageViewer = exports.ImageViewer = /*#__PURE__*/function (_BaseViewer) {
       var src = contextId ? (0, _mediaClient.addFileAttrsToUrl)(content.objectUrl, {
         id: item.id,
         contextId: contextId,
-        collection: collectionName
+        collection: collectionName,
+        clientId: (_content$clientId = content.clientId) !== null && _content$clientId !== void 0 ? _content$clientId : ''
       }) : content.objectUrl;
       return /*#__PURE__*/_react.default.createElement(_interactiveImg.InteractiveImg, {
         onLoad: this.onLoad,

package/dist/es2019/analytics/index.js

@@ -1,7 +1,7 @@
 import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
 const componentName = 'mediaViewer';
 const packageName = "@atlaskit/media-viewer";
-const packageVersion = "52.7.4";
+const packageVersion = "52.7.5";
 export { packageName, packageVersion, componentName, componentName as component };
 export function getFileAttributes(fileState) {
   if (!fileState) {

package/dist/es2019/analytics/ufoExperiences.js

@@ -3,7 +3,7 @@ import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 const packageName = "@atlaskit/media-viewer";
-const packageVersion = "52.7.4";
+const packageVersion = "52.7.5";
 let ufoExperience;
 const getExperience = () => {
   if (!ufoExperience) {

package/dist/es2019/viewers/image/index.js

@@ -47,6 +47,14 @@ export class ImageViewer extends BaseViewer {
       let objectUrl;
       let originalBinaryImageUrl;
       let isLocalFileReference = false;
+      let clientId;
+
+      // Fetch clientId for cross-client copy
+      try {
+        clientId = await mediaClient.getClientId(collectionName);
+      } catch {
+        // ClientId is optional, silently fail
+      }
       const {
         preview
       } = fileState;
@@ -85,7 +93,8 @@ export class ImageViewer extends BaseViewer {
         content: Outcome.successful({
           objectUrl,
           orientation,
-          originalBinaryImageUrl
+          originalBinaryImageUrl,
+          clientId
         })
       });
     } catch (err) {
@@ -115,6 +124,7 @@ export class ImageViewer extends BaseViewer {
     URL.revokeObjectURL(objectUrl);
   }
   renderSuccessful(content) {
+    var _content$clientId;
     const {
       item,
       onClose,
@@ -127,7 +137,8 @@ export class ImageViewer extends BaseViewer {
     const src = contextId ? addFileAttrsToUrl(content.objectUrl, {
       id: item.id,
       contextId,
-      collection: collectionName
+      collection: collectionName,
+      clientId: (_content$clientId = content.clientId) !== null && _content$clientId !== void 0 ? _content$clientId : ''
     }) : content.objectUrl;
     return /*#__PURE__*/React.createElement(InteractiveImg, {
       onLoad: this.onLoad,

package/dist/esm/analytics/index.js

@@ -1,7 +1,7 @@
 import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
 var componentName = 'mediaViewer';
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "52.7.4";
+var packageVersion = "52.7.5";
 export { packageName, packageVersion, componentName, componentName as component };
 export function getFileAttributes(fileState) {
   if (!fileState) {

package/dist/esm/analytics/ufoExperiences.js

@@ -6,7 +6,7 @@ import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "52.7.4";
+var packageVersion = "52.7.5";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/esm/viewers/image/index.js

@@ -53,7 +53,7 @@ export var ImageViewer = /*#__PURE__*/function (_BaseViewer) {
     key: "init",
     value: function () {
       var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _this$props, fileState, mediaClient, collectionName, traceContext, controller, orientation, objectUrl, originalBinaryImageUrl, isLocalFileReference, preview, _yield$preview, value, origin, item, response, imgError;
+        var _this$props, fileState, mediaClient, collectionName, traceContext, controller, orientation, objectUrl, originalBinaryImageUrl, isLocalFileReference, clientId, preview, _yield$preview, value, origin, item, response, imgError;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -68,37 +68,48 @@ export var ImageViewer = /*#__PURE__*/function (_BaseViewer) {
               _context.prev = 4;
               orientation = 1;
               isLocalFileReference = false;
+              _context.prev = 7;
+              _context.next = 10;
+              return mediaClient.getClientId(collectionName);
+            case 10:
+              clientId = _context.sent;
+              _context.next = 15;
+              break;
+            case 13:
+              _context.prev = 13;
+              _context.t0 = _context["catch"](7);
+            case 15:
               preview = fileState.preview;
               if (!preview) {
-                _context.next = 25;
+                _context.next = 33;
                 break;
               }
-              _context.next = 11;
+              _context.next = 19;
               return preview;
-            case 11:
+            case 19:
               _yield$preview = _context.sent;
               value = _yield$preview.value;
               origin = _yield$preview.origin;
               if (!(value instanceof Blob)) {
-                _context.next = 22;
+                _context.next = 30;
                 break;
               }
-              _context.next = 17;
+              _context.next = 25;
               return getOrientation(value);
-            case 17:
+            case 25:
               orientation = _context.sent;
               objectUrl = URL.createObjectURL(value);
               isLocalFileReference = origin === 'local';
-              _context.next = 23;
+              _context.next = 31;
               break;
-            case 22:
+            case 30:
               objectUrl = value;
-            case 23:
-              _context.next = 38;
+            case 31:
+              _context.next = 46;
               break;
-            case 25:
+            case 33:
               if (!isImageRepresentationReady(fileState)) {
-                _context.next = 36;
+                _context.next = 44;
                 break;
               }
               item = processedFileStateToMediaItem(fileState);
@@ -109,56 +120,57 @@ export var ImageViewer = /*#__PURE__*/function (_BaseViewer) {
               this.cancelImageFetch = function () {
                 return controller === null || controller === void 0 ? void 0 : controller.abort();
               };
-              _context.t0 = URL;
-              _context.next = 32;
+              _context.t1 = URL;
+              _context.next = 40;
               return response;
-            case 32:
-              _context.t1 = _context.sent;
-              objectUrl = _context.t0.createObjectURL.call(_context.t0, _context.t1);
-              _context.next = 38;
+            case 40:
+              _context.t2 = _context.sent;
+              objectUrl = _context.t1.createObjectURL.call(_context.t1, _context.t2);
+              _context.next = 46;
               break;
-            case 36:
+            case 44:
               this.setState({
                 content: Outcome.pending()
               });
               return _context.abrupt("return");
-            case 38:
+            case 46:
               if (!(!isLocalFileReference &&
               // objectUrl at this point is binary file already
               !isErrorFileState(fileState) && fileState.status !== 'uploading' && fileState.mediaType === 'image' && isImageMimeTypeSupportedByBrowser(fileState.mimeType))) {
-                _context.next = 42;
+                _context.next = 50;
                 break;
               }
-              _context.next = 41;
+              _context.next = 49;
               return mediaClient.file.getFileBinaryURL(fileState.id, collectionName);
-            case 41:
+            case 49:
               originalBinaryImageUrl = _context.sent;
-            case 42:
+            case 50:
               this.setState({
                 content: Outcome.successful({
                   objectUrl: objectUrl,
                   orientation: orientation,
-                  originalBinaryImageUrl: originalBinaryImageUrl
+                  originalBinaryImageUrl: originalBinaryImageUrl,
+                  clientId: clientId
                 })
               });
-              _context.next = 48;
+              _context.next = 56;
               break;
-            case 45:
-              _context.prev = 45;
-              _context.t2 = _context["catch"](4);
+            case 53:
+              _context.prev = 53;
+              _context.t3 = _context["catch"](4);
               // TODO : properly handle aborted requests (MS-2843)
               if (!(controller !== null && controller !== void 0 && controller.signal.aborted)) {
-                imgError = new MediaViewerError('imageviewer-fetch-url', _context.t2 instanceof Error ? _context.t2 : undefined);
+                imgError = new MediaViewerError('imageviewer-fetch-url', _context.t3 instanceof Error ? _context.t3 : undefined);
                 this.setState({
                   content: Outcome.failed(imgError)
                 });
                 this.props.onError(imgError);
               }
-            case 48:
+            case 56:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 45]]);
+        }, _callee, this, [[4, 53], [7, 13]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -187,6 +199,7 @@ export var ImageViewer = /*#__PURE__*/function (_BaseViewer) {
   }, {
     key: "renderSuccessful",
     value: function renderSuccessful(content) {
+      var _content$clientId;
       var _this$props2 = this.props,
         item = _this$props2.item,
         onClose = _this$props2.onClose,
@@ -198,7 +211,8 @@ export var ImageViewer = /*#__PURE__*/function (_BaseViewer) {
       var src = contextId ? addFileAttrsToUrl(content.objectUrl, {
         id: item.id,
         contextId: contextId,
-        collection: collectionName
+        collection: collectionName,
+        clientId: (_content$clientId = content.clientId) !== null && _content$clientId !== void 0 ? _content$clientId : ''
       }) : content.objectUrl;
       return /*#__PURE__*/React.createElement(InteractiveImg, {
         onLoad: this.onLoad,

package/dist/types/viewers/image/index.d.ts

@@ -19,6 +19,7 @@ export interface ImageViewerContent {
     objectUrl: ObjectUrl;
     originalBinaryImageUrl?: string;
     orientation?: number;
+    clientId?: string;
 }
 export declare class ImageViewer extends BaseViewer<ImageViewerContent, ImageViewerProps> {
     protected get initialState(): {

package/dist/types-ts4.5/viewers/image/index.d.ts

@@ -19,6 +19,7 @@ export interface ImageViewerContent {
     objectUrl: ObjectUrl;
     originalBinaryImageUrl?: string;
     orientation?: number;
+    clientId?: string;
 }
 export declare class ImageViewer extends BaseViewer<ImageViewerContent, ImageViewerProps> {
     protected get initialState(): {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "52.7.5",
+	"version": "52.8.0",
 	"description": "MediaViewer is Atlassian's powerful solution for viewing files on the web. It's both powerful and extendable yet easy-to-integrate",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -40,9 +40,9 @@
 		"@atlaskit/icon": "^31.0.0",
 		"@atlaskit/icon-file-type": "^7.0.0",
 		"@atlaskit/icon-lab": "^5.16.0",
-		"@atlaskit/media-client": "^35.7.0",
-		"@atlaskit/media-client-react": "^4.1.0",
-		"@atlaskit/media-common": "^12.3.0",
+		"@atlaskit/media-client": "^35.8.0",
+		"@atlaskit/media-client-react": "^4.2.0",
+		"@atlaskit/media-common": "^12.4.0",
 		"@atlaskit/media-document-viewer": "^0.6.0",
 		"@atlaskit/media-svg": "^2.2.0",
 		"@atlaskit/media-ui": "^28.7.0",