chartist 1.2.0 → 1.3.0

package/dist/index.js

@@ -243,12 +243,13 @@ function extend() {
  * @return The same value that was provided to the n parameter
  */ const noop = (n)=>n
 ;
-/**
- * Functional style helper to produce array with given length initialized with undefined values
- */ const times = (length)=>Array.from({
+function times(length, filler) {
+    return Array.from({
         length
-    })
-;
+    }, filler ? (_, i)=>filler(i)
+     : ()=>void 0
+    );
+}
 /**
  * Sum helper to be used in reduce functions
  */ const sum = (previous, current)=>previous + (current ? current : 0)
@@ -267,7 +268,7 @@ function extend() {
  * // 2. call arguments: (2, undefined, undefined)
  * ```
  */ const serialMap = (array, callback)=>times(Math.max(...array.map((element)=>element.length
-    ))).map((_inner, index)=>callback(...array.map((element)=>element[index]
+    )), (index)=>callback(...array.map((element)=>element[index]
         ))
     )
 ;
@@ -294,6 +295,14 @@ function getNumberOrUndefined(value) {
     }
     return data.every(Array.isArray);
 }
+/**
+ * Loop over array.
+ */ function each(list, callback) {
+    let reverse = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+    let index = 0;
+    list[reverse ? "reduceRight" : "reduce"]((_, item, itemIndex)=>callback(item, index++, itemIndex)
+    , void 0);
+}
 
 /**
  * Get meta data of a specific value in a series.
@@ -398,22 +407,25 @@ function normalizeData(data) {
     let reverse = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false, multi = arguments.length > 2 ? arguments[2] : void 0, distributed = arguments.length > 3 ? arguments[3] : void 0;
     let labelCount;
     const normalized = {
-        labels: [],
+        labels: (data.labels || []).slice(),
         series: normalizeSeries(data.series, multi, distributed)
     };
+    const inputLabelCount = normalized.labels.length;
     // If all elements of the normalized data array are arrays we're dealing with
     // multi series data and we need to find the largest series if they are un-even
     if (isArrayOfArrays(normalized.series)) {
         // Getting the series with the the most elements
-        labelCount = Math.max(...normalized.series.map((series)=>series.length
+        labelCount = Math.max(inputLabelCount, ...normalized.series.map((series)=>series.length
         ));
+        normalized.series.forEach((series)=>{
+            series.push(...times(Math.max(0, labelCount - series.length)));
+        });
     } else {
         // We're dealing with Pie data so we just take the normalized array length
         labelCount = normalized.series.length;
     }
-    normalized.labels = (data.labels || []).slice();
     // Padding the labels to labelCount with empty strings
-    normalized.labels.push(...times(Math.max(0, labelCount - normalized.labels.length)).map(()=>""
+    normalized.labels.push(...times(Math.max(0, labelCount - inputLabelCount), ()=>""
     ));
     if (reverse) {
         reverseData(normalized);
@@ -2387,7 +2399,7 @@ class FixedScaleAxis extends Axis {
     constructor(axisUnit, data, chartRect, options){
         const highLow = options.highLow || getHighLow(data, options, axisUnit.pos);
         const divisor = options.divisor || 1;
-        const ticks = (options.ticks || times(divisor).map((_value, index)=>highLow.low + (highLow.high - highLow.low) / divisor * index
+        const ticks = (options.ticks || times(divisor, (index)=>highLow.low + (highLow.high - highLow.low) / divisor * index
         )).sort((a, b)=>Number(a) - Number(b)
         );
         const range = {
@@ -2561,7 +2573,7 @@ class LineChart extends BaseChart {
             createGridBackground(gridGroup, chartRect, options.classNames.gridBackground, this.eventEmitter);
         }
         // Draw the series
-        data.series.forEach((series, seriesIndex)=>{
+        each(data.series, (series, seriesIndex)=>{
             const seriesElement = seriesGroup.elem("g");
             const seriesName = safeHasProperty(series, "name") && series.name;
             const seriesClassName = safeHasProperty(series, "className") && series.className;
@@ -2721,7 +2733,7 @@ class LineChart extends BaseChart {
                     });
                 });
             }
-        });
+        }, options.reverseData);
         this.eventEmitter.emit("created", {
             chartRect,
             axisX,
@@ -2903,8 +2915,9 @@ function getSerialSums(series) {
     seriesBarDistance: 15,
     // If set to true this property will cause the series bars to be stacked. Check the `stackMode` option for further stacking options.
     stackBars: false,
-    // If set to 'overlap' this property will force the stacked bars to draw from the zero line.
+    // If set to true this property will force the stacked bars to draw from the zero line.
     // If set to 'accumulate' this property will form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
+    // If set to 'accumulate-relative' positive and negative values will be handled separately.
     stackMode: "accumulate",
     // Inverts the axes of the bar chart in order to draw a horizontal bar chart. Be aware that you also need to invert your axis settings as the Y Axis will now display the labels and the X Axis the values.
     horizontalBars: false,
@@ -3013,15 +3026,19 @@ class BarChart extends BaseChart {
         }
         // Projected 0 point
         const zeroPoint = options.horizontalBars ? chartRect.x1 + valueAxis.projectValue(0) : chartRect.y1 - valueAxis.projectValue(0);
+        const isAccumulateStackMode = options.stackMode === "accumulate";
+        const isAccumulateRelativeStackMode = options.stackMode === "accumulate-relative";
         // Used to track the screen coordinates of stacked bars
-        const stackedBarValues = [];
+        const posStackedBarValues = [];
+        const negStackedBarValues = [];
+        let stackedBarValues = posStackedBarValues;
         labelAxis.createGridAndLabels(gridGroup, labelGroup, options, this.eventEmitter);
         valueAxis.createGridAndLabels(gridGroup, labelGroup, options, this.eventEmitter);
         if (options.showGridBackground) {
             createGridBackground(gridGroup, chartRect, options.classNames.gridBackground, this.eventEmitter);
         }
         // Draw the series
-        data.series.forEach((series, seriesIndex)=>{
+        each(data.series, (series, seriesIndex)=>{
             // Calculating bi-polar value of index for seriesOffset. For i = 0..4 biPol will be -1.5, -0.5, 0.5, 1.5 etc.
             const biPol = seriesIndex - (data.series.length - 1) / 2;
             // Half of the period width between vertical grid lines used to position bars
@@ -3061,6 +3078,8 @@ class BarChart extends BaseChart {
                 seriesClassName || "".concat(options.classNames.series, "-").concat(alphaNumerate(seriesIndex))
             ].join(" "));
             normalizedData.series[seriesIndex].forEach((value, valueIndex)=>{
+                const valueX = safeHasProperty(value, "x") && value.x;
+                const valueY = safeHasProperty(value, "y") && value.y;
                 let labelAxisValueIndex;
                 // We need to set labelAxisValueIndex based on some options combinations
                 if (options.distributeSeries && !options.stackBars) {
@@ -3079,13 +3098,13 @@ class BarChart extends BaseChart {
                 // We need to transform coordinates differently based on the chart layout
                 if (options.horizontalBars) {
                     projected = {
-                        x: chartRect.x1 + valueAxis.projectValue(safeHasProperty(value, "x") ? value.x : 0, valueIndex, normalizedData.series[seriesIndex]),
-                        y: chartRect.y1 - labelAxis.projectValue(safeHasProperty(value, "y") ? value.y : 0, labelAxisValueIndex, normalizedData.series[seriesIndex])
+                        x: chartRect.x1 + valueAxis.projectValue(valueX || 0, valueIndex, normalizedData.series[seriesIndex]),
+                        y: chartRect.y1 - labelAxis.projectValue(valueY || 0, labelAxisValueIndex, normalizedData.series[seriesIndex])
                     };
                 } else {
                     projected = {
-                        x: chartRect.x1 + labelAxis.projectValue(safeHasProperty(value, "x") ? value.x : 0, labelAxisValueIndex, normalizedData.series[seriesIndex]),
-                        y: chartRect.y1 - valueAxis.projectValue(safeHasProperty(value, "y") ? value.y : 0, valueIndex, normalizedData.series[seriesIndex])
+                        x: chartRect.x1 + labelAxis.projectValue(valueX || 0, labelAxisValueIndex, normalizedData.series[seriesIndex]),
+                        y: chartRect.y1 - valueAxis.projectValue(valueY || 0, valueIndex, normalizedData.series[seriesIndex])
                     };
                 }
                 // If the label axis is a step based axis we will offset the bar into the middle of between two steps using
@@ -3100,6 +3119,10 @@ class BarChart extends BaseChart {
                     // Using bi-polar offset for multiple series if no stacked bars or series distribution is used
                     projected[labelAxis.units.pos] += options.stackBars || options.distributeSeries ? 0 : biPol * options.seriesBarDistance * (options.horizontalBars ? -1 : 1);
                 }
+                // distinguish between positive and negative values in relative stack mode
+                if (isAccumulateRelativeStackMode) {
+                    stackedBarValues = valueY >= 0 || valueX >= 0 ? posStackedBarValues : negStackedBarValues;
+                }
                 // Enter value in stacked bar values used to remember previous screen value for stacking up bars
                 const previousStack = stackedBarValues[valueIndex] || zeroPoint;
                 stackedBarValues[valueIndex] = previousStack - (zeroPoint - projected[labelAxis.counterUnits.pos]);
@@ -3111,7 +3134,7 @@ class BarChart extends BaseChart {
                     ["".concat(labelAxis.units.pos, "1")]: projected[labelAxis.units.pos],
                     ["".concat(labelAxis.units.pos, "2")]: projected[labelAxis.units.pos]
                 };
-                if (options.stackBars && (options.stackMode === "accumulate" || !options.stackMode)) {
+                if (options.stackBars && (isAccumulateStackMode || isAccumulateRelativeStackMode || !options.stackMode)) {
                     // Stack mode: accumulate (default)
                     // If bars are stacked we use the stackedBarValues reference and otherwise base all bars off the zero line
                     // We want backwards compatibility, so the expected fallback without the 'stackMode' option
@@ -3133,8 +3156,8 @@ class BarChart extends BaseChart {
                 // Create bar element
                 const bar = seriesElement.elem("line", positions, options.classNames.bar).attr({
                     "ct:value": [
-                        safeHasProperty(value, "x") && value.x,
-                        safeHasProperty(value, "y") && value.y
+                        valueX,
+                        valueY
                     ].filter(isNumeric).join(","),
                     "ct:meta": serialize(metaData)
                 });
@@ -3153,7 +3176,7 @@ class BarChart extends BaseChart {
                     ...positions
                 });
             });
-        });
+        }, options.reverseData);
         this.eventEmitter.emit("created", {
             chartRect,
             axisX,
@@ -3242,8 +3265,6 @@ class BarChart extends BaseChart {
     labelInterpolationFnc: noop,
     // Label direction can be 'neutral', 'explode' or 'implode'. The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
     labelDirection: "neutral",
-    // If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
-    reverseData: false,
     // If true empty values will be ignored to avoid drawing unnecessary slices and labels
     ignoreEmptyValues: false
 };
@@ -3521,5 +3542,5 @@ class PieChart extends BaseChart {
     }
 }
 
-export { AutoScaleAxis, Axis, BarChart, BaseChart, EPSILON, EventEmitter, FixedScaleAxis, index as Interpolation, LineChart, PieChart, StepAxis, Svg, SvgList, SvgPath, alphaNumerate, axisUnits, createChartRect, createGrid, createGridBackground, createLabel, createSvg, deserialize, determineAnchorPosition, easings, ensureUnit, escapingMap, extend, getBounds, getHighLow, getMetaData, getMultiValue, getNumberOrUndefined, getSeriesOption, isArrayOfArrays, isArrayOfSeries, isDataHoleValue, isFalseyButZero, isMultiValue, isNumeric, namespaces, noop, normalizeData, normalizePadding, optionsProvider, orderOfMagnitude, polarToCartesian, precision, projectLength, quantity, rho, roundWithPrecision, safeHasProperty, serialMap, serialize, splitIntoSegments, sum, times };
+export { AutoScaleAxis, Axis, BarChart, BaseChart, EPSILON, EventEmitter, FixedScaleAxis, index as Interpolation, LineChart, PieChart, StepAxis, Svg, SvgList, SvgPath, alphaNumerate, axisUnits, createChartRect, createGrid, createGridBackground, createLabel, createSvg, deserialize, determineAnchorPosition, each, easings, ensureUnit, escapingMap, extend, getBounds, getHighLow, getMetaData, getMultiValue, getNumberOrUndefined, getSeriesOption, isArrayOfArrays, isArrayOfSeries, isDataHoleValue, isFalseyButZero, isMultiValue, isNumeric, namespaces, noop, normalizeData, normalizePadding, optionsProvider, orderOfMagnitude, polarToCartesian, precision, projectLength, quantity, rho, roundWithPrecision, safeHasProperty, serialMap, serialize, splitIntoSegments, sum, times };
 //# sourceMappingURL=index.js.map