@datarailsshared/dr_renderer 1.2.419 → 1.2.420

package/package.json

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

package/src/highcharts_renderer.js

@@ -346,7 +346,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         },
         exporting: {
             enabled: false,
-            sourceWidth: 900
+            sourceWidth: 900,
+            chartOptions: {
+                chart: {
+                    events: {
+                        load: function () {
+                            const chart = this;
+                            chart.renderer.definition({
+                                tagName: 'style',
+                                textContent: `
+                                    .highcharts-xaxis-grid > .highcharts-grid-line {
+                                        stroke: none;
+                                    }
+                                `,
+                            });
+                        },
+                    },
+                },
+            },
         },
         drilldown: {
             activeAxisLabelStyle: {
@@ -6248,7 +6265,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'checkbox',
                     element_label: 'Freeze panes <small>(old table only)</small>',
                     value_name: 'freeze_panes',
-                    default_value: true
+                    default_value: false
                 },
                 {
                     element_type: 'checkbox',
@@ -6474,7 +6491,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'checkbox',
                     element_label: 'Freeze panes <small>(old table only)</small>',
                     value_name: 'freeze_panes',
-                    default_value: true
+                    default_value: false
                 },
                 {
                     element_type: 'checkbox',

package/src/published_items_renderer.js

@@ -4,6 +4,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
   this.scope = {};
   this.options = {};
   this.isScenarioMode = null;
+  this.settings = {};
 
   publishedItemsRenderer.formulaCellClicked = function (event, scope, options, window) {
     event.stopPropagation();
@@ -30,16 +31,23 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     publishedItemsRenderer.resizePublishedImage(publish_item_image, iframeWindow, body);
   }
 
-  publishedItemsRenderer.zoomTable = function(iframeWindow, table, body) {
+  publishedItemsRenderer.zoomTable = function (iframeWindow, table, body) {
     const bodyZoom = parseFloat(body.style.zoom) || 1;
+    const SCROLL_OFFSET = 16;
+
+    const tableWidth = table.getBoundingClientRect().width * bodyZoom;
+    const tableHeight = table.getBoundingClientRect().height * bodyZoom;
+    const root = iframeWindow.document.documentElement;
+
+    let requiredZoom = (root.clientWidth - SCROLL_OFFSET) / tableWidth;
+    if (this.settings.resizeTableUsingBothDimensions) {
+      requiredZoom = Math.min(requiredZoom, (root.clientHeight - SCROLL_OFFSET) / tableHeight);
+    }
 
-    const tableWidth = (table.getBoundingClientRect().width + (iframeWindow.innerWidth - body.offsetWidth)) * bodyZoom;
-    const requiredZoom = iframeWindow.innerWidth / tableWidth;
-  
     table.style.zoom = requiredZoom;
   };
 
-  publishedItemsRenderer.resizePublishedImage = function(publish_item_image, iframeWindow, body) {
+  publishedItemsRenderer.resizePublishedImage = function (publish_item_image, iframeWindow, body) {
     if (!publish_item_image) return;
 
     let body_zoom = body.style.zoom;
@@ -188,7 +196,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
           const format = inputMetaData.format ? inputMetaData.format.toUpperCase() : 'MM/DD/YYYY';
           const formattedDate = formatValue('d', format, inputMetaData.value).value
           if (_this.isScenarioMode) {
-             dateEl.innerHTML = '<label class="value dateInput" style="background: #FFEDBF;padding: 2px 1px 2px 6px;border: 1px solid #FABC5F;border-radius: 6px;cursor:pointer;">' + formattedDate + '</label>';
+            dateEl.innerHTML = '<label class="value dateInput" style="background: #FFEDBF;padding: 2px 1px 2px 6px;border: 1px solid #FABC5F;border-radius: 6px;cursor:pointer;">' + formattedDate + '</label>';
           } else {
             dateEl.innerHTML = '<label class="value dateInput" style="cursor: pointer;">' + formattedDate + '</label>';
           }
@@ -299,7 +307,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
       if (resizeTimeout) {
         cancelAnimationFrame(resizeTimeout);
       }
-    
+
       resizeTimeout = requestAnimationFrame(() => {
         publishedItemsRenderer.resizeTable(iframeWindow.__options__, iframeWindow);
       });
@@ -342,7 +350,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     }, 500);
   }
 
-  publishedItemsRenderer.applyInitDocumentStyles = function(document, iframeWindow) {
+  publishedItemsRenderer.applyInitDocumentStyles = function (document, iframeWindow) {
     const table = document.getElementsByTagName('table')[0];
     if (table) {
       table.style.overflow = 'hidden';