@desynova-digital/player 4.0.69 → 4.0.71

package/components/Shortcut.js

@@ -52,7 +52,8 @@ var defaultProps = {
   dblclickable: true,
   actions: {},
   player: {},
-  shortcuts: []
+  shortcuts: [],
+  allowMarkerOverlap: false
 };
 var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   function Shortcut(props, context) {
@@ -401,7 +402,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
           disablePlayerActions = _this$props5.disablePlayerActions,
           playerSelectedMarker = _this$props5.playerSelectedMarker,
           frameRate = _this$props5.frameRate,
-          timelineClicked = _this$props5.timelineClicked;
+          timelineClicked = _this$props5.timelineClicked,
+          allowMarkerOverlap = _this$props5.allowMarkerOverlap;
         if (timelineClicked && ["snp_edit", "promo_review", "pgm_edit", "dubbing_review"].includes(playerType)) {
           var _markers$;
           _this.executeShortcut67(player, actions, frameRate, '', (_markers$ = markers[0]) === null || _markers$ === void 0 ? void 0 : _markers$.values);
@@ -420,7 +422,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         } else {
           if (playerType !== 'panel') {
             var createPoint = true;
-            if (markers && markers.length && markers[0].values && markers[0].values.length) {
+            if (markers && markers.length && markers[0].values && markers[0].values.length && !allowMarkerOverlap) {
               var markerArr = markers[0].values;
               if (Object.keys(player.selectedMarker).length) {
                 markerArr = markerArr.filter(function (marker) {
@@ -470,7 +472,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
           disablePlayerActions = _this$props6.disablePlayerActions,
           playerSelectedMarker = _this$props6.playerSelectedMarker,
           frameRate = _this$props6.frameRate,
-          pauseOnOutMarkerSelect = _this$props6.pauseOnOutMarkerSelect;
+          pauseOnOutMarkerSelect = _this$props6.pauseOnOutMarkerSelect,
+          allowMarkerOverlap = _this$props6.allowMarkerOverlap;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -496,7 +499,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         } else {
           var createPoint = true;
           if (playerType !== 'panel') {
-            if (markers && markers.length && markers[0].values && markers[0].values.length) {
+            if (markers && markers.length && markers[0].values && markers[0].values.length && !allowMarkerOverlap) {
               var markerArr = markers[0].values;
               if (Object.keys(player.selectedMarker).length) {
                 markerArr = markerArr.filter(function (marker) {

package/components/Video.js

@@ -1315,7 +1315,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         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;
+      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) {

package/components/control-bar/CaptionControlMenuButton.js

@@ -96,7 +96,7 @@ var CaptionControlMenuButton = /*#__PURE__*/function (_Component) {
         theme = _this$props4.theme,
         subtitleData = _this$props4.subtitleData,
         playerType = _this$props4.playerType;
-      var showCaptionButton = subtitleData && subtitleData.length && playerType === 'default';
+      var showCaptionButton = subtitleData && subtitleData.length && playerType !== 'subtitle_assign' && playerType !== "subtitle";
       return showCaptionButton ? /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           marginRight: '10px'

package/components/control-bar/ControlBar.js

@@ -236,6 +236,10 @@ var ControlBar = exports["default"] = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/_react["default"].createElement(_SubtitleMovementMenu["default"], _extends({}, this.props, {
         key: "subtitle-movement-menu",
         order: 8
+      })), /*#__PURE__*/_react["default"].createElement(_CaptionControlMenuButton["default"], _extends({}, this.props, {
+        order: 8,
+        playerType: playerType,
+        key: "caption-control-menu-button"
       })), /*#__PURE__*/_react["default"].createElement(_AudioTracksMenuButton["default"], _extends({}, this.props, {
         key: "audio-tracks-menu-button",
         order: 9

package/components/settings-menu-control/SettingsMenu.js

@@ -114,7 +114,7 @@ function SettingsMenu(_ref) {
     setSettingStatus(true);
     setSubtitleChildStatus(false);
   }, [playerType]);
-  var playerValue = playerType === 'default';
+  var playerValue = subtitleData.length > 0;
   var settingShow = settingStatus || !playerValue;
   return /*#__PURE__*/_react["default"].createElement(SettingsMenuContainer, {
     theme: theme,

package/package.json

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