@atlaskit/media-ui 28.2.1 → 28.2.3

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/media-ui
 
+## 28.2.3
+
+### Patch Changes
+
+- [#162842](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/162842)
+  [`d51dcb8ef3350`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d51dcb8ef3350) -
+  Add UFOCustomData to indicate existence of media component in performance metrics
+
+## 28.2.2
+
+### Patch Changes
+
+- [#134528](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134528)
+  [`61165836daa36`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/61165836daa36) -
+  [ux] Use latest media token on video resume or seek
+
+  Previously when resuming a video after the current token had expired the video player would fail
+  to load and would show an error boundary page.
+
+  The same bug would occur when seeking to a new `currentTime` after the token expired.
+
+  Now both the dedicated and inline player will update their `src` to a new URL with the latest
+  cached token.
+
+- Updated dependencies
+
 ## 28.2.1
 
 ### Patch Changes

package/dist/cjs/MediaInlineCard/Frame/styled-compiled.js

@@ -14,8 +14,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _colors = require("@atlaskit/theme/colors");
 var _excluded = ["isSelected", "children"];
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var selectedStyles = null;
 var notSelectedStyles = null;
 var wrapperStyles = null;

package/dist/cjs/MediaInlineCard/Icon-compiled.js

@@ -14,8 +14,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _excluded = ["alt"],
   _excluded2 = ["children"];
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // TODO: Figure out a more scalable/responsive solution
 // for vertical alignment.
 // Current rationale: vertically positioned at the top of

package/dist/cjs/MediaInlineCard/IconAndTitleLayout/styled-compiled.js

@@ -20,8 +20,7 @@ var _excluded = ["children"],
   _excluded6 = ["children"],
   _excluded7 = ["children"],
   _excluded8 = ["children"];
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // TODO: remove this override behaviour for @atlaskit/icon-object

package/dist/cjs/MediaInlineCard/LoadingView/styled-compiled.js

@@ -13,8 +13,7 @@ var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _excluded = ["children"];
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var spinnerWrapperStyles = null;
 var SpinnerWrapper = exports.SpinnerWrapper = function SpinnerWrapper(_ref) {
   var children = _ref.children,

package/dist/cjs/MediaInlineCard/styled-compiled.js

@@ -14,8 +14,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _colors = require("@atlaskit/theme/colors");
 var _excluded = ["children"];
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var noLinkAppearanceStyles = null;
 var NoLinkAppearance = exports.NoLinkAppearance = function NoLinkAppearance(_ref) {
   var children = _ref.children,

package/dist/cjs/abuseModal/abuseModal.js

@@ -13,8 +13,7 @@ var _closeCross = _interopRequireDefault(require("@atlaskit/icon/core/migration/
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _primitives = require("@atlaskit/primitives");
 var _messages = require("../messages");
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var gridStyles = (0, _primitives.xcss)({
   width: '100%'
 });

package/dist/cjs/customMediaPlayer/index-compiled.js

@@ -47,8 +47,7 @@ var _legacyCustomIcons = require("@atlaskit/legacy-custom-icons");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _videoSkipForwardTen = _interopRequireDefault(require("@atlaskit/icon/core/video-skip-forward-ten"));
 var _videoSkipBackwardTen = _interopRequireDefault(require("@atlaskit/icon/core/video-skip-backward-ten"));
-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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -138,13 +137,22 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       }
     });
     (0, _defineProperty2.default)(_this, "onTimeChanged", function () {
+      var _this$props3, _this$props3$onTimeCh;
       _this.createAndFireUIEvent('timeRangeNavigate', 'time');
+      (_this$props3 = _this.props) === null || _this$props3 === void 0 || (_this$props3$onTimeCh = _this$props3.onTimeChanged) === null || _this$props3$onTimeCh === void 0 || _this$props3$onTimeCh.call(_this$props3);
     });
     (0, _defineProperty2.default)(_this, "onVolumeChanged", function () {
       _this.createAndFireUIEvent('volumeRangeNavigate', 'volume');
     });
+    (0, _defineProperty2.default)(_this, "getDefaultTime", function () {
+      return _this.timeSaver.defaultTime;
+    });
     (0, _defineProperty2.default)(_this, "onCurrentTimeChange", function (currentTime, duration) {
-      if (duration - currentTime > MINIMUM_DURATION_BEFORE_SAVING_TIME) {
+      // We rely on the saved time when switching to the new source URL
+      // so we need to save it irrespective of elapsed time or video length
+      if ((0, _platformFeatureFlags.fg)('platform_media_resume_video_on_token_expiry')) {
+        _this.timeSaver.defaultTime = currentTime;
+      } else if (duration - currentTime > MINIMUM_DURATION_BEFORE_SAVING_TIME) {
         _this.timeSaver.defaultTime = currentTime;
       } else {
         _this.timeSaver.defaultTime = 0;
@@ -154,15 +162,16 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       var currentTime = _ref.currentTime,
         duration = _ref.duration;
       return /*#__PURE__*/_react.default.createElement(_styled.CurrentTime, {
-        draggable: false
+        draggable: false,
+        "data-testid": "current-time"
       }, (0, _formatDuration.formatDuration)(currentTime), " / ", (0, _formatDuration.formatDuration)(duration));
     });
     (0, _defineProperty2.default)(_this, "renderHDButton", function () {
-      var _this$props3 = _this.props,
-        type = _this$props3.type,
-        isHDAvailable = _this$props3.isHDAvailable,
-        isHDActive = _this$props3.isHDActive,
-        onHDToggleClick = _this$props3.onHDToggleClick;
+      var _this$props4 = _this.props,
+        type = _this$props4.type,
+        isHDAvailable = _this$props4.isHDAvailable,
+        isHDActive = _this$props4.isHDActive,
+        onHDToggleClick = _this$props4.onHDToggleClick;
       if (type === 'audio' || !isHDAvailable) {
         return;
       }
@@ -213,7 +222,9 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
           label: _this.props.intl.formatMessage(_messages.messages.volumeMuteButtonAria)
         }),
         "aria-pressed": videoState.isMuted
-      })), showSlider && /*#__PURE__*/_react.default.createElement(_styled.VolumeTimeRangeWrapper, null, /*#__PURE__*/_react.default.createElement(_volumeRange.default, {
+      })), showSlider && /*#__PURE__*/_react.default.createElement(_styled.VolumeTimeRangeWrapper, {
+        "data-testid": "volume-time-range-wrapper"
+      }, /*#__PURE__*/_react.default.createElement(_volumeRange.default, {
         onChange: actions.setVolume,
         currentVolume: videoState.volume,
         isAlwaysActive: true,
@@ -244,9 +255,9 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       }
     });
     (0, _defineProperty2.default)(_this, "renderFullScreenButton", function () {
-      var _this$props4 = _this.props,
-        formatMessage = _this$props4.intl.formatMessage,
-        type = _this$props4.type;
+      var _this$props5 = _this.props,
+        formatMessage = _this$props5.intl.formatMessage,
+        type = _this$props5.type;
       if (type === 'audio') {
         return;
       }
@@ -362,6 +373,7 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
     });
     (0, _defineProperty2.default)(_this, "renderSpinner", function () {
       return /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+        testId: "spinner",
         direction: "column",
         alignItems: "center",
         justifyContent: "center",
@@ -372,12 +384,16 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       }));
     });
     (0, _defineProperty2.default)(_this, "pause", function () {
+      var _this$props6, _this$props6$onPause;
       if (_this.actions) {
         _this.actions.pause();
       }
+      (_this$props6 = _this.props) === null || _this$props6 === void 0 || (_this$props6$onPause = _this$props6.onPause) === null || _this$props6$onPause === void 0 || _this$props6$onPause.call(_this$props6);
     });
     (0, _defineProperty2.default)(_this, "play", function () {
-      var onFirstPlay = _this.props.onFirstPlay;
+      var _this$props7 = _this.props,
+        onFirstPlay = _this$props7.onFirstPlay,
+        onPlay = _this$props7.onPlay;
       if (_this.actions) {
         _this.actions.play();
       }
@@ -387,6 +403,7 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
         _this.wasPlayedOnce = true;
         onFirstPlay();
       }
+      onPlay === null || onPlay === void 0 || onPlay();
     });
     (0, _defineProperty2.default)(_this, "getMediaButtonClickHandler", function (action, buttonType) {
       return function () {
@@ -405,13 +422,13 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       };
     });
     (0, _defineProperty2.default)(_this, "onViewed", function (videoState) {
-      var _this$props5 = _this.props,
-        createAnalyticsEvent = _this$props5.createAnalyticsEvent,
-        fileId = _this$props5.fileId,
-        isAutoPlay = _this$props5.isAutoPlay,
-        isHDAvailable = _this$props5.isHDAvailable,
-        isHDActive = _this$props5.isHDActive,
-        type = _this$props5.type;
+      var _this$props8 = _this.props,
+        createAnalyticsEvent = _this$props8.createAnalyticsEvent,
+        fileId = _this$props8.fileId,
+        isAutoPlay = _this$props8.isAutoPlay,
+        isHDAvailable = _this$props8.isHDAvailable,
+        isHDActive = _this$props8.isHDActive,
+        type = _this$props8.type;
       var _this$state2 = _this.state,
         isFullScreenEnabled = _this$state2.isFullScreenEnabled,
         playerSize = _this$state2.playerSize,
@@ -461,14 +478,14 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
   return (0, _createClass2.default)(CustomMediaPlayerBase, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props6 = this.props,
-        type = _this$props6.type,
-        fileId = _this$props6.fileId,
-        isAutoPlay = _this$props6.isAutoPlay,
-        isHDAvailable = _this$props6.isHDAvailable,
-        isHDActive = _this$props6.isHDActive,
-        onFirstPlay = _this$props6.onFirstPlay,
-        createAnalyticsEvent = _this$props6.createAnalyticsEvent;
+      var _this$props9 = this.props,
+        type = _this$props9.type,
+        fileId = _this$props9.fileId,
+        isAutoPlay = _this$props9.isAutoPlay,
+        isHDAvailable = _this$props9.isHDAvailable,
+        isHDActive = _this$props9.isHDActive,
+        onFirstPlay = _this$props9.onFirstPlay,
+        createAnalyticsEvent = _this$props9.createAnalyticsEvent;
       var _this$state3 = this.state,
         isFullScreenEnabled = _this$state3.isFullScreenEnabled,
         playerSize = _this$state3.playerSize,
@@ -486,12 +503,14 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
       }
       _simultaneousPlayManager.default.subscribe(this);
       if (isAutoPlay) {
+        var _this$props0, _this$props0$onPlay;
         _simultaneousPlayManager.default.pauseOthers(this);
         if (onFirstPlay) {
           this.fireFirstPlayedTrackEvent();
           this.wasPlayedOnce = true;
           onFirstPlay();
         }
+        (_this$props0 = this.props) === null || _this$props0 === void 0 || (_this$props0$onPlay = _this$props0.onPlay) === null || _this$props0$onPlay === void 0 || _this$props0$onPlay.call(_this$props0);
       }
     }
   }, {
@@ -501,8 +520,8 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
         this.videoWrapperRef.current.removeEventListener('fullscreenchange', this.onFullScreenChange);
       }
       if (this.state.isFullScreenEnabled) {
-        var _this$props$onFullscr2, _this$props7;
-        (_this$props$onFullscr2 = (_this$props7 = this.props).onFullscreenChange) === null || _this$props$onFullscr2 === void 0 || _this$props$onFullscr2.call(_this$props7, false);
+        var _this$props$onFullscr2, _this$props1;
+        (_this$props$onFullscr2 = (_this$props1 = this.props).onFullscreenChange) === null || _this$props$onFullscr2 === void 0 || _this$props$onFullscr2.call(_this$props1, false);
       }
       _simultaneousPlayManager.default.unsubscribe(this);
     }
@@ -518,13 +537,13 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
   }, {
     key: "createAndFireUIEvent",
     value: function createAndFireUIEvent(eventType, actionSubjectId) {
-      var _this$props8 = this.props,
-        type = _this$props8.type,
-        fileId = _this$props8.fileId,
-        isHDActive = _this$props8.isHDActive,
-        isHDAvailable = _this$props8.isHDAvailable,
-        isAutoPlay = _this$props8.isAutoPlay,
-        createAnalyticsEvent = _this$props8.createAnalyticsEvent;
+      var _this$props10 = this.props,
+        type = _this$props10.type,
+        fileId = _this$props10.fileId,
+        isHDActive = _this$props10.isHDActive,
+        isHDAvailable = _this$props10.isHDAvailable,
+        isAutoPlay = _this$props10.isAutoPlay,
+        createAnalyticsEvent = _this$props10.createAnalyticsEvent;
       var _this$state4 = this.state,
         isFullScreenEnabled = _this$state4.isFullScreenEnabled,
         playerSize = _this$state4.playerSize,
@@ -571,24 +590,25 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$props9 = this.props,
-        type = _this$props9.type,
-        src = _this$props9.src,
-        isAutoPlay = _this$props9.isAutoPlay,
-        onCanPlay = _this$props9.onCanPlay,
-        onError = _this$props9.onError,
-        poster = _this$props9.poster,
-        videoControlsWrapperRef = _this$props9.videoControlsWrapperRef;
+      var _this$props11 = this.props,
+        type = _this$props11.type,
+        src = _this$props11.src,
+        isAutoPlay = _this$props11.isAutoPlay,
+        onCanPlay = _this$props11.onCanPlay,
+        onError = _this$props11.onError,
+        poster = _this$props11.poster,
+        videoControlsWrapperRef = _this$props11.videoControlsWrapperRef;
       return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
         xcss: customVideoWrapperStyles.root,
         ref: this.videoWrapperRef,
         testId: "custom-media-player"
       }, /*#__PURE__*/_react.default.createElement(_reactVideoRenderer.default, {
+        "data-testid": "media-player",
         sourceType: type,
         src: src,
         autoPlay: isAutoPlay,
         onCanPlay: onCanPlay,
-        defaultTime: this.timeSaver.defaultTime,
+        defaultTime: this.getDefaultTime,
         onTimeChange: this.onCurrentTimeChange,
         onError: onError,
         poster: poster
@@ -611,11 +631,19 @@ var CustomMediaPlayerBase = exports.CustomMediaPlayerBase = /*#__PURE__*/functio
           var skipAmount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultSkipAmount;
           var newTime = videoState.currentTime - skipAmount;
           actions.navigate(Math.max(newTime, 0));
+          if ((0, _platformFeatureFlags.fg)('platform_media_resume_video_on_token_expiry')) {
+            var _this2$props, _this2$props$onTimeCh;
+            (_this2$props = _this2.props) === null || _this2$props === void 0 || (_this2$props$onTimeCh = _this2$props.onTimeChanged) === null || _this2$props$onTimeCh === void 0 || _this2$props$onTimeCh.call(_this2$props);
+          }
         };
         var skipForward = function skipForward() {
           var skipAmount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultSkipAmount;
           var newTime = videoState.currentTime + skipAmount;
           actions.navigate(Math.min(newTime, videoState.duration));
+          if ((0, _platformFeatureFlags.fg)('platform_media_resume_video_on_token_expiry')) {
+            var _this2$props2, _this2$props2$onTimeC;
+            (_this2$props2 = _this2.props) === null || _this2$props2 === void 0 || (_this2$props2$onTimeC = _this2$props2.onTimeChanged) === null || _this2$props2$onTimeC === void 0 || _this2$props2$onTimeC.call(_this2$props2);
+          }
         };
         var shortcuts = _this2.renderShortcuts({
           togglePlayPauseAction: isPlaying ? _this2.pause : _this2.play,