@desynova-digital/player 4.0.25 → 4.0.27

package/components/Player.js

@@ -291,12 +291,14 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
         },
         key: "control-bar",
         pauseOnOutMarkerSelect: fullProps.pauseOnOutMarkerSelect,
-        order: 4
+        order: 4,
+        playerType: fullProps.playerType
       }, this.props)), /*#__PURE__*/_react["default"].createElement(_Shortcut["default"], _extends({
         key: "shortcut",
         order: 99.0
       }, props, {
         pauseOnOutMarkerSelect: fullProps.pauseOnOutMarkerSelect,
+        playerType: fullProps.playerType,
         frameRate: fullProps.frameRate
       }))];
     }

package/components/Shortcut.js

@@ -186,10 +186,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
           action: 'pause',
           source: 'shortcut'
         });
-        // actions.changeRate(1.0, {
-        //   action: 'fast-forward',
-        //   source: 'shortcut'
-        // });
+        actions.changeRate(1.0, {
+          action: 'fast-forward',
+          source: 'shortcut'
+        });
         actions.handleVideoRewind(false);
       }
     }, {
@@ -288,7 +288,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
     }, {
       keyCode: 73,
       // I Key
-      handle: function handle(player, actions) {
+      handle: !["snp_edit", "promo", "pgm_edit"].includes(_this.props.playerType) ? function (player, actions) {
         var _this$props4 = _this.props,
           markers = _this$props4.markers,
           playerType = _this$props4.playerType,
@@ -346,21 +346,38 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
             }
           }
         }
-      }
-    }, {
-      keyCode: 79,
-      // O Key
-      handle: function handle(player, actions) {
+      } : function (player) {
         var _this$props5 = _this.props,
-          markers = _this$props5.markers,
-          onMarkerSelect = _this$props5.onMarkerSelect,
-          playerType = _this$props5.playerType,
           onAddMarker = _this$props5.onAddMarker,
           playerReadOnlyMode = _this$props5.playerReadOnlyMode,
           disablePlayerActions = _this$props5.disablePlayerActions,
           playerSelectedMarker = _this$props5.playerSelectedMarker,
-          frameRate = _this$props5.frameRate,
-          pauseOnOutMarkerSelect = _this$props5.pauseOnOutMarkerSelect;
+          frameRate = _this$props5.frameRate;
+        if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
+          return;
+        }
+        //for single annotations here
+        var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
+        if (currentAdjustedTime < (playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker) || playerSelectedMarker.leftMarker === -1 || playerSelectedMarker.rightMarker === -1) {
+          onAddMarker(currentAdjustedTime, playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.rightMarker, '', false, {
+            markerType: 'create'
+          });
+        }
+      }
+    }, {
+      keyCode: 79,
+      // O Key
+      handle: function handle(player, actions) {
+        var _this$props6 = _this.props,
+          markers = _this$props6.markers,
+          onMarkerSelect = _this$props6.onMarkerSelect,
+          playerType = _this$props6.playerType,
+          onAddMarker = _this$props6.onAddMarker,
+          playerReadOnlyMode = _this$props6.playerReadOnlyMode,
+          disablePlayerActions = _this$props6.disablePlayerActions,
+          playerSelectedMarker = _this$props6.playerSelectedMarker,
+          frameRate = _this$props6.frameRate,
+          pauseOnOutMarkerSelect = _this$props6.pauseOnOutMarkerSelect;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -413,7 +430,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
                 markerPos: 'right',
                 currentTime: currentAdjustedTime
               };
-              if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
+              if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length) && !["snp_edit", "promo", "pgm_edit"].includes(playerType)) {
                 onAddMarker(playerSelectedMarker.leftMarker, currentAdjustedTime, 'update', false, _data);
               }
               //Commented for CN-632.
@@ -422,7 +439,7 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
               // }
             }
           }
-          if (playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > -1 && playerSelectedMarker.markerCreate && createPoint && currentAdjustedTime > playerSelectedMarker.leftMarker) {
+          if (playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > -1 && (playerSelectedMarker.markerCreate || ["snp_edit", "promo", "pgm_edit"].includes(playerType)) && createPoint && currentAdjustedTime > playerSelectedMarker.leftMarker) {
             // actions.handleMarkerPointChange('create');
             onAddMarker(playerSelectedMarker.leftMarker, currentAdjustedTime, '', false, {
               markerType: 'create'
@@ -586,10 +603,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props6 = this.props,
-        shortcuts = _this$props6.shortcuts,
-        player = _this$props6.player,
-        frameRate = _this$props6.frameRate;
+      var _this$props7 = this.props,
+        shortcuts = _this$props7.shortcuts,
+        player = _this$props7.player,
+        frameRate = _this$props7.frameRate;
       if (prevProps.shortcuts !== shortcuts) {
         this.mergeShortcuts();
       }
@@ -613,10 +630,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "rewindVideo",
     value: function rewindVideo() {
-      var _this$props7 = this.props,
-        player = _this$props7.player,
-        actions = _this$props7.actions,
-        frameRate = _this$props7.frameRate;
+      var _this$props8 = this.props,
+        player = _this$props8.player,
+        actions = _this$props8.actions,
+        frameRate = _this$props8.frameRate;
       if (player.currentTime == 0 || !player.rewindActive) {
         clearInterval(this.intervalRewind);
         this.intervalRewind = null;
@@ -745,11 +762,11 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleKeyPress",
     value: function handleKeyPress(e) {
-      var _this$props8 = this.props,
-        player = _this$props8.player,
-        actions = _this$props8.actions,
-        frameRate = _this$props8.frameRate,
-        markers = _this$props8.markers;
+      var _this$props9 = this.props,
+        player = _this$props9.player,
+        actions = _this$props9.actions,
+        frameRate = _this$props9.frameRate,
+        markers = _this$props9.markers;
       if (!player.isActive) {
         return;
       }
@@ -788,10 +805,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleClick",
     value: function handleClick(e) {
-      var _this$props9 = this.props,
-        player = _this$props9.player,
-        actions = _this$props9.actions,
-        clickable = _this$props9.clickable;
+      var _this$props10 = this.props,
+        player = _this$props10.player,
+        actions = _this$props10.actions,
+        clickable = _this$props10.clickable;
       if (!this.canBeClicked(player, e) || !clickable) {
         return;
       }
@@ -801,10 +818,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleDoubleClick",
     value: function handleDoubleClick(e) {
-      var _this$props10 = this.props,
-        player = _this$props10.player,
-        actions = _this$props10.actions,
-        dblclickable = _this$props10.dblclickable;
+      var _this$props11 = this.props,
+        player = _this$props11.player,
+        actions = _this$props11.actions,
+        dblclickable = _this$props11.dblclickable;
       if (!this.canBeClicked(player, e) || !dblclickable) {
         return;
       }

package/components/control-bar/ControlBar.js

@@ -108,7 +108,9 @@ var ControlBar = exports["default"] = /*#__PURE__*/function (_Component) {
       })), /*#__PURE__*/_react["default"].createElement(_DurationDisplay["default"], _extends({}, this.props, {
         key: "duration-display",
         order: 5.3
-      })), /*#__PURE__*/_react["default"].createElement(_MarkingControl["default"], _extends({}, this.props, {
+      })), /*#__PURE__*/_react["default"].createElement(_MarkingControl["default"], _extends({
+        playerType: playerType
+      }, this.props, {
         key: "marking-controls",
         order: 6
       })),
@@ -182,7 +184,9 @@ var ControlBar = exports["default"] = /*#__PURE__*/function (_Component) {
       })), /*#__PURE__*/_react["default"].createElement(_DurationDisplay["default"], _extends({}, this.props, {
         key: "duration-display",
         order: 5.3
-      })), /*#__PURE__*/_react["default"].createElement(_MarkingControl["default"], _extends({}, this.props, {
+      })), /*#__PURE__*/_react["default"].createElement(_MarkingControl["default"], _extends({
+        playerType: playerType
+      }, this.props, {
         key: "marking-controls",
         order: 6
       })),

package/components/control-bar/SettingsMenuButton.js

@@ -11,8 +11,8 @@ var _SettingsMenu = _interopRequireDefault(require("../settings-menu-control/Set
 var _excluded = ["style", "player", "actions", "disablePlayerActions", "theme", "playerType", "subtitleData"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 var propTypes = {
   player: _propTypes.PropTypes.instanceOf(Object),
   actions: _propTypes.PropTypes.instanceOf(Object),

package/components/marking-controls/MarkInControl.js

@@ -90,15 +90,27 @@ var MarkInControl = exports["default"] = /*#__PURE__*/function (_Component) {
         actions = _this$props2.actions,
         onAddMarker = _this$props2.onAddMarker,
         frameRate = _this$props2.frameRate;
-      // actions.handleMarkerPointChange('add', 'left', player.currentTime);
-      if (onAddMarker) {
+      if (["snp_edit", "promo", "pgm_edit"].includes(playerType)) {
         var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
         var data = {
           markerType: player.markerType !== 'update' ? 'add' : 'update',
           markerPos: 'left',
           currentTime: currentAdjustedTime
         };
-        onAddMarker(currentAdjustedTime, -1, '', true, data);
+        onAddMarker(currentAdjustedTime, -1, '', false, {
+          markerType: 'create'
+        });
+      } else {
+        // actions.handleMarkerPointChange('add', 'left', player.currentTime);
+        if (onAddMarker) {
+          var _currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
+          var _data = {
+            markerType: player.markerType !== 'update' ? 'add' : 'update',
+            markerPos: 'left',
+            currentTime: _currentAdjustedTime
+          };
+          onAddMarker(_currentAdjustedTime, -1, '', true, _data);
+        }
       }
     }
   }, {

package/components/marking-controls/MarkingControl.js

@@ -54,6 +54,7 @@ function MarkingControl(_ref) {
     disablePlayerActions = _ref$disablePlayerAct === void 0 ? [] : _ref$disablePlayerAct,
     playerSelectedMarker = _ref.playerSelectedMarker,
     theme = _ref.theme,
+    enablePlayerActions = _ref.enablePlayerActions,
     pauseOnOutMarkerSelect = _ref.pauseOnOutMarkerSelect;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, playerType !== 'panel' && playerType !== 'default' && playerType !== 'clipping_default' ? /*#__PURE__*/_react["default"].createElement(MarkingBlock, {
     theme: theme
@@ -64,7 +65,9 @@ function MarkingControl(_ref) {
     player: player,
     markers: markers,
     allowMarkerOverlap: allowMarkerOverlap,
-    onAddMarker: onAddMarker
+    onAddMarker: onAddMarker,
+    enablePlayerActions: enablePlayerActions,
+    playerType: playerType
   }), /*#__PURE__*/_react["default"].createElement(_MarkOutControl["default"], {
     theme: theme,
     leftMarker: playerSelectedMarker === null || playerSelectedMarker === void 0 ? void 0 : playerSelectedMarker.leftMarker,

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

@@ -26,8 +26,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 /*
  * import SubtitleControl from './SubtitleControl';

package/package.json

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