@desynova-digital/player 4.0.102 → 4.0.104

package/components/Player.js

@@ -446,6 +446,18 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
       this.actions.seek(start_time);
       this.actions.handleVideoPreview(true);
     }
+  }, {
+    key: "exitFullScreenMode",
+    value: function exitFullScreenMode() {
+      var _this$manager$getStat2 = this.manager.getState(),
+        player = _this$manager$getStat2.player;
+      var onRightMenuVisible = this.props.onRightMenuVisible;
+      this.actions.toggleFullscreen(player);
+      // Trigger UI change based for exit
+      var isFull = player === null || player === void 0 ? void 0 : player.isFullscreen;
+      onRightMenuVisible(isFull);
+      this.actions.toggleRightBar(player, isFull);
+    }
   }, {
     key: "getDefaultChildren",
     value: function getDefaultChildren(props, fullProps) {
@@ -798,8 +810,8 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleResize",
     value: function handleResize() {
-      var _this$manager$getStat2 = this.manager.getState(),
-        player = _this$manager$getStat2.player;
+      var _this$manager$getStat3 = this.manager.getState(),
+        player = _this$manager$getStat3.player;
       var leftSectionRef = this._leftSectionRef;
       var rightSectionRef = this._rightSectionRef;
       var audioMeterBlock = this._audioMeterBlock;
@@ -962,8 +974,8 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleBlur",
     value: function handleBlur() {
-      var _this$manager$getStat3 = this.manager.getState(),
-        player = _this$manager$getStat3.player;
+      var _this$manager$getStat4 = this.manager.getState(),
+        player = _this$manager$getStat4.player;
       if (player.isFullscreen) return;
       this.actions.activate(false);
     }
@@ -981,8 +993,8 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this6 = this,
         _props$player;
-      var _this$manager$getStat4 = this.manager.getState(),
-        player = _this$manager$getStat4.player;
+      var _this$manager$getStat5 = this.manager.getState(),
+        player = _this$manager$getStat5.player;
       var props = _objectSpread(_objectSpread({}, this.props), {}, {
         player: player,
         actions: this.actions,

package/components/Video.js

@@ -197,6 +197,12 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         formattedTime: currentFormattedTime
       };
     });
+    _defineProperty(_this, "isFullscreenWithRightMenu", function () {
+      var _this$props3 = _this.props,
+        player = _this$props3.player,
+        isRightMenuVisible = _this$props3.isRightMenuVisible;
+      return !!(player !== null && player !== void 0 && player.isFullscreen && isRightMenuVisible);
+    });
     _this.state = {
       audioTracks: [],
       isM3U8: false,
@@ -215,7 +221,12 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       isBuffering: false,
       currentSubtitleObj: {},
       shouldShowAnnotate: false,
-      annotationsVersion: 0
+      annotationsVersion: 0,
+      svgSize: {
+        width: 0,
+        height: 0
+      },
+      calculatedHeight: null
     };
     _this.video = null; // the html5 video
     _this.manager = new _Manager["default"](props.store);
@@ -255,12 +266,16 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     _this.handleKeypress = _this.handleKeypress.bind(_this);
     _this.audioVisualizer = _this.audioVisualizer.bind(_this);
     _this.checkWatermark = _this.checkWatermark.bind(_this);
+    _this.updateSvgSize = _this.updateSvgSize.bind(_this);
+    _this.disconnectResizeObserver = _this.disconnectResizeObserver.bind(_this);
+    _this.calculateHeightBasedOnResolution = _this.calculateHeightBasedOnResolution.bind(_this);
     return _this;
   }
   _inherits(Video, _Component);
   return _createClass(Video, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var _this2 = this;
       var src = this.props.src;
       var isM3U8 = src.split('.').pop() === 'm3u8' ? true : false;
       this.setState({
@@ -280,33 +295,52 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         watermarkInterval: watermarkInterval
       });
       if (this.video) {
-        this.video.addEventListener("timeupdate", this.onVideoTimeUpdate);
+        this.video.addEventListener('timeupdate', this.onVideoTimeUpdate);
+        this.video.addEventListener('loadedmetadata', this.calculateHeightBasedOnResolution);
+      }
+      window.addEventListener('resize', this.calculateHeightBasedOnResolution);
+      this.updateSvgSize();
+      this.calculateHeightBasedOnResolution();
+      if (typeof ResizeObserver !== 'undefined' && this.playerBlock) {
+        this.resizeObserver = new ResizeObserver(function () {
+          _this2.updateSvgSize();
+          _this2.calculateHeightBasedOnResolution();
+        });
+        this.resizeObserver.observe(this.playerBlock);
       }
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this2 = this;
-      var _this$props3 = this.props,
-        parentAnnotations = _this$props3.parentAnnotations,
-        inTime = _this$props3.inTime,
-        outTime = _this$props3.outTime;
+      var _this3 = this,
+        _prevProps$player;
+      var _this$props4 = this.props,
+        parentAnnotations = _this$props4.parentAnnotations,
+        inTime = _this$props4.inTime,
+        outTime = _this$props4.outTime,
+        isRightMenuVisible = _this$props4.isRightMenuVisible,
+        player = _this$props4.player;
       var hasNewAnnotations = JSON.stringify(parentAnnotations) !== JSON.stringify(prevProps.parentAnnotations);
       if (hasNewAnnotations) {
         Promise.resolve().then(function () {
-          _this2.setState(function (prevState) {
+          _this3.setState(function (prevState) {
             return {
               annotationsVersion: (prevState.annotationsVersion || 0) + 1
             };
           });
         });
       }
+      if (isRightMenuVisible !== prevProps.isRightMenuVisible || (player === null || player === void 0 ? void 0 : player.isFullscreen) !== ((_prevProps$player = prevProps.player) === null || _prevProps$player === void 0 ? void 0 : _prevProps$player.isFullscreen)) {
+        this.updateSvgSize();
+        this.calculateHeightBasedOnResolution();
+      }
       if (this.props.isSvgLayer && this.props.isSvgLayer !== prevProps.isSvgLayer) {
         this.toggleViaAnnotatePlay();
       }
       if (inTime !== prevProps.inTime || outTime !== prevProps.outTime) {
         this.updateAnnotateVisibility();
       }
+      this.updateSvgSize();
     }
   }, {
     key: "componentWillUnmount",
@@ -321,8 +355,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       }
       clearInterval(watermarkInterval);
       if (this.video) {
-        this.video.removeEventListener("timeupdate", this.onVideoTimeUpdate);
+        this.video.removeEventListener('timeupdate', this.onVideoTimeUpdate);
+        this.video.removeEventListener('loadedmetadata', this.calculateHeightBasedOnResolution);
       }
+      window.removeEventListener('resize', this.calculateHeightBasedOnResolution);
+      this.disconnectResizeObserver();
     }
   }, {
     key: "checkWatermark",
@@ -332,9 +369,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
      */
     function checkWatermark() {
       var watermark = this.state.watermark;
-      var _this$props4 = this.props,
-        onPlayerClose = _this$props4.onPlayerClose,
-        userEmail = _this$props4.userEmail;
+      var _this$props5 = this.props,
+        onPlayerClose = _this$props5.onPlayerClose,
+        userEmail = _this$props5.userEmail;
       var watermark_text = document.querySelector('#watermark-text');
       var video_player = null;
       var watermark_dimension = null;
@@ -366,10 +403,10 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "setupHLS",
     value: function setupHLS(src) {
-      var _this3 = this;
-      var _this$props5 = this.props,
-        actions = _this$props5.actions,
-        activeTrackIndex = _this$props5.activeTrackIndex;
+      var _this4 = this;
+      var _this$props6 = this.props,
+        actions = _this$props6.actions,
+        activeTrackIndex = _this$props6.activeTrackIndex;
       var self = this;
       // bind them together
       this.hls.attachMedia(this.video);
@@ -390,18 +427,18 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
           switch (data.type) {
             case _hls["default"].ErrorTypes.NETWORK_ERROR:
               // try to recover network error
-              _this3.hls.startLoad();
+              _this4.hls.startLoad();
               break;
             case _hls["default"].ErrorTypes.MEDIA_ERROR:
-              _this3.hls.recoverMediaError();
+              _this4.hls.recoverMediaError();
               break;
             default:
               // cannot recover
-              _this3.hls.destroy();
+              _this4.hls.destroy();
               break;
           }
         } else if (data.details === 'internalException' && data.type === 'otherError' || data.details === 'bufferStalledError' && data.type === 'mediaError') {
-          _this3.hls.startLoad();
+          _this4.hls.startLoad();
         }
       });
     }
@@ -491,16 +528,16 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "getStyle",
     value: function getStyle() {
-      var _this$props6 = this.props,
-        fluid = _this$props6.fluid,
-        noRightComponent = _this$props6.noRightComponent;
+      var _this$props7 = this.props,
+        fluid = _this$props7.fluid,
+        noRightComponent = _this$props7.noRightComponent;
       var _this$manager$getStat2 = this.manager.getState(),
         player = _this$manager$getStat2.player;
       var style = {};
-      var _this$props7 = this.props,
-        aspectRatio = _this$props7.aspectRatio,
-        width = _this$props7.width,
-        height = _this$props7.height;
+      var _this$props8 = this.props,
+        aspectRatio = _this$props8.aspectRatio,
+        width = _this$props8.width,
+        height = _this$props8.height;
       /*
        * The aspect ratio is either used directly
        * or to calculate width and height.
@@ -541,12 +578,12 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "getProperties",
     value: function getProperties() {
-      var _this4 = this;
+      var _this5 = this;
       if (!this.video) {
         return null;
       }
       return _utils.mediaProperties.reduce(function (properties, key) {
-        properties[key] = _this4.video[key];
+        properties[key] = _this5.video[key];
         return properties;
       }, {});
     }
@@ -604,12 +641,12 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(newProps) {
-      var _this$props8 = this.props,
-        src = _this$props8.src,
-        activeAudio = _this$props8.player.activeAudio,
-        currentSubtitleObj = _this$props8.currentSubtitleObj,
-        markers = _this$props8.markers,
-        playerType = _this$props8.playerType;
+      var _this$props9 = this.props,
+        src = _this$props9.src,
+        activeAudio = _this$props9.player.activeAudio,
+        currentSubtitleObj = _this$props9.currentSubtitleObj,
+        markers = _this$props9.markers,
+        playerType = _this$props9.playerType;
       if (markers && markers !== newProps.markers && newProps.markers) {
         this.displaySubtitle(newProps.markers);
       }
@@ -770,9 +807,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "toggleFullscreen",
     value: function toggleFullscreen() {
-      var _this$props9 = this.props,
-        player = _this$props9.player,
-        actions = _this$props9.actions;
+      var _this$props10 = this.props,
+        player = _this$props10.player,
+        actions = _this$props10.actions;
       actions.toggleFullscreen(player);
     }
 
@@ -783,10 +820,10 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleLoadStart",
     value: function handleLoadStart() {
-      var _this$props10 = this.props,
-        actions = _this$props10.actions,
-        onLoadStart = _this$props10.onLoadStart,
-        fileType = _this$props10.fileType;
+      var _this$props11 = this.props,
+        actions = _this$props11.actions,
+        onLoadStart = _this$props11.onLoadStart,
+        fileType = _this$props11.fileType;
       if (fileType === 'audio') {
         this.audioVisualizer();
       }
@@ -803,9 +840,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleCanPlay",
     value: function handleCanPlay() {
-      var _this$props11 = this.props,
-        actions = _this$props11.actions,
-        onCanPlay = _this$props11.onCanPlay;
+      var _this$props12 = this.props,
+        actions = _this$props12.actions,
+        onCanPlay = _this$props12.onCanPlay;
       actions.handleCanPlay(this.getProperties());
       if (onCanPlay) {
         onCanPlay.apply(void 0, arguments);
@@ -819,9 +856,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleCanPlayThrough",
     value: function handleCanPlayThrough() {
-      var _this$props12 = this.props,
-        actions = _this$props12.actions,
-        onCanPlayThrough = _this$props12.onCanPlayThrough;
+      var _this$props13 = this.props,
+        actions = _this$props13.actions,
+        onCanPlayThrough = _this$props13.onCanPlayThrough;
       actions.handleCanPlayThrough(this.getProperties());
       if (onCanPlayThrough) {
         onCanPlayThrough.apply(void 0, arguments);
@@ -835,9 +872,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handlePlaying",
     value: function handlePlaying() {
-      var _this$props13 = this.props,
-        actions = _this$props13.actions,
-        onPlaying = _this$props13.onPlaying;
+      var _this$props14 = this.props,
+        actions = _this$props14.actions,
+        onPlaying = _this$props14.onPlaying;
       actions.handlePlaying(this.getProperties());
       if (onPlaying) {
         onPlaying.apply(void 0, arguments);
@@ -848,9 +885,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handlePlay",
     value: function handlePlay() {
-      var _this$props14 = this.props,
-        actions = _this$props14.actions,
-        onPlay = _this$props14.onPlay;
+      var _this$props15 = this.props,
+        actions = _this$props15.actions,
+        onPlay = _this$props15.onPlay;
       actions.handlePlay(this.getProperties());
       if (onPlay) {
         onPlay.apply(void 0, arguments);
@@ -861,9 +898,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handlePause",
     value: function handlePause() {
-      var _this$props15 = this.props,
-        actions = _this$props15.actions,
-        onPause = _this$props15.onPause;
+      var _this$props16 = this.props,
+        actions = _this$props16.actions,
+        onPause = _this$props16.onPause;
       actions.handlePause(this.getProperties());
       if (onPause) {
         onPause.apply(void 0, arguments);
@@ -877,9 +914,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleDurationChange",
     value: function handleDurationChange() {
-      var _this$props16 = this.props,
-        actions = _this$props16.actions,
-        onDurationChange = _this$props16.onDurationChange;
+      var _this$props17 = this.props,
+        actions = _this$props17.actions,
+        onDurationChange = _this$props17.onDurationChange;
       actions.handleDurationChange(this.getProperties());
       if (onDurationChange) {
         onDurationChange.apply(void 0, arguments);
@@ -893,9 +930,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleProgress",
     value: function handleProgress() {
-      var _this$props17 = this.props,
-        actions = _this$props17.actions,
-        onProgress = _this$props17.onProgress;
+      var _this$props18 = this.props,
+        actions = _this$props18.actions,
+        onProgress = _this$props18.onProgress;
       if (this.video) {
         actions.handleProgressChange(this.getProperties());
       }
@@ -916,11 +953,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "displaySubtitle",
     value: function displaySubtitle(marker) {
-      var _this$props18 = this.props,
-        markers = _this$props18.markers,
-        resetSubtitleData = _this$props18.resetSubtitleData,
-        subtitleReadOnly = _this$props18.subtitleReadOnly,
-        subtitleDataList = _this$props18.subtitleDataList;
+      var _this$props19 = this.props,
+        markers = _this$props19.markers,
+        resetSubtitleData = _this$props19.resetSubtitleData,
+        subtitleReadOnly = _this$props19.subtitleReadOnly,
+        subtitleDataList = _this$props19.subtitleDataList;
       var currentSubtitleObj = this.state.currentSubtitleObj;
       if (resetSubtitleData) {
         resetSubtitleData();
@@ -962,11 +999,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleEnded",
     value: function handleEnded() {
-      var _this$props19 = this.props,
-        loop = _this$props19.loop,
-        player = _this$props19.player,
-        actions = _this$props19.actions,
-        onEnded = _this$props19.onEnded;
+      var _this$props20 = this.props,
+        loop = _this$props20.loop,
+        player = _this$props20.player,
+        actions = _this$props20.actions,
+        onEnded = _this$props20.onEnded;
       if (loop) {
         this.seek(0);
         this.play();
@@ -983,9 +1020,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleWaiting",
     value: function handleWaiting() {
-      var _this$props20 = this.props,
-        actions = _this$props20.actions,
-        onWaiting = _this$props20.onWaiting;
+      var _this$props21 = this.props,
+        actions = _this$props21.actions,
+        onWaiting = _this$props21.onWaiting;
       actions.handleWaiting(this.getProperties());
       if (onWaiting) {
         onWaiting.apply(void 0, arguments);
@@ -999,9 +1036,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleSeeking",
     value: function handleSeeking() {
-      var _this$props21 = this.props,
-        actions = _this$props21.actions,
-        onSeeking = _this$props21.onSeeking;
+      var _this$props22 = this.props,
+        actions = _this$props22.actions,
+        onSeeking = _this$props22.onSeeking;
       actions.handleSeeking(this.getProperties());
       if (onSeeking) {
         onSeeking.apply(void 0, arguments);
@@ -1015,9 +1052,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleSeeked",
     value: function handleSeeked() {
-      var _this$props22 = this.props,
-        actions = _this$props22.actions,
-        onSeeked = _this$props22.onSeeked;
+      var _this$props23 = this.props,
+        actions = _this$props23.actions,
+        onSeeked = _this$props23.onSeeked;
       actions.handleSeeked(this.getProperties());
       if (onSeeked) {
         onSeeked.apply(void 0, arguments);
@@ -1036,9 +1073,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleSuspend",
     value: function handleSuspend() {
-      var _this$props23 = this.props,
-        actions = _this$props23.actions,
-        onSuspend = _this$props23.onSuspend;
+      var _this$props24 = this.props,
+        actions = _this$props24.actions,
+        onSuspend = _this$props24.onSuspend;
       actions.handleSuspend(this.getProperties());
       if (onSuspend) {
         onSuspend.apply(void 0, arguments);
@@ -1049,9 +1086,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleAbort",
     value: function handleAbort() {
-      var _this$props24 = this.props,
-        actions = _this$props24.actions,
-        onAbort = _this$props24.onAbort;
+      var _this$props25 = this.props,
+        actions = _this$props25.actions,
+        onAbort = _this$props25.onAbort;
       actions.handleAbort(this.getProperties());
       if (onAbort) {
         onAbort.apply(void 0, arguments);
@@ -1062,9 +1099,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleEmptied",
     value: function handleEmptied() {
-      var _this$props25 = this.props,
-        actions = _this$props25.actions,
-        onEmptied = _this$props25.onEmptied;
+      var _this$props26 = this.props,
+        actions = _this$props26.actions,
+        onEmptied = _this$props26.onEmptied;
       actions.handleEmptied(this.getProperties());
       if (onEmptied) {
         onEmptied.apply(void 0, arguments);
@@ -1078,9 +1115,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleStalled",
     value: function handleStalled() {
-      var _this$props26 = this.props,
-        actions = _this$props26.actions,
-        onStalled = _this$props26.onStalled;
+      var _this$props27 = this.props,
+        actions = _this$props27.actions,
+        onStalled = _this$props27.onStalled;
       actions.handleStalled(this.getProperties());
       if (onStalled) {
         onStalled.apply(void 0, arguments);
@@ -1094,10 +1131,10 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleLoadedMetaData",
     value: function handleLoadedMetaData() {
-      var _this$props27 = this.props,
-        actions = _this$props27.actions,
-        onLoadedMetadata = _this$props27.onLoadedMetadata,
-        startTime = _this$props27.startTime;
+      var _this$props28 = this.props,
+        actions = _this$props28.actions,
+        onLoadedMetadata = _this$props28.onLoadedMetadata,
+        startTime = _this$props28.startTime;
       if (startTime && startTime > 0) {
         this.video.currentTime = startTime;
       }
@@ -1114,9 +1151,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleLoadedData",
     value: function handleLoadedData() {
-      var _this$props28 = this.props,
-        actions = _this$props28.actions,
-        onLoadedData = _this$props28.onLoadedData;
+      var _this$props29 = this.props,
+        actions = _this$props29.actions,
+        onLoadedData = _this$props29.onLoadedData;
       actions.handleLoadedData(this.getProperties());
       if (onLoadedData) {
         onLoadedData.apply(void 0, arguments);
@@ -1130,11 +1167,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleTimeUpdate",
     value: function handleTimeUpdate() {
-      var _this$props29 = this.props,
-        previewActive = _this$props29.player.previewActive,
-        actions = _this$props29.actions,
-        onTimeUpdate = _this$props29.onTimeUpdate,
-        rightMarker = _this$props29.playerSelectedMarker.rightMarker;
+      var _this$props30 = this.props,
+        previewActive = _this$props30.player.previewActive,
+        actions = _this$props30.actions,
+        onTimeUpdate = _this$props30.onTimeUpdate,
+        rightMarker = _this$props30.playerSelectedMarker.rightMarker;
 
       //for annotation time updataton for svg
       var _this$getTimeData3 = this.getTimeData(this.video.currentTime),
@@ -1162,9 +1199,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleRateChange",
     value: function handleRateChange() {
-      var _this$props30 = this.props,
-        actions = _this$props30.actions,
-        onRateChange = _this$props30.onRateChange;
+      var _this$props31 = this.props,
+        actions = _this$props31.actions,
+        onRateChange = _this$props31.onRateChange;
       actions.handleRateChange(this.getProperties());
       if (onRateChange) {
         onRateChange.apply(void 0, arguments);
@@ -1175,9 +1212,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleVolumeChange",
     value: function handleVolumeChange() {
-      var _this$props31 = this.props,
-        actions = _this$props31.actions,
-        onVolumeChange = _this$props31.onVolumeChange;
+      var _this$props32 = this.props,
+        actions = _this$props32.actions,
+        onVolumeChange = _this$props32.onVolumeChange;
       actions.handleVolumeChange(this.getProperties());
       if (onVolumeChange) {
         onVolumeChange.apply(void 0, arguments);
@@ -1191,9 +1228,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleError",
     value: function handleError() {
-      var _this$props32 = this.props,
-        actions = _this$props32.actions,
-        onError = _this$props32.onError;
+      var _this$props33 = this.props,
+        actions = _this$props33.actions,
+        onError = _this$props33.onError;
       actions.handleError(this.getProperties());
       if (onError) {
         onError.apply(void 0, arguments);
@@ -1202,6 +1239,74 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleKeypress",
     value: function handleKeypress() {}
+  }, {
+    key: "updateSvgSize",
+    value: function updateSvgSize() {
+      var el = this.video || this.playerBlock || this.video && this.video.parentNode;
+      if (!el || typeof el.getBoundingClientRect !== 'function') return;
+      var rect = el.getBoundingClientRect();
+      var next = {
+        width: Math.round(rect.width),
+        height: Math.round(rect.height)
+      };
+      var svgSize = this.state.svgSize;
+      if (svgSize.width !== next.width || svgSize.height !== next.height) {
+        this.setState({
+          svgSize: next
+        });
+      }
+    }
+  }, {
+    key: "calculateHeightBasedOnResolution",
+    value: function calculateHeightBasedOnResolution() {
+      var _this$props34 = this.props,
+        player = _this$props34.player,
+        isRightMenuVisible = _this$props34.isRightMenuVisible,
+        heightRatio = _this$props34.heightRatio;
+      var ratio = typeof heightRatio === 'number' ? heightRatio : 1;
+      if (!(player !== null && player !== void 0 && player.isFullscreen) || !isRightMenuVisible) {
+        if (this.state.calculatedHeight !== null) {
+          this.setState({
+            calculatedHeight: null
+          });
+        }
+        return;
+      }
+      try {
+        var videoElement = this.video;
+        if (!videoElement) return;
+        var videoWidth = videoElement.videoWidth;
+        var videoHeight = videoElement.videoHeight;
+        if (!videoWidth || !videoHeight) return;
+        var aspectRatio = videoWidth / videoHeight;
+        var leftVideoSection = document.querySelector('.left-video-section');
+        if (!leftVideoSection) return;
+        var containerWidth = leftVideoSection.getBoundingClientRect().width;
+        var newHeight = aspectRatio < 1.5 ? containerWidth * (3 / 4) : containerWidth * (9 / 16);
+        var finalHeight = newHeight * ratio;
+        if (this.state.calculatedHeight !== finalHeight) {
+          this.setState({
+            calculatedHeight: finalHeight
+          });
+        }
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('Error calculating height:', error);
+        if (this.state.calculatedHeight !== null) {
+          this.setState({
+            calculatedHeight: null
+          });
+        }
+      }
+    }
+  }, {
+    key: "disconnectResizeObserver",
+    value: function disconnectResizeObserver() {
+      if (this.resizeObserver) {
+        this.resizeObserver.disconnect();
+        this.resizeObserver = null;
+      }
+    }
   }, {
     key: "audioVisualizer",
     value: function audioVisualizer() {
@@ -1253,7 +1358,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderChildren",
     value: function renderChildren() {
-      var _this5 = this;
+      var _this6 = this;
       var props = _objectSpread(_objectSpread({}, this.props), {}, {
         video: this.video
       });
@@ -1275,7 +1380,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
               if (preOnError) {
                 preOnError.apply(void 0, arguments);
               }
-              _this5.handleError.apply(_this5, arguments);
+              _this6.handleError.apply(_this6, arguments);
             };
           }
         } else {
@@ -1287,9 +1392,9 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleSubtitleContainerClick",
     value: function handleSubtitleContainerClick() {
-      var _this$props33 = this.props,
-        actions = _this$props33.actions,
-        player = _this$props33.player;
+      var _this$props35 = this.props,
+        actions = _this$props35.actions,
+        player = _this$props35.player;
       if (player.paused) {
         actions.play();
       } else {
@@ -1299,11 +1404,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleSubtitleClick",
     value: function handleSubtitleClick(e) {
-      var _this$props34 = this.props,
-        actions = _this$props34.actions,
-        player = _this$props34.player,
-        onScreenSubtitleClick = _this$props34.onScreenSubtitleClick,
-        controlType = _this$props34.controlType;
+      var _this$props36 = this.props,
+        actions = _this$props36.actions,
+        player = _this$props36.player,
+        onScreenSubtitleClick = _this$props36.onScreenSubtitleClick,
+        controlType = _this$props36.controlType;
       var currentSubtitleObj = this.state.currentSubtitleObj;
       if (controlType === 'advanced') {
         if (onScreenSubtitleClick) {
@@ -1323,37 +1428,37 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this6 = this,
+      var _this7 = this,
         _this$props$parentAnn,
         _this$props$parentAnn2,
         _this$props$parentAnn3,
         _this$props$parentAnn4;
-      var _this$props35 = this.props,
-        loop = _this$props35.loop,
-        poster = _this$props35.poster,
-        preload = _this$props35.preload,
-        autoPlay = _this$props35.autoPlay,
-        playsInline = _this$props35.playsInline,
-        muted = _this$props35.muted,
-        crossOrigin = _this$props35.crossOrigin,
-        videoId = _this$props35.videoId,
-        fileType = _this$props35.fileType,
-        userEmail = _this$props35.userEmail,
-        theme = _this$props35.theme,
-        player = _this$props35.player,
-        playerType = _this$props35.playerType,
-        markers = _this$props35.markers,
-        isRightMenuVisible = _this$props35.isRightMenuVisible;
+      var _this$props37 = this.props,
+        loop = _this$props37.loop,
+        poster = _this$props37.poster,
+        preload = _this$props37.preload,
+        autoPlay = _this$props37.autoPlay,
+        playsInline = _this$props37.playsInline,
+        muted = _this$props37.muted,
+        crossOrigin = _this$props37.crossOrigin,
+        videoId = _this$props37.videoId,
+        fileType = _this$props37.fileType,
+        userEmail = _this$props37.userEmail,
+        theme = _this$props37.theme,
+        player = _this$props37.player,
+        playerType = _this$props37.playerType,
+        markers = _this$props37.markers,
+        isRightMenuVisible = _this$props37.isRightMenuVisible;
       var _this$state2 = this.state,
         isBuffering = _this$state2.isBuffering,
         watermark = _this$state2.watermark,
         currentSubtitleObj = _this$state2.currentSubtitleObj;
       var children = this.getChildren(this.props);
-      var isSubtitleActive = player.SubtitleStatus && playerType === "default" || playerType === 'subtitle' && markers && markers.length || player.SubtitleStatus;
+      var isSubtitleActive = player.SubtitleStatus && playerType === 'default' || playerType === 'subtitle' && markers && markers.length || player.SubtitleStatus;
       return /*#__PURE__*/_react["default"].createElement(VideoBlock, {
         className: "video-react-player-block",
         ref: function ref(c) {
-          _this6.playerBlock = c;
+          _this7.playerBlock = c;
         },
         style: this.getStyle(),
         HDBorder: player.HDBorderActive,
@@ -1363,7 +1468,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       }, isBuffering && /*#__PURE__*/_react["default"].createElement("div", {
         className: "loader-container",
         onClick: function onClick() {
-          return _this6.togglePlay();
+          return _this7.togglePlay();
         }
       }, /*#__PURE__*/_react["default"].createElement(_components.Loader, {
         theme: theme,
@@ -1371,7 +1476,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       })) || null, fileType === 'audio' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("canvas", {
         id: "canvas",
         ref: function ref(c) {
-          _this6.canvas = c;
+          _this7.canvas = c;
         },
         style: {
           top: 0,
@@ -1382,7 +1487,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         id: videoId,
         crossOrigin: "anonymous",
         ref: function ref(c) {
-          _this6.video = c;
+          _this7.video = c;
         },
         muted: muted,
         preload: preload,
@@ -1418,7 +1523,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         id: videoId,
         crossOrigin: crossOrigin,
         ref: function ref(c) {
-          _this6.video = c;
+          _this7.video = c;
         },
         muted: muted,
         preload: preload,
@@ -1451,23 +1556,24 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement("track", {
         kind: "captions"
       }), this.renderChildren()), this.state.shouldShowAnnotate && (((_this$props$parentAnn = this.props.parentAnnotations) === null || _this$props$parentAnn === void 0 ? void 0 : _this$props$parentAnn.length) > 0 || this.props.isSvgLayer) ? /*#__PURE__*/_react["default"].createElement("svg", {
-        key: "".concat(this.state.annotationsVersion),
+        key: "".concat(this.state.annotationsVersion, "-").concat(this.state.svgSize.width, "x").concat(this.state.svgSize.height, "-").concat(this.state.calculatedHeight),
         ref: this.props.playerSvgRef,
         onMouseDown: this.props.handleMouseDown,
         onMouseMove: this.props.handleMouseMove,
         onMouseUp: this.props.handleMouseUp,
         style: {
           position: 'absolute',
-          top: 0,
-          left: 0,
-          width: '100%',
-          height: '100%',
+          top: this.isFullscreenWithRightMenu() ? '50%' : 0,
+          left: this.isFullscreenWithRightMenu() ? '50%' : 0,
+          width: this.isFullscreenWithRightMenu() ? this.state.svgSize.width : '100%',
+          height: this.isFullscreenWithRightMenu() ? "".concat(this.state.calculatedHeight) : '100%',
           pointerEvents: this.state.shouldShowAnnotate ? 'auto' : 'none',
-          zIndex: 999
+          zIndex: 1,
+          transform: this.isFullscreenWithRightMenu() ? 'translate(-50%, -50%)' : 'none'
         }
       }, ((_this$props$parentAnn2 = this.props.parentAnnotations) === null || _this$props$parentAnn2 === void 0 ? void 0 : _this$props$parentAnn2.length) && ((_this$props$parentAnn3 = this.props.parentAnnotations) === null || _this$props$parentAnn3 === void 0 ? void 0 : _this$props$parentAnn3.map(function (ann, idx) {
-        var _this6$props$playerSv;
-        var svg = (_this6$props$playerSv = _this6.props.playerSvgRef) === null || _this6$props$playerSv === void 0 ? void 0 : _this6$props$playerSv.current;
+        var _this7$props$playerSv;
+        var svg = (_this7$props$playerSv = _this7.props.playerSvgRef) === null || _this7$props$playerSv === void 0 ? void 0 : _this7$props$playerSv.current;
         if (!svg) return null;
         var svgData = svg.getBoundingClientRect();
         var width = svgData.width;
@@ -1487,10 +1593,10 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
             strokeWidth: "4",
             fill: "none",
             onMouseDown: function onMouseDown(e) {
-              return _this6.props.onShapeMouseDown(e, idx, ann);
+              return _this7.props.onShapeMouseDown(e, idx, ann);
             },
             style: {
-              cursor: _this6.props.isSvgLayer ? 'move' : 'default'
+              cursor: _this7.props.isSvgLayer ? 'move' : 'default'
             }
           });
         } else if (ann.type === 'line' || ann.type === 'arrow') {
@@ -1508,25 +1614,25 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
             strokeWidth: "4",
             markerEnd: ann.type === 'arrow' ? "url(#open-arrowhead-".concat(ann.color.replace('#', ''), "-").concat(idx, ")") : undefined,
             onMouseDown: function onMouseDown(e) {
-              return _this6.props.onShapeMouseDown(e, idx, ann);
+              return _this7.props.onShapeMouseDown(e, idx, ann);
             },
             style: {
               color: ann.color,
-              cursor: _this6.props.isSvgLayer ? 'move' : 'default'
+              cursor: _this7.props.isSvgLayer ? 'move' : 'default'
             }
           });
         } else if (ann.type === 'pencil') {
           return /*#__PURE__*/_react["default"].createElement("path", {
             key: idx,
-            d: _this6.buildSmoothPath(ann.points, width, height),
+            d: _this7.buildSmoothPath(ann.points, width, height),
             stroke: ann.color,
             strokeWidth: "4",
             fill: "none",
             onMouseDown: function onMouseDown(e) {
-              return _this6.props.onShapeMouseDown(e, idx, ann);
+              return _this7.props.onShapeMouseDown(e, idx, ann);
             },
             style: {
-              cursor: _this6.props.isSvgLayer ? 'move' : 'default'
+              cursor: _this7.props.isSvgLayer ? 'move' : 'default'
             }
           });
         }
@@ -1558,11 +1664,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         id: "outer",
         currentSubtitleObj: currentSubtitleObj,
         onClick: function onClick() {
-          return _this6.handleSubtitleContainerClick();
+          return _this7.handleSubtitleContainerClick();
         }
       }, /*#__PURE__*/_react["default"].createElement("span", {
         onClick: function onClick(e) {
-          return _this6.handleSubtitleClick(e);
+          return _this7.handleSubtitleClick(e);
         },
         className: "subtitleContainer longSubtitleStyles",
         style: _objectSpread({}, currentSubtitleObj.style)

package/components/progress-bar/RenderCommentMarkers.js

@@ -89,7 +89,6 @@ var clampHoverBoxLeft = function clampHoverBoxLeft(rawLeftPx, boxWidth, containe
    MAIN COMPONENT
 ---------------------------------------------------------- */
 var RenderCommentMarkers = function RenderCommentMarkers(_ref) {
-  var _containerRef$current;
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
     _ref$duration = _ref.duration,
@@ -118,6 +117,53 @@ var RenderCommentMarkers = function RenderCommentMarkers(_ref) {
   var isLineVisible = function isLineVisible(time) {
     return hovered === time || hoverBoxHold && hovered === time;
   };
+  var _useState5 = (0, _react.useState)(0),
+    _useState6 = _slicedToArray(_useState5, 2),
+    containerWidth = _useState6[0],
+    setContainerWidth = _useState6[1];
+
+  // Measure eagerly during layout to avoid first-paint misalignment.
+  (0, _react.useLayoutEffect)(function () {
+    var measure = function measure() {
+      var _containerRef$current;
+      return setContainerWidth(((_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.offsetWidth) || 0);
+    };
+    measure();
+    // double rAF to catch layout after fullscreen/right-panel changes
+    requestAnimationFrame(function () {
+      return requestAnimationFrame(measure);
+    });
+  }, []);
+
+  // Keep width in sync on first render, fullscreen toggle, right-menu visibility, and resize.
+  (0, _react.useEffect)(function () {
+    var updateWidth = function updateWidth() {
+      var _containerRef$current2;
+      return setContainerWidth(((_containerRef$current2 = containerRef.current) === null || _containerRef$current2 === void 0 ? void 0 : _containerRef$current2.offsetWidth) || 0);
+    };
+    updateWidth();
+    requestAnimationFrame(updateWidth);
+    var onResize = function onResize() {
+      return updateWidth();
+    };
+    window.addEventListener('resize', onResize);
+    return function () {
+      return window.removeEventListener('resize', onResize);
+    };
+  }, [isRightMenuVisible, player === null || player === void 0 ? void 0 : player.isFullscreen]);
+
+  // Observe container size for layout shifts.
+  (0, _react.useEffect)(function () {
+    if (!containerRef.current || typeof ResizeObserver === 'undefined') return;
+    var observer = new ResizeObserver(function () {
+      var _containerRef$current3;
+      return setContainerWidth(((_containerRef$current3 = containerRef.current) === null || _containerRef$current3 === void 0 ? void 0 : _containerRef$current3.offsetWidth) || 0);
+    });
+    observer.observe(containerRef.current);
+    return function () {
+      return observer.disconnect();
+    };
+  }, [containerRef.current]);
   var handleMouseEnter = function handleMouseEnter(time) {
     clearTimeout(hideTimer.current);
     setHovered(time);
@@ -147,7 +193,6 @@ var RenderCommentMarkers = function RenderCommentMarkers(_ref) {
   data.forEach(function (item, i) {
     originalIndexMap.set(item.id, i);
   });
-  var containerWidth = (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.offsetWidth;
   return /*#__PURE__*/_react["default"].createElement(MarkerTimeline, {
     ref: containerRef
   }, Object.entries(grouped).map(function (_ref2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "4.0.102",
+  "version": "4.0.104",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {