@datarailsshared/dr_renderer 1.2.98 → 1.2.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.98",
+  "version": "1.2.101",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr_pivottable.js

@@ -646,10 +646,10 @@ let initDRPivotTable = function($, window, document) {
         getColorsWithOffsetForTable = function (value) {
             var colors = [];
 
-            if (opts.paletteOptions.widgetPalette) {
+            if (opts.paletteOptions && opts.paletteOptions.widgetPalette) {
                 const mc_palette = _.find(_.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
                 colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
-            } else if (opts.paletteOptions.dashboardPalette && opts.paletteOptions.dashboardPalette.colors) {
+            } else if (opts.paletteOptions && opts.paletteOptions.dashboardPalette && opts.paletteOptions.dashboardPalette.colors) {
                 colors = opts.paletteOptions.dashboardPalette.colors;
             } else {
                 colors = newTableColors;
@@ -1421,13 +1421,18 @@ let initDRPivotTable = function($, window, document) {
                     "data-rownode": rowHeader.node
                 }, getTableEventHandlers(val, rowHeader.key, []));
 
+                if (rowHeader.children.length && rowHeader.clickStatus === 'expanded') {
+                    td.style.display = 'none';
+                }
+
                 tr.appendChild(td)
             }
         }
 
         buildAdditionalRowValues = function (tr, colHeaderCols, rowKey) {
             for (let i = 0; i < colHeaderCols.length; i++) {
-                const colKey = colHeaderCols[i].flatKey;
+                const colHeader = colHeaderCols[i];
+                const colKey = colHeader.flatKey;
                 const totalAggregator = getAdditionalAggregation(rowKey, colKey);
                 const val = totalAggregator.value();
                 const formattedValue = getFormattedNumber(val, totalAggregator, opts)
@@ -1439,6 +1444,10 @@ let initDRPivotTable = function($, window, document) {
                     "data-colnode": "" + i
                 });
 
+                if (colHeader.children.length && colHeader.clickStatus === 'expanded') {
+                    td.style.display = 'none';
+                }
+
                 tr.appendChild(td);
             }
 

package/src/novix_renderer.js

@@ -304,7 +304,7 @@ let initNovixRenderer = function($, window, document, Handsontable){
                 dataSource.fixedColumns = pvtData.rowAttrs.length + (hasColumnAttr ? 1 : 0);
                 dataSource.fixedRows = pvtData.colAttrs.length + (hasRowAttr ? 1 : 0);
 
-                for (i = 0; i < pvtData.rowAttrs.length; i++) {
+                for (let i = 0; i < pvtData.rowAttrs.length; i++) {
                     rowKeys.sort((a,b) => {
                         if (_.isEqual(a.slice(0, i), b.slice(0,i)) && a[i] && a[i] === subtotal) return -1;
                         if (_.isEqual(a.slice(0, i), b.slice(0,i)) && b[i] && b[i] === subtotal) return 1;

package/src/published_items_renderer.js

@@ -18,74 +18,78 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     return false;
   }
 
-  publishedItemsRenderer.resizeTable = function (options, window) {
+  publishedItemsRenderer.resizeTable = function (options, iframeWindow) {
     options.alreadySetTimeout = null;
-    const publish_item_image = window.document.getElementById('publish_item_image');
-    const table = window.document.getElementsByTagName("table")[0];
-    const body = window.document.getElementsByTagName("body")[0];
-    let body_zoom = body.style.zoom;
-    body_zoom = parseFloat(body_zoom);
+    const publish_item_image = iframeWindow.document.getElementById('publish_item_image');
+    const table = iframeWindow.document.getElementsByTagName("table")[0];
+    const body = iframeWindow.document.getElementsByTagName("body")[0];
 
-    if (!body_zoom) {
-      body_zoom = 1;
+    if (table && options.responsive) {
+      publishedItemsRenderer.zoomTable(iframeWindow, table, body);
     }
 
-    if (table && options.autoResize) {
-      let zoom = table.style.zoom;
-      zoom = parseFloat(zoom);
+    publishedItemsRenderer.resizePublishedImage(publish_item_image, iframeWindow, body);
+  }
 
-      if (!zoom) {
-        zoom = 1;
-      }
+  publishedItemsRenderer.zoomTable = function(iframeWindow, table, body) {
+    let body_zoom = body.style.zoom;
+    body_zoom = parseFloat(body_zoom) || 1;
 
-      const positionInfo = table.getBoundingClientRect();
-      let height = (positionInfo.height + positionInfo.y * 2) * zoom * body_zoom;
-      let width = (positionInfo.width + positionInfo.x * 2) * zoom * body_zoom;
-
-      if (height < window.innerHeight && width < window.innerWidth) {
-        zoom += 0.05;
-        height = (positionInfo.height + positionInfo.y * 2) * zoom * body_zoom;
-        width = (positionInfo.width + positionInfo.x * 2) * zoom * body_zoom;
-        if (height < window.innerHeight && width < window.innerWidth) {
-          table.style.zoom = zoom;
-          setTimeout(function () {
-            publishedItemsRenderer.resizeTable(options, window);
-          }, 10);
-        }
-      } else if (height >= window.innerHeight || width >= window.innerWidth) {
-        zoom -= 0.05;
-        height = (positionInfo.height + positionInfo.y * 2) * zoom * body_zoom;
-        width = (positionInfo.width + positionInfo.x * 2) * zoom * body_zoom;
+    let zoom = table.style.zoom;
+    zoom = parseFloat(zoom) || 1;
+
+    const positionInfo = table.getBoundingClientRect();
+    let width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+
+    if (width < iframeWindow.innerWidth) {
+      zoom += 0.05;
+
+      width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+      if (width < iframeWindow.innerWidth) {
         table.style.zoom = zoom;
-        if (height >= window.innerHeight || width >= window.innerWidth) {
-          setTimeout(function () {
-            publishedItemsRenderer.resizeTable(options, window);
-          }, 10);
-        }
-      }
-    }
-    if (publish_item_image) {
-      if (publish_item_image.style.height === '100%') {
-        publish_item_image.style.height = 'auto';
-        publish_item_image.style.width = '100%';
-        publish_item_image.style.marginTop = "";
         setTimeout(function () {
-          publishedItemsRenderer.resizeTable(options, window);
+          publishedItemsRenderer.zoomTable(iframeWindow, table, body);
         }, 10);
       }
+    } else if (width >= iframeWindow.innerWidth) {
+      zoom -= 0.05;
 
-      const imgPositionInfo = publish_item_image.getBoundingClientRect();
-      const height = (imgPositionInfo.height + imgPositionInfo.y * 2) * body_zoom;
-      if (height > window.innerHeight) {
-        publish_item_image.style.height = '100%';
-        publish_item_image.style.width = 'auto';
-      } else if (height < window.innerHeight) {
-        const temp = (window.innerHeight - height) / 2;
-        publish_item_image.style.marginTop = (temp / body_zoom + imgPositionInfo.y) + "px";
+      width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+      table.style.zoom = zoom;
+      if (width >= iframeWindow.innerWidth) {
+        setTimeout(function () {
+          publishedItemsRenderer.zoomTable(iframeWindow, table, body);
+        }, 10);
       }
     }
   }
 
+  publishedItemsRenderer.resizePublishedImage = function(publish_item_image, iframeWindow, body) {
+    if (!publish_item_image) return;
+
+    let body_zoom = body.style.zoom;
+    body_zoom = parseFloat(body_zoom) || 1;
+
+    if (publish_item_image.style.height === '100%') {
+      publish_item_image.style.height = 'auto';
+      publish_item_image.style.width = '100%';
+      publish_item_image.style.marginTop = "";
+      setTimeout(function () {
+        publishedItemsRenderer.resizePublishedImage(publish_item_image, iframeWindow, body);
+      }, 10);
+    }
+
+    const imgPositionInfo = publish_item_image.getBoundingClientRect();
+    const height = (imgPositionInfo.height + imgPositionInfo.y * 2) * body_zoom;
+    if (height > iframeWindow.innerHeight) {
+      publish_item_image.style.height = '100%';
+      publish_item_image.style.width = 'auto';
+    } else if (height < iframeWindow.innerHeight) {
+      const temp = (iframeWindow.innerHeight - height) / 2;
+      publish_item_image.style.marginTop = (temp / body_zoom + imgPositionInfo.y) + "px";
+    }
+  }
+
   publishedItemsRenderer.resetTableZoom = function (document) {
     const table = document.getElementsByTagName("table")[0];
     if (table) {
@@ -93,16 +97,22 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     }
   }
 
-  publishedItemsRenderer.changedAutoResize = function (options, window, document) {
-      if (!options.autoResize) {
-        publishedItemsRenderer.resetTableZoom(document);
-      } else {
-        if (!options.alreadySetTimeout) {
-          options.alreadySetTimeout = setTimeout(function () {
-            publishedItemsRenderer.resizeTable(options, window);
-          }, 100);
-        }
+  publishedItemsRenderer.changedAutoResize = function (options, iframeWindow, document) {
+    Object.assign(iframeWindow.__options__, options);
+    const table = document.getElementsByTagName("table")[0];
+    if (table) {
+      table.style.margin = options.responsive ? '0 auto' : '';
+    }
+
+    if (!options.responsive) {
+      publishedItemsRenderer.resetTableZoom(document);
+    } else {
+      if (!options.alreadySetTimeout) {
+        options.alreadySetTimeout = setTimeout(function () {
+          publishedItemsRenderer.resizeTable(options, iframeWindow);
+        }, 100);
       }
+    }
   }
 
   publishedItemsRenderer.changedInputValue = function (firstTime, scope, options) {
@@ -312,18 +322,18 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     }
   }
 
-  publishedItemsRenderer.addEventListeners = function (document, window, scope, options) {
+  publishedItemsRenderer.addEventListeners = function (document, iframeWindow, scope, options) {
     document.addEventListener("DOMContentLoaded", function () {
       if (!options.alreadySetTimeout) {
         options.alreadySetTimeout = setTimeout(function () {
-          publishedItemsRenderer.resizeTable(options, window);
+          publishedItemsRenderer.resizeTable(options, iframeWindow);
         }, 50);
       }
     });
-    window.addEventListener("resize", function () {
+    iframeWindow.addEventListener("resize", function () {
       if (!options.alreadySetTimeout) {
         options.alreadySetTimeout = setTimeout(function () {
-          publishedItemsRenderer.resizeTable(options, window);
+          publishedItemsRenderer.resizeTable(iframeWindow.__options__, iframeWindow);
         }, 100);
       }
     });
@@ -334,7 +344,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
       let td_elem = all_a_hrefs[i].closest('td');
       td_elem.classList.add("apply_hover");
       td_elem.addEventListener('click', function (event) {
-        publishedItemsRenderer.formulaCellClicked(event, scope, options, window)
+        publishedItemsRenderer.formulaCellClicked(event, scope, options, iframeWindow)
       });
     }
   }
@@ -348,17 +358,30 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     return this.options.inputValuesData;
   }
 
-  publishedItemsRenderer.initPublishedItem = function (document, window, scope, options) {
+  publishedItemsRenderer.initPublishedItem = function (document, iframeWindow, scope, options) {
     this.document = document;
     this.scope = scope;
     this.options = options;
+    iframeWindow.__options__ = options;
     publishedItemsRenderer.prepareInputCells(document, scope, options, this.isScenarioMode);
-    publishedItemsRenderer.addEventListeners(document, window, scope, options);
+    publishedItemsRenderer.applyInitDocumentStyles(document, iframeWindow);
+    publishedItemsRenderer.addEventListeners(document, iframeWindow, scope, options);
 
     setTimeout(function () {
       publishedItemsRenderer.changedInputValue(true, scope, options);
     }, 500);
   }
+
+  publishedItemsRenderer.applyInitDocumentStyles = function(document, iframeWindow) {
+    const table = document.getElementsByTagName('table')[0];
+    if (table) {
+      table.style.overflow = 'hidden';
+      table.style.margin = iframeWindow.__options__.responsive ? '0 auto' : '';
+    }
+
+    const body = document.body;
+    body.style.margin = '0';
+  }
 }
 
 module.exports = getPublishedItemsRenderer;