@atlaskit/media-viewer 47.6.1 → 48.0.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/media-viewer
 
+## 48.0.1
+
+### Patch Changes
+
+- [`9d00501a414`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9d00501a414) - Ensure legacy types are published for TS 4.5-4.8
+
+## 48.0.0
+
+### Major Changes
+
+- [`8c6a6cf4bc4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8c6a6cf4bc4) - Media Viewer no longer accepts a collection name as a data source. Integrators should pass the full list of files to browse, instead.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 47.6.1
 
 ### Patch Changes

package/dist/cjs/analytics/index.js

@@ -12,7 +12,7 @@ var componentName = 'mediaViewer';
 exports.component = exports.componentName = componentName;
 var packageName = "@atlaskit/media-viewer";
 exports.packageName = packageName;
-var packageVersion = "47.6.1";
+var packageVersion = "48.0.1";
 exports.packageVersion = packageVersion;
 function getFileAttributes(fileState) {
   if (!fileState) {

package/dist/cjs/analytics/ufoExperiences.js

@@ -12,7 +12,7 @@ var _mediaCommon = require("@atlaskit/media-common");
 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) { (0, _defineProperty2.default)(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; }
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "47.6.1";
+var packageVersion = "48.0.1";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/cjs/components/media-viewer.js

@@ -1,13 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MediaViewer = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireWildcard(require("react"));
 var _mediaViewer = require("../media-viewer");
-var _normaliseInput2 = require("./normaliseInput");
+var _utils = require("../utils");
+var _mediaClient = require("@atlaskit/media-client");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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) { (0, _defineProperty2.default)(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; }
+var ensureCollectionName = function ensureCollectionName(identifier, collectionName) {
+  return (0, _mediaClient.isFileIdentifier)(identifier) ? _objectSpread(_objectSpread({}, identifier), {}, {
+    collectionName: identifier.collectionName || collectionName
+  }) : identifier;
+};
+var normaliseItems = function normaliseItems(items, selectedItem, collectionName) {
+  var selectedItemWithCollectionName = ensureCollectionName(selectedItem, collectionName);
+  var selectedIndex = -1;
+  var itemsWithCollectionName = items.map(function (item, index) {
+    if ((0, _utils.isSameIdentifier)(item, selectedItemWithCollectionName)) {
+      selectedIndex = index;
+    }
+    return ensureCollectionName(item, collectionName);
+  });
+  var itemsWithSelectedItem = selectedIndex === -1 ? [selectedItem].concat((0, _toConsumableArray2.default)(itemsWithCollectionName)) : itemsWithCollectionName;
+  return {
+    items: itemsWithSelectedItem,
+    selectedItem: selectedItemWithCollectionName
+  };
+};
 var MediaViewer = function MediaViewer(_ref) {
   var featureFlags = _ref.featureFlags,
     onClose = _ref.onClose,
@@ -16,16 +44,12 @@ var MediaViewer = function MediaViewer(_ref) {
     collectionName = _ref.collectionName,
     items = _ref.items,
     extensions = _ref.extensions,
-    contextId = _ref.contextId,
-    dataSource = _ref.dataSource;
-  var _normaliseInput = (0, _normaliseInput2.normaliseInput)({
-      selectedItem: selectedItem,
-      collectionName: collectionName,
-      items: items,
-      dataSource: dataSource
-    }),
-    normalisedSelectedItem = _normaliseInput.normalisedSelectedItem,
-    normalisedItems = _normaliseInput.normalisedItems;
+    contextId = _ref.contextId;
+  var _useMemo = (0, _react.useMemo)(function () {
+      return normaliseItems(items, selectedItem, collectionName);
+    }, [items, selectedItem, collectionName]),
+    normalisedItems = _useMemo.items,
+    normalisedSelectedItem = _useMemo.selectedItem;
   return /*#__PURE__*/_react.default.createElement(_mediaViewer.MediaViewer, {
     mediaClient: mediaClient,
     selectedItem: normalisedSelectedItem,

package/dist/cjs/media-viewer.js

@@ -25,8 +25,6 @@ var _content = require("./content");
 var _styleWrappers = require("./styleWrappers");
 var _perfMarks = require("perf-marks");
 var _classnames = require("./classnames");
-var _errorMessage = _interopRequireDefault(require("./errorMessage"));
-var _errors = require("./errors");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
@@ -96,24 +94,9 @@ var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
         items = _this$props.items,
         selectedItem = _this$props.selectedItem;
-      var firstItem = items === null || items === void 0 ? void 0 : items[0];
+      var firstItem = items[0];
       return selectedItem || firstItem;
     }
-  }, {
-    key: "renderError",
-    value:
-    /**
-     * TODO: https://product-fabric.atlassian.net/browse/MEX-2207
-     * This error message is simulating the current error thrown by the backend when consumer provides a collection as datasource.
-     * This is displayed at this level when no items are provided from the parent component.
-     * This error message should be removed when the deprecated API is removed.
-     */
-    function renderError() {
-      return /*#__PURE__*/_react.default.createElement(_errorMessage.default, {
-        fileId: 'undefined',
-        error: new _errors.MediaViewerError('collection-fetch-metadata', new Error('collection as datasource is no longer supported'))
-      });
-    }
   }, {
     key: "render",
     value: function render() {
@@ -134,7 +117,7 @@ var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/_react.default.createElement(_content.Content, {
         isSidebarVisible: isSidebarVisible,
         onClose: this.onContentClose
-      }, !items ? this.renderError() : /*#__PURE__*/_react.default.createElement(_list.List, {
+      }, /*#__PURE__*/_react.default.createElement(_list.List, {
         defaultSelectedItem: this.defaultSelectedItem || items[0],
         items: items,
         mediaClient: mediaClient,

package/dist/cjs/utils/index.js

@@ -4,22 +4,27 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rejectAfter = exports.isMacPrivateFile = exports.getSelectedIndex = exports.getMimeTypeFromFilename = exports.getMediaTypeFromFilename = exports.getFormattedFolderName = exports.getFolderParent = exports.extractArchiveFolderName = void 0;
+exports.rejectAfter = exports.isSameIdentifier = exports.isMacPrivateFile = exports.getSelectedIndex = exports.getMimeTypeFromFilename = exports.getMediaTypeFromFilename = exports.getFormattedFolderName = exports.getFolderParent = exports.extractArchiveFolderName = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _mediaClient = require("@atlaskit/media-client");
 var _mime = require("mime");
+var isSameIdentifier = function isSameIdentifier(id1, id2) {
+  if ((0, _mediaClient.isFileIdentifier)(id1) && (0, _mediaClient.isFileIdentifier)(id2)) {
+    return id1.id === id2.id;
+  }
+  if (!(0, _mediaClient.isFileIdentifier)(id1) && !(0, _mediaClient.isFileIdentifier)(id2)) {
+    return id1.dataURI === id2.dataURI;
+  }
+  return false;
+};
+
 // TODO MS-1752 - current implementation makes viewer navigation to misbehave
 // if passed a file with the same id (with different occurrenceKeys) or with the same dataURI twice
+exports.isSameIdentifier = isSameIdentifier;
 var getSelectedIndex = function getSelectedIndex(items, selectedItem) {
   return items.findIndex(function (item) {
-    if ((0, _mediaClient.isFileIdentifier)(item) && (0, _mediaClient.isFileIdentifier)(selectedItem)) {
-      return item.id === selectedItem.id;
-    }
-    if (!(0, _mediaClient.isFileIdentifier)(item) && !(0, _mediaClient.isFileIdentifier)(selectedItem)) {
-      return item.dataURI === selectedItem.dataURI;
-    }
-    return false;
+    return isSameIdentifier(item, selectedItem);
   });
 };
 exports.getSelectedIndex = getSelectedIndex;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "47.6.1",
+	"version": "48.0.1",
 	"sideEffects": false
 }

package/dist/es2019/analytics/index.js

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

package/dist/es2019/analytics/ufoExperiences.js

@@ -2,7 +2,7 @@ import { UFOExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atl
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 const packageName = "@atlaskit/media-viewer";
-const packageVersion = "47.6.1";
+const packageVersion = "48.0.1";
 let ufoExperience;
 const getExperience = () => {
   if (!ufoExperience) {

package/dist/es2019/components/media-viewer.js

@@ -1,6 +1,26 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { MediaViewer as MediaViewerNextGen } from '../media-viewer';
-import { normaliseInput } from './normaliseInput';
+import { isSameIdentifier } from '../utils';
+import { isFileIdentifier } from '@atlaskit/media-client';
+const ensureCollectionName = (identifier, collectionName) => isFileIdentifier(identifier) ? {
+  ...identifier,
+  collectionName: identifier.collectionName || collectionName
+} : identifier;
+const normaliseItems = (items, selectedItem, collectionName) => {
+  const selectedItemWithCollectionName = ensureCollectionName(selectedItem, collectionName);
+  let selectedIndex = -1;
+  const itemsWithCollectionName = items.map((item, index) => {
+    if (isSameIdentifier(item, selectedItemWithCollectionName)) {
+      selectedIndex = index;
+    }
+    return ensureCollectionName(item, collectionName);
+  });
+  const itemsWithSelectedItem = selectedIndex === -1 ? [selectedItem, ...itemsWithCollectionName] : itemsWithCollectionName;
+  return {
+    items: itemsWithSelectedItem,
+    selectedItem: selectedItemWithCollectionName
+  };
+};
 export const MediaViewer = ({
   featureFlags,
   onClose,
@@ -9,18 +29,12 @@ export const MediaViewer = ({
   collectionName,
   items,
   extensions,
-  contextId,
-  dataSource
+  contextId
 }) => {
   const {
-    normalisedSelectedItem,
-    normalisedItems
-  } = normaliseInput({
-    selectedItem,
-    collectionName,
-    items,
-    dataSource
-  });
+    items: normalisedItems,
+    selectedItem: normalisedSelectedItem
+  } = useMemo(() => normaliseItems(items, selectedItem, collectionName), [items, selectedItem, collectionName]);
   return /*#__PURE__*/React.createElement(MediaViewerNextGen, {
     mediaClient: mediaClient,
     selectedItem: normalisedSelectedItem,

package/dist/es2019/media-viewer.js

@@ -12,8 +12,6 @@ import { Content } from './content';
 import { Blanket, SidebarWrapper } from './styleWrappers';
 import { start } from 'perf-marks';
 import { mediaViewerPopupClass } from './classnames';
-import ErrorMessage from './errorMessage';
-import { MediaViewerError } from './errors';
 export class MediaViewerComponent extends React.Component {
   constructor(...args) {
     super(...args);
@@ -77,21 +75,9 @@ export class MediaViewerComponent extends React.Component {
       items,
       selectedItem
     } = this.props;
-    const firstItem = items === null || items === void 0 ? void 0 : items[0];
+    const firstItem = items[0];
     return selectedItem || firstItem;
   }
-  /**
-   * TODO: https://product-fabric.atlassian.net/browse/MEX-2207
-   * This error message is simulating the current error thrown by the backend when consumer provides a collection as datasource.
-   * This is displayed at this level when no items are provided from the parent component.
-   * This error message should be removed when the deprecated API is removed.
-   */
-  renderError() {
-    return /*#__PURE__*/React.createElement(ErrorMessage, {
-      fileId: 'undefined',
-      error: new MediaViewerError('collection-fetch-metadata', new Error('collection as datasource is no longer supported'))
-    });
-  }
   render() {
     const {
       mediaClient,
@@ -113,7 +99,7 @@ export class MediaViewerComponent extends React.Component {
     }), /*#__PURE__*/React.createElement(Content, {
       isSidebarVisible: isSidebarVisible,
       onClose: this.onContentClose
-    }, !items ? this.renderError() : /*#__PURE__*/React.createElement(List, {
+    }, /*#__PURE__*/React.createElement(List, {
       defaultSelectedItem: this.defaultSelectedItem || items[0],
       items: items,
       mediaClient: mediaClient,

package/dist/es2019/utils/index.js

@@ -1,18 +1,19 @@
 import { isFileIdentifier, getMediaTypeFromMimeType } from '@atlaskit/media-client';
 import { getType } from 'mime';
+export const isSameIdentifier = (id1, id2) => {
+  if (isFileIdentifier(id1) && isFileIdentifier(id2)) {
+    return id1.id === id2.id;
+  }
+  if (!isFileIdentifier(id1) && !isFileIdentifier(id2)) {
+    return id1.dataURI === id2.dataURI;
+  }
+  return false;
+};
 
 // TODO MS-1752 - current implementation makes viewer navigation to misbehave
 // if passed a file with the same id (with different occurrenceKeys) or with the same dataURI twice
 export const getSelectedIndex = (items, selectedItem) => {
-  return items.findIndex(item => {
-    if (isFileIdentifier(item) && isFileIdentifier(selectedItem)) {
-      return item.id === selectedItem.id;
-    }
-    if (!isFileIdentifier(item) && !isFileIdentifier(selectedItem)) {
-      return item.dataURI === selectedItem.dataURI;
-    }
-    return false;
-  });
+  return items.findIndex(item => isSameIdentifier(item, selectedItem));
 };
 export const getMediaTypeFromFilename = filename => {
   const mimeType = getMimeTypeFromFilename(filename);

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "47.6.1",
+	"version": "48.0.1",
 	"sideEffects": false
 }

package/dist/esm/analytics/index.js

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

package/dist/esm/analytics/ufoExperiences.js

@@ -5,7 +5,7 @@ import { UFOExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atl
 import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "47.6.1";
+var packageVersion = "48.0.1";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/esm/components/media-viewer.js

@@ -1,6 +1,31 @@
-import React from 'react';
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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 React, { useMemo } from 'react';
 import { MediaViewer as MediaViewerNextGen } from '../media-viewer';
-import { normaliseInput } from './normaliseInput';
+import { isSameIdentifier } from '../utils';
+import { isFileIdentifier } from '@atlaskit/media-client';
+var ensureCollectionName = function ensureCollectionName(identifier, collectionName) {
+  return isFileIdentifier(identifier) ? _objectSpread(_objectSpread({}, identifier), {}, {
+    collectionName: identifier.collectionName || collectionName
+  }) : identifier;
+};
+var normaliseItems = function normaliseItems(items, selectedItem, collectionName) {
+  var selectedItemWithCollectionName = ensureCollectionName(selectedItem, collectionName);
+  var selectedIndex = -1;
+  var itemsWithCollectionName = items.map(function (item, index) {
+    if (isSameIdentifier(item, selectedItemWithCollectionName)) {
+      selectedIndex = index;
+    }
+    return ensureCollectionName(item, collectionName);
+  });
+  var itemsWithSelectedItem = selectedIndex === -1 ? [selectedItem].concat(_toConsumableArray(itemsWithCollectionName)) : itemsWithCollectionName;
+  return {
+    items: itemsWithSelectedItem,
+    selectedItem: selectedItemWithCollectionName
+  };
+};
 export var MediaViewer = function MediaViewer(_ref) {
   var featureFlags = _ref.featureFlags,
     onClose = _ref.onClose,
@@ -9,16 +34,12 @@ export var MediaViewer = function MediaViewer(_ref) {
     collectionName = _ref.collectionName,
     items = _ref.items,
     extensions = _ref.extensions,
-    contextId = _ref.contextId,
-    dataSource = _ref.dataSource;
-  var _normaliseInput = normaliseInput({
-      selectedItem: selectedItem,
-      collectionName: collectionName,
-      items: items,
-      dataSource: dataSource
-    }),
-    normalisedSelectedItem = _normaliseInput.normalisedSelectedItem,
-    normalisedItems = _normaliseInput.normalisedItems;
+    contextId = _ref.contextId;
+  var _useMemo = useMemo(function () {
+      return normaliseItems(items, selectedItem, collectionName);
+    }, [items, selectedItem, collectionName]),
+    normalisedItems = _useMemo.items,
+    normalisedSelectedItem = _useMemo.selectedItem;
   return /*#__PURE__*/React.createElement(MediaViewerNextGen, {
     mediaClient: mediaClient,
     selectedItem: normalisedSelectedItem,

package/dist/esm/media-viewer.js

@@ -20,8 +20,6 @@ import { Content } from './content';
 import { Blanket, SidebarWrapper } from './styleWrappers';
 import { start } from 'perf-marks';
 import { mediaViewerPopupClass } from './classnames';
-import ErrorMessage from './errorMessage';
-import { MediaViewerError } from './errors';
 export var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
   _inherits(MediaViewerComponent, _React$Component);
   var _super = _createSuper(MediaViewerComponent);
@@ -89,24 +87,9 @@ export var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
         items = _this$props.items,
         selectedItem = _this$props.selectedItem;
-      var firstItem = items === null || items === void 0 ? void 0 : items[0];
+      var firstItem = items[0];
       return selectedItem || firstItem;
     }
-  }, {
-    key: "renderError",
-    value:
-    /**
-     * TODO: https://product-fabric.atlassian.net/browse/MEX-2207
-     * This error message is simulating the current error thrown by the backend when consumer provides a collection as datasource.
-     * This is displayed at this level when no items are provided from the parent component.
-     * This error message should be removed when the deprecated API is removed.
-     */
-    function renderError() {
-      return /*#__PURE__*/React.createElement(ErrorMessage, {
-        fileId: 'undefined',
-        error: new MediaViewerError('collection-fetch-metadata', new Error('collection as datasource is no longer supported'))
-      });
-    }
   }, {
     key: "render",
     value: function render() {
@@ -127,7 +110,7 @@ export var MediaViewerComponent = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/React.createElement(Content, {
         isSidebarVisible: isSidebarVisible,
         onClose: this.onContentClose
-      }, !items ? this.renderError() : /*#__PURE__*/React.createElement(List, {
+      }, /*#__PURE__*/React.createElement(List, {
         defaultSelectedItem: this.defaultSelectedItem || items[0],
         items: items,
         mediaClient: mediaClient,

package/dist/esm/utils/index.js

@@ -2,18 +2,21 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { isFileIdentifier, getMediaTypeFromMimeType } from '@atlaskit/media-client';
 import { getType } from 'mime';
+export var isSameIdentifier = function isSameIdentifier(id1, id2) {
+  if (isFileIdentifier(id1) && isFileIdentifier(id2)) {
+    return id1.id === id2.id;
+  }
+  if (!isFileIdentifier(id1) && !isFileIdentifier(id2)) {
+    return id1.dataURI === id2.dataURI;
+  }
+  return false;
+};
 
 // TODO MS-1752 - current implementation makes viewer navigation to misbehave
 // if passed a file with the same id (with different occurrenceKeys) or with the same dataURI twice
 export var getSelectedIndex = function getSelectedIndex(items, selectedItem) {
   return items.findIndex(function (item) {
-    if (isFileIdentifier(item) && isFileIdentifier(selectedItem)) {
-      return item.id === selectedItem.id;
-    }
-    if (!isFileIdentifier(item) && !isFileIdentifier(selectedItem)) {
-      return item.dataURI === selectedItem.dataURI;
-    }
-    return false;
+    return isSameIdentifier(item, selectedItem);
   });
 };
 export var getMediaTypeFromFilename = function getMediaTypeFromFilename(filename) {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "47.6.1",
+	"version": "48.0.1",
 	"sideEffects": false
 }

package/dist/types/components/media-viewer.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { MediaViewerProps } from './types';
-export declare const MediaViewer: ({ featureFlags, onClose, mediaClient, selectedItem, collectionName, items, extensions, contextId, dataSource, }: MediaViewerProps) => JSX.Element;
+export declare const MediaViewer: ({ featureFlags, onClose, mediaClient, selectedItem, collectionName, items, extensions, contextId, }: MediaViewerProps) => JSX.Element;

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

@@ -1,10 +1,6 @@
 import { Identifier, MediaClient } from '@atlaskit/media-client';
 import { MediaFeatureFlags } from '@atlaskit/media-common';
 import { ReactNode } from 'react';
-export interface MediaViewerDataSource {
-    list?: Array<Identifier>;
-    collectionName?: string;
-}
 export type FileStateFlags = {
     wasStatusProcessing: boolean;
     wasStatusUploading: boolean;
@@ -21,20 +17,8 @@ export interface MediaViewerExtensions {
 export interface MediaViewerProps {
     readonly mediaClient: MediaClient;
     readonly selectedItem: Identifier;
-    /**
-     * Data source for media viewer.
-     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-147 Internal documentation for deprecation (no external access)}}
-     * Use items property instead
-     */
-    readonly dataSource?: MediaViewerDataSource;
-    readonly items?: Array<Identifier>;
+    readonly items: Array<Identifier>;
     readonly collectionName: string;
-    /**
-     * The page size
-     * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-147 Internal documentation for deprecation (no external access)}}
-     * There is no replacement for this property.
-     */
-    readonly pageSize?: number;
     readonly onClose?: () => void;
     readonly featureFlags?: MediaFeatureFlags;
     readonly extensions?: MediaViewerExtensions;

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { default as MediaViewer } from './components/media-viewer-loader';
-export type { MediaViewerDataSource, MediaViewerExtensions, MediaViewerExtensionsActions, MediaViewerProps, } from './components/types';
+export type { MediaViewerExtensions, MediaViewerExtensionsActions, MediaViewerProps, } from './components/types';

package/dist/types/media-viewer.d.ts

@@ -10,11 +10,7 @@ export type Props = {
     selectedItem?: Identifier;
     featureFlags?: MediaFeatureFlags;
     mediaClient: MediaClient;
-    /**
-     * TODO: https://product-fabric.atlassian.net/browse/MEX-2207
-     * property should be mandatory
-     */
-    items?: Identifier[];
+    items: Identifier[];
     extensions?: MediaViewerExtensions;
     contextId?: string;
 } & WithAnalyticsEventsProps;
@@ -30,13 +26,6 @@ export declare class MediaViewerComponent extends React.Component<Props & Wrappe
     private toggleSidebar;
     private get defaultSelectedItem();
     renderSidebar: () => JSX.Element | undefined;
-    /**
-     * TODO: https://product-fabric.atlassian.net/browse/MEX-2207
-     * This error message is simulating the current error thrown by the backend when consumer provides a collection as datasource.
-     * This is displayed at this level when no items are provided from the parent component.
-     * This error message should be removed when the deprecated API is removed.
-     */
-    renderError(): JSX.Element;
     render(): JSX.Element;
     private onNavigationChange;
 }

package/dist/types/utils/index.d.ts

@@ -1,4 +1,5 @@
 import { Identifier, MediaType } from '@atlaskit/media-client';
+export declare const isSameIdentifier: (id1: Identifier, id2: Identifier) => boolean;
 export declare const getSelectedIndex: (items: Identifier[], selectedItem: Identifier) => number;
 export declare const getMediaTypeFromFilename: (filename: string) => MediaType;
 export declare const getMimeTypeFromFilename: (filename: string) => string;

package/dist/types-ts4.5/analytics/events/index.d.ts

@@ -0,0 +1,14 @@
+import { CommencedEventPayload } from './operational/commenced';
+import { LoadFailedEventPayload } from './operational/loadFailed';
+import { LoadSucceededEventPayload } from './operational/loadSucceeded';
+import { PreviewUnsupportedEventPayload } from './operational/previewUnsupported';
+import { ZipEntryLoadFailedEventPayload } from './operational/zipEntryLoadFailed';
+import { ZipEntryLoadSucceededEventPayload } from './operational/zipEntryLoadSucceeded';
+import { ModalEventPayload } from './screen/modal';
+import { ClosedEventPayload } from './ui/closed';
+import { DownloadButtonClickedEventPayload } from './ui/downloadButtonClicked';
+import { FailedPreviewDownloadButtonClickedEventPayload } from './ui/failedPreviewDownloadButtonClicked';
+import { NavigatedEventPayload } from './ui/navigated';
+import { ZoomInButtonClickEventPayload } from './ui/zoomInButtonClicked';
+import { ZoomOutButtonClickEventPayload } from './ui/zoomOutButtonClicked';
+export type MediaViewerEventPayload = CommencedEventPayload | LoadFailedEventPayload | LoadSucceededEventPayload | PreviewUnsupportedEventPayload | ZipEntryLoadFailedEventPayload | ZipEntryLoadSucceededEventPayload | ModalEventPayload | ClosedEventPayload | DownloadButtonClickedEventPayload | FailedPreviewDownloadButtonClickedEventPayload | NavigatedEventPayload | ZoomInButtonClickEventPayload | ZoomOutButtonClickEventPayload;

package/dist/types-ts4.5/analytics/events/operational/_mediaFile.d.ts

@@ -0,0 +1,3 @@
+import { OperationalEventPayload, OperationalAttributes } from '@atlaskit/media-common';
+/** common definition used by other mediaFile events */
+export type MediaFileEventPayload<Attributes extends OperationalAttributes, Action extends 'commenced' | 'loadSucceeded' | 'loadFailed' | 'previewUnsupported' | 'zipEntryLoadSucceeded' | 'zipEntryLoadFailed'> = OperationalEventPayload<Attributes, Action, 'mediaFile'>;

package/dist/types-ts4.5/analytics/events/operational/commenced.d.ts

@@ -0,0 +1,5 @@
+import { MediaTraceContext, WithFileAttributes, WithTraceContext } from '@atlaskit/media-common';
+import { MediaFileEventPayload } from './_mediaFile';
+export type CommencedAttributes = WithFileAttributes & WithTraceContext;
+export type CommencedEventPayload = MediaFileEventPayload<CommencedAttributes, 'commenced'>;
+export declare const createCommencedEvent: (fileId: string, traceContext: MediaTraceContext) => CommencedEventPayload;

package/dist/types-ts4.5/analytics/events/operational/loadFailed.d.ts

@@ -0,0 +1,7 @@
+import { FileState } from '@atlaskit/media-client';
+import { MediaFileEventPayload } from './_mediaFile';
+import { MediaViewerFailureAttributes } from '../..';
+import { MediaViewerError } from '../../../errors';
+import { MediaTraceContext } from '@atlaskit/media-common';
+export type LoadFailedEventPayload = MediaFileEventPayload<MediaViewerFailureAttributes, 'loadFailed'>;
+export declare const createLoadFailedEvent: (fileId: string, error: MediaViewerError, fileState?: FileState, traceContext?: MediaTraceContext) => LoadFailedEventPayload;

package/dist/types-ts4.5/analytics/events/operational/loadSucceeded.d.ts

@@ -0,0 +1,5 @@
+import { SuccessAttributes, WithFileAttributes, FileAttributes, MediaTraceContext, WithTraceContext } from '@atlaskit/media-common';
+import { MediaFileEventPayload } from './_mediaFile';
+export type LoadSucceededAttributes = SuccessAttributes & WithFileAttributes & WithTraceContext;
+export type LoadSucceededEventPayload = MediaFileEventPayload<LoadSucceededAttributes, 'loadSucceeded'>;
+export declare const createLoadSucceededEvent: ({ fileId, fileMediatype, fileMimetype, fileSize }: FileAttributes, traceContext?: MediaTraceContext) => LoadSucceededEventPayload;