@xibosignage/xibo-layout-renderer 1.0.5 → 1.0.7

package/dist/src/Types/XLR/XLR.types.d.ts

@@ -1,4 +1,5 @@
 import { ILayout, InputLayoutType, OptionsType } from '../Layout';
+import { Emitter } from 'nanoevents';
 export type PrepareLayoutsType = {
     moveNext?: boolean;
 };
@@ -6,6 +7,9 @@ export declare enum ELayoutType {
     CURRENT = 0,
     NEXT = 1
 }
+export type IXlrEvents = {
+    layoutChange: (layoutId: number) => void;
+};
 export interface IXlr {
     inputLayouts: InputLayoutType[];
     config: OptionsType;
@@ -14,6 +18,7 @@ export interface IXlr {
     currentLayoutId: number | null;
     currentLayout: ILayout | undefined;
     nextLayout: ILayout | undefined;
+    emitter: Emitter<IXlrEvents>;
     bootstrap(): void;
     init(): Promise<IXlr>;
     playSchedules(xlr: IXlr): void;

package/dist/xibo-layout-renderer.cjs.js

@@ -71383,6 +71383,7 @@ var initialXlr = {
   currentLayoutId: null,
   currentLayout: undefined,
   nextLayout: undefined,
+  emitter: {},
   bootstrap: function bootstrap() {},
   init: function init() {
     return Promise.resolve({});
@@ -71471,6 +71472,39 @@ function XiboLayoutRenderer(inputLayouts, options) {
     options: options
   };
   var xlrObject = _objectSpread2({}, initialXlr);
+  var emitter = createNanoEvents();
+  xlrObject.emitter = emitter;
+  xlrObject.emitter.on('layoutChange', /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(layoutId) {
+      var _xlrObject$nextLayout, _targetLayout, _targetLayout2;
+      var targetLayout;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (layoutId === ((_xlrObject$nextLayout = xlrObject.nextLayout) === null || _xlrObject$nextLayout === void 0 ? void 0 : _xlrObject$nextLayout.layoutId)) {
+              targetLayout = {
+                layout: xlrObject.nextLayout,
+                pos: exports.ELayoutType.NEXT
+              };
+            }
+            if (!((_targetLayout = targetLayout) !== null && _targetLayout !== void 0 && _targetLayout.layout && (_targetLayout2 = targetLayout) !== null && _targetLayout2 !== void 0 && _targetLayout2.pos)) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return xlrObject.prepareLayoutXlf(xlrObject.nextLayout);
+          case 4:
+            xlrObject.nextLayout = _context.sent;
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }());
   xlrObject.bootstrap = function () {
     // Place to set configurations and initialize required props
     var self = this;
@@ -71512,11 +71546,11 @@ function XiboLayoutRenderer(inputLayouts, options) {
     this.updateLayouts(inputLayouts);
   };
   xlrObject.updateLayouts = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(inputLayouts) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(inputLayouts) {
       var _this2 = this;
       var xlr, _this$currentLayout, _this$nextLayout, currLayoutIndex, nxtLayoutIndex, tempOldNxtLayout, newNxtLayoutIndex, tempNxtLayout, hasOldNxtLayout, oldNxtLayoutIndex, _this$nextLayout2, tempNewNxtLayout;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             /**
              * @TODO
@@ -71539,19 +71573,19 @@ function XiboLayoutRenderer(inputLayouts, options) {
               var _this2$currentLayout;
               return inputLayout.layoutId === ((_this2$currentLayout = _this2.currentLayout) === null || _this2$currentLayout === void 0 ? void 0 : _this2$currentLayout.layoutId);
             }).length === 0)) {
-              _context.next = 11;
+              _context2.next = 11;
               break;
             }
             // Unset currentLayout, nextLayout and layouts
             this.layouts = [];
             this.currentLayout = undefined;
             this.nextLayout = undefined;
-            _context.next = 7;
+            _context2.next = 7;
             return this.prepareLayouts();
           case 7:
-            xlr = _context.sent;
+            xlr = _context2.sent;
             this.playSchedules(xlr);
-            _context.next = 40;
+            _context2.next = 40;
             break;
           case 11:
             /** Case 2: When currentLayout is in inputLayouts, then continue playing
@@ -71566,18 +71600,18 @@ function XiboLayoutRenderer(inputLayouts, options) {
             tempOldNxtLayout = this.layouts[nxtLayoutIndex];
             newNxtLayoutIndex = currLayoutIndex + 1;
             if (!(nxtLayoutIndex !== newNxtLayoutIndex)) {
-              _context.next = 33;
+              _context2.next = 33;
               break;
             }
             // Delete old nextLayout
             delete this.layouts[nxtLayoutIndex];
             if (!Boolean(this.layouts[newNxtLayoutIndex])) {
-              _context.next = 22;
+              _context2.next = 22;
               break;
             }
             this.nextLayout = this.layouts[newNxtLayoutIndex];
             this.layouts[newNxtLayoutIndex] = this.nextLayout;
-            _context.next = 31;
+            _context2.next = 31;
             break;
           case 22:
             // Check if newNxtLayoutIndex is still within inputLayouts
@@ -71586,14 +71620,14 @@ function XiboLayoutRenderer(inputLayouts, options) {
               newNxtLayoutIndex = 0;
             }
             if (!Boolean(inputLayouts[newNxtLayoutIndex])) {
-              _context.next = 29;
+              _context2.next = 29;
               break;
             }
             tempNxtLayout = _objectSpread2(_objectSpread2({}, initialLayout), inputLayouts[newNxtLayoutIndex]);
-            _context.next = 27;
+            _context2.next = 27;
             return this.prepareLayoutXlf(tempNxtLayout);
           case 27:
-            this.nextLayout = _context.sent;
+            this.nextLayout = _context2.sent;
             this.layouts[newNxtLayoutIndex] = this.nextLayout;
           case 29:
             // Move old nextLayout to its index
@@ -71605,18 +71639,18 @@ function XiboLayoutRenderer(inputLayouts, options) {
               this.layouts[oldNxtLayoutIndex] = tempOldNxtLayout;
             }
           case 31:
-            _context.next = 40;
+            _context2.next = 40;
             break;
           case 33:
             if (!(inputLayouts[nxtLayoutIndex].layoutId !== ((_this$nextLayout2 = this.nextLayout) === null || _this$nextLayout2 === void 0 ? void 0 : _this$nextLayout2.layoutId))) {
-              _context.next = 39;
+              _context2.next = 39;
               break;
             }
             tempNewNxtLayout = _objectSpread2(_objectSpread2({}, initialLayout), inputLayouts[nxtLayoutIndex]);
-            _context.next = 37;
+            _context2.next = 37;
             return this.prepareLayoutXlf(tempNewNxtLayout);
           case 37:
-            this.nextLayout = _context.sent;
+            this.nextLayout = _context2.sent;
             this.layouts[nxtLayoutIndex] = this.nextLayout;
           case 39:
             // Remove old nextLayout if it's not in inputLayouts
@@ -71629,19 +71663,19 @@ function XiboLayoutRenderer(inputLayouts, options) {
             }
           case 40:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
-    return function (_x) {
-      return _ref.apply(this, arguments);
+    return function (_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
-  xlrObject.prepareLayouts = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  xlrObject.prepareLayouts = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var _xlrLayouts$current;
     var self, xlrLayouts, layoutsXlf, layouts;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           self = this; // Get layouts
           xlrLayouts = getLayout({
@@ -71660,13 +71694,13 @@ function XiboLayoutRenderer(inputLayouts, options) {
               return [].concat(_toConsumableArray(coll), [self.prepareLayoutXlf(item)]);
             }, []);
           };
-          _context2.next = 7;
+          _context3.next = 7;
           return Promise.all(layoutsXlf());
         case 7:
-          layouts = _context2.sent;
+          layouts = _context3.sent;
           console.debug('prepareLayouts::layouts', layouts);
           console.debug('prepareLayouts::xlr>layouts', self.layouts);
-          return _context2.abrupt("return", new Promise(function (resolve) {
+          return _context3.abrupt("return", new Promise(function (resolve) {
             layouts.map(function (layoutItem) {
               if (!Boolean(self.layouts[layoutItem.index])) {
                 self.layouts[layoutItem.index] = layoutItem;
@@ -71685,41 +71719,41 @@ function XiboLayoutRenderer(inputLayouts, options) {
           }));
         case 11:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, this);
+    }, _callee3, this);
   }));
   xlrObject.prepareLayoutXlf = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(inputLayout) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(inputLayout) {
       var _this3 = this;
       var self, newOptions, layoutXlf, layoutXlfNode, parser;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             self = this; // Compose layout props first
             newOptions = Object.assign({}, platform);
             newOptions = _objectSpread2(_objectSpread2({}, newOptions), props.options);
             if (self.config.platform === 'CMS' && inputLayout && Boolean(inputLayout.layoutId)) {
               newOptions.xlfUrl = newOptions.xlfUrl.replace(':layoutId', String(inputLayout.layoutId));
-            } else if (self.config.platform === 'chromeOS') {
+            } else if (self.config.platform === 'chromeOS' && inputLayout !== undefined) {
               newOptions.xlfUrl = inputLayout.path;
             }
             if (!(inputLayout && inputLayout.layoutNode === null)) {
-              _context3.next = 12;
+              _context4.next = 12;
               break;
             }
-            _context3.next = 7;
+            _context4.next = 7;
             return getXlf(newOptions);
           case 7:
-            layoutXlf = _context3.sent;
+            layoutXlf = _context4.sent;
             parser = new window.DOMParser();
             layoutXlfNode = parser.parseFromString(layoutXlf, 'text/xml');
-            _context3.next = 13;
+            _context4.next = 13;
             break;
           case 12:
             layoutXlfNode = inputLayout && inputLayout.layoutNode;
           case 13:
-            return _context3.abrupt("return", new Promise(function (resolve) {
+            return _context4.abrupt("return", new Promise(function (resolve) {
               var xlrLayoutObj = initialLayout;
               xlrLayoutObj.id = Number(inputLayout.layoutId);
               xlrLayoutObj.layoutId = Number(inputLayout.layoutId);
@@ -71729,12 +71763,12 @@ function XiboLayoutRenderer(inputLayouts, options) {
             }));
           case 14:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
-    return function (_x2) {
-      return _ref3.apply(this, arguments);
+    return function (_x3) {
+      return _ref4.apply(this, arguments);
     };
   }();
   xlrObject.bootstrap();