@desynova-digital/player 4.0.32 → 4.0.34

package/actions/player.js

@@ -333,10 +333,21 @@ function handleMarkerUpdate(leftMarker, rightMarker) {
   };
   return data;
 }
-function handleSDBorderChange(SDBorderActive) {
+
+// export function handleSDBorderChange(SDBorderActive) {
+//   let data = {
+//     type: SD_BORDER_SWITCH,
+//     SDBorderActive
+//   };
+
+//   return data;
+// }
+
+function handleSDBorderChange(safeAreaObj) {
   var data = {
     type: SD_BORDER_SWITCH,
-    SDBorderActive: SDBorderActive
+    key: safeAreaObj.key,
+    value: safeAreaObj.value
   };
   return data;
 }

package/components/Player.js

@@ -241,6 +241,14 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
             key: "SDBorderActive",
             value: false
           });
+          this.actions.handleSDBorderChange({
+            key: "sixteenNineSafeArea",
+            value: true
+          });
+          this.actions.handleSDBorderChange({
+            key: "HDBorderActive",
+            value: true
+          });
         } else if (this.props.quality === 'sd') {
           this.actions.handleSDBorderChange({
             key: "HDBorderActive",
@@ -250,6 +258,14 @@ var Player = exports["default"] = /*#__PURE__*/function (_Component) {
             key: "sixteenNineSafeArea",
             value: false
           });
+          this.actions.handleSDBorderChange({
+            key: "fourThreeSafeArea",
+            value: true
+          });
+          this.actions.handleSDBorderChange({
+            key: "SDBorderActive",
+            value: true
+          });
         }
       } else {
         this.actions.handleSDBorderChange({

package/components/Video.js

@@ -100,7 +100,7 @@ var defaultProps = {
 var SubTitleSection = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  font-family: SFUIText-Regular;\n  font-size: 16px;\n  bottom: 20px;\n  width: 100%;\n  display: flex;\n  justify-content: center;\n  text-align: center;\n  color: #ffffff;\n  height: 90%;\n  align-items: center;\n\n  .subtitleContainer {\n    border-radius: 4px;\n    width: fit-content;\n    background: #000000;\n    opacity: 0.9;\n    padding: ", ";\n    line-height: 20px;\n    position: absolute;\n\n    i,em {\n      font-style: italic; /* Override the font style for <em> tags inside elements with the class .someClass */\n    }\n\n    strong{\n      font-weight: bold; \n    }\n    \n  }\n  .longSubtitleStyles {\n    overflow-y: auto;\n    height: fit-content;\n    max-height: 70px;\n    max-width: 75%;\n    width: fit-content;\n  }\n"])), function (props) {
   return props.currentSubtitleObj && props.currentSubtitleObj.line1 ? '8px 10px' : '0px';
 });
-var VideoBlock = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  &.video-react-player-block {\n    position: relative;\n    transition: all 0.1s ease-in-out;\n    -moz-transition: all 0.1s ease-in-out;\n    -webkit-transition: all 0.1s ease-in-out;\n    -ms-transition: all 0.1s ease-in-out;\n    -o-transition: all 0.1s ease-in-out;\n    video {\n      position: absolute;\n      top: 0;\n      left: 0;\n      width: 100%;\n      height: 100%;\n      right: 0;\n      bottom: 0;\n    }\n    .audio-tracks {\n      position: relative;\n      display: flex;\n      background: rgba(0, 0, 0, 0.5);\n      color: #fff;\n      z-index: 10;\n      position: absolute;\n      width: 100%;\n      bottom: 0;\n      p {\n        cursor: pointer;\n        padding: 10px;\n      }\n    }\n    .loader-container {\n      width: 100%;\n      height: 100%;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      position: absolute;\n      z-index: 10;\n      background: rgba(0, 0, 0, 0.5);\n    }\n  }\n  &.ratio-border {\n    // border: 1px solid rgba(255, 255, 255, 0.5);\n    &:after {\n      content: '16:9 Safe Area';\n      position: absolute;\n      color: #fff;\n      font-family: SFUIText-Regular;\n      font-size: 12px;\n      transform: rotate(-90deg);\n      top: 20%;\n      left: -50px;\n    }\n  }\n"])));
+var VideoBlock = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  &.video-react-player-block {\n    position: relative;\n    transition: all 0.1s ease-in-out;\n    -moz-transition: all 0.1s ease-in-out;\n    -webkit-transition: all 0.1s ease-in-out;\n    -ms-transition: all 0.1s ease-in-out;\n    -o-transition: all 0.1s ease-in-out;\n    video {\n      position: absolute;\n      top: 0;\n      left: 0;\n      width: 100%;\n      height: 100%;\n      right: 0;\n      bottom: 0;\n    }\n    .audio-tracks {\n      position: relative;\n      display: flex;\n      background: rgba(0, 0, 0, 0.5);\n      color: #fff;\n      z-index: 10;\n      position: absolute;\n      width: 100%;\n      bottom: 0;\n      p {\n        cursor: pointer;\n        padding: 10px;\n      }\n    }\n    .loader-container {\n      width: 100%;\n      height: 100%;\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      position: absolute;\n      z-index: 10;\n      background: rgba(0, 0, 0, 0.5);\n    }\n  }\n  &.ratio-border {\n    // border: 1px solid rgba(255, 255, 255, 0.5);\n    &:after {\n      // content: '16:9 Safe Area';\n      position: absolute;\n      color: #fff;\n      font-family: SFUIText-Regular;\n      font-size: 12px;\n      transform: rotate(-90deg);\n      top: 20%;\n      left: -50px;\n    }\n  }\n"])));
 var Video = exports["default"] = /*#__PURE__*/function (_Component) {
   function Video(props) {
     var _this;

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

@@ -126,7 +126,8 @@ var ChildMenuButton = /*#__PURE__*/function (_Component) {
         subtitleData = _this$props3.subtitleData,
         theme = _this$props3.theme,
         player = _this$props3.player,
-        activeChild = _this$props3.activeChild;
+        activeChild = _this$props3.activeChild,
+        actions = _this$props3.actions;
       switch (mainHeader) {
         case 'Subtitle':
           return subtitleData.map(function (subtitle, index) {

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

@@ -32,7 +32,7 @@ var propTypes = {
   player: _propTypes.PropTypes.instanceOf(Object),
   theme: _propTypes.PropTypes.string
 };
-var SafeAreaBlock = (0, _styledComponents["default"])('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  background: transparent;\n  font-family: SFUIText-Medium;\n  font-size: 12px;\n  text-transform: uppercase;\n  justify-content: flex-start;\n  align-items: center;\n  &:hover {\n    background: ", ";\n  }\n  p {\n    margin-left: 10px;\n    white-space: nowrap;\n  }\n"])), function (props) {
+var SafeAreaBlock = (0, _styledComponents["default"])('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  background: transparent;\n  font-family: SFUIText-Medium;\n  font-size: 12px;\n  text-transform: uppercase;\n  justify-content: flex-start;\n  // align-items: center;\n  flex-direction: column;\n  width: 100%;\n  &:hover {\n    background: ", ";\n  }\n  p {\n    margin-left: 10px;\n    white-space: nowrap;\n  }\n"])), function (props) {
   return props.theme ? " ".concat(_tokens.colors[props.theme].videoPlayer.rgbaThemeColor) : 'rgba(0, 206, 198, 0.1)';
 });
 var SafeAreaControl = exports["default"] = /*#__PURE__*/function (_Component) {
@@ -49,30 +49,36 @@ var SafeAreaControl = exports["default"] = /*#__PURE__*/function (_Component) {
     value: function handleClick() {
       var _this$props = this.props,
         player = _this$props.player,
-        actions = _this$props.actions;
-      actions.handleSDBorderChange(!player.SDBorderActive);
+        actions = _this$props.actions,
+        keyData = _this$props.keyData,
+        siblingData = _this$props.siblingData;
+      actions.handleSDBorderChange({
+        key: keyData,
+        value: !player[keyData]
+      });
+      actions.handleSDBorderChange({
+        key: siblingData,
+        value: false
+      });
     }
   }, {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
         player = _this$props2.player,
-        theme = _this$props2.theme;
+        theme = _this$props2.theme,
+        keyData = _this$props2.keyData,
+        name = _this$props2.name;
       return /*#__PURE__*/_react["default"].createElement(SafeAreaBlock, {
         onClick: this.handleClick,
         theme: theme
-      }, /*#__PURE__*/_react["default"].createElement(_components.Icon, {
-        name: "safe-area",
-        width: 20,
-        height: 20,
-        color: player.SDBorderActive ? theme ? "".concat(_tokens.colors[theme].videoPlayer.themeColor) : '#00cec6' : '#333333'
-      }), /*#__PURE__*/_react["default"].createElement("p", {
-        style: player.SDBorderActive ? {
+      }, /*#__PURE__*/_react["default"].createElement("p", {
+        style: player[keyData] ? {
           color: theme ? " ".concat(_tokens.colors[theme].videoPlayer.themeColor) : '#00cec6'
         } : {
           color: '#333333'
         }
-      }, "4:3 Safe Area"));
+      }, name));
     }
   }]);
 }(_react.Component);

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

@@ -110,6 +110,10 @@ function SettingsMenu(_ref) {
       "name": "16:9"
     }]
   };
+  (0, _react.useEffect)(function () {
+    setSettingStatus(true);
+    setSubtitleChildStatus(false);
+  }, [playerType]);
   var playerValue = playerType === 'default';
   var settingShow = settingStatus || !playerValue;
   return /*#__PURE__*/_react["default"].createElement(SettingsMenuContainer, {

package/package.json

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

package/reducers/player.js

@@ -22,7 +22,10 @@ var initialState = {
   rightMarker: -1,
   selectedMarker: {},
   markerType: 'create',
-  SDBorderActive: false,
+  SDBorderActive: true,
+  HDBorderActive: true,
+  fourThreeSafeArea: true,
+  sixteenNineSafeArea: true,
   buffered: null,
   waiting: false,
   seeking: false,
@@ -199,10 +202,13 @@ function player() {
       return _objectSpread(_objectSpread({}, state), {}, {
         controlType: action.controlType
       });
+    // case SD_BORDER_SWITCH:
+    //   return {
+    //     ...state,
+    //     SDBorderActive: action.SDBorderActive
+    //   };
     case _player.SD_BORDER_SWITCH:
-      return _objectSpread(_objectSpread({}, state), {}, {
-        SDBorderActive: action.SDBorderActive
-      });
+      return _objectSpread(_objectSpread({}, state), {}, _defineProperty({}, action.key, action.value));
     case _player.SUBTITLE_STATUS:
       return _objectSpread(_objectSpread({}, state), {}, {
         SubtitleStatus: action.SubtitleStatus