@atlaskit/media-viewer 52.0.16 → 52.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/media-viewer
 
+## 52.1.0
+
+### Minor Changes
+
+- [#153282](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/153282)
+  [`b271b4820aef9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b271b4820aef9) -
+  Added support for Video Captions (experimental)
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 52.0.16
 
 ### 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.0.16";
+var packageVersion = exports.packageVersion = "52.1.0";
 function getFileAttributes(fileState) {
   if (!fileState) {
     return {

package/dist/cjs/analytics/ufoExperiences.js

@@ -12,7 +12,7 @@ var _mediaCommon = require("@atlaskit/media-common");
 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.0.16";
+var packageVersion = "52.1.0";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

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

@@ -13,6 +13,7 @@ var _mediaViewer = require("../media-viewer");
 var _utils = require("../utils");
 var _mediaClient = require("@atlaskit/media-client");
 var _mediaClientReact = require("@atlaskit/media-client-react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; }
@@ -90,6 +91,9 @@ var MediaViewerBase = exports.MediaViewerBase = function MediaViewerBase(_ref) {
 // export const MediaViewerWithMediaClient = withMediaClient(MediaViewerBase)
 var MediaViewerWithMediaClient = exports.MediaViewerWithMediaClient = function MediaViewerWithMediaClient(props) {
   var ViewerComponent = _react.default.useMemo(function () {
+    if ((0, _platformFeatureFlags.fg)('platform_media_video_captions')) {
+      return (0, _mediaClientReact.withMediaClientAndSettings)(MediaViewerBase);
+    }
     return (0, _mediaClientReact.withMediaClient)(MediaViewerBase);
   }, []);
   return /*#__PURE__*/_react.default.createElement(ViewerComponent, props);

package/dist/cjs/item-viewer.js

@@ -266,6 +266,7 @@ var ItemViewerBase = exports.ItemViewerBase = function ItemViewerBase(_ref) {
         }, viewerProps));
       case 'video':
         return /*#__PURE__*/_react.default.createElement(VideoViewer, (0, _extends2.default)({
+          identifier: identifier,
           showControls: showControls,
           onCanPlay: onSuccess,
           onError: onLoadFail

package/dist/cjs/viewers/video.js

@@ -79,14 +79,30 @@ var VideoViewer = exports.VideoViewer = /*#__PURE__*/function (_BaseViewer) {
       var _this$props2 = this.props,
         item = _this$props2.item,
         showControls = _this$props2.showControls,
-        previewCount = _this$props2.previewCount;
+        previewCount = _this$props2.previewCount,
+        identifier = _this$props2.identifier;
       var useCustomVideoPlayer = !(0, _isIE.isIE)();
       var isAutoPlay = previewCount === 0;
       var hdAvailable = isHDAvailable(item);
       var hdActiveOverride = (0, _platformFeatureFlags.fg)('platform_media_disable_video_640p_artifact_usage') ? hdAvailable : isHDActive;
       return useCustomVideoPlayer ? /*#__PURE__*/_react.default.createElement(_styleWrappers.CustomVideoPlayerWrapper, {
         "data-testid": "media-viewer-video-content"
-      }, /*#__PURE__*/_react.default.createElement(_mediaUi.CustomMediaPlayer, {
+      }, (0, _mediaClient.isFileIdentifier)(identifier) && (0, _platformFeatureFlags.fg)('platform_media_video_captions') ? /*#__PURE__*/_react.default.createElement(_mediaUi.MediaPlayer, {
+        identifier: identifier,
+        type: "video",
+        isAutoPlay: isAutoPlay,
+        onHDToggleClick: this.onHDChange,
+        showControls: showControls,
+        src: content,
+        isHDActive: hdActiveOverride,
+        isHDAvailable: hdAvailable,
+        isShortcutEnabled: true,
+        onFirstPlay: this.onFirstPlay,
+        onError: this.onError,
+        lastWatchTimeConfig: {
+          contentId: item.id
+        }
+      }) : /*#__PURE__*/_react.default.createElement(_mediaUi.CustomMediaPlayer, {
         type: "video",
         isAutoPlay: isAutoPlay,
         onHDToggleClick: this.onHDChange,

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.0.16";
+const packageVersion = "52.1.0";
 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 = "52.0.16";
+const packageVersion = "52.1.0";
 let ufoExperience;
 const getExperience = () => {
   if (!ufoExperience) {

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

@@ -2,7 +2,8 @@ import React, { useEffect, useMemo } from 'react';
 import { MediaViewer as MediaViewerNextGen } from '../media-viewer';
 import { isSameIdentifier } from '../utils';
 import { isFileIdentifier } from '@atlaskit/media-client';
-import { withMediaClient } from '@atlaskit/media-client-react';
+import { withMediaClient, withMediaClientAndSettings } from '@atlaskit/media-client-react';
+import { fg } from '@atlaskit/platform-feature-flags';
 const ensureCollectionName = (identifier, collectionName) => isFileIdentifier(identifier) ? {
   ...identifier,
   collectionName: identifier.collectionName || collectionName
@@ -75,6 +76,9 @@ export const MediaViewerBase = ({
 // export const MediaViewerWithMediaClient = withMediaClient(MediaViewerBase)
 export const MediaViewerWithMediaClient = props => {
   const ViewerComponent = React.useMemo(() => {
+    if (fg('platform_media_video_captions')) {
+      return withMediaClientAndSettings(MediaViewerBase);
+    }
     return withMediaClient(MediaViewerBase);
   }, []);
   return /*#__PURE__*/React.createElement(ViewerComponent, props);

package/dist/es2019/item-viewer.js

@@ -203,6 +203,7 @@ export const ItemViewerBase = ({
         }, viewerProps));
       case 'video':
         return /*#__PURE__*/React.createElement(VideoViewer, _extends({
+          identifier: identifier,
           showControls: showControls,
           onCanPlay: onSuccess,
           onError: onLoadFail

package/dist/es2019/viewers/video.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import { getArtifactUrl, globalMediaEventEmitter } from '@atlaskit/media-client';
-import { CustomMediaPlayer } from '@atlaskit/media-ui';
+import { getArtifactUrl, globalMediaEventEmitter, isFileIdentifier } from '@atlaskit/media-client';
+import { CustomMediaPlayer, MediaPlayer } from '@atlaskit/media-ui';
 import { Outcome } from '../domain';
 import { MediaViewerError } from '../errors';
 import { Video, CustomVideoPlayerWrapper } from '../styleWrappers';
@@ -59,7 +59,8 @@ export class VideoViewer extends BaseViewer {
     const {
       item,
       showControls,
-      previewCount
+      previewCount,
+      identifier
     } = this.props;
     const useCustomVideoPlayer = !isIE();
     const isAutoPlay = previewCount === 0;
@@ -67,7 +68,22 @@ export class VideoViewer extends BaseViewer {
     const hdActiveOverride = fg('platform_media_disable_video_640p_artifact_usage') ? hdAvailable : isHDActive;
     return useCustomVideoPlayer ? /*#__PURE__*/React.createElement(CustomVideoPlayerWrapper, {
       "data-testid": "media-viewer-video-content"
-    }, /*#__PURE__*/React.createElement(CustomMediaPlayer, {
+    }, isFileIdentifier(identifier) && fg('platform_media_video_captions') ? /*#__PURE__*/React.createElement(MediaPlayer, {
+      identifier: identifier,
+      type: "video",
+      isAutoPlay: isAutoPlay,
+      onHDToggleClick: this.onHDChange,
+      showControls: showControls,
+      src: content,
+      isHDActive: hdActiveOverride,
+      isHDAvailable: hdAvailable,
+      isShortcutEnabled: true,
+      onFirstPlay: this.onFirstPlay,
+      onError: this.onError,
+      lastWatchTimeConfig: {
+        contentId: item.id
+      }
+    }) : /*#__PURE__*/React.createElement(CustomMediaPlayer, {
       type: "video",
       isAutoPlay: isAutoPlay,
       onHDToggleClick: this.onHDChange,

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.0.16";
+var packageVersion = "52.1.0";
 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 = "52.0.16";
+var packageVersion = "52.1.0";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

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

@@ -6,7 +6,8 @@ import React, { useEffect, useMemo } from 'react';
 import { MediaViewer as MediaViewerNextGen } from '../media-viewer';
 import { isSameIdentifier } from '../utils';
 import { isFileIdentifier } from '@atlaskit/media-client';
-import { withMediaClient } from '@atlaskit/media-client-react';
+import { withMediaClient, withMediaClientAndSettings } from '@atlaskit/media-client-react';
+import { fg } from '@atlaskit/platform-feature-flags';
 var ensureCollectionName = function ensureCollectionName(identifier, collectionName) {
   return isFileIdentifier(identifier) ? _objectSpread(_objectSpread({}, identifier), {}, {
     collectionName: identifier.collectionName || collectionName
@@ -80,6 +81,9 @@ export var MediaViewerBase = function MediaViewerBase(_ref) {
 // export const MediaViewerWithMediaClient = withMediaClient(MediaViewerBase)
 export var MediaViewerWithMediaClient = function MediaViewerWithMediaClient(props) {
   var ViewerComponent = React.useMemo(function () {
+    if (fg('platform_media_video_captions')) {
+      return withMediaClientAndSettings(MediaViewerBase);
+    }
     return withMediaClient(MediaViewerBase);
   }, []);
   return /*#__PURE__*/React.createElement(ViewerComponent, props);

package/dist/esm/item-viewer.js

@@ -244,6 +244,7 @@ export var ItemViewerBase = function ItemViewerBase(_ref) {
         }, viewerProps));
       case 'video':
         return /*#__PURE__*/React.createElement(VideoViewer, _extends({
+          identifier: identifier,
           showControls: showControls,
           onCanPlay: onSuccess,
           onError: onLoadFail

package/dist/esm/viewers/video.js

@@ -9,8 +9,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
 import React from 'react';
-import { getArtifactUrl, globalMediaEventEmitter } from '@atlaskit/media-client';
-import { CustomMediaPlayer } from '@atlaskit/media-ui';
+import { getArtifactUrl, globalMediaEventEmitter, isFileIdentifier } from '@atlaskit/media-client';
+import { CustomMediaPlayer, MediaPlayer } from '@atlaskit/media-ui';
 import { Outcome } from '../domain';
 import { MediaViewerError } from '../errors';
 import { Video, CustomVideoPlayerWrapper } from '../styleWrappers';
@@ -72,14 +72,30 @@ export var VideoViewer = /*#__PURE__*/function (_BaseViewer) {
       var _this$props2 = this.props,
         item = _this$props2.item,
         showControls = _this$props2.showControls,
-        previewCount = _this$props2.previewCount;
+        previewCount = _this$props2.previewCount,
+        identifier = _this$props2.identifier;
       var useCustomVideoPlayer = !isIE();
       var isAutoPlay = previewCount === 0;
       var hdAvailable = isHDAvailable(item);
       var hdActiveOverride = fg('platform_media_disable_video_640p_artifact_usage') ? hdAvailable : isHDActive;
       return useCustomVideoPlayer ? /*#__PURE__*/React.createElement(CustomVideoPlayerWrapper, {
         "data-testid": "media-viewer-video-content"
-      }, /*#__PURE__*/React.createElement(CustomMediaPlayer, {
+      }, isFileIdentifier(identifier) && fg('platform_media_video_captions') ? /*#__PURE__*/React.createElement(MediaPlayer, {
+        identifier: identifier,
+        type: "video",
+        isAutoPlay: isAutoPlay,
+        onHDToggleClick: this.onHDChange,
+        showControls: showControls,
+        src: content,
+        isHDActive: hdActiveOverride,
+        isHDAvailable: hdAvailable,
+        isShortcutEnabled: true,
+        onFirstPlay: this.onFirstPlay,
+        onError: this.onError,
+        lastWatchTimeConfig: {
+          contentId: item.id
+        }
+      }) : /*#__PURE__*/React.createElement(CustomMediaPlayer, {
         type: "video",
         isAutoPlay: isAutoPlay,
         onHDToggleClick: this.onHDChange,

package/dist/types/viewers/video.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
-import { type MediaClient, type FileState } from '@atlaskit/media-client';
+import { type MediaClient, type FileState, type Identifier } from '@atlaskit/media-client';
 import { type WithShowControlMethodProp } from '@atlaskit/media-ui';
 import { Outcome } from '../domain';
 import { MediaViewerError } from '../errors';
 import { type BaseState, BaseViewer } from './base-viewer';
 import { type MediaTraceContext } from '@atlaskit/media-common';
 export type Props = Readonly<{
+    identifier: Identifier;
     item: FileState;
     mediaClient: MediaClient;
     collectionName?: string;

package/dist/types-ts4.5/viewers/video.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
-import { type MediaClient, type FileState } from '@atlaskit/media-client';
+import { type MediaClient, type FileState, type Identifier } from '@atlaskit/media-client';
 import { type WithShowControlMethodProp } from '@atlaskit/media-ui';
 import { Outcome } from '../domain';
 import { MediaViewerError } from '../errors';
 import { type BaseState, BaseViewer } from './base-viewer';
 import { type MediaTraceContext } from '@atlaskit/media-common';
 export type Props = Readonly<{
+    identifier: Identifier;
     item: FileState;
     mediaClient: MediaClient;
     collectionName?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "52.0.16",
+	"version": "52.1.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/"
@@ -37,26 +37,26 @@
 	},
 	"dependencies": {
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/button": "^23.0.0",
+		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/code": "^17.2.0",
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/heading": "^5.2.0",
-		"@atlaskit/icon": "^26.0.0",
+		"@atlaskit/icon": "^26.1.0",
 		"@atlaskit/icon-file-type": "^7.0.0",
-		"@atlaskit/icon-lab": "^4.12.0",
+		"@atlaskit/icon-lab": "^4.13.0",
 		"@atlaskit/media-client": "^33.3.0",
 		"@atlaskit/media-client-react": "^4.1.0",
-		"@atlaskit/media-common": "^12.0.0",
-		"@atlaskit/media-svg": "^2.0.0",
-		"@atlaskit/media-ui": "^28.1.0",
+		"@atlaskit/media-common": "^12.1.0",
+		"@atlaskit/media-svg": "^2.1.0",
+		"@atlaskit/media-ui": "^28.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/portal": "^5.1.0",
-		"@atlaskit/primitives": "^14.7.0",
-		"@atlaskit/side-navigation": "^10.0.0",
+		"@atlaskit/primitives": "^14.8.0",
+		"@atlaskit/side-navigation": "^10.1.0",
 		"@atlaskit/spinner": "^18.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tokens": "^4.8.0",
+		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -114,6 +114,9 @@
 		},
 		"platform_media_compiled": {
 			"type": "boolean"
+		},
+		"platform_media_video_captions": {
+			"type": "boolean"
 		}
 	},
 	"techstack": {