@desynova-digital/player 3.2.2 → 3.3.0

package/components/Video.js

@@ -451,21 +451,20 @@ var Video = function (_Component) {
         this.hls.audioTrack = newProps.player.activeAudio.id;
       }
       if (newProps.subtitleObj && newProps.subtitleObj.field && JSON.stringify(newProps.subtitleObj) !== JSON.stringify(currentSubtitleObj)) {
-        // if(newProps.subtitleObj?.field){
-        var style = this.getSubtitleStyle(newProps.subtitleObj.field);
-        this.setState({
-          currentSubtitleObj: {
-            line1: newProps.subtitleObj.field.line1,
-            line2: newProps.subtitleObj.field.line2,
-            style: style
-          }
-        });
-        // } else if (!newProps.subtitleObj?.field?.length) {
-        // this.setState({
-        //   subtitleObj: {
-        //   }
-        // })
-        // }
+        if (newProps.subtitleObj && newProps.subtitleObj.field && !newProps.subtitleObj.field.line1) {
+          this.setState({
+            currentSubtitleObj: {}
+          });
+        } else if (newProps.subtitleObj && newProps.subtitleObj.field && newProps.subtitleObj.field.line1) {
+          var style = this.getSubtitleStyle(newProps.subtitleObj.field);
+          this.setState({
+            currentSubtitleObj: {
+              line1: newProps.subtitleObj.field.line1,
+              line2: newProps.subtitleObj.field.line2,
+              style: style
+            }
+          });
+        }
       }
       if (newProps.markers.length && markers.length && newProps.markers[0].values.length !== markers[0].values.length) {
         this.displaySubtitle(newProps.markers);
@@ -745,9 +744,13 @@ var Video = function (_Component) {
     key: 'displaySubtitle',
     value: function displaySubtitle(marker) {
       var _props14 = this.props,
-          currentTime = _props14.player.currentTime,
-          markers = _props14.markers;
+          markers = _props14.markers,
+          resetSubtitleData = _props14.resetSubtitleData;
 
+      if (resetSubtitleData) {
+        resetSubtitleData();
+      }
+      var currentTime = this.video.currentTime;
       var currentMarker = marker || markers;
       if (currentMarker && currentMarker[0] && currentMarker[0].name === "Subtitle") {
         var values = currentMarker[0].values;
@@ -988,6 +991,7 @@ var Video = function (_Component) {
       if (onTimeUpdate) {
         onTimeUpdate.apply(undefined, arguments);
       }
+      this.displaySubtitle();
     }
 
     /**
@@ -1141,22 +1145,36 @@ var Video = function (_Component) {
         return _react2.default.cloneElement(c, cprops);
       });
     }
+  }, {
+    key: 'handleClick',
+    value: function handleClick() {
+      var _props29 = this.props,
+          actions = _props29.actions,
+          player = _props29.player;
+
+      if (player.paused) {
+        actions.play();
+      } else {
+        actions.pause();
+      }
+      actions.handleVideoRewind(false);
+    }
   }, {
     key: 'render',
     value: function render() {
       var _this5 = this;
 
-      var _props29 = this.props,
-          loop = _props29.loop,
-          poster = _props29.poster,
-          preload = _props29.preload,
-          autoPlay = _props29.autoPlay,
-          playsInline = _props29.playsInline,
-          muted = _props29.muted,
-          crossOrigin = _props29.crossOrigin,
-          videoId = _props29.videoId,
-          fileType = _props29.fileType,
-          userEmail = _props29.userEmail;
+      var _props30 = this.props,
+          loop = _props30.loop,
+          poster = _props30.poster,
+          preload = _props30.preload,
+          autoPlay = _props30.autoPlay,
+          playsInline = _props30.playsInline,
+          muted = _props30.muted,
+          crossOrigin = _props30.crossOrigin,
+          videoId = _props30.videoId,
+          fileType = _props30.fileType,
+          userEmail = _props30.userEmail;
       var _state2 = this.state,
           isBuffering = _state2.isBuffering,
           watermark = _state2.watermark,
@@ -1286,12 +1304,7 @@ var Video = function (_Component) {
           SubTitleSection,
           {
             onClick: function onClick() {
-              if (player.paused) {
-                actions.play();
-              } else {
-                actions.pause();
-              }
-              actions.handleVideoRewind(false);
+              return _this5.handleClick();
             }
           },
           _react2.default.createElement(

package/components/control-bar/CameraButton.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+var _createClass = 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, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require("react");
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require("prop-types");
+
+var _styledComponents = require("styled-components");
+
+var _styledComponents2 = _interopRequireDefault(_styledComponents);
+
+var _components = require("@desynova-digital/components");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var CameraButtonIcon = (0, _styledComponents2.default)(_components.Button).withConfig({
+    displayName: "CameraButton__CameraButtonIcon",
+    componentId: "sc-1iapkc3-0"
+})(["background:transparent;border:none;margin:0px;margin-right:10px;&:hover,&:focus{background:transparent;}"]);
+
+var propTypes = {
+    actions: _propTypes.PropTypes.instanceOf(Object),
+    player: _propTypes.PropTypes.instanceOf(Object),
+    handleClick: _propTypes.PropTypes.func
+};
+
+var CameraButton = function (_Component) {
+    _inherits(CameraButton, _Component);
+
+    function CameraButton(props, context) {
+        _classCallCheck(this, CameraButton);
+
+        return _possibleConstructorReturn(this, (CameraButton.__proto__ || Object.getPrototypeOf(CameraButton)).call(this, props, context));
+    }
+
+    _createClass(CameraButton, [{
+        key: "handleClick",
+        value: function handleClick() {
+            var _props = this.props,
+                onTakeSnapshot = _props.onTakeSnapshot,
+                video = _props.video;
+
+            onTakeSnapshot(video.currentTime);
+        }
+    }, {
+        key: "render",
+        value: function render() {
+            var playerType = this.props.playerType;
+
+            return playerType === 'tagging' && _react2.default.createElement(CameraButtonIcon, {
+                display: "rounded",
+                appearance: "cta",
+                icon: "camera",
+                iconWidth: 18,
+                iconHeight: 18,
+                width: 20,
+                height: 20,
+                onClick: this.handleClick
+            });
+        }
+    }]);
+
+    return CameraButton;
+}(_react.Component);
+
+exports.default = CameraButton;

package/components/control-bar/ControlBar.js

@@ -72,6 +72,10 @@ var _SubtitleLanguagesMenuButton = require('./SubtitleLanguagesMenuButton');
 
 var _SubtitleLanguagesMenuButton2 = _interopRequireDefault(_SubtitleLanguagesMenuButton);
 
+var _CameraButton = require('./CameraButton');
+
+var _CameraButton2 = _interopRequireDefault(_CameraButton);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -187,7 +191,10 @@ var ControlBar = function (_Component) {
       }, this.props, {
         key: 'volume-menu-button',
         order: 8
-      })), _react2.default.createElement(_AudioTracksMenuButton2.default, _extends({}, this.props, {
+      })), _react2.default.createElement(_CameraButton2.default, {
+        order: 9,
+        playerType: playerType
+      }), _react2.default.createElement(_AudioTracksMenuButton2.default, _extends({}, this.props, {
         key: 'audio-tracks-menu-button',
         order: 9
       })), _react2.default.createElement(_SettingsMenuButton2.default, _extends({}, this.props, {

package/package.json

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