@xibosignage/xibo-layout-renderer 1.0.24 → 1.0.25

package/dist/xibo-layout-renderer.js

@@ -834,31 +834,37 @@ var XiboLayoutRenderer = (function (exports) {
               case 0:
                 _context2.next = 2;
                 return Promise.all(list.map( /*#__PURE__*/function () {
-                  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
-                    var inputOverlay, overlayLayout, $overlay;
+                  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item, index) {
+                    var _item$index;
+                    var inputOverlay, overlayLayout, $overlay, _overlayLayout$zIndex;
                     return _regeneratorRuntime().wrap(function _callee$(_context) {
                       while (1) switch (_context.prev = _context.next) {
                         case 0:
                           inputOverlay = {};
                           inputOverlay = _objectSpread2(_objectSpread2({}, inputOverlay), item);
-                          inputOverlay.index = item.index;
+                          inputOverlay.index = (_item$index = item.index) !== null && _item$index !== void 0 ? _item$index : index;
                           _context.next = 5;
                           return _this.parent.prepareLayoutXlf(_objectSpread2(_objectSpread2({}, initialLayout), inputOverlay));
                         case 5:
                           overlayLayout = _context.sent;
+                          console.debug('<> XLR.debug OverlayLayoutManager::parseOverlays prepared overlay layout', {
+                            overlayLayout: overlayLayout,
+                            inputOverlay: inputOverlay
+                          });
                           // Hide all overlays first
                           $overlay = document.querySelector("#".concat(overlayLayout.containerName, "[data-sequence=\"").concat(overlayLayout.index, "\"]"));
                           if ($overlay !== null) {
-                            $overlay.style.setProperty('display', 'none');
+                            $overlay.style.setProperty('visibility', 'hidden');
+                            $overlay.style.setProperty('z-index', "".concat((_overlayLayout$zIndex = overlayLayout.zIndex) !== null && _overlayLayout$zIndex !== void 0 ? _overlayLayout$zIndex : -999));
                           }
                           return _context.abrupt("return", overlayLayout);
-                        case 9:
+                        case 10:
                         case "end":
                           return _context.stop();
                       }
                     }, _callee);
                   }));
-                  return function (_x2) {
+                  return function (_x2, _x3) {
                     return _ref.apply(this, arguments);
                   };
                 }()));
@@ -987,7 +993,7 @@ var XiboLayoutRenderer = (function (exports) {
             }
           }, _callee3, this, [[12, 21, 24, 27]]);
         }));
-        function prepareOverlayLayouts(_x3, _x4) {
+        function prepareOverlayLayouts(_x4, _x5) {
           return _prepareOverlayLayouts.apply(this, arguments);
         }
         return prepareOverlayLayouts;
@@ -998,7 +1004,8 @@ var XiboLayoutRenderer = (function (exports) {
         var _this$parent$currentL;
         if (this.overlays.length === 0) return;
         if (this.parent && (_this$parent$currentL = this.parent.currentLayout) !== null && _this$parent$currentL !== void 0 && _this$parent$currentL.isInterrupt()) {
-          this.container.style.setProperty('display', 'none');
+          this.container.style.setProperty('visibility', 'hidden');
+          this.container.style.setProperty('z-index', '-999');
           return;
         }
         this.overlays.forEach(function (overlay) {
@@ -1016,21 +1023,25 @@ var XiboLayoutRenderer = (function (exports) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   overlayHtml = document.querySelector("#".concat(overlay.containerName, "[data-sequence=\"").concat(overlay.index, "\"]"));
+                  console.debug('<> XLR.debug OverlayLayoutManager::stopOverlays', {
+                    overlay: overlay,
+                    overlayHtml: overlayHtml
+                  });
                   if (!(overlayHtml !== null)) {
-                    _context5.next = 5;
+                    _context5.next = 6;
                     break;
                   }
-                  _context5.next = 4;
+                  _context5.next = 5;
                   return overlay.finishAllRegions();
-                case 4:
-                  overlay.emitter.emit('end', overlay);
                 case 5:
+                  overlay.emitter.emit('end', overlay);
+                case 6:
                 case "end":
                   return _context5.stop();
               }
             }, _callee4);
           }));
-          return function (_x5) {
+          return function (_x6) {
             return _ref2.apply(this, arguments);
           };
         }());
@@ -73806,6 +73817,13 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     }));
     return _playerReportFault.apply(this, arguments);
   }
+  function setLayoutIndex(layout, layoutIndex) {
+    if (!layout || layout.id === null) {
+      return;
+    }
+    layout.index = layoutIndex;
+    return layout;
+  }
 
   const urlAlphabet =
     'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
@@ -74981,10 +74999,16 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     }, {
       key: "openLayoutInNewTab",
       value: function openLayoutInNewTab(layoutCode, options) {
-        if (confirm(this.translations.navigateToLayout.replace('[layoutTag]', layoutCode))) {
-          var url = options.layoutPreviewUrl.replace('[layoutCode]', layoutCode) + '?findByCode=1';
-          window.open(url, '_blank');
-        }
+        var url = options.layoutPreviewUrl.replace('[layoutCode]', layoutCode) + '?findByCode=1';
+        // Send a postMessage to the parent frame so the CMS can handle the confirmation
+        // and navigation (confirm() is blocked in sandboxed iframes without allow-modals).
+        window.parent.postMessage({
+          type: 'xlr:navLayout',
+          layoutCode: layoutCode,
+          url: url
+        }, '*');
+        // Also emit via the XLR event system for non-iframe consumers.
+        this.parent.xlr.emitter.emit('navLayout', layoutCode, url);
       }
     }, {
       key: "openLayoutInPlayer",
@@ -75401,8 +75425,11 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                   layout.state = exports.ELayoutState.PLAYED;
                 }
                 layout.done = true;
-                console.debug({
-                  $layout: $layout
+                console.debug('>>> XLR.debug Layout end emitted > Layout ID > ', {
+                  $layout: $layout,
+                  layoutId: layout.id,
+                  isOverlay: layout.isOverlay,
+                  isInterrupt: layout.isInterrupt()
                 });
                 if ($layout !== null) {
                   $layout.style.setProperty('visibility', 'hidden');
@@ -76137,12 +76164,12 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
           $splashScreen === null || $splashScreen === void 0 || $splashScreen.hide();
         }
         if (!xlr.currentLayout.done) {
-          console.log('>>>> XLR.debug XLR::playSchedules > Running currentLayout', xlr.currentLayout);
-          xlr.currentLayout.run();
           // Hide overlays when current layout is interrupt
           if (xlr.currentLayout.isInterrupt()) {
             xlrObject.overlayLayoutManager.stopOverlays();
           }
+          console.log('>>>> XLR.debug XLR::playSchedules > Running currentLayout', xlr.currentLayout);
+          xlr.currentLayout.run();
         }
       } else {
         // Show splash screen
@@ -76490,8 +76517,10 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
               var tempNextLayoutIndex = getLayoutIndexByLayoutId(this.inputLayouts, this.nextLayout.layoutId);
               _currentLayoutIndex = tempNextLayoutIndex !== null && tempNextLayoutIndex !== void 0 ? tempNextLayoutIndex : 0;
               _currentLayout = this.getLayout(this.inputLayouts[tempNextLayoutIndex !== null && tempNextLayoutIndex !== void 0 ? tempNextLayoutIndex : 0]);
+              _currentLayout = setLayoutIndex(_currentLayout, _currentLayoutIndex);
             } else {
               _currentLayout = this.getLayout(this.inputLayouts[0]);
+              _currentLayout = setLayoutIndex(_currentLayout, 0);
             }
             if (this.inputLayouts.length > 1) {
               if (_currentLayoutIndex + 1 > this.inputLayouts.length - 1) {
@@ -76500,6 +76529,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                 _nextLayoutIndex = _currentLayoutIndex + 1;
               }
               _nextLayout = this.getLayout(this.inputLayouts[_nextLayoutIndex]);
+              _nextLayout = setLayoutIndex(_nextLayout, _nextLayoutIndex);
             } else {
               _nextLayout = _currentLayout;
             }
@@ -76512,20 +76542,25 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                   if (_currentLayout) {
                     _currentLayoutIndex = _currentLayout.index;
                   }
+                  _currentLayout = setLayoutIndex(_currentLayout, _currentLayoutIndex);
                   _nextLayoutIndex = 0;
                   _nextLayout = this.getLayout(this.inputLayouts[_nextLayoutIndex]);
+                  _nextLayout = setLayoutIndex(_nextLayout, _nextLayoutIndex);
                 }
               } else {
                 _currentLayoutIndex = this.nextLayout.index > this.inputLayouts.length - 1 ? 0 : this.nextLayout.index;
                 _currentLayout = this.getLayout(this.inputLayouts[_currentLayoutIndex]);
+                _currentLayout = setLayoutIndex(_currentLayout, _currentLayoutIndex);
                 _nextLayoutIndex = _currentLayoutIndex + 1 > this.inputLayouts.length - 1 ? 0 : _currentLayoutIndex + 1;
                 _nextLayout = this.getLayout(this.inputLayouts[_nextLayoutIndex]);
+                _nextLayout = setLayoutIndex(_nextLayout, _nextLayoutIndex);
               }
             } else {
               _currentLayout = this.nextLayout;
               _currentLayoutIndex = _currentLayout.index;
               _nextLayoutIndex = (_currentLayoutIndex + 1) % this.inputLayouts.length;
               _nextLayout = this.getLayout(this.inputLayouts[_nextLayoutIndex]);
+              _nextLayout = setLayoutIndex(_nextLayout, _nextLayoutIndex);
             }
           }
         }
@@ -76533,17 +76568,22 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
         // Initial run: set both currentLayout and nextLayout
         if (hasLayout) {
           _currentLayout = this.getLayout(this.inputLayouts[_currentLayoutIndex]);
+          _currentLayout = setLayoutIndex(_currentLayout, _currentLayoutIndex);
           if (this.inputLayouts.length > 1) {
             _nextLayout = this.getLayout(this.inputLayouts[_nextLayoutIndex]);
+            _nextLayout = setLayoutIndex(_nextLayout, _nextLayoutIndex);
           } else {
             _nextLayout = this.getLayout(this.inputLayouts[0]);
+            _nextLayout = setLayoutIndex(_nextLayout, 0);
           }
         }
       }
       if (_currentLayout === undefined && _nextLayout === undefined) {
         if (_hasDefaultOnly) {
           _currentLayout = this.getLayout(this.inputLayouts[0]);
+          _currentLayout = setLayoutIndex(_currentLayout, 0);
           _nextLayout = this.getLayout(this.inputLayouts[0]);
+          _nextLayout = setLayoutIndex(_nextLayout, 0);
         }
       }
       if (_currentLayout !== undefined && _nextLayout !== undefined) {
@@ -76577,6 +76617,11 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
             activeLayout = _objectSpread2({}, this.uniqueLayouts[inputLayout.layoutId]);
           }
           _layout = _objectSpread2(_objectSpread2({}, _layout), activeLayout);
+          console.debug('XLR::getLayout > activeLayout from uniqueLayouts', {
+            activeLayout: activeLayout,
+            inputLayout: inputLayout,
+            uniqueLayouts: this.uniqueLayouts
+          });
           // Must set index/sequence from schedule loop
           _layout.index = activeLayout.index;
         }
@@ -76789,7 +76834,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
               _nextLayout = nextLayout;
             case 2:
               if (!(_nextLayout && _nextLayout.xlfString === '')) {
-                _context16.next = 16;
+                _context16.next = 17;
                 break;
               }
               // Remove skipped layout
@@ -76801,25 +76846,26 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                 _context16.next = 7;
                 break;
               }
-              return _context16.abrupt("break", 16);
+              return _context16.abrupt("break", 17);
             case 7:
               inputLayout = self.inputLayouts[nextIndex];
               if (inputLayout) {
                 _context16.next = 10;
                 break;
               }
-              return _context16.abrupt("break", 16);
+              return _context16.abrupt("break", 17);
             case 10:
               nextLayoutObj = self.getLayout(inputLayout);
-              _context16.next = 13;
+              nextLayoutObj = setLayoutIndex(nextLayoutObj, nextIndex);
+              _context16.next = 14;
               return self.prepareLayoutXlf(nextLayoutObj);
-            case 13:
+            case 14:
               _nextLayout = _context16.sent;
               _context16.next = 2;
               break;
-            case 16:
-              return _context16.abrupt("return", _nextLayout);
             case 17:
+              return _context16.abrupt("return", _nextLayout);
+            case 18:
             case "end":
               return _context16.stop();
           }