@desynova-digital/player 3.7.7 → 3.8.2

package/components/Video.js

@@ -115,7 +115,7 @@ var defaultProps = {
 var SubTitleSection = _styledComponents2.default.div.withConfig({
   displayName: 'Video__SubTitleSection',
   componentId: 'omlcc3-0'
-})(['position:absolute;font-family:SFUIText-Regular;font-size:14px;bottom:20px;width:100%;display:flex;justify-content:center;text-align:center;color:#FFFFFF;height:85%;align-items:center;.subtitleContainer{border-radius:4px;width:fit-content;background:#000000;opacity:0.5;padding:8px 10px;line-height:20px;position:absolute;}']);
+})(['position:absolute;font-family:SFUIText-Regular;font-size:14px;bottom:20px;width:100%;display:flex;justify-content:center;text-align:center;color:#FFFFFF;height:60px;align-items:center;.subtitleContainer{border-radius:4px;width:fit-content;background:#000000;opacity:0.5;padding:8px 10px;line-height:20px;position:absolute;}']);
 
 var VideoBlock = _styledComponents2.default.div.withConfig({
   displayName: 'Video__VideoBlock',
@@ -774,8 +774,8 @@ var Video = function (_Component) {
             currentSubtitleObj: {
               line1: currentValue[0] && currentValue[0].line1 || '',
               line2: currentValue[0] && currentValue[0].line2 || '',
-              start_time: currentValue[0] && currentValue[0].start_time || '',
-              end_time: currentValue[0] && currentValue[0].end_time || '',
+              start_time: currentValue[0] && currentValue[0].start_time || 0,
+              end_time: currentValue[0] && currentValue[0].end_time || 0,
               style: style
             }
           });
@@ -1160,16 +1160,25 @@ var Video = function (_Component) {
       });
     }
   }, {
-    key: 'handleClick',
-    value: function handleClick() {
+    key: 'handleSubtitleClick',
+    value: function handleSubtitleClick() {
       var _props29 = this.props,
           actions = _props29.actions,
-          player = _props29.player;
+          onScreenSubtitleClick = _props29.onScreenSubtitleClick,
+          controlType = _props29.controlType;
+      var currentSubtitleObj = this.state.currentSubtitleObj;
 
-      if (player.paused) {
-        actions.play();
-      } else {
+      if (controlType === 'advanced') {
+        if (onScreenSubtitleClick) {
+          onScreenSubtitleClick(currentSubtitleObj);
+        }
         actions.pause();
+      } else {
+        if (player.paused) {
+          actions.play();
+        } else {
+          actions.pause();
+        }
       }
       actions.handleVideoRewind(false);
     }
@@ -1316,14 +1325,12 @@ var Video = function (_Component) {
         ),
         currentSubtitleObj && currentSubtitleObj.line1 && currentSubtitleObj.line1.length && _react2.default.createElement(
           SubTitleSection,
-          {
-            onClick: function onClick() {
-              return _this5.handleClick();
-            }
-          },
+          null,
           _react2.default.createElement(
             'span',
-            { className: 'subtitleContainer', style: _extends({}, currentSubtitleObj.style) },
+            { className: 'subtitleContainer', style: _extends({}, currentSubtitleObj.style), onClick: function onClick() {
+                return _this5.handleSubtitleClick();
+              } },
             _react2.default.createElement(
               'p',
               null,

package/components/marking-controls/MarkingControl.js

@@ -79,7 +79,8 @@ function MarkingControl(_ref) {
       playerType = _ref.playerType,
       allowMarkerOverlap = _ref.allowMarkerOverlap,
       playerReadOnlyMode = _ref.playerReadOnlyMode,
-      disablePlayerActions = _ref.disablePlayerActions;
+      _ref$disablePlayerAct = _ref.disablePlayerActions,
+      disablePlayerActions = _ref$disablePlayerAct === undefined ? [] : _ref$disablePlayerAct;
 
   return _react2.default.createElement(
     _react2.default.Fragment,

package/components/progress-bar/ProgressControl.js

@@ -130,7 +130,7 @@ var ProgressControl = function (_Component) {
       // To be Rectified
       if (this.seekBar.timeline) {
         this.seekBar.timeline.generateTimeline();
-        this.seekBar.audioWaveform.getWaveform();
+        // this.seekBar.audioWaveform.getWaveform();
         this.setState({ stateZoom: zoom });
       }
     }

package/components/progress-bar/SeekBar.js

@@ -18,10 +18,6 @@ var _styledComponents2 = _interopRequireDefault(_styledComponents);
 
 var _propTypes = require('prop-types');
 
-var _AudioWaveform = require('./AudioWaveform');
-
-var _AudioWaveform2 = _interopRequireDefault(_AudioWaveform);
-
 var _Slider = require('../Slider');
 
 var _Slider2 = _interopRequireDefault(_Slider);
@@ -52,6 +48,9 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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; }
 
+// import AudioWaveform from './AudioWaveform';
+
+
 // import MouseTimeDisplay from './MouseTimeDisplay';
 
 var AdvancedControlBlock = _styledComponents2.default.div.withConfig({
@@ -137,11 +136,13 @@ var SeekBar = function (_Component) {
   }, {
     key: 'handleMouseDown',
     value: function handleMouseDown() {
+      console.log('handleMouse handleMouseDown');
       this.setState({ sliderActive: true });
     }
   }, {
     key: 'handleMouseUp',
     value: function handleMouseUp(event) {
+      console.log('handleMouse handleMouseUp');
       var actions = this.props.actions;
 
       var newTime = this.getNewTime(event);
@@ -199,54 +200,53 @@ var SeekBar = function (_Component) {
         _react2.default.createElement(_MarkerBar2.default, this.props),
         tagsMarker && tagsMarker.length ? _react2.default.createElement(_TagsBar2.default, this.props) : null,
         _react2.default.createElement(
-          SliderBlock,
-          null,
+          'div',
+          {
+            onMouseDown: this.handleMouseDown,
+            onMouseMove: this.handleMouseMove,
+            onMouseUp: this.handleMouseUp
+          },
           _react2.default.createElement(
-            _Slider2.default,
-            {
-              ref: function ref(input) {
-                _this2.slider = input;
+            SliderBlock,
+            null,
+            _react2.default.createElement(
+              _Slider2.default,
+              {
+                ref: function ref(input) {
+                  _this2.slider = input;
+                },
+                label: 'video progress bar',
+                valuenow: (this.getPercent() * 100).toFixed(2),
+                valuetext: (0, _utils.formatTime)(time, duration)
+                // onMouseDown={this.handleMouseDown}
+                // onMouseMove={this.handleMouseMove}
+                // onMouseUp={this.handleMouseUp}
+                , getPercent: this.getPercent,
+                stepForward: this.stepForward,
+                stepBack: this.stepBack
               },
-              label: 'video progress bar',
-              valuenow: (this.getPercent() * 100).toFixed(2),
-              valuetext: (0, _utils.formatTime)(time, duration),
-              onMouseDown: this.handleMouseDown,
-              onMouseMove: this.handleMouseMove,
-              onMouseUp: this.handleMouseUp,
-              getPercent: this.getPercent,
-              stepForward: this.stepForward,
-              stepBack: this.stepBack
-            },
-            _react2.default.createElement(_PlayProgressBar2.default, _extends({
-              currentTime: time,
-              duration: duration,
-              playerType: playerType,
-              assetType: assetType
-            }, this.props))
-          )
-        ),
-        controlType === 'advanced' && !isFullscreen ? _react2.default.createElement(
-          _react2.default.Fragment,
-          null,
-          _react2.default.createElement(
-            AdvancedControlBlock,
-            {
-              onMouseDown: this.handleMouseDown,
-              onMouseMove: this.handleMouseMove,
-              onMouseUp: this.handleMouseUp
-            },
-            _react2.default.createElement(_AudioWaveform2.default, _extends({}, this.props, {
-              ref: function ref(c) {
-                _this2.audioWaveform = c;
-              }
-            })),
-            _react2.default.createElement(_Timeline2.default, _extends({}, this.props, {
-              ref: function ref(c) {
-                _this2.timeline = c;
-              }
-            }))
-          )
-        ) : null
+              _react2.default.createElement(_PlayProgressBar2.default, _extends({
+                currentTime: time,
+                duration: duration,
+                playerType: playerType,
+                assetType: assetType
+              }, this.props))
+            )
+          ),
+          controlType === 'advanced' && !isFullscreen ? _react2.default.createElement(
+            _react2.default.Fragment,
+            null,
+            _react2.default.createElement(
+              AdvancedControlBlock,
+              null,
+              _react2.default.createElement(_Timeline2.default, _extends({}, this.props, {
+                ref: function ref(c) {
+                  _this2.timeline = c;
+                }
+              }))
+            )
+          ) : null
+        )
       );
     }
   }]);

package/components/progress-bar/Timeline.js

@@ -39,7 +39,7 @@ var propTypes = {
 var TimelineBlock = _styledComponents2.default.div.withConfig({
   displayName: 'Timeline__TimelineBlock',
   componentId: 'sc-1qvrkuc-0'
-})(['display:flex;justify-content:space-between;align-items:stretch;position:absolute;width:100%;height:100%;top:0px;left:0;.player-time{width:100%;position:relative;height:46px;&:first-child{p{left:0px;}}&:last-child{width:10px;', '{display:none;}p{left:auto;right:0px;}}', '{position:absolute;left:0;bottom:0;}p{color:#aaa;font-size:10px;font-family:SFUIText-Regular;left:-28px;top:10px;letter-spacing:0.5px;position:absolute;}}'], _components.Icon.Element, _components.Icon.Element);
+})(['display:flex;justify-content:space-between;align-items:stretch;position:absolute;width:100%;height:100%;top:0px;left:0;.player-time{width:100%;position:relative;height:46px;user-select:none;&:first-child{p{left:0px;}}&:last-child{width:10px;', '{display:none;}p{left:auto;right:0px;}}', '{position:absolute;left:0;bottom:0;}p{color:#aaa;font-size:10px;font-family:SFUIText-Regular;left:-28px;top:10px;letter-spacing:0.5px;position:absolute;user-select:none;}}'], _components.Icon.Element, _components.Icon.Element);
 
 var Timeline = function (_Component) {
   _inherits(Timeline, _Component);

package/components/zoom-control/ZoomLevel.js

@@ -49,7 +49,8 @@ var ZoomLevelBar = _styledComponents2.default.div.withConfig({
 function ZoomLevel(_ref) {
   var percentage = _ref.percentage,
       vertical = _ref.vertical,
-      playerType = _ref.playerType;
+      playerType = _ref.playerType,
+      assetType = _ref.assetType;
 
   var style = {};
   if (vertical) {
@@ -58,7 +59,7 @@ function ZoomLevel(_ref) {
     style.width = percentage;
   }
 
-  return _react2.default.createElement(ZoomLevelBar, { style: style, playerType: playerType, vertical: vertical });
+  return _react2.default.createElement(ZoomLevelBar, { style: style, playerType: playerType, vertical: vertical, assetType: assetType });
 }
 
 ZoomLevel.propTypes = propTypes;

package/package.json

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