@hpcc-js/chart 2.81.10 → 2.82.0

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.81.10";
-var BUILD_VERSION = "2.104.37";
+var PKG_VERSION = "2.82.0";
+var BUILD_VERSION = "2.105.0";
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -2932,6 +2932,7 @@ var Column = /** @class */ (function (_super) {
     function Column() {
         var _this = _super.call(this) || this;
         _this.textLocal = local();
+        _this.stackedTextLocal = local();
         INDChart.call(_this);
         ITooltip.call(_this);
         _this._selection.skipBringToTop(true);
@@ -3012,30 +3013,26 @@ var Column = /** @class */ (function (_super) {
             .rangeRound(isHorizontal ? [0, dataLen] : [dataLen, 0])
             .paddingInner(this.xAxisSeriesPaddingInner())
             .paddingOuter(0);
-        var rowData = this.adjustedData(host);
         var domainSums = [];
         var seriesSums = [];
         var columnLength = this.columns().length;
-        if (this.showValue()) {
-            switch (this.showValueAsPercent()) {
-                case "series":
-                    rowData.forEach(function (row) {
-                        row.filter(function (_, idx) { return idx > 0 && idx < columnLength; }).forEach(function (col, idx) {
-                            if (seriesSums[idx + 1] === undefined) {
-                                seriesSums[idx + 1] = 0;
-                            }
-                            seriesSums[idx + 1] += col;
-                        });
-                    });
-                    break;
-                case "domain":
-                    domainSums = rowData.map(function (row) {
-                        return row.filter(function (cell, idx) { return idx > 0 && idx < columnLength; }).reduce(function (sum, cell) {
-                            return sum + cell;
-                        }, 0);
-                    });
-                    break;
-            }
+        var rowData = this.data();
+        if (this.showValue() && this.showValueAsPercent() === "series") {
+            rowData.forEach(function (row) {
+                row.filter(function (_, idx) { return idx > 0 && idx < columnLength; }).forEach(function (col, idx) {
+                    if (seriesSums[idx + 1] === undefined) {
+                        seriesSums[idx + 1] = 0;
+                    }
+                    seriesSums[idx + 1] += col;
+                });
+            });
+        }
+        if (this.showDomainTotal() || (this.showValue() && this.showValueAsPercent() === "domain")) {
+            domainSums = rowData.map(function (row) {
+                return row.filter(function (cell, idx) { return idx > 0 && idx < columnLength; }).reduce(function (sum, cell) {
+                    return sum + cell;
+                }, 0);
+            });
         }
         var column = element.selectAll(".dataRow")
             .data(this.adjustedData(host));
@@ -3100,7 +3097,7 @@ var Column = /** @class */ (function (_super) {
                             valueText = format(context.showValueAsPercentFormat())(valueText / seriesSum);
                             break;
                         case "domain":
-                            var domainSum = typeof dm.sum !== "undefined" ? dm.sum : domainSums[d.idx];
+                            var domainSum = typeof dm.sum !== "undefined" ? dm.sum : domainSums[d.idx - 1];
                             valueText = format(context.showValueAsPercentFormat())(valueText / domainSum);
                             break;
                         case null:
@@ -3231,7 +3228,7 @@ var Column = /** @class */ (function (_super) {
                                 ...then ASSUME THERES ROOM ON THE OPPOSITE SIDE
                         */
                         if (isHorizontal) { // Column
-                            noRoomInside = dataRect.height < textSize.height;
+                            noRoomInside = context.yAxisStacked() ? false : dataRect.height < textSize.height;
                             isOutside = !context.valueCentered() || noRoomInside;
                             pos.x = dataRect.x + (dataRect.width / 2);
                             if (isOutside) {
@@ -3271,7 +3268,7 @@ var Column = /** @class */ (function (_super) {
                             }
                         }
                         else { // Bar
-                            noRoomInside = dataRect.width < textSize.width;
+                            noRoomInside = context.yAxisStacked() ? false : dataRect.width < textSize.width;
                             isOutside = !context.valueCentered() || noRoomInside;
                             pos.y = dataRect.y + (dataRect.height / 2);
                             if (isOutside) {
@@ -3334,6 +3331,55 @@ var Column = /** @class */ (function (_super) {
             columnGRect.exit().transition().duration(duration)
                 .style("opacity", 0)
                 .remove();
+            var value4pos = host.yAxisStacked() ? domainSums[dataRowIdx] : Math.max.apply(Math, dataRow.filter(function (_, idx) { return idx > 0 && idx < columnLength; }));
+            var stackedTotalText = element.selectAll(".stackedTotalText").data(context.showDomainTotal() ? [domainSums[dataRowIdx]] : []);
+            var stackedTotalTextEnter = stackedTotalText.enter().append("g")
+                .attr("class", "stackedTotalText")
+                .each(function (d) {
+                context.stackedTextLocal.set(this, new Text().target(this).colorStroke_default("transparent"));
+            });
+            stackedTotalTextEnter.merge(stackedTotalText)
+                .each(function (d) {
+                var pos = { x: 0, y: 0 };
+                var domainPos = host.dataPos(dataRow[0]);
+                var valuePos = host.valuePos(value4pos);
+                var valueFontFamily = context.valueFontFamily();
+                var valueFontSize = context.valueFontSize();
+                var textSize = context.textSize(d, valueFontFamily, valueFontSize);
+                var isPositive = parseFloat(d) >= 0;
+                var valueAnchor = "middle";
+                if (isHorizontal) {
+                    pos.x = domainPos;
+                    if (isPositive) {
+                        pos.y = valuePos - textSize.height / 2;
+                    }
+                    else {
+                        pos.y = valuePos + textSize.height / 2;
+                    }
+                }
+                else {
+                    valueAnchor = "start";
+                    pos.y = domainPos;
+                    if (isPositive) {
+                        pos.x = valuePos + textSize.width / 2;
+                    }
+                    else {
+                        pos.x = valuePos - textSize.width / 2;
+                    }
+                }
+                context.stackedTextLocal.get(this)
+                    .pos(pos)
+                    .anchor(valueAnchor)
+                    .fontFamily(valueFontFamily)
+                    .fontSize(valueFontSize)
+                    .text(d)
+                    .render();
+            });
+            stackedTotalText.exit()
+                .each(function (d) {
+                context.textLocal.get(this).target(null);
+            })
+                .remove();
         });
         column.exit().transition().duration(duration)
             .remove();
@@ -3420,6 +3466,7 @@ Column.prototype.publish("showInnerText", false, "boolean", "Show Label in colum
 Column.prototype.publish("showValueFormat", ",", "string", "D3 Format for Value", null, { disable: function (w) { return !w.showValue() || !!w.showValueAsPercent(); } });
 Column.prototype.publish("showValueAsPercent", null, "set", "If showValue is true, optionally show value as a percentage by Series or Domain", [null, "series", "domain"], { disable: function (w) { return !w.showValue(); }, optional: true });
 Column.prototype.publish("showValueAsPercentFormat", ".0%", "string", "D3 Format for %", null, { disable: function (w) { return !w.showValue() || !w.showValueAsPercent(); } });
+Column.prototype.publish("showDomainTotal", false, "boolean", "Show Total Value for Stacked Columns", null);
 Column.prototype.publish("valueCentered", false, "boolean", "Show Value in center of column");
 Column.prototype.publish("valueAnchor", "middle", "set", "text-anchor for shown value text", ["start", "middle", "end"]);
 Column.prototype.publish("xAxisSeriesPaddingInner", 0, "number", "Determines the ratio of the range that is reserved for blank space between band (0->1)");