@hpcc-js/layout 2.47.3 → 2.48.0

package/dist/index.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/common'), require('@hpcc-js/dgrid'), require('@hpcc-js/api')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/common', '@hpcc-js/dgrid', '@hpcc-js/api'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/layout"] = {}, global["@hpcc-js/common"], global["@hpcc-js/dgrid"], global["@hpcc-js/api"]));
-})(this, (function (exports, common, dgrid, api) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/common'), require('@hpcc-js/dgrid2'), require('@hpcc-js/api')) :
+    typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/common', '@hpcc-js/dgrid2', '@hpcc-js/api'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/layout"] = {}, global["@hpcc-js/common"], global["@hpcc-js/dgrid2"], global["@hpcc-js/api"]));
+})(this, (function (exports, common, dgrid2, api) { 'use strict';
 
     function _mergeNamespaces(n, m) {
         m.forEach(function (e) {
@@ -20,8 +20,8 @@
     }
 
     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.
@@ -2941,7 +2941,7 @@
             _this._spacer = new common.Spacer();
             _this._titleBar = new common.TitleBar().buttons([_this._toggleData, _this._buttonDownload, _this._buttonDownloadImage, _this._spacer, _this._toggleLegend]);
             _this._carousel = new Carousel();
-            _this._table = new dgrid.Table();
+            _this._table = new dgrid2.Table();
             _this._hideLegendToggleList = ["dgrid_Table"];
             _this._tag = "div";
             return _this;
@@ -3096,7 +3096,28 @@
             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);
@@ -3126,12 +3147,13 @@
             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());