@desynova-digital/player 4.1.6 → 4.1.8

package/components/PlayerHeader.js

@@ -61,7 +61,7 @@ var VideoTitle = _styledComponents["default"].button(_templateObject2 || (_templ
   var isShowPageAvailable = _ref.isShowPageAvailable;
   return isShowPageAvailable ? 'pointer' : 'default';
 });
-var IconButton = (0, _styledComponents["default"])(_components.Button)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  background: ", ";\n  border-radius: 8px;\n  padding: 4px;\n  border: 1px solid ", ";\n  transition: all 0.2s ease;\n\n  /* Icon color */\n  svg path {\n    fill: ", " !important;\n  }\n\n  &:hover {\n    background: ", ";\n    border-color: ", ";\n\n    svg path {\n      fill: ", " !important;\n    }\n  }\n\n  &:active {\n    background: ", ";\n  }\n"])), function (_ref2) {
+var IconButton = (0, _styledComponents["default"])(_components.Button)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  background: ", ";\n  border-radius: 8px;\n  padding: 4px;\n  border: 1px solid\n    ", ";\n  transition: all 0.2s ease;\n\n  /* Icon color */\n  svg path {\n    fill: ", " !important;\n  }\n\n  &:hover {\n    background: ", ";\n    border-color: ", ";\n\n    svg path {\n      fill: ", " !important;\n    }\n  }\n\n  &:active {\n    background: ", ";\n  }\n"])), function (_ref2) {
   var isRightMenuVisible = _ref2.isRightMenuVisible;
   return isRightMenuVisible ? '#ffffff' : '#0bbec5';
 }, function (_ref3) {
@@ -262,7 +262,7 @@ var PlayerHeader = exports["default"] = /*#__PURE__*/function (_Component) {
         className: "versions-dropdown-block"
       }, /*#__PURE__*/_react["default"].createElement("p", {
         className: "active-version"
-      }, "".concat(activeVersion.version_name, " ").concat(activeVersion.version)), updatedVersionsList && updatedVersionsList.length > 0 && playerType === 'default' && /*#__PURE__*/_react["default"].createElement("div", {
+      }, "".concat(activeVersion.version_name, " ").concat(activeVersion.version)), updatedVersionsList && updatedVersionsList.length > 0 && (playerType === 'default' || playerType === 'dubbing_review') && /*#__PURE__*/_react["default"].createElement("div", {
         className: "versions-dropdown-container"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "versions-container"
@@ -344,7 +344,7 @@ var PlayerHeader = exports["default"] = /*#__PURE__*/function (_Component) {
         tabIndex: "0"
       }, this.props, {
         onClick: openSharePopup
-      })), !isFullscreen && !isUserGuest && (playerType === 'default' || playerType === 'qc') && qcReportAvailable && /*#__PURE__*/_react["default"].createElement(QCReportButton, _extends({
+      })), !isFullscreen && !isUserGuest && showQCReport.includes(playerType) && qcReportAvailable && /*#__PURE__*/_react["default"].createElement(QCReportButton, _extends({
         display: "rounded",
         appearance: "cta",
         icon: "qc_report",

package/components/Video.js

@@ -20,9 +20,16 @@ var _templateObject, _templateObject2;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -91,7 +98,8 @@ var propTypes = {
   onPlayerClose: _propTypes.PropTypes.func,
   userEmail: _propTypes.PropTypes.string,
   playerSelectedMarker: _propTypes.PropTypes.instanceOf(Object),
-  theme: _propTypes.PropTypes.string
+  theme: _propTypes.PropTypes.string,
+  dubbedTracks: _propTypes.PropTypes.string
 };
 var defaultProps = {
   startTime: 0,
@@ -102,7 +110,8 @@ var defaultProps = {
   preload: 'auto',
   aspectRatio: 'auto',
   crossOrigin: 'anonymous',
-  theme: 'dark'
+  theme: 'dark',
+  dubbedTracks: null
 };
 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,\n    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  .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';
@@ -243,6 +252,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     };
     _this.video = null; // the html5 video
     _this.manager = new _Manager["default"](props.store);
+    _this.dubbedTrackNames = null;
     _this.getStyle = _this.getStyle.bind(_this);
     _this.getChildren = _this.getChildren.bind(_this);
     _this.play = _this.play.bind(_this);
@@ -282,15 +292,144 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     _this.updateSvgSize = _this.updateSvgSize.bind(_this);
     _this.disconnectResizeObserver = _this.disconnectResizeObserver.bind(_this);
     _this.calculateHeightBasedOnResolution = _this.calculateHeightBasedOnResolution.bind(_this);
+    _this.combineM3U8Manifests = _this.combineM3U8Manifests.bind(_this);
     return _this;
   }
   _inherits(Video, _Component);
   return _createClass(Video, [{
+    key: "combineM3U8Manifests",
+    value: function () {
+      var _combineM3U8Manifests = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(originalUrl, dubbedUrl) {
+        var fetchManifest, _yield$Promise$all, _yield$Promise$all2, originalContent, dubbedContent, extractAudioTracks, extractVideoStream, originalBase, dubbedBase, videoStreamUri, originalAudioTracks, dubbedAudioTracks, dubbedTrackNames, allTracksMap, allAudioTracks, combinedManifest, _i, _allAudioTracks, track;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              fetchManifest = /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
+                  var response;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return fetch(url);
+                      case 2:
+                        response = _context.sent;
+                        if (response.ok) {
+                          _context.next = 5;
+                          break;
+                        }
+                        throw new Error("Failed to fetch ".concat(url));
+                      case 5:
+                        return _context.abrupt("return", response.text());
+                      case 6:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                return function fetchManifest(_x3) {
+                  return _ref.apply(this, arguments);
+                };
+              }();
+              _context2.next = 3;
+              return Promise.all([fetchManifest(originalUrl), fetchManifest(dubbedUrl)]);
+            case 3:
+              _yield$Promise$all = _context2.sent;
+              _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
+              originalContent = _yield$Promise$all2[0];
+              dubbedContent = _yield$Promise$all2[1];
+              extractAudioTracks = function extractAudioTracks(content, baseUrl) {
+                var lines = content.split(/\r?\n/);
+                var audioTracks = [];
+                for (var i = 0; i < lines.length; i++) {
+                  var line = lines[i];
+                  if (line.startsWith('#EXT-X-MEDIA:TYPE=AUDIO')) {
+                    var groupIdMatch = line.match(/GROUP-ID="([^"]+)"/);
+                    var nameMatch = line.match(/NAME="([^"]+)"/);
+                    var uriMatch = line.match(/URI="([^"]+)"/);
+                    var languageMatch = line.match(/LANGUAGE="([^"]+)"/);
+                    var defaultMatch = line.match(/DEFAULT=(\w+)/);
+                    var autoselectMatch = line.match(/AUTOSELECT=(\w+)/);
+                    if (groupIdMatch && nameMatch && uriMatch) {
+                      var uri = uriMatch[1];
+                      if (!uri.startsWith('http://') && !uri.startsWith('https://') && !uri.startsWith('//')) {
+                        var base = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
+                        uri = new URL(uri, base).href;
+                      }
+                      audioTracks.push({
+                        groupId: groupIdMatch[1],
+                        name: nameMatch[1],
+                        uri: uri,
+                        language: languageMatch ? languageMatch[1] : nameMatch[1],
+                        "default": defaultMatch ? defaultMatch[1] === 'YES' : false,
+                        autoselect: autoselectMatch ? autoselectMatch[1] === 'YES' : true
+                      });
+                    }
+                  }
+                }
+                return audioTracks;
+              };
+              extractVideoStream = function extractVideoStream(content, baseUrl) {
+                var lines = content.split(/\r?\n/);
+                for (var i = 0; i < lines.length; i++) {
+                  if (lines[i].startsWith('#EXT-X-STREAM-INF')) {
+                    var videoUri = lines[i + 1];
+                    if (videoUri && !videoUri.startsWith('#')) {
+                      if (!videoUri.startsWith('http://') && !videoUri.startsWith('https://') && !videoUri.startsWith('//')) {
+                        var base = baseUrl.substring(0, baseUrl.lastIndexOf('/') + 1);
+                        return new URL(videoUri, base).href;
+                      }
+                      return videoUri;
+                    }
+                  }
+                }
+                throw new Error('No video stream found in original manifest');
+              };
+              originalBase = originalUrl;
+              dubbedBase = dubbedUrl;
+              videoStreamUri = extractVideoStream(originalContent, originalBase);
+              originalAudioTracks = extractAudioTracks(originalContent, originalBase);
+              dubbedAudioTracks = extractAudioTracks(dubbedContent, dubbedBase);
+              dubbedTrackNames = dubbedAudioTracks.map(function (track) {
+                return track.name;
+              });
+              allTracksMap = new Map();
+              [].concat(_toConsumableArray(originalAudioTracks), _toConsumableArray(dubbedAudioTracks)).forEach(function (track) {
+                var key = track.name || track.language;
+                if (!allTracksMap.has(key)) {
+                  allTracksMap.set(key, track);
+                }
+              });
+              allAudioTracks = Array.from(allTracksMap.values());
+              combinedManifest = '#EXTM3U\n';
+              combinedManifest += '#EXT-X-VERSION:6\n\n';
+              combinedManifest += '#EXT-X-STREAM-INF:BANDWIDTH=800000,RESOLUTION=640x360,AUDIO="audio"\n';
+              combinedManifest += "".concat(videoStreamUri, "\n\n");
+              for (_i = 0, _allAudioTracks = allAudioTracks; _i < _allAudioTracks.length; _i++) {
+                track = _allAudioTracks[_i];
+                combinedManifest += "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio\",LANGUAGE=\"".concat(track.language, "\",NAME=\"").concat(track.name, "\",AUTOSELECT=").concat(track.autoselect ? 'YES' : 'NO', ",DEFAULT=").concat(track["default"] ? 'YES' : 'NO', ",URI=\"").concat(track.uri, "\"\n");
+              }
+              return _context2.abrupt("return", {
+                combinedManifest: combinedManifest,
+                dubbedTrackNames: dubbedTrackNames
+              });
+            case 24:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function combineM3U8Manifests(_x, _x2) {
+        return _combineM3U8Manifests.apply(this, arguments);
+      }
+      return combineM3U8Manifests;
+    }()
+  }, {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this2 = this;
       var src = this.props.src;
-      var isM3U8 = src.split('.').pop() === 'm3u8' ? true : false;
+      var isM3U8 = src.split('.').pop() === 'm3u8';
       this.setState({
         isM3U8: isM3U8
       });
@@ -302,7 +441,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       } else {
         this.video.src = src;
       }
-      this.forceUpdate(); // make sure the children can get the video property
+      this.forceUpdate();
       var watermarkInterval = setInterval(this.checkWatermark, 40000);
       this.setState({
         watermarkInterval: watermarkInterval
@@ -362,9 +501,12 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         isM3U8 = _this$state.isM3U8,
         watermarkInterval = _this$state.watermarkInterval;
       if (_hls["default"].isSupported() && isM3U8) {
-        this.hls.detachMedia();
+        if (this.hls) {
+          this.hls.detachMedia();
+          this.hls.destroy();
+        }
       } else {
-        this.video.src = '';
+        if (this.video) this.video.src = '';
       }
       clearInterval(watermarkInterval);
       if (this.video) {
@@ -373,6 +515,10 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       }
       window.removeEventListener('resize', this.calculateHeightBasedOnResolution);
       this.disconnectResizeObserver();
+      if (this.combinedManifestUrl) {
+        URL.revokeObjectURL(this.combinedManifestUrl);
+        this.combinedManifestUrl = null;
+      }
     }
   }, {
     key: "checkWatermark",
@@ -415,38 +561,69 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "setupHLS",
-    value: function setupHLS(src) {
+    value: function setupHLS(originalSrc) {
       var _this4 = this;
+      var dubbedTracksOverride = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var _this$props6 = this.props,
         actions = _this$props6.actions,
         activeTrackIndex = _this$props6.activeTrackIndex;
       var self = this;
-      // bind them together
-      this.hls.attachMedia(this.video);
-      this.hls.on(_hls["default"].Events.MEDIA_ATTACHED, function () {
-        self.hls.loadSource(src);
-      });
+      var effectiveDubbedTracks = dubbedTracksOverride !== undefined ? dubbedTracksOverride : this.props.dubbedTracks;
+      var attachAndLoad = function attachAndLoad(sourceUrl) {
+        if (!self.hls) return;
+        self.hls.attachMedia(self.video);
+        self.hls.on(_hls["default"].Events.MEDIA_ATTACHED, function () {
+          self.hls.loadSource(sourceUrl);
+        });
+      };
+      if (effectiveDubbedTracks && effectiveDubbedTracks.length && effectiveDubbedTracks.trim() !== '') {
+        this.combineM3U8Manifests(originalSrc, effectiveDubbedTracks).then(function (_ref2) {
+          var combinedManifest = _ref2.combinedManifest,
+            dubbedTrackNames = _ref2.dubbedTrackNames;
+          // Store the list of dubbed track names
+          self.dubbedTrackNames = dubbedTrackNames;
+          var blob = new Blob([combinedManifest], {
+            type: 'application/vnd.apple.mpegurl'
+          });
+          var combinedUrl = URL.createObjectURL(blob);
+          _this4.combinedManifestUrl = combinedUrl;
+          attachAndLoad(combinedUrl);
+        })["catch"](function (err) {
+          console.error('Failed to combine manifests, falling back to original', err);
+          self.dubbedTrackNames = [];
+          attachAndLoad(originalSrc);
+        });
+      } else {
+        self.dubbedTrackNames = [];
+        attachAndLoad(originalSrc);
+      }
       this.hls.on(_hls["default"].Events.MANIFEST_PARSED, function (event, data) {
-        actions.handleAudioTracks(data.audioTracks);
+        // Add isDubbedTrack flag to audio tracks
+        var audioTracksWithFlag = (data.audioTracks || []).map(function (track) {
+          if (self.dubbedTrackNames && self.dubbedTrackNames.includes(track.name)) {
+            return _objectSpread(_objectSpread({}, track), {}, {
+              isDubbedTrack: true
+            });
+          }
+          return track;
+        });
+        actions.handleAudioTracks(audioTracksWithFlag);
       });
       this.hls.once(_hls["default"].Events.AUDIO_TRACK_LOADED, function (event, data) {
         var trackIndex = activeTrackIndex || 0;
         actions.handleAudioTrackChange(self.props.player.audioTracksArr[trackIndex]);
       });
       this.hls.on(_hls["default"].Events.ERROR, function (event, data) {
-        // eslint-disable-next-line no-console
         console.log('HLS.Events.ERROR: ', event, data);
         if (data.fatal) {
           switch (data.type) {
             case _hls["default"].ErrorTypes.NETWORK_ERROR:
-              // try to recover network error
               _this4.hls.startLoad();
               break;
             case _hls["default"].ErrorTypes.MEDIA_ERROR:
               _this4.hls.recoverMediaError();
               break;
             default:
-              // cannot recover
               _this4.hls.destroy();
               break;
           }
@@ -656,6 +833,7 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
     value: function UNSAFE_componentWillReceiveProps(newProps) {
       var _this$props9 = this.props,
         src = _this$props9.src,
+        dubbedTracks = _this$props9.dubbedTracks,
         activeAudio = _this$props9.player.activeAudio,
         currentSubtitleObj = _this$props9.currentSubtitleObj,
         markers = _this$props9.markers,
@@ -663,14 +841,21 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
       if (markers && markers !== newProps.markers && newProps.markers) {
         this.displaySubtitle(newProps.markers);
       }
-      if (newProps.src !== src) {
+      if (newProps.src !== src || newProps.dubbedTracks !== dubbedTracks) {
         var isM3U8 = this.state.isM3U8;
         if (_hls["default"].isSupported() && isM3U8) {
-          this.hls.detachMedia();
-        } else {
+          if (this.hls) {
+            this.hls.detachMedia();
+            this.hls.destroy();
+          }
+        } else if (this.video) {
           this.video.src = '';
         }
-        var m3u8 = newProps.src.split('.').pop() === 'm3u8' ? true : false;
+        if (this.combinedManifestUrl) {
+          URL.revokeObjectURL(this.combinedManifestUrl);
+          this.combinedManifestUrl = null;
+        }
+        var m3u8 = newProps.src.split('.').pop() === 'm3u8';
         this.setState({
           isM3U8: m3u8
         });
@@ -678,13 +863,13 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
           var _this$manager$getStat3 = this.manager.getState(),
             HLSConfig = _this$manager$getStat3.player.HLSConfig;
           this.hls = new _hls["default"](HLSConfig);
-          this.setupHLS(newProps.src);
-        } else {
+          this.setupHLS(newProps.src, newProps.dubbedTracks);
+        } else if (this.video) {
           this.video.src = newProps.src;
         }
-        this.forceUpdate(); // make sure the children can get the video property
+        this.forceUpdate();
       }
-      if (newProps.player.activeAudio && activeAudio && activeAudio.id !== newProps.player.activeAudio.id) {
+      if (newProps.player.activeAudio && activeAudio && activeAudio.id !== newProps.player.activeAudio.id && this.hls) {
         this.hls.audioTrack = newProps.player.activeAudio.id;
       }
       if (newProps.subtitleObj && newProps.subtitleObj.field && JSON.stringify(newProps.subtitleObj) !== JSON.stringify(currentSubtitleObj)) {

package/components/control-bar/AudioTracksMenuButton.js

@@ -10,15 +10,14 @@ var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _Menu = _interopRequireDefault(require("../Menu"));
 var _tokens = require("@desynova-digital/tokens");
-var _templateObject;
+var _components = require("@desynova-digital/components");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
 function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
@@ -26,22 +25,100 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 var propTypes = {
   actions: _propTypes.PropTypes.instanceOf(Object),
   player: _propTypes.PropTypes.instanceOf(Object),
   theme: _propTypes.PropTypes.string
 };
-var AudioTrackBlock = (0, _styledComponents["default"])('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  text-align: left;\n  background: transparent;\n  cursor: pointer;\n  border-bottom: 1px solid #eeeeee;\n  &:last-child {\n    border: none;\n  }\n  &:hover,\n  &:focus {\n    background: ", ";\n  }\n  p {\n    padding 15px;\n    font-family: SFUIText-Medium;\n    font-size: 12px;\n    white-space: nowrap;\n  }\n"])), function (props) {
+var AudioTrackBlock = (0, _styledComponents["default"])('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  text-align: left;\n  background: transparent;\n  cursor: pointer;\n  border-bottom: 1px solid #eeeeee;\n  &:last-child {\n    border: none;\n  }\n  &:hover,\n  &:focus {\n    background: ", ";\n  }\n  p {\n    padding: 15px;\n    font-family: SFUIText-Medium;\n    font-size: 12px;\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 AccordionContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 100%;\n"])));
+var AccordionHeader = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 12px 15px;\n  background: ", ";\n  cursor: pointer;\n  border-bottom: 1px solid #eeeeee;\n  font-family: SFUIText-Medium;\n  font-size: 13px;\n  font-weight: 500;\n  color: ", ";\n  &:hover {\n    background: ", ";\n  }\n"])), function (props) {
+  return props.theme ? "".concat(_tokens.colors[props.theme].videoPlayer.rgbaThemeColor, "10") : 'rgba(0, 206, 198, 0.05)';
+}, function (props) {
+  return props.theme ? _tokens.colors[props.theme].videoPlayer.themeColor : '#00cec6';
+}, function (props) {
+  return props.theme ? "".concat(_tokens.colors[props.theme].videoPlayer.rgbaThemeColor, "20") : 'rgba(0, 206, 198, 0.1)';
+});
+var HeaderTitle = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  user-select: none;\n  color: #999999;\n"])));
+var HeaderIcon = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 12px;\n  transition: transform 0.2s ease;\n  transform: ", ";\n"])), function (props) {
+  return props.isOpen ? 'rotate(180deg)' : 'rotate(0deg)';
+});
+var AccordionContent = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  overflow: hidden;\n  transition: max-height 0.25s ease-in-out;\n  max-height: ", ";\n"])), function (props) {
+  return props.isOpen ? '500px' : '0';
+});
+var NowPlayingContainer = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  padding: 12px 15px;\n  border-bottom: 1px solid #eeeeee;\n  margin-bottom: 4px;\n"])));
+var NowPlayingLabel = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  font-family: SFUIText-Medium;\n  font-size: 11px;\n  letter-spacing: 0.5px;\n  color: #999999;\n  margin-bottom: 6px;\n"])));
+var NowPlayingTrackName = _styledComponents["default"].div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  font-family: SFUIText-Medium;\n  font-size: 14px;\n  font-weight: 500;\n  color: #333333;\n  white-space: nowrap;\n  overflow: hidden;\n  text-overflow: ellipsis;\n"])));
 var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
   function AudioTracksMenuButton(props, context) {
+    var _this;
     _classCallCheck(this, AudioTracksMenuButton);
-    return _callSuper(this, AudioTracksMenuButton, [props, context]);
+    _this = _callSuper(this, AudioTracksMenuButton, [props, context]);
+    _defineProperty(_this, "toggleOriginalAccordion", function () {
+      _this.setState(function (prevState) {
+        return {
+          openAccordion: prevState.openAccordion === 'original' ? null : 'original'
+        };
+      });
+    });
+    _defineProperty(_this, "toggleDubbedAccordion", function () {
+      _this.setState(function (prevState) {
+        return {
+          openAccordion: prevState.openAccordion === 'dubbed' ? null : 'dubbed'
+        };
+      });
+    });
+    _this.state = {
+      openAccordion: 'original'
+    };
+    return _this;
   }
   _inherits(AudioTracksMenuButton, _Component);
   return _createClass(AudioTracksMenuButton, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.ensureValidAudioTrack();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _prevProps$player, _this$props$player, _prevProps$player2, _this$props$player2;
+      var prevTracks = (_prevProps$player = prevProps.player) === null || _prevProps$player === void 0 ? void 0 : _prevProps$player.audioTracksArr;
+      var currentTracks = (_this$props$player = this.props.player) === null || _this$props$player === void 0 ? void 0 : _this$props$player.audioTracksArr;
+      var prevActiveAudio = (_prevProps$player2 = prevProps.player) === null || _prevProps$player2 === void 0 ? void 0 : _prevProps$player2.activeAudio;
+      var currentActiveAudio = (_this$props$player2 = this.props.player) === null || _this$props$player2 === void 0 ? void 0 : _this$props$player2.activeAudio;
+      if (prevTracks !== currentTracks || (prevActiveAudio === null || prevActiveAudio === void 0 ? void 0 : prevActiveAudio.id) !== (currentActiveAudio === null || currentActiveAudio === void 0 ? void 0 : currentActiveAudio.id)) {
+        this.ensureValidAudioTrack();
+      }
+    }
+  }, {
+    key: "ensureValidAudioTrack",
+    value: function ensureValidAudioTrack() {
+      var _this$props = this.props,
+        player = _this$props.player,
+        actions = _this$props.actions;
+      var allTracks = player.audioTracksArr || [];
+      if (allTracks.length === 0) return;
+      var currentActive = player.activeAudio;
+      var isCurrentTrackValid = currentActive && allTracks.some(function (track) {
+        return track.id === currentActive.id;
+      });
+      if (!isCurrentTrackValid) {
+        var firstOriginalTrack = allTracks.find(function (track) {
+          return track.autoselect;
+        });
+        if (firstOriginalTrack) {
+          actions.handleAudioTrackChange(firstOriginalTrack);
+        }
+      }
+    }
+  }, {
     key: "changeTrack",
     value: function changeTrack(track) {
       var actions = this.props.actions;
@@ -50,12 +127,27 @@ var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this = this;
-      var _this$props = this.props,
-        player = _this$props.player,
-        actions = _this$props.actions,
-        theme = _this$props.theme;
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, player.audioTracksArr && player.audioTracksArr.length ? /*#__PURE__*/_react["default"].createElement(_Menu["default"], {
+      var _player$activeAudio,
+        _this2 = this;
+      var _this$props2 = this.props,
+        player = _this$props2.player,
+        actions = _this$props2.actions,
+        theme = _this$props2.theme;
+      var openAccordion = this.state.openAccordion;
+      var allTracks = player.audioTracksArr || [];
+      var originalTracks = allTracks.filter(function (track) {
+        return !track.isDubbedTrack;
+      });
+      var dubbedTracks = allTracks.filter(function (track) {
+        return track.isDubbedTrack === true;
+      });
+      var currentTrackName = ((_player$activeAudio = player.activeAudio) === null || _player$activeAudio === void 0 ? void 0 : _player$activeAudio.name) || 'No track playing';
+      var hasOriginalTracks = originalTracks.length > 0;
+      var hasDubbedTracks = dubbedTracks.length > 0;
+      if (!hasOriginalTracks && !hasDubbedTracks) {
+        return null;
+      }
+      return /*#__PURE__*/_react["default"].createElement(_Menu["default"], {
         theme: theme,
         icon: "audio-track",
         player: player,
@@ -66,11 +158,52 @@ var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
         position: "left"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "menu-container"
-      }, player.audioTracksArr.map(function (track) {
+      }, hasDubbedTracks && /*#__PURE__*/_react["default"].createElement(NowPlayingContainer, null, /*#__PURE__*/_react["default"].createElement(NowPlayingLabel, null, "Now playing"), /*#__PURE__*/_react["default"].createElement(NowPlayingTrackName, {
+        theme: theme
+      }, currentTrackName)), hasDubbedTracks && /*#__PURE__*/_react["default"].createElement(AccordionContainer, null, /*#__PURE__*/_react["default"].createElement(AccordionHeader, {
+        theme: theme,
+        onClick: this.toggleDubbedAccordion
+      }, /*#__PURE__*/_react["default"].createElement(HeaderTitle, null, "Dubbed tracks"), /*#__PURE__*/_react["default"].createElement(HeaderIcon, {
+        isOpen: openAccordion === 'dubbed'
+      }, /*#__PURE__*/_react["default"].createElement(_components.Icon, {
+        color: "#999999",
+        name: "dropdown_more_icon"
+      }))), /*#__PURE__*/_react["default"].createElement(AccordionContent, {
+        isOpen: openAccordion === 'dubbed'
+      }, dubbedTracks.map(function (track, index) {
+        return /*#__PURE__*/_react["default"].createElement(AudioTrackBlock, {
+          theme: theme,
+          onClick: function onClick() {
+            return _this2.changeTrack(track);
+          },
+          role: "presentation",
+          key: track.id || index,
+          style: player.activeAudio && player.activeAudio.id === track.id ? {
+            pointerEvents: 'none'
+          } : null
+        }, /*#__PURE__*/_react["default"].createElement("p", {
+          style: player.activeAudio && player.activeAudio.id === track.id ? {
+            color: theme ? "".concat(_tokens.colors[theme].videoPlayer.themeColor) : '#00cec6',
+            pointerEvents: 'none'
+          } : {
+            color: '#333333'
+          }
+        }, track.name || "Dubbed Track ".concat(index + 1)));
+      }))), hasOriginalTracks && /*#__PURE__*/_react["default"].createElement(AccordionContainer, null, hasDubbedTracks && /*#__PURE__*/_react["default"].createElement(AccordionHeader, {
+        theme: theme,
+        onClick: this.toggleOriginalAccordion
+      }, /*#__PURE__*/_react["default"].createElement(HeaderTitle, null, "Original tracks"), /*#__PURE__*/_react["default"].createElement(HeaderIcon, {
+        isOpen: openAccordion === 'original'
+      }, /*#__PURE__*/_react["default"].createElement(_components.Icon, {
+        color: "#999999",
+        name: "dropdown_more_icon"
+      }))), /*#__PURE__*/_react["default"].createElement(AccordionContent, {
+        isOpen: openAccordion === 'original'
+      }, originalTracks.map(function (track) {
         return /*#__PURE__*/_react["default"].createElement(AudioTrackBlock, {
           theme: theme,
           onClick: function onClick() {
-            return _this.changeTrack(track);
+            return _this2.changeTrack(track);
           },
           role: "presentation",
           key: track.id,
@@ -79,13 +212,13 @@ var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
           } : null
         }, /*#__PURE__*/_react["default"].createElement("p", {
           style: player.activeAudio && player.activeAudio.id === track.id ? {
-            color: theme ? " ".concat(_tokens.colors[theme].videoPlayer.themeColor) : '#00cec6',
+            color: theme ? "".concat(_tokens.colors[theme].videoPlayer.themeColor) : '#00cec6',
             pointerEvents: 'none'
           } : {
             color: '#333333'
           }
-        }, track.name));
-      }))) : null);
+        }, track.name || ''));
+      })))));
     }
   }]);
 }(_react.Component);

package/package.json

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