@hpcc-js/chart 2.81.10 → 2.82.0

package/dist/index.js

@@ -5,8 +5,8 @@
 })(this, (function (exports, api, common, util) { 'use strict';
 
   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.
@@ -2934,6 +2934,7 @@
       function Column() {
           var _this = _super.call(this) || this;
           _this.textLocal = common.local();
+          _this.stackedTextLocal = common.local();
           api.INDChart.call(_this);
           api.ITooltip.call(_this);
           _this._selection.skipBringToTop(true);
@@ -3014,30 +3015,26 @@
               .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));
@@ -3102,7 +3099,7 @@
                               valueText = common.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 = common.format(context.showValueAsPercentFormat())(valueText / domainSum);
                               break;
                           case null:
@@ -3233,7 +3230,7 @@
                                   ...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) {
@@ -3273,7 +3270,7 @@
                               }
                           }
                           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) {
@@ -3336,6 +3333,55 @@
               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 common.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();
@@ -3422,6 +3468,7 @@
   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)");