@hpcc-js/layout 2.47.3 → 2.48.0

package/dist/index.es6.js

@@ -1,5 +1,5 @@
 import { HTMLWidget, FAChar, select, selectAll, d3Event, Platform, drag, Utility, scaleLinear, dispatch, formatLocale, formatSpecifier, format, formatPrefix, sum, Database, Palette, scaleOrdinal, SVGWidget, IconBar, Spacer, ProgressBar, ToggleButton, Text, Button, TitleBar } from '@hpcc-js/common';
-import { Table } from '@hpcc-js/dgrid';
+import { Table } from '@hpcc-js/dgrid2';
 import { instanceOfIHighlight } from '@hpcc-js/api';
 
 function _mergeNamespaces(n, m) {
@@ -18,8 +18,8 @@ function _mergeNamespaces(n, m) {
 }
 
 var PKG_NAME = "@hpcc-js/layout";
-var PKG_VERSION = "2.47.3";
-var BUILD_VERSION = "2.102.11";
+var PKG_VERSION = "2.48.0";
+var BUILD_VERSION = "2.103.2";
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -3094,7 +3094,28 @@ var ChartPanel = /** @class */ (function (_super) {
         element.style("transform", "translate(0px,0px) scale(1)");
     };
     ChartPanel.prototype.update = function (domNode, element) {
+        var _this = this;
         _super.prototype.update.call(this, domNode, element);
+        if (this._table && this.widget_exists() && this.widget().class().indexOf("chart_XYAxis") >= 0) {
+            var chart_1 = this.widget();
+            this._table.columns().forEach(function (column, idx) {
+                switch (idx === 0 ? chart_1.xAxisType() : chart_1.yAxisType()) {
+                    case "linear":
+                    case "log":
+                    case "pow":
+                        _this._table.columnType(column, "number");
+                        break;
+                    case "time":
+                        _this._table.columnType(column, "time");
+                        break;
+                    case "ordinal":
+                    default:
+                        _this._table.columnType(column, "string");
+                }
+                _this._table.columnPattern(column, idx === 0 ? chart_1.xAxisTypeTimePattern() : chart_1.yAxisTypeTimePattern());
+                _this._table.columnFormat(column, idx === 0 ? chart_1.xAxisTickFormat() : chart_1.yAxisTickFormat());
+            });
+        }
     };
     ChartPanel.prototype.preUpdate = function (domNode, element) {
         _super.prototype.preUpdate.call(this, domNode, element);
@@ -3124,12 +3145,13 @@ var ChartPanel = /** @class */ (function (_super) {
         if (this._prevdataVisible !== this.dataVisible()) {
             this._prevdataVisible = this.dataVisible();
             this._toggleData.selected(this._prevdataVisible);
+            this._legend.visible(this._prevlegendVisible && !this._prevdataVisible);
             this._carousel.active(this._prevdataVisible ? 1 : 0);
         }
         if (this._prevlegendVisible !== this.legendVisible()) {
             this._prevlegendVisible = this.legendVisible();
             this._toggleLegend.selected(this._prevlegendVisible);
-            this._legend.visible(this._prevlegendVisible);
+            this._legend.visible(this._prevlegendVisible && !this._prevdataVisible);
         }
         this._legend.orientation(this.legendPosition() === "bottom" ? "horizontal" : "vertical");
         this.showLeft(!this.left());