@hpcc-js/chart 2.82.0 → 2.83.2

package/dist/index.es6.js

@@ -3,8 +3,8 @@ import { select, scaleTime, timeParse, timeFormat, scaleLog, format, scalePow, s
 import { normalizeRadians, degreesToRadians } from '@hpcc-js/util';
 
 var PKG_NAME = "@hpcc-js/chart";
-var PKG_VERSION = "2.82.0";
-var BUILD_VERSION = "2.105.0";
+var PKG_VERSION = "2.83.2";
+var BUILD_VERSION = "2.105.6";
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -1892,7 +1892,7 @@ var Axis = /** @class */ (function (_super) {
         this.svg.style("display", this.hidden() ? "none" : null);
         var overlap = this.calcOverflow(element);
         var lowerPos = this.isHorizontal() ? overlap.left : this.height() - overlap.top - overlap.bottom;
-        var upperPos = this.isHorizontal() ? this.width() - overlap.right : 0;
+        var upperPos = this.isHorizontal() ? this.width() - overlap.right - this.padding() : 0 + this.padding();
         this.range(this.reverse() ? [upperPos, lowerPos] : [lowerPos, upperPos]);
         var context = this;
         function doPosition(element) {
@@ -2020,6 +2020,7 @@ Axis.prototype.publish("hidden", false, "boolean", "Hides axis when 'true'");
 Axis.prototype.publish("ordinalPaddingInner", 0.1, "number", "Determines the ratio of the range that is reserved for blank space between band (0->1)", null, { disable: function (w) { return w.type() !== "ordinal"; } });
 Axis.prototype.publish("ordinalPaddingOuter", 0.1, "number", "Determines the ratio of the range that is reserved for blank space before the first band and after the last band (0->1)", null, { disable: function (w) { return w.type() !== "ordinal"; } });
 Axis.prototype.publish("ordinalMappings", null, "object", "Alternative label mappings (icons)", null, { optional: true });
+Axis.prototype.publish("padding", 0, "number", "Padding space at top of axis (pixels)", null, { optional: true });
 
 var css_248z$b = ".chart_XYAxis .axis{fill:#000}.chart_XYAxis .axis,.chart_XYAxis .tick>text{font:10px sans-serif}.chart_XYAxis .focus .chart_Axis.value .tick{visibility:hidden}.chart_XYAxis .axis line,.chart_XYAxis .axis path{fill:none;stroke:#000;shape-rendering:crispEdges}.chart_XYAxis .region{opacity:.33}.chart_XYAxis .brush rect.background{z-index:-999}.chart_XYAxis .brush .selection{stroke:#4682b4;stroke-opacity:1;stroke-width:1px;fill:#4682b4;fill-opacity:.125;shape-rendering:crispEdges}.chart_XYAxis .brush path.handle--custom{fill:#eee;stroke:#666}";
 styleInject(css_248z$b);
@@ -2613,6 +2614,8 @@ XYAxis.prototype.publish("yAxisGuideLines", true, "boolean", "Y-Axis Guide Lines
 XYAxis.prototype.publishProxy("yAxisHidden", "valueAxis", "hidden");
 XYAxis.prototype.publish("regions", [], "array", "Regions");
 XYAxis.prototype.publish("layers", [], "widgetArray", "Layers", null, { render: false });
+XYAxis.prototype.publishProxy("xAxisPadding", "domainAxis", "padding");
+XYAxis.prototype.publishProxy("yAxisPadding", "valueAxis", "padding");
 
 var css_248z$a = ".chart_Scatter .area,.chart_Scatter .line,.chart_Scatter .pointShape{pointer-events:none}.chart_Scatter .point .pointSelection{fill:none;stroke:none;pointer-events:all}.chart_Scatter .point .pointSelection.selected{fill:none;stroke:red}";
 styleInject(css_248z$a);
@@ -2994,6 +2997,7 @@ var Column = /** @class */ (function (_super) {
         if (this.useClonedPalette()) {
             this._palette = this._palette.cloneNotExists(this.paletteID() + "_" + this.id());
         }
+        var formatPct = format(context.showValueAsPercentFormat());
         var dataLen = 10;
         var offset = 0;
         switch (host.xAxisType()) {
@@ -3094,11 +3098,11 @@ var Column = /** @class */ (function (_super) {
                     switch (context.showValueAsPercent()) {
                         case "series":
                             var seriesSum = typeof dm.sum !== "undefined" ? dm.sum : seriesSums[d.idx];
-                            valueText = format(context.showValueAsPercentFormat())(valueText / seriesSum);
+                            valueText = formatPct(valueText / seriesSum);
                             break;
                         case "domain":
-                            var domainSum = typeof dm.sum !== "undefined" ? dm.sum : domainSums[d.idx - 1];
-                            valueText = format(context.showValueAsPercentFormat())(valueText / domainSum);
+                            var domainSum = typeof dm.sum !== "undefined" ? dm.sum : domainSums[dataRowIdx];
+                            valueText = formatPct(valueText / domainSum);
                             break;
                         case null:
                         default:
@@ -3228,7 +3232,7 @@ var Column = /** @class */ (function (_super) {
                                 ...then ASSUME THERES ROOM ON THE OPPOSITE SIDE
                         */
                         if (isHorizontal) { // Column
-                            noRoomInside = context.yAxisStacked() ? false : dataRect.height < textSize.height;
+                            noRoomInside = dataRect.height < textSize.height;
                             isOutside = !context.valueCentered() || noRoomInside;
                             pos.x = dataRect.x + (dataRect.width / 2);
                             if (isOutside) {
@@ -3268,7 +3272,7 @@ var Column = /** @class */ (function (_super) {
                             }
                         }
                         else { // Bar
-                            noRoomInside = context.yAxisStacked() ? false : dataRect.width < textSize.width;
+                            noRoomInside = dataRect.width < textSize.width;
                             isOutside = !context.valueCentered() || noRoomInside;
                             pos.y = dataRect.y + (dataRect.height / 2);
                             if (isOutside) {
@@ -3311,7 +3315,8 @@ var Column = /** @class */ (function (_super) {
                     var textColor = isOutside ? null : context.textColor(d.row, d.column, d.value, d.origRow);
                     //  Prevent overlapping labels on stacked columns
                     var columns = context.columns();
-                    var hideValue = isOutside && context.yAxisStacked() && columns.indexOf(d.column) !== columns.length - 1;
+                    var hideValue = (context.yAxisStacked() && noRoomInside) ||
+                        (isOutside && context.yAxisStacked() && columns.indexOf(d.column) !== columns.length - 1);
                     context.textLocal.get(this)
                         .pos(pos)
                         .anchor(valueAnchor)