@desynova-digital/player 3.2.0 → 3.2.4

package/components/PointersBar.js

@@ -239,23 +239,12 @@ var PointersBar = function (_Component) {
                   width: 7,
                   height: 11
                 }),
-                _react2.default.createElement(
-                  'p',
-                  null,
-                  'to select a range. '
-                ),
-                _react2.default.createElement(
-                  'p',
-                  null,
-                  'Then press'
-                ),
-                _react2.default.createElement(_components.Icon, { name: 'add', stroke: '#fff', width: 10, height: 10 }),
                 _react2.default.createElement(
                   'p',
                   null,
                   'to create ',
                   marker_obj.name,
-                  '.'
+                  ' in the selected range. '
                 )
               )
             ),

package/components/Video.js

@@ -146,7 +146,7 @@ var Video = function (_Component) {
       },
       watermarkInterval: -1,
       isBuffering: false,
-      subtitleObj: {}
+      currentSubtitleObj: {}
     };
     _this.video = null; // the html5 video
     _this.manager = new _Manager2.default(props.store);
@@ -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,11 @@ 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;
 
+      resetSubtitleData();
+      var currentTime = this.video.currentTime;
       var currentMarker = marker || markers;
       if (currentMarker && currentMarker[0] && currentMarker[0].name === "Subtitle") {
         var values = currentMarker[0].values;
@@ -1141,25 +1142,40 @@ 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;
+          watermark = _state2.watermark,
+          currentSubtitleObj = _state2.currentSubtitleObj;
 
 
       var children = this.getChildren(this.props);
@@ -1281,33 +1297,28 @@ var Video = function (_Component) {
           { className: 'user-name-wrapper', id: 'watermark-text', style: _extends({}, watermark) },
           userEmail
         ),
-        subtitleObj.line1 && subtitleObj.line1.length && _react2.default.createElement(
+        currentSubtitleObj && currentSubtitleObj.line1 && currentSubtitleObj.line1.length && _react2.default.createElement(
           SubTitleSection,
           {
             onClick: function onClick() {
-              if (player.paused) {
-                actions.play();
-              } else {
-                actions.pause();
-              }
-              actions.handleVideoRewind(false);
+              return _this5.handleClick();
             }
           },
           _react2.default.createElement(
             'span',
-            { className: 'subtitleContainer', style: _extends({}, subtitleObj.style) },
+            { className: 'subtitleContainer', style: _extends({}, currentSubtitleObj.style) },
             _react2.default.createElement(
               'p',
               null,
               ' ',
-              subtitleObj.line1,
+              currentSubtitleObj.line1,
               ' '
             ),
             _react2.default.createElement(
               'p',
               null,
               ' ',
-              subtitleObj.line2,
+              currentSubtitleObj.line2,
               ' '
             )
           )

package/components/marking-controls/MarkingControl.js

@@ -105,7 +105,8 @@ function MarkingControl(_ref) {
           markers: markers,
           controlType: controlType,
           onMarkerSelect: onMarkerSelect,
-          allowMarkerOverlap: allowMarkerOverlap
+          allowMarkerOverlap: allowMarkerOverlap,
+          onAddMarker: onAddMarker
         })
       ) : null,
       player.leftMarker > -1 || player.rightMarker > -1 ? _react2.default.createElement(_MarkingDuration2.default, {

package/package.json

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