@desynova-digital/player 4.0.39 → 4.0.41

package/components/Shortcut.js

@@ -84,6 +84,17 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         onTagClick((_values$newIndex2 = values[newIndex]) === null || _values$newIndex2 === void 0 ? void 0 : _values$newIndex2.start_time, (_values$newIndex3 = values[newIndex]) === null || _values$newIndex3 === void 0 ? void 0 : _values$newIndex3.end_time, values[newIndex]);
       }
     });
+    _defineProperty(_this, "executeShortcut67", function (player, actions) {
+      var shortcut = _this.defaultShortcuts.find(function (s) {
+        return s.keyCode === 67;
+      });
+      if (shortcut) {
+        for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+          args[_key - 2] = arguments[_key];
+        }
+        shortcut.handle.apply(shortcut, [player, actions].concat(args));
+      }
+    });
     _defineProperty(_this, "debounceSegmentShiftForward", (0, _lodash.debounce)(function () {
       _this.segmentShift('forward');
     }, 0));
@@ -286,8 +297,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         actions.seek(0); // Go to beginning of video
       }
     }, {
-      keyCode: 73,
-      // I Key
+      keyCode: 67,
+      // C Key
       handle: function handle(player, actions) {
         var _this$props4 = _this.props,
           markers = _this$props4.markers,
@@ -304,8 +315,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
             return;
           }
           var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
-          for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-            args[_key - 2] = arguments[_key];
+          for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+            args[_key2 - 2] = arguments[_key2];
           }
           var isOverLapTime = args[0].timeAfterOverlap;
           if (isOverLapTime) {
@@ -363,19 +374,87 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         }
       }
     }, {
-      keyCode: 79,
-      // O Key
+      keyCode: 73,
+      // I Key
       handle: function handle(player, actions) {
         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;
+          timelineClicked = _this$props5.timelineClicked;
+        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);
+          return;
+        }
+        if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
+          return;
+        }
+        var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
+        for (var _len3 = arguments.length, args = new Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
+          args[_key3 - 2] = arguments[_key3];
+        }
+        var isOverLapTime = args[0].timeAfterOverlap;
+        if (isOverLapTime) {
+          onAddMarker(args[0].timeAfterOverlap, playerSelectedMarker.rightMarker, 'update');
+        } else {
+          if (playerType !== 'panel') {
+            var createPoint = true;
+            if (markers && markers.length && markers[0].values && markers[0].values.length) {
+              var markerArr = markers[0].values;
+              if (Object.keys(player.selectedMarker).length) {
+                markerArr = markerArr.filter(function (marker) {
+                  return marker.start_time !== player.selectedMarker.leftMarker && marker.end_time !== player.selectedMarker.rightMarker;
+                });
+              }
+              markerArr.filter(function (marker) {
+                if (currentAdjustedTime >= marker.start_time && currentAdjustedTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
+                  createPoint = false;
+                }
+              });
+            }
+            if (!createPoint && playerSelectedMarker.markerType === 'update' && currentAdjustedTime > player.selectedMarker.leftMarker && currentAdjustedTime < player.selectedMarker.rightMarker) {
+              createPoint = true;
+            }
+            if (createPoint) {
+              if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && currentAdjustedTime < playerSelectedMarker.rightMarker) {
+                // actions.handleMarkerPointChange(
+                //   player.markerType !== 'update' ? 'add' : 'update',
+                //   'left',
+                //   currentAdjustedTime
+                // );
+                var data = {
+                  markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
+                  markerPos: 'left',
+                  currentTime: currentAdjustedTime
+                };
+                onAddMarker(currentAdjustedTime, -1, '', true, data);
+                if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
+                  onAddMarker(currentAdjustedTime, playerSelectedMarker.rightMarker, 'update');
+                }
+              }
+            }
+          }
+        }
+      }
+    }, {
+      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;
         }
@@ -387,8 +466,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
           actions.seek(player.currentTime);
         }
         var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
-        for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
-          args[_key2 - 2] = arguments[_key2];
+        for (var _len4 = arguments.length, args = new Array(_len4 > 2 ? _len4 - 2 : 0), _key4 = 2; _key4 < _len4; _key4++) {
+          args[_key4 - 2] = arguments[_key4];
         }
         var isOverLapTime = args[0].timeAfterOverlap;
         if (isOverLapTime) {
@@ -601,10 +680,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();
       }
@@ -628,10 +707,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;
@@ -760,11 +839,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;
       }
@@ -785,8 +864,8 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
         return true;
       })[0];
       if (shortcut) {
-        var _markers$;
-        shortcut.handle(player, actions, frameRate, e, (_markers$ = markers[0]) === null || _markers$ === void 0 ? void 0 : _markers$.values);
+        var _markers$2;
+        shortcut.handle(player, actions, frameRate, e, (_markers$2 = markers[0]) === null || _markers$2 === void 0 ? void 0 : _markers$2.values);
         e.preventDefault();
       }
     }
@@ -803,10 +882,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;
       }
@@ -816,10 +895,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/package.json

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