@desynova-digital/player 3.13.20 → 3.13.22

package/components/Shortcut.js

@@ -12,10 +12,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 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); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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(arr) { if (Array.isArray(arr)) return arr; }
 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; }
@@ -55,6 +59,37 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
     var _this;
     _classCallCheck(this, Shortcut);
     _this = _callSuper(this, Shortcut, [props, context]);
+    _defineProperty(_assertThisInitialized(_this), "segmentShift", function (direction) {
+      var _this$props = _this.props,
+        leftMarker = _this$props.playerSelectedMarker.leftMarker,
+        onTagClick = _this$props.onTagClick;
+      var _this$props2 = _this.props,
+        actions = _this$props2.actions,
+        _this$props2$markers = _slicedToArray(_this$props2.markers, 1),
+        values = _this$props2$markers[0].values;
+      var newIndex;
+      if (direction === 'backward') {
+        newIndex = values.findIndex(function (item) {
+          return item.in_time === leftMarker;
+        }) - 1;
+      }
+      if (direction === 'forward') {
+        newIndex = values.findIndex(function (item) {
+          return item.in_time === leftMarker;
+        }) + 1;
+      }
+      if (leftMarker > -1 && newIndex < values.length && direction === 'forward' || leftMarker > -1 && newIndex > -1 && direction === 'backward') {
+        var _values$newIndex, _values$newIndex2, _values$newIndex3;
+        actions.seek((_values$newIndex = values[newIndex]) === null || _values$newIndex === void 0 ? void 0 : _values$newIndex.start_time);
+        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(_assertThisInitialized(_this), "debounceSegmentShiftForward", (0, _lodash.debounce)(function () {
+      _this.segmentShift('forward');
+    }, 0));
+    _defineProperty(_assertThisInitialized(_this), "debounceSegmentShiftBackward", (0, _lodash.debounce)(function () {
+      _this.segmentShift('backward');
+    }, 0));
     _defineProperty(_assertThisInitialized(_this), "debounceKeyFunc", (0, _lodash.debounce)(function (keyCode) {
       _this.handleKeyMovement(keyCode);
     }));
@@ -97,9 +132,9 @@ var Shortcut = exports["default"] = /*#__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) {
-      var _this$props = _this.props,
-        playerReadOnlyMode = _this$props.playerReadOnlyMode,
-        disablePlayerActions = _this$props.disablePlayerActions;
+      var _this$props3 = _this.props,
+        playerReadOnlyMode = _this$props3.playerReadOnlyMode,
+        disablePlayerActions = _this$props3.disablePlayerActions;
       if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
         return;
       }
@@ -250,13 +285,13 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       keyCode: 73,
       // I Key
       handle: function handle(player, actions) {
-        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;
+        var _this$props4 = _this.props,
+          markers = _this$props4.markers,
+          playerType = _this$props4.playerType,
+          onAddMarker = _this$props4.onAddMarker,
+          playerReadOnlyMode = _this$props4.playerReadOnlyMode,
+          disablePlayerActions = _this$props4.disablePlayerActions,
+          playerSelectedMarker = _this$props4.playerSelectedMarker;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -310,14 +345,14 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       keyCode: 79,
       // O Key
       handle: function handle(player, actions) {
-        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;
+        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;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
@@ -472,36 +507,12 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
       keyCode: 219,
       //'ctrl + ['
       ctrl: true,
-      handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props4 = _this.props,
-          leftMarker = _this$props4.playerSelectedMarker.leftMarker,
-          onTagClick = _this$props4.onTagClick;
-        var newIndex = markers.findIndex(function (item) {
-          return item.in_time === leftMarker;
-        }) - 1;
-        if (leftMarker > -1 && newIndex > -1) {
-          var _markers$newIndex, _markers$newIndex2, _markers$newIndex3;
-          actions.seek((_markers$newIndex = markers[newIndex]) === null || _markers$newIndex === void 0 ? void 0 : _markers$newIndex.start_time);
-          onTagClick((_markers$newIndex2 = markers[newIndex]) === null || _markers$newIndex2 === void 0 ? void 0 : _markers$newIndex2.start_time, (_markers$newIndex3 = markers[newIndex]) === null || _markers$newIndex3 === void 0 ? void 0 : _markers$newIndex3.end_time, markers[newIndex]);
-        }
-      }
+      handle: _this.debounceSegmentShiftBackward
     }, {
       keyCode: 221,
       //'ctrl + ]'
       ctrl: true,
-      handle: function handle(player, actions, frameRate, e, markers) {
-        var _this$props5 = _this.props,
-          leftMarker = _this$props5.playerSelectedMarker.leftMarker,
-          onTagClick = _this$props5.onTagClick;
-        var newIndex = markers.findIndex(function (item) {
-          return item.in_time === leftMarker;
-        }) + 1;
-        if (leftMarker > -1 && newIndex < markers.length) {
-          var _markers$newIndex4, _markers$newIndex5, _markers$newIndex6;
-          actions.seek((_markers$newIndex4 = markers[newIndex]) === null || _markers$newIndex4 === void 0 ? void 0 : _markers$newIndex4.start_time);
-          onTagClick((_markers$newIndex5 = markers[newIndex]) === null || _markers$newIndex5 === void 0 ? void 0 : _markers$newIndex5.start_time, (_markers$newIndex6 = markers[newIndex]) === null || _markers$newIndex6 === void 0 ? void 0 : _markers$newIndex6.end_time, markers[newIndex]);
-        }
-      }
+      handle: _this.debounceSegmentShiftForward
     }];
     _this.shortcuts = _toConsumableArray(_this.defaultShortcuts);
     _this.isCalled = false;
@@ -515,19 +526,19 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function componentDidMount() {
       this.mergeShortcuts();
-      (0, _hotkeysJs["default"])('o+right,right+o', {
+      (0, _hotkeysJs["default"])('w+right,right+w', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo1);
-      (0, _hotkeysJs["default"])('o+left,left+o', {
+      (0, _hotkeysJs["default"])('w+left,left+w', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo2);
-      (0, _hotkeysJs["default"])('i+right,right+i', {
+      (0, _hotkeysJs["default"])('q+right,right+q', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo3);
-      (0, _hotkeysJs["default"])('i+left,left+i', {
+      (0, _hotkeysJs["default"])('q+left,left+q', {
         keyup: true,
         keydown: true
       }, this.threeKeyCombo4);
@@ -574,10 +585,10 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      _hotkeysJs["default"].unbind('o+right,right+o');
-      _hotkeysJs["default"].unbind('i+right,right+i');
-      _hotkeysJs["default"].unbind('i+left,left+i');
-      _hotkeysJs["default"].unbind('o+left,left+o');
+      _hotkeysJs["default"].unbind('q+right,right+q');
+      _hotkeysJs["default"].unbind('w+right,right+w');
+      _hotkeysJs["default"].unbind('w+left,left+w');
+      _hotkeysJs["default"].unbind('w+left,left+w');
       document.removeEventListener('keydown', this.handleKeyPress);
       document.removeEventListener('click', this.handleClick);
       document.removeEventListener('dblclick', this.handleDoubleClick);

package/package.json

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