Merge pull request #135 from philips-emr/3094461

Fix chart render
philips-emr · Jul 20, 2023 · 7d6eacf · 7d6eacf
2 parents 1e78e35 + 7a54f02
commit 7d6eacf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/dist/vis.js b/dist/vis.js
@@ -5,7 +5,7 @@
  * A dynamic, browser-based visualization library.
  *
  * @version 4.15.4
- * @date    2023-07-10
+ * @date    2023-07-20
  *
  * @license
  * Copyright (C) 2011-2016 Almende B.V, http://almende.com
@@ -20827,8 +20827,7 @@ return /******/ (function(modules) { // webpackBootstrap
     var diffInHours = (end - start) / (1000 * 60 * 60);
     var rangeColumnCount = this.body.range.props && this.body.range.props.columnCount ? this.body.range.props.columnCount : 0;
     var columnCount = rangeColumnCount ? rangeColumnCount : diffInHours / (gap ? gap : 1) + totalizersToAdd;
-    var itemsFit = this.body.range.options.itemsFit;
-
+    var itemsFit = this.body.range.options.itemsFit || [];
     if (itemsFit && columnCount < itemsFit.length) {
       columnCount = itemsFit.length;
     }
@@ -28369,9 +28368,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
     var _loop = function _loop(i) {
       var dataPointItem = datapoints[i];
-      if (_this6.body.range.options.gap === 0 || _this6.body.range.options.itemsFit.some(function (x) {
+      if (_this6.body.range.options && (_this6.body.range.options.gap === 0 || _this6.body.range.options.itemsFit && _this6.body.range.options.itemsFit.some(function (x) {
         return x.type == GAPCHARTNOW;
-      })) {
+      }))) {
         dataPointItem.screen_x = _this6._calculateGapPositionVIS(dataPointItem.x, widthTimeline);
       } else {
         var factor = _this6.body.range.end - _this6.body.range.start;

diff --git a/dist/vis.map b/dist/vis.map
diff --git a/dist/vis.min.js b/dist/vis.min.js
diff --git a/lib/timeline/component/LineGraph.js b/lib/timeline/component/LineGraph.js
@@ -1038,7 +1038,7 @@ LineGraph.prototype._convertXcoordinates = function (datapoints) {
 
   for (let i = 0; i < datapoints.length; i++) {
     const dataPointItem = datapoints[i];
-    if (this.body.range.options.gap === 0 || this.body.range.options.itemsFit.some(x => x.type == GAPCHARTNOW)) {
+    if (this.body.range.options && (this.body.range.options.gap === 0 || (this.body.range.options.itemsFit && this.body.range.options.itemsFit.some(x => x.type == GAPCHARTNOW)))) {
       dataPointItem.screen_x = this._calculateGapPositionVIS(dataPointItem.x, widthTimeline);
     } else {
       let factor = this.body.range.end - this.body.range.start;

diff --git a/lib/timeline/component/TimeAxis.js b/lib/timeline/component/TimeAxis.js
@@ -209,7 +209,7 @@ TimeAxis.prototype._repaintLabels = function () {
   const diffInHours = (end - start) / (1000 * 60 * 60);
   const rangeColumnCount = this.body.range.props && this.body.range.props.columnCount ? this.body.range.props.columnCount : 0;
   let columnCount = rangeColumnCount ? rangeColumnCount : diffInHours / (gap ? gap : 1) + totalizersToAdd;
-  const { itemsFit } = this.body.range.options;
+  const itemsFit = this.body.range.options.itemsFit || [];
   if (itemsFit && columnCount < itemsFit.length) {
     columnCount = itemsFit.length;
   }