@desynova-digital/player 3.13.17 → 3.13.19

package/components/Shortcut.js

@@ -9,7 +9,7 @@ var _propTypes = require("prop-types");
 var _lodash = require("lodash");
 var _hotkeysJs = _interopRequireDefault(require("hotkeys-js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -19,16 +19,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var propTypes = {
   clickable: _propTypes.PropTypes.bool,
   dblclickable: _propTypes.PropTypes.bool,
@@ -49,13 +49,12 @@ var defaultProps = {
   player: {},
   shortcuts: []
 };
-var Shortcut = /*#__PURE__*/function (_Component) {
+var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   _inherits(Shortcut, _Component);
-  var _super = _createSuper(Shortcut);
   function Shortcut(props, context) {
     var _this;
     _classCallCheck(this, Shortcut);
-    _this = _super.call(this, props, context);
+    _this = _callSuper(this, Shortcut, [props, context]);
     _defineProperty(_assertThisInitialized(_this), "debounceKeyFunc", (0, _lodash.debounce)(function (keyCode) {
       _this.handleKeyMovement(keyCode);
     }));
@@ -66,13 +65,26 @@ var Shortcut = /*#__PURE__*/function (_Component) {
      *common function to handle the key functionalies. eg-> W Key and Q key functionalities
      */
     _defineProperty(_assertThisInitialized(_this), "handleKeyMovement", function (keyCode) {
-      var currentTimeRequired = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var _this$props$markers$, _this$props$playerSel, _this$props$player, _this$props$player2;
+      if (keyCode === 81 || keyCode === 87) {
+        _this.isCalled = true;
+      }
+      var frameRateNumber = parseInt(_this.props.frameRate);
+      var timeAfterOverlap;
       var keyPressHandle = _this.defaultShortcuts.find(function (shortcut) {
         return shortcut.keyCode === keyCode;
       });
+      var ans = _this.findAdjacentMarkers((_this$props$markers$ = _this.props.markers[0]) === null || _this$props$markers$ === void 0 ? void 0 : _this$props$markers$.values, (_this$props$playerSel = _this.props.playerSelectedMarker) === null || _this$props$playerSel === void 0 ? void 0 : _this$props$playerSel.data);
+      if (((_this$props$player = _this.props.player) === null || _this$props$player === void 0 ? void 0 : _this$props$player.currentTime) >= (ans === null || ans === void 0 ? void 0 : ans.in_time_forward)) {
+        timeAfterOverlap = ans.in_time_forward - 1 / frameRateNumber;
+      }
+      if (((_this$props$player2 = _this.props.player) === null || _this$props$player2 === void 0 ? void 0 : _this$props$player2.currentTime) <= (ans === null || ans === void 0 ? void 0 : ans.out_time_behind)) {
+        timeAfterOverlap = ans.out_time_behind + 1 / frameRateNumber;
+      }
       if (keyPressHandle) {
-        var currentTime = currentTimeRequired ? _this.props.player.currentTime : undefined;
-        keyPressHandle.handle(_this.props.player, _this.props.actions, currentTime);
+        keyPressHandle.handle(_this.props.player, _this.props.actions, {
+          timeAfterOverlap: timeAfterOverlap
+        });
       }
     });
     /**
@@ -85,42 +97,43 @@ var Shortcut = /*#__PURE__*/function (_Component) {
      * Once we leave the keyCombo isCalled variable is set to false. This ensures that on the next combo press we will again execute Q/W key combo first.
      */
     _defineProperty(_assertThisInitialized(_this), "createThreeKeyCombo", function (event, handleKeyMovement, debounceKeyFunc, keyParameter) {
-      console.log("".concat(keyParameter, " arrow key pressed"));
-      if (!_this.state.isCalled) {
+      var _this$props = _this.props,
+        playerReadOnlyMode = _this$props.playerReadOnlyMode,
+        disablePlayerActions = _this$props.disablePlayerActions;
+      if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
+        return;
+      }
+      if (!_this.isCalled) {
         handleKeyMovement();
       }
       if (event.type === 'keydown') {
         debounceKeyFunc();
-        _this.setState({
-          isCalled: true
-        });
+        _this.isCalled = true;
       }
       if (event.type === 'keyup') {
-        _this.setState({
-          isCalled: false
-        });
+        _this.isCalled = false;
       }
     });
     _defineProperty(_assertThisInitialized(_this), "threeKeyCombo1", (0, _lodash.debounce)(function (event) {
-      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 87, false), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 79), 'Ctrl + O + Right');
+      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 87), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 79), 'Ctrl + O + Right');
     }, 0, {
       leading: true,
       trailing: true
     }));
     _defineProperty(_assertThisInitialized(_this), "threeKeyCombo2", (0, _lodash.debounce)(function (event) {
-      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 87, false), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 79), 'Ctrl + O + Left');
+      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 87), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 79), 'Ctrl + O + Left');
     }, 0, {
       leading: true,
       trailing: true
     }));
     _defineProperty(_assertThisInitialized(_this), "threeKeyCombo3", (0, _lodash.debounce)(function (event) {
-      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 81, false), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 73), 'Ctrl + I + Right');
+      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 81), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 73), 'Ctrl + I + Right');
     }, 0, {
       leading: true,
       trailing: true
     }));
     _defineProperty(_assertThisInitialized(_this), "threeKeyCombo4", (0, _lodash.debounce)(function (event) {
-      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 81, false), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 73), 'Ctrl + I + Left');
+      return _this.createThreeKeyCombo(event, _this.handleKeyMovement.bind(_assertThisInitialized(_this), 81), _this.debounceKeyFunc.bind(_assertThisInitialized(_this), 73), 'Ctrl + I + Left');
     }, 0, {
       leading: true,
       trailing: true
@@ -237,49 +250,61 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       keyCode: 73,
       // I Key
       handle: function handle(player, actions) {
-        var _this$props = _this.props,
-          markers = _this$props.markers,
-          playerType = _this$props.playerType,
-          onAddMarker = _this$props.onAddMarker,
-          playerReadOnlyMode = _this$props.playerReadOnlyMode,
-          disablePlayerActions = _this$props.disablePlayerActions,
-          playerSelectedMarker = _this$props.playerSelectedMarker;
+        var _args$;
+        var _this$props2 = _this.props,
+          markers = _this$props2.markers,
+          playerType = _this$props2.playerType,
+          onAddMarker = _this$props2.onAddMarker,
+          playerReadOnlyMode = _this$props2.playerReadOnlyMode,
+          disablePlayerActions = _this$props2.disablePlayerActions,
+          playerSelectedMarker = _this$props2.playerSelectedMarker;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
-        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;
+        for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+          args[_key - 2] = arguments[_key];
+        }
+        if ((_args$ = args[1]) !== null && _args$ !== void 0 && _args$.ctrlKey) {
+          return;
+        }
+        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 (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
+                  createPoint = false;
+                }
               });
             }
-            markerArr.filter(function (marker) {
-              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
-                createPoint = false;
-              }
-            });
-          }
-          if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
-            createPoint = true;
-          }
-          if (createPoint) {
-            if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && player.currentTime < playerSelectedMarker.rightMarker) {
-              // actions.handleMarkerPointChange(
-              //   player.markerType !== 'update' ? 'add' : 'update',
-              //   'left',
-              //   player.currentTime
-              // );
-              var data = {
-                markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
-                markerPos: 'left',
-                currentTime: player.currentTime
-              };
-              onAddMarker(player.currentTime, -1, '', true, data);
-              if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
-                onAddMarker(player.currentTime, playerSelectedMarker.rightMarker, 'update');
+            if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
+              createPoint = true;
+            }
+            if (createPoint) {
+              if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && player.currentTime < playerSelectedMarker.rightMarker) {
+                // actions.handleMarkerPointChange(
+                //   player.markerType !== 'update' ? 'add' : 'update',
+                //   'left',
+                //   player.currentTime
+                // );
+                var data = {
+                  markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
+                  markerPos: 'left',
+                  currentTime: player.currentTime
+                };
+                onAddMarker(player.currentTime, -1, '', true, data);
+                if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
+                  onAddMarker(player.currentTime, playerSelectedMarker.rightMarker, 'update');
+                }
               }
             }
           }
@@ -289,61 +314,77 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       keyCode: 79,
       // O Key
       handle: function handle(player, actions) {
-        var _this$props2 = _this.props,
-          markers = _this$props2.markers,
-          onMarkerSelect = _this$props2.onMarkerSelect,
-          playerType = _this$props2.playerType,
-          onAddMarker = _this$props2.onAddMarker,
-          playerReadOnlyMode = _this$props2.playerReadOnlyMode,
-          disablePlayerActions = _this$props2.disablePlayerActions,
-          playerSelectedMarker = _this$props2.playerSelectedMarker;
+        var _args$2;
+        var _this$props3 = _this.props,
+          markers = _this$props3.markers,
+          onMarkerSelect = _this$props3.onMarkerSelect,
+          playerType = _this$props3.playerType,
+          onAddMarker = _this$props3.onAddMarker,
+          playerReadOnlyMode = _this$props3.playerReadOnlyMode,
+          disablePlayerActions = _this$props3.disablePlayerActions,
+          playerSelectedMarker = _this$props3.playerSelectedMarker;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
-        var createPoint = true;
-        if (playerType !== 'panel') {
-          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;
+        for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+          args[_key2 - 2] = arguments[_key2];
+        }
+        if ((_args$2 = args[1]) !== null && _args$2 !== void 0 && _args$2.ctrlKey) {
+          return;
+        }
+        var isOverLapTime = args[0].timeAfterOverlap;
+        if (isOverLapTime) {
+          var data = {
+            markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
+            markerPos: 'right',
+            currentTime: args[0].timeAfterOverlap
+          };
+          onAddMarker(playerSelectedMarker.leftMarker, args[0].timeAfterOverlap, 'update', false, data);
+        } else {
+          var createPoint = true;
+          if (playerType !== 'panel') {
+            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 (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
+                  createPoint = false;
+                }
               });
             }
-            markerArr.filter(function (marker) {
-              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
-                createPoint = false;
+            if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
+              createPoint = true;
+            }
+            if (createPoint && playerSelectedMarker.leftMarker > -1 && player.currentTime > playerSelectedMarker.leftMarker) {
+              // actions.handleMarkerPointChange(
+              //   markerType: player.markerType !== 'update' ? 'add' : 'update',
+              //   markerPos: 'right',
+              //   currentTime: player.currentTime
+              // );
+              var _data = {
+                markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
+                markerPos: 'right',
+                currentTime: player.currentTime
+              };
+              if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
+                onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, 'update', false, _data);
               }
-            });
-          }
-          if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
-            createPoint = true;
-          }
-          if (createPoint && playerSelectedMarker.leftMarker > -1 && player.currentTime > playerSelectedMarker.leftMarker) {
-            // actions.handleMarkerPointChange(
-            //   markerType: player.markerType !== 'update' ? 'add' : 'update',
-            //   markerPos: 'right',
-            //   currentTime: player.currentTime
-            // );
-            var data = {
-              markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
-              markerPos: 'right',
-              currentTime: player.currentTime
-            };
-            if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
-              onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, 'update', false, data);
+              //Commented for CN-632.
+              // if (player.controlType === 'default') {
+              //   onMarkerSelect(player.leftMarker, player.currentTime);
+              // }
             }
-            //Commented for CN-632.
-            // if (player.controlType === 'default') {
-            //   onMarkerSelect(player.leftMarker, player.currentTime);
-            // }
           }
-        }
-
-        if (playerSelectedMarker.leftMarker > -1 && player.currentTime > -1 && playerSelectedMarker.markerCreate && createPoint && player.currentTime > playerSelectedMarker.leftMarker) {
-          // actions.handleMarkerPointChange('create');
-          onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, '', false, {
-            markerType: 'create'
-          });
+          if (playerSelectedMarker.leftMarker > -1 && player.currentTime > -1 && playerSelectedMarker.markerCreate && createPoint && player.currentTime > playerSelectedMarker.leftMarker) {
+            // actions.handleMarkerPointChange('create');
+            onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, '', false, {
+              markerType: 'create'
+            });
+          }
         }
       }
     }, {
@@ -440,16 +481,11 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       //'ctrl + ['
       ctrl: true,
       handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props3 = _this.props,
-          leftMarker = _this$props3.playerSelectedMarker.leftMarker,
-          _this$props3$playerSe = _this$props3.playerSelectedMarker,
-          _this$props3$playerSe2 = _this$props3$playerSe === void 0 ? {} : _this$props3$playerSe,
-          _this$props3$playerSe3 = _this$props3$playerSe2.data,
-          _this$props3$playerSe4 = _this$props3$playerSe3 === void 0 ? {} : _this$props3$playerSe3,
-          uniqueKey = _this$props3$playerSe4.uniqueKey,
-          onTagClick = _this$props3.onTagClick;
+        var _this$props4 = _this.props,
+          leftMarker = _this$props4.playerSelectedMarker.leftMarker,
+          onTagClick = _this$props4.onTagClick;
         var newIndex = markers.findIndex(function (item) {
-          return item.uniqueKey === uniqueKey;
+          return item.in_time === leftMarker;
         }) - 1;
         if (leftMarker > -1 && newIndex > -1) {
           var _markers$newIndex, _markers$newIndex2, _markers$newIndex3;
@@ -462,16 +498,11 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       //'ctrl + ]'
       ctrl: true,
       handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props4 = _this.props,
-          leftMarker = _this$props4.playerSelectedMarker.leftMarker,
-          _this$props4$playerSe = _this$props4.playerSelectedMarker,
-          _this$props4$playerSe2 = _this$props4$playerSe === void 0 ? {} : _this$props4$playerSe,
-          _this$props4$playerSe3 = _this$props4$playerSe2.data,
-          _this$props4$playerSe4 = _this$props4$playerSe3 === void 0 ? {} : _this$props4$playerSe3,
-          uniqueKey = _this$props4$playerSe4.uniqueKey,
-          onTagClick = _this$props4.onTagClick;
+        var _this$props5 = _this.props,
+          leftMarker = _this$props5.playerSelectedMarker.leftMarker,
+          onTagClick = _this$props5.onTagClick;
         var newIndex = markers.findIndex(function (item) {
-          return item.uniqueKey === uniqueKey;
+          return item.in_time === leftMarker;
         }) + 1;
         if (leftMarker > -1 && newIndex < markers.length) {
           var _markers$newIndex4, _markers$newIndex5, _markers$newIndex6;
@@ -481,9 +512,7 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       }
     }];
     _this.shortcuts = _toConsumableArray(_this.defaultShortcuts);
-    _this.state = {
-      isCalled: false
-    };
+    _this.isCalled = false;
     _this.mergeShortcuts = _this.mergeShortcuts.bind(_assertThisInitialized(_this));
     _this.handleKeyPress = _this.handleKeyPress.bind(_assertThisInitialized(_this));
     _this.handleClick = _this.handleClick.bind(_assertThisInitialized(_this));
@@ -494,19 +523,19 @@ var Shortcut = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.mergeShortcuts();
-      (0, _hotkeysJs["default"])('ctrl+i+left', {
+      (0, _hotkeysJs["default"])('ctrl+i+left, ctrl+left+i, i+ctrl+left, i+left+ ctrl, left+ ctrl+ i, left+i+ ctrl', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo4);
-      (0, _hotkeysJs["default"])('ctrl+i+right', {
+      (0, _hotkeysJs["default"])('ctrl+i+right,ctrl+right+i,i+ctrl+right,i+right+ctrl,right+ctrl+i,right+i+ctrl', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo3);
-      (0, _hotkeysJs["default"])('ctrl+o+left', {
+      (0, _hotkeysJs["default"])('ctrl+o+left,ctrl+left+o,o+ctrl+left,o+left+ctrl,left+ctrl+o,left+o+ctrl', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo2);
-      (0, _hotkeysJs["default"])('ctrl+o+right', {
+      (0, _hotkeysJs["default"])('ctrl+o+right,ctrl+right+o,o+ctrl+right,o+right+ctrl,right+ctrl+o,right+o+ctrl', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo1);
@@ -514,13 +543,33 @@ var Shortcut = /*#__PURE__*/function (_Component) {
       document.addEventListener('click', this.handleClick);
       document.addEventListener('dblclick', this.handleDoubleClick);
     }
+  }, {
+    key: "findAdjacentMarkers",
+    value: function findAdjacentMarkers(markers, selectedMarker) {
+      if (markers) {
+        var index = markers === null || markers === void 0 ? void 0 : markers.findIndex(function (marker) {
+          return marker.in_time === selectedMarker.in_time && marker.out_time === selectedMarker.out_time;
+        });
+        if (index !== -1) {
+          var adjacentMarkerForward = markers[index + 1];
+          var adjacentMarkerBehind = markers[index - 1];
+          var result = {
+            in_time_forward: adjacentMarkerForward ? adjacentMarkerForward.in_time : undefined,
+            out_time_behind: adjacentMarkerBehind ? adjacentMarkerBehind.out_time : undefined
+          };
+          return result;
+        }
+      } else {
+        return undefined;
+      }
+    }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this$props5 = this.props,
-        shortcuts = _this$props5.shortcuts,
-        player = _this$props5.player,
-        frameRate = _this$props5.frameRate;
+      var _this$props6 = this.props,
+        shortcuts = _this$props6.shortcuts,
+        player = _this$props6.player,
+        frameRate = _this$props6.frameRate;
       if (prevProps.shortcuts !== shortcuts) {
         this.mergeShortcuts();
       }
@@ -533,10 +582,10 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      _hotkeysJs["default"].unbind('ctrl+i+left');
-      _hotkeysJs["default"].unbind('ctrl+i+right');
-      _hotkeysJs["default"].unbind('ctrl+o+left');
-      _hotkeysJs["default"].unbind('ctrl+o+right');
+      _hotkeysJs["default"].unbind('ctrl+i+left, ctrl+left+i, i+ctrl+left, i+left+ ctrl, left+ ctrl+ i, left+i+ ctrl');
+      _hotkeysJs["default"].unbind('ctrl+i+right,ctrl+right+i,i+ctrl+right,i+right+ctrl,right+ctrl+i,right+i+ctrl');
+      _hotkeysJs["default"].unbind('ctrl+o+left,ctrl+left+o,o+ctrl+left,o+left+ctrl,left+ctrl+o,left+o+ctrl');
+      _hotkeysJs["default"].unbind('ctrl+o+right,ctrl+right+o,o+ctrl+right,o+right+ctrl,right+ctrl+o,right+o+ctrl');
       document.removeEventListener('keydown', this.handleKeyPress);
       document.removeEventListener('click', this.handleClick);
       document.removeEventListener('dblclick', this.handleDoubleClick);
@@ -544,10 +593,10 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }, {
     key: "rewindVideo",
     value: function rewindVideo() {
-      var _this$props6 = this.props,
-        player = _this$props6.player,
-        actions = _this$props6.actions,
-        frameRate = _this$props6.frameRate;
+      var _this$props7 = this.props,
+        player = _this$props7.player,
+        actions = _this$props7.actions,
+        frameRate = _this$props7.frameRate;
       if (player.currentTime == 0 || !player.rewindActive) {
         clearInterval(this.intervalRewind);
         this.intervalRewind = null;
@@ -676,11 +725,11 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleKeyPress",
     value: function handleKeyPress(e) {
-      var _this$props7 = this.props,
-        player = _this$props7.player,
-        actions = _this$props7.actions,
-        frameRate = _this$props7.frameRate,
-        markers = _this$props7.markers;
+      var _this$props8 = this.props,
+        player = _this$props8.player,
+        actions = _this$props8.actions,
+        frameRate = _this$props8.frameRate,
+        markers = _this$props8.markers;
       if (!player.isActive) {
         return;
       }
@@ -719,10 +768,10 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleClick",
     value: function handleClick(e) {
-      var _this$props8 = this.props,
-        player = _this$props8.player,
-        actions = _this$props8.actions,
-        clickable = _this$props8.clickable;
+      var _this$props9 = this.props,
+        player = _this$props9.player,
+        actions = _this$props9.actions,
+        clickable = _this$props9.clickable;
       if (!this.canBeClicked(player, e) || !clickable) {
         return;
       }
@@ -732,10 +781,10 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }, {
     key: "handleDoubleClick",
     value: function handleDoubleClick(e) {
-      var _this$props9 = this.props,
-        player = _this$props9.player,
-        actions = _this$props9.actions,
-        dblclickable = _this$props9.dblclickable;
+      var _this$props10 = this.props,
+        player = _this$props10.player,
+        actions = _this$props10.actions,
+        dblclickable = _this$props10.dblclickable;
       if (!this.canBeClicked(player, e) || !dblclickable) {
         return;
       }
@@ -755,7 +804,6 @@ var Shortcut = /*#__PURE__*/function (_Component) {
   }]);
   return Shortcut;
 }(_react.Component);
-exports["default"] = Shortcut;
 Shortcut.propTypes = propTypes;
 Shortcut.defaultProps = defaultProps;
 Shortcut.displayName = 'Shortcut';