@desynova-digital/player 4.0.10 → 4.0.12

package/components/Menu.js

@@ -26,9 +26,7 @@ var defaultProps = {
 var MenuContainer = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 20px;\n  position: relative;\n  &:hover {\n    .menu-popup {\n      visibility: visible;\n      opacity: 1;\n    }\n  }\n  .menu-popup {\n    visibility: hidden;\n    opacity: 0;\n    position: absolute;\n    bottom: 20px;\n    padding-bottom: 16px;\n    z-index: 10;\n    transition: all 350ms ease-in-out;\n    &.right {\n      left: -10px;\n      &:after {\n        left: 15px;\n      }\n    }\n    &.center {\n      left: 50%;\n      transform: translateX(-50%);\n      &:after {\n        left: 50%;\n        transform: translateX(-50%);\n      }\n    }\n    &.left {\n      right: -10px;\n      &:after {\n        right: 15px;\n      }\n    }\n    &.active {\n      visibility: visible;\n      opacity: 1;\n    }\n    &:after {\n      content: '';\n      border-left: 6px solid transparent;\n      position: absolute;\n      border-right: 6px solid transparent;\n      border-top: 6px solid ", ";\n      bottom: 10px;\n    }\n    .menu-list {\n      border-radius: 10px;\n      background: #fff;\n      min-width: 175px;\n      max-height: 500px;\n      transition: all 250ms ease-in-out;\n      overflow: auto;\n      max-height: 400px;\n    }\n  }\n"])), function (props) {
   return props.theme ? " ".concat(_tokens.colors[props.theme].videoPlayer.borderColor) : 'rgb(0, 206, 198)';
 });
-var MenuIcon = (0, _styledComponents["default"])(_components.Button)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: transparent;\n  border: none;\n  margin: 0px;\n  &:hover,\n  &:focus {\n    background: transparent;\n    svg path {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
-  return props.theme ? " ".concat(_tokens.colors[props.theme].videoPlayer.themeColor) : '#00cec6';
-});
+var MenuIcon = (0, _styledComponents["default"])(_components.Button)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: transparent;\n  border: none;\n  margin: 0px;\n  &:hover,\n  &:focus {\n    background: transparent;\n  }\n"])));
 function Menu(_ref) {
   var style = _ref.style,
     children = _ref.children,

package/components/Video.js

@@ -1138,13 +1138,14 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         fileType = _this$props31.fileType,
         userEmail = _this$props31.userEmail,
         theme = _this$props31.theme,
-        player = _this$props31.player;
+        player = _this$props31.player,
+        playerType = _this$props31.playerType;
       var _this$state2 = this.state,
         isBuffering = _this$state2.isBuffering,
         watermark = _this$state2.watermark,
         currentSubtitleObj = _this$state2.currentSubtitleObj;
       var children = this.getChildren(this.props);
-      var isSubtitleActive = player.SubtitleStatus;
+      var isSubtitleActive = player.SubtitleStatus || playerType !== "default";
       return /*#__PURE__*/_react["default"].createElement(VideoBlock, {
         className: "video-react-player-block",
         ref: function ref(c) {

package/components/control-bar/CaptionControlMenuButton.js

@@ -67,8 +67,10 @@ var CaptionControlMenuButton = /*#__PURE__*/function (_Component) {
       var _this$props2 = this.props,
         subtitleData = _this$props2.subtitleData,
         actions = _this$props2.actions,
-        filterSelectedSubtitle = _this$props2.filterSelectedSubtitle;
-      if (subtitleData && subtitleData.length) {
+        filterSelectedSubtitle = _this$props2.filterSelectedSubtitle,
+        playerType = _this$props2.playerType,
+        player = _this$props2.player;
+      if (subtitleData && subtitleData.length && player.activeCaption === 'Off' && playerType === 'default') {
         actions.handleCaptionTrackChange(subtitleData[0].title);
         filterSelectedSubtitle(subtitleData[0].subtitle_info_id);
       }

package/components/control-bar/ControlBar.js

@@ -217,11 +217,13 @@ var ControlBar = exports["default"] = /*#__PURE__*/function (_Component) {
       //   key="subtitle-menu-button"
       //   order={8}
       // />,
-      _react["default"].createElement(_CaptionControlMenuButton["default"], _extends({}, this.props, {
-        order: 8,
-        playerType: playerType,
-        key: "caption-control-menu-button"
-      })), /*#__PURE__*/_react["default"].createElement(_CameraButton["default"], {
+      // <CaptionControlMenuButton
+      // {...this.props}
+      // order={8}
+      // playerType={playerType}
+      // key="caption-control-menu-button"
+      // />,
+      _react["default"].createElement(_CameraButton["default"], {
         order: 9,
         playerType: playerType
       }), /*#__PURE__*/_react["default"].createElement(_SubtitleMovementMenu["default"], _extends({}, this.props, {

package/components/control-bar/FullscreenToggle.js

@@ -37,9 +37,7 @@ var defaultProps = {
   actions: {},
   player: {}
 };
-var FullscreenToggleButton = (0, _styledComponents["default"])(_components.Button)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: transparent;\n  border: none;\n  margin: 0 10px;\n  &:hover,\n  &:focus {\n    background: transparent;\n    svg path {\n      fill: ", ";\n    }\n  }\n"])), function (props) {
-  return props.theme ? " ".concat(_tokens.colors[props.theme].videoPlayer.themeColor) : '#00cec6';
-});
+var FullscreenToggleButton = (0, _styledComponents["default"])(_components.Button)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: transparent;\n  border: none;\n  margin: 0 10px;\n  &:hover,\n  &:focus {\n    background: transparent;\n  }\n"])));
 var FullscreenToggle = exports["default"] = /*#__PURE__*/function (_Component) {
   _inherits(FullscreenToggle, _Component);
   function FullscreenToggle(props, context) {

package/components/settings-menu-control/SettingsMenu.js

@@ -73,13 +73,15 @@ function SettingsMenu(_ref) {
       return !prevSubtitleChildStatus;
     });
   };
+  var playerValue = playerType === 'default';
+  var settingShow = settingStatus || !playerValue;
   return /*#__PURE__*/_react["default"].createElement(SettingsMenuContainer, {
     theme: theme,
     style: style,
     disablePlayerActions: disablePlayerActions
-  }, settingStatus && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, settingShow && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "settings-menu-tile parent-area"
-  }, /*#__PURE__*/_react["default"].createElement(_ParentMenuComponent["default"], _extends({}, props, {
+  }, playerValue && /*#__PURE__*/_react["default"].createElement(_ParentMenuComponent["default"], _extends({}, props, {
     data: subtitleData,
     iconName: 'subtitle-on-off',
     hasChild: true,
@@ -103,7 +105,7 @@ function SettingsMenu(_ref) {
     actions: actions,
     disablePlayerActions: disablePlayerActions,
     playerType: playerType
-  }))), subtitleChildStatus && /*#__PURE__*/_react["default"].createElement(_ChildMenuComponent["default"], _extends({}, props, {
+  }))), subtitleChildStatus && playerValue && /*#__PURE__*/_react["default"].createElement(_ChildMenuComponent["default"], _extends({}, props, {
     stop: true,
     iconName: "child-close-button",
     mainHeader: "Subtitle",

package/package.json

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

package/reducers/player.js

@@ -50,7 +50,7 @@ var initialState = {
   // state used to show the value of selected subtitle
   markerCreate: false,
   rewindActive: false,
-  SubtitleStatus: false,
+  SubtitleStatus: true,
   // state used to show whether subtitle will be shown on player or not
   HLSConfig: {
     debug: true,