@desynova-digital/player 4.0.20 → 4.0.22

package/components/BigPlayButton.js

@@ -36,7 +36,7 @@ var defaultProps = {
   actions: {},
   player: {}
 };
-var PlayButton = (0, _styledComponents["default"])(_components.Button)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 100px;\n  height: 100px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  border: none;\n  z-index:1;\n  &:hover,\n  &:focus {\n    background: ", ";\n  }\n"])), function (props) {
+var PlayButton = (0, _styledComponents["default"])(_components.Button)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 100px;\n  height: 100px;\n  position: absolute;\n  opacity: 0.5;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  border: none;\n  z-index:1;\n  &:hover,\n  &:focus {\n    background: ", ";\n  }\n"])), function (props) {
   return _colors["default"].common.video[props.assetType].buttonGradient;
 }, function (props) {
   return _colors["default"].common.video[props.assetType].buttonGradient;

package/components/Player.js

@@ -289,6 +289,7 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
         key: "shortcut",
         order: 99.0
       }, props, {
+        pauseOnOutMarkerSelect: fullProps.pauseOnOutMarkerSelect,
         frameRate: fullProps.frameRate
       }))];
     }
@@ -353,7 +354,8 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
         key: "shortcut",
         order: 99.0
       }, props, {
-        frameRate: fullProps.frameRate
+        frameRate: fullProps.frameRate,
+        pauseOnOutMarkerSelect: fullProps.pauseOnOutMarkerSelect
       }))];
     }
   }, {

package/components/Shortcut.js

@@ -359,10 +359,18 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
           playerReadOnlyMode = _this$props5.playerReadOnlyMode,
           disablePlayerActions = _this$props5.disablePlayerActions,
           playerSelectedMarker = _this$props5.playerSelectedMarker,
-          frameRate = _this$props5.frameRate;
+          frameRate = _this$props5.frameRate,
+          pauseOnOutMarkerSelect = _this$props5.pauseOnOutMarkerSelect;
         if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
           return;
         }
+        if (pauseOnOutMarkerSelect && !player.paused) {
+          actions.pause({
+            action: 'pause',
+            source: 'shortcut'
+          });
+          actions.seek(player.currentTime);
+        }
         var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
         for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
           args[_key2 - 2] = arguments[_key2];

package/components/Video.js

@@ -115,7 +115,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         'font-family': 'SFUIText-Regular',
         'text-shadow': '0 0 4px rgb(0 0 0 / 50%)',
         'font-size': '12px',
-        opacity: '0.6',
+        opacity: '0.4',
         display: 'block',
         top: '0px',
         left: '0px'
@@ -182,7 +182,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         this.video.src = src;
       }
       this.forceUpdate(); // make sure the children can get the video property
-      var watermarkInterval = setInterval(this.checkWatermark, 20000);
+      var watermarkInterval = setInterval(this.checkWatermark, 40000);
       this.setState({
         watermarkInterval: watermarkInterval
       });
@@ -222,7 +222,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         video_player = document.querySelector('.video-react-player-block').getBoundingClientRect();
         watermark_dimension = watermark_text.getBoundingClientRect();
         text_css = watermark_text.style;
-        bool_text = text_css.position !== 'absolute' || text_css.opacity !== '0.6' || text_css['font-family'] !== 'SFUIText-Regular' && text_css['font-family'] !== '"SFUIText-Regular"';
+        bool_text = text_css.position !== 'absolute' || text_css.opacity !== '0.4' || text_css['font-family'] !== 'SFUIText-Regular' && text_css['font-family'] !== '"SFUIText-Regular"';
         bool_text = bool_text || text_css.display !== 'block';
         bool_text = bool_text || text_css.top !== watermark.top;
         bool_text = bool_text || text_css.left !== watermark.left;

package/components/progress-bar/ProgressControl.js

@@ -50,19 +50,22 @@ var ProgressControlBlock = _styledComponents["default"].div(_templateObject || (
   var markers = _ref.markers;
   return markers.length > 3 ? '40px' : '23px';
 });
-var SeekControlBar = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n  position: relative;\n  cursor: pointer;\n  overflow: hidden;\n  z-index: ", ";\n  .timeline-content {\n    overflow-x: auto;\n    white-space: nowrap;\n  }\n  .hide-scrollbar {\n    /* Hide scrollbar for Webkit-based browsers (Chrome, Safari, Edge) */\n    scrollbar-width: none; /* Hides scrollbar in Firefox */\n    -ms-overflow-style: none; /* Hides scrollbar in IE 10+ */\n  }\n\n  .hide-scrollbar::-webkit-scrollbar {\n    width: 0; /* Removes the scrollbar for Webkit browsers */\n  }\n"])), function (props) {
+var SeekControlBar = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n  position: relative;\n  cursor: pointer;\n  overflow: hidden;\n  z-index: ", ";\n  .timeline-content {\n    overflow-x: ", ";\n    white-space: nowrap;\n  }\n  .hide-scrollbar {\n    /* Hide scrollbar for Webkit-based browsers (Chrome, Safari, Edge) */\n    scrollbar-width: none; /* Hides scrollbar in Firefox */\n    -ms-overflow-style: none; /* Hides scrollbar in IE 10+ */\n  }\n\n  .hide-scrollbar::-webkit-scrollbar {\n    width: 0; /* Removes the scrollbar for Webkit browsers */\n  }\n\n  .scrollBarVisibility\n  max-height: 65px;\n  overflow-y: visible;\n  scrollbar-width: none; /* Hides scrollbar in Firefox */\n  -ms-overflow-style: none; /* Hides scrollbar in Internet Explorer 10+ */\n\n  /* Hides scrollbar for Webkit-based browsers (Chrome, Safari, Edge) */\n  &::-webkit-scrollbar {\n    width: 0;\n  }\n"])), function (props) {
   return props.controlType === 'advanced' && !props.isFullscreen ? '2' : '1';
+}, function (_ref2) {
+  var zoom = _ref2.zoom;
+  return zoom > 0 ? 'auto' : 'visible';
 });
 var MarkerTagsBlock = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  min-width: 100px;\n  max-width: 100px;\n  position: relative;\n  height: 60px;\n  .empty-block {\n    height: calc(100% - 20px);\n  }\n  .tags-block {\n    height: 20px;\n    font-family: SFUIText-Medium;\n    font-size: 12px;\n    color: #ffffff;\n    text-transform: uppercase;\n    border-top: 1px solid #333333;\n    border-bottom: 1px solid #333333;\n    p {\n      line-height: 18px;\n      padding-left: 10px;\n    }\n  }\n"])));
-var ScrollStyledDiv = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  max-height: 101px;\n  position: relative;\n  top: ", ";\n  overflow-y: ", ";\n  overflow-x: ", ";\n"])), function (_ref2) {
-  var markers = _ref2.markers;
-  return markers.length > 3 ? '18px' : '17px';
-}, function (_ref3) {
+var ScrollStyledDiv = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  max-height: 101px;\n  position: relative;\n  top: ", ";\n  overflow-y: ", ";\n  overflow-x: ", ";\n"])), function (_ref3) {
   var markers = _ref3.markers;
-  return markers.length > 3 ? 'hidden' : 'visible';
+  return markers.length > 3 ? '18px' : '17px';
 }, function (_ref4) {
   var markers = _ref4.markers;
   return markers.length > 3 ? 'hidden' : 'visible';
+}, function (_ref5) {
+  var markers = _ref5.markers;
+  return markers.length > 3 ? 'hidden' : 'visible';
 });
 var CoverDiv = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  background-color: black;\n  z-index: 2;\n  position: absolute;\n  height: 60px;\n  width: 89px;\n  left: 0px;\n  top: 20px;\n"])));
 var ProgressControl = exports["default"] = /*#__PURE__*/function (_Component) {
@@ -191,12 +194,7 @@ var ProgressControl = exports["default"] = /*#__PURE__*/function (_Component) {
         },
         zoom: stateZoom && parseFloat(stateZoom.toFixed(1))
       }, this.props)), /*#__PURE__*/_react["default"].createElement("div", {
-        style: {
-          maxHeight: '65px',
-          scrollbarWidth: 'none',
-          msOverflowStyle: 'none',
-          overflowY: markers.length > 3 ? 'scroll' : 'visible'
-        }
+        className: "scrollBarVisibility"
       }, /*#__PURE__*/_react["default"].createElement(_PointersBar["default"], _extends({
         onScroll: this.handleChildScroll,
         theme: theme,

package/package.json

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

package/reducers/player.js

@@ -22,7 +22,7 @@ var initialState = {
   rightMarker: -1,
   selectedMarker: {},
   markerType: 'create',
-  SDBorderActive: true,
+  SDBorderActive: false,
   buffered: null,
   waiting: false,
   seeking: false,