mdt-charts 1.12.4 → 1.12.8

package/lib/engine/features/axis/axis.d.ts

@@ -1,4 +1,4 @@
-import { IAxisModel, IScaleModel } from "../../../model/model";
+import { AxisModelOptions, IAxisModel, IScaleModel } from "../../../model/model";
 import { Block } from "../../block/block";
 import { Scales } from "../scale/scale";
 import { Size } from '../../../config/config';
@@ -6,6 +6,8 @@ export declare class Axis {
     static axesClass: string;
     static render(block: Block, scales: Scales, scaleModel: IScaleModel, axisModel: IAxisModel, blockSize: Size): void;
     static update(block: Block, scales: Scales, scalesOptions: IScaleModel, axisModel: IAxisModel, blockSize: Size, keyDomainsEquality: boolean): void;
+    static raiseKeyAxis(block: Block, axisOptions: AxisModelOptions): void;
+    private static findAxis;
     private static renderAxis;
     private static updateValueAxis;
     private static updateKeyAxis;

package/lib/engine/features/axis/axis.js

@@ -20,6 +20,14 @@ export class Axis {
         if (axisModel.key.visibility)
             this.updateKeyAxis(block, scales.key, scalesOptions.key, axisModel.key, blockSize, keyDomainsEquality);
     }
+    static raiseKeyAxis(block, axisOptions) {
+        const axisElement = this.findAxis(block, axisOptions.cssClass);
+        axisElement.raise();
+    }
+    static findAxis(block, axisCssClass) {
+        return block.getSvg()
+            .select(`g.${axisCssClass}`);
+    }
     static renderAxis(block, scale, scaleOptions, axisOptions, blockSize) {
         const axisGenerator = AxisHelper.getBaseAxisGenerator(axisOptions, scale, scaleOptions);
         if (axisOptions.type === 'value' && (scaleOptions.type === 'linear' || scaleOptions.type === 'datetime'))

package/lib/engine/features/gridLine/gidLineHelper.d.ts

@@ -1,3 +1,4 @@
+import { AxisScale } from "d3-axis";
 import { Size } from "../../../config/config";
 import { AxisModelOptions, BlockMargin } from "../../../model/model";
 export declare type GridLineType = 'key' | 'value';
@@ -10,4 +11,5 @@ export interface GridLineAttributes {
 export declare class GridLineHelper {
     static getGridLineLength(gridLineType: GridLineType, keyAxis: AxisModelOptions, valueAxis: AxisModelOptions, blockSize: Size, margin: BlockMargin): number;
     static getLineAttributes(axis: AxisModelOptions, lineLength: number): GridLineAttributes;
+    static getKeyLineAttributes(axis: AxisModelOptions, scaleValue: AxisScale<any>): GridLineAttributes;
 }

package/lib/engine/features/gridLine/gidLineHelper.js

@@ -1,3 +1,4 @@
+import { max, min } from "d3-array";
 export class GridLineHelper {
     static getGridLineLength(gridLineType, keyAxis, valueAxis, blockSize, margin) {
         let axis;
@@ -27,4 +28,25 @@ export class GridLineHelper {
             attributes.y2 = lineLength;
         return attributes;
     }
+    static getKeyLineAttributes(axis, scaleValue) {
+        const attributes = {
+            x1: 0,
+            y1: 0,
+            x2: 0,
+            y2: 0
+        };
+        const scaledStart = scaleValue(scaleValue.domain()[0]);
+        const scaledEnd = scaleValue(scaleValue.domain()[1]);
+        const minCoord = min([scaledStart, scaledEnd]) - scaleValue(0);
+        const maxCoord = max([scaledStart, scaledEnd]) - scaleValue(0);
+        if (axis.orient === 'left' || axis.orient === 'right') {
+            attributes.x1 = minCoord;
+            attributes.x2 = maxCoord;
+        }
+        else {
+            attributes.y1 = minCoord;
+            attributes.y2 = maxCoord;
+        }
+        return attributes;
+    }
 }

package/lib/engine/features/gridLine/gridLine.d.ts

@@ -1,11 +1,13 @@
 import { Size } from "../../../config/config";
-import { BlockMargin, GridLineFlag, IAxisModel, ScaleKeyModel } from "../../../model/model";
+import { BlockMargin, GridLineFlag, IAxisModel } from "../../../model/model";
 import { Block } from "../../block/block";
+import { Scales } from "../scale/scale";
 export declare class GridLine {
     private static readonly gridLineClass;
-    static render(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scaleKey: ScaleKeyModel): void;
-    static update(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scaleKey: ScaleKeyModel): void;
+    static render(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scales: Scales): void;
+    static update(block: Block, gridLineFlag: GridLineFlag, axes: IAxisModel, blockSize: Size, margin: BlockMargin, scales: Scales): void;
     private static renderLine;
     private static clear;
     private static removeGridLinesOnAxes;
+    private static rmGridLineOnTick;
 }

package/lib/engine/features/gridLine/gridLine.js

@@ -1,24 +1,20 @@
 import { GridLineHelper } from "./gidLineHelper";
 export class GridLine {
-    static render(block, gridLineFlag, axes, blockSize, margin, scaleKey) {
+    static render(block, gridLineFlag, axes, blockSize, margin, scales) {
         if (gridLineFlag.value) {
             const lineLength = GridLineHelper.getGridLineLength('value', axes.key, axes.value, blockSize, margin);
             const lineAttributes = GridLineHelper.getLineAttributes(axes.value, lineLength);
             this.renderLine(block, axes.value, lineAttributes);
         }
         if (gridLineFlag.key) {
-            const lineLength = GridLineHelper.getGridLineLength('key', axes.key, axes.value, blockSize, margin);
-            const lineAttributes = GridLineHelper.getLineAttributes(axes.key, lineLength);
+            const lineAttributes = GridLineHelper.getKeyLineAttributes(axes.key, scales.value);
             this.renderLine(block, axes.key, lineAttributes);
         }
-        if (scaleKey.type === 'point' && (gridLineFlag.key || gridLineFlag.value))
-            this.removeGridLinesOnAxes(block, axes.key, axes.value, false);
-        else if (gridLineFlag.key || gridLineFlag.value)
-            this.removeGridLinesOnAxes(block, axes.key, axes.value, true);
+        this.removeGridLinesOnAxes(block, axes.key, axes.value, true);
     }
-    static update(block, gridLineFlag, axes, blockSize, margin, scaleKey) {
+    static update(block, gridLineFlag, axes, blockSize, margin, scales) {
         this.clear(block, axes.key.cssClass, axes.value.cssClass);
-        this.render(block, gridLineFlag, axes, blockSize, margin, scaleKey);
+        this.render(block, gridLineFlag, axes, blockSize, margin, scales);
     }
     static renderLine(block, axis, lineAttributes) {
         block
@@ -51,17 +47,20 @@ export class GridLine {
             tickOnValueAxisSelector = ':last-of-type';
         if (keyAxis.orient === 'bottom' || keyAxis.orient === 'right')
             tickOnKeyAxisSelector = ':last-of-type';
-        block.getSvg()
+        const tickOnKey = block.getSvg()
             .select(`.${valueAxis.cssClass}`)
-            .select(`g.tick${tickOnKeyAxisSelector}`)
+            .select(`g.tick${tickOnKeyAxisSelector}`);
+        const tickOnValue = block.getSvg()
+            .select(`.${keyAxis.cssClass}`)
+            .select(`g.tick${tickOnValueAxisSelector}`);
+        // this.rmGridLineOnTick(tickOnKey);
+        // if (!excludeKey)
+        //     this.rmGridLineOnTick(tickOnValue);
+    }
+    static rmGridLineOnTick(tick) {
+        tick
             .select(`.${this.gridLineClass}`)
             .remove();
-        if (!excludeKey)
-            block.getSvg()
-                .select(`.${keyAxis.cssClass}`)
-                .select(`g.tick${tickOnValueAxisSelector}`)
-                .select(`.${this.gridLineClass}`)
-                .remove();
     }
 }
 GridLine.gridLineClass = 'grid-line';

package/lib/engine/features/scale/scale.d.ts

@@ -1,3 +1,4 @@
+import { ScaleLinear, ScaleTime } from 'd3-scale';
 import { AxisScale } from 'd3-axis';
 import { BarChartSettings, ScaleKeyModel, ScaleValueModel } from '../../../model/model';
 export interface Scales {
@@ -6,6 +7,7 @@ export interface Scales {
 }
 export declare class Scale {
     static getScales(scaleKey: ScaleKeyModel, scaleValue: ScaleValueModel, bandSettings: BarChartSettings): Scales;
+    static getScaleValue(scaleValue: ScaleValueModel): ScaleLinear<number, number, never> | ScaleTime<number, number, never>;
     static getScaleBandWidth(scale: AxisScale<any>): number;
     static getScaleStep(scale: AxisScale<any>): number;
     static getScaledValue(scale: AxisScale<any>, value: any): number;

package/lib/engine/features/scale/scale.js

@@ -9,11 +9,14 @@ export class Scale {
             scales.key = this.getScaleBand(scaleKey.domain, scaleKey.range, bandSettings, scaleKey.elementsAmount);
         else if (scaleKey.type === 'point')
             scales.key = this.getScalePoint(scaleKey.domain, scaleKey.range);
+        scales.value = this.getScaleValue(scaleValue);
+        return scales;
+    }
+    static getScaleValue(scaleValue) {
         if (scaleValue.type === 'linear')
-            scales.value = this.getScaleLinear(scaleValue.domain, scaleValue.range);
+            return this.getScaleLinear(scaleValue.domain, scaleValue.range);
         else if (scaleValue.type === 'datetime')
-            scales.value = this.getScaleTime(scaleValue.domain, scaleValue.range);
-        return scales;
+            return this.getScaleTime(scaleValue.domain, scaleValue.range);
     }
     static getScaleBandWidth(scale) {
         if (scale.bandwidth && scale.bandwidth() !== 0) {

package/lib/engine/intervalNotation/intervalManager.js

@@ -11,7 +11,7 @@ export class IntervalManager {
         block.renderSvg(model.blockCanvas.size);
         const scales = Scale.getScales(options.scale.key, options.scale.value, options.chartSettings.bar);
         Axis.render(block, scales, options.scale, options.axis, model.blockCanvas.size);
-        GridLine.render(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.render(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         this.renderCharts(block, options.charts, scales, data, options.data, model.chartBlock.margin, options.axis.key.orient, options.chartSettings);
         Title.render(block, options.title, model.otherComponents.titleBlock, model.blockCanvas.size);
         Legend.render(block, data, options, model);

package/lib/engine/twoDimensionalNotation/area/area.js

@@ -1,9 +1,9 @@
-import { stack } from 'd3-shape';
 import { select } from 'd3-selection';
 import { MarkDot } from "../../features/markDots/markDot";
 import { AreaHelper } from './areaHelper';
 import { DomHelper } from '../../helpers/domHelper';
 import { Helper } from '../../helpers/helper';
+import { getStackedDataWithOwn } from '../bar/stackedData/dataStacker';
 export class Area {
     static render(block, scales, data, keyField, margin, keyAxisOrient, chart, blockSize) {
         if (chart.isSegmented)
@@ -44,7 +44,7 @@ export class Area {
         });
     }
     static renderSegmented(block, scales, data, keyField, margin, keyAxisOrient, chart) {
-        const stackedData = stack().keys(chart.data.valueFields.map(field => field.name))(data);
+        const stackedData = getStackedDataWithOwn(data, chart.data.valueFields.map(field => field.name));
         const areaGenerator = AreaHelper.getSegmentedAreaGenerator(keyAxisOrient, scales, margin, keyField.name);
         const areas = block.getChartGroup(chart.index)
             .selectAll(`.${this.areaChartClass}${Helper.getCssClassesLine(chart.cssClasses)}`)
@@ -76,7 +76,7 @@ export class Area {
         return promises;
     }
     static updateSegmented(block, scales, newData, keyField, margin, chart, keyAxisOrient) {
-        const stackedData = stack().keys(chart.data.valueFields.map(field => field.name))(newData);
+        const stackedData = getStackedDataWithOwn(newData, chart.data.valueFields.map(field => field.name));
         const areaGenerator = AreaHelper.getSegmentedAreaGenerator(keyAxisOrient, scales, margin, keyField.name);
         const areas = block.getChartGroup(chart.index)
             .selectAll(`path.${this.areaChartClass}${Helper.getCssClassesLine(chart.cssClasses)}`)

package/lib/engine/twoDimensionalNotation/area/areaHelper.js

@@ -5,11 +5,11 @@ export class AreaHelper {
         if (keyAxisOrient === 'bottom' || keyAxisOrient === 'top')
             return area()
                 .x(d => Scale.getScaledValue(scales.key, d[keyFieldName]) + margin.left)
-                .y0(d => this.getZeroCoordinate(keyAxisOrient, margin, blockSize))
+                .y0(d => scales.value(0) + margin.top)
                 .y1(d => scales.value(d[valueFieldName]) + margin.top);
         if (keyAxisOrient === 'left' || keyAxisOrient === 'right')
             return area()
-                .x0(d => this.getZeroCoordinate(keyAxisOrient, margin, blockSize))
+                .x0(d => scales.value(0) + margin.left)
                 .x1(d => scales.value(d[valueFieldName]) + margin.left)
                 .y(d => Scale.getScaledValue(scales.key, d[keyFieldName]) + margin.top);
     }

package/lib/engine/twoDimensionalNotation/bar/bar.js

@@ -1,4 +1,3 @@
-import { stack } from 'd3-shape';
 import { select } from 'd3-selection';
 import { EmbeddedLabels } from "../../features/embeddedLabels/embeddedLabels";
 import { EmbeddedLabelsHelper } from "../../features/embeddedLabels/embeddedLabelsHelper";
@@ -6,6 +5,7 @@ import { BarHelper } from "./barHelper";
 import { sum } from "d3-array";
 import { DomHelper } from "../../helpers/domHelper";
 import { Helper } from "../../helpers/helper";
+import { getStackedDataWithOwn } from './stackedData/dataStacker';
 export class Bar {
     static render(block, scales, data, keyField, margin, keyAxisOrient, chart, blockSize, barSettings, barsAmounts, isSegmented, firstBarIndex) {
         if (isSegmented)
@@ -52,7 +52,7 @@ export class Bar {
         });
     }
     static renderSegmented(block, scales, data, keyField, margin, keyAxisOrient, chart, barsAmounts, blockSize, firstBarIndex, barSettings) {
-        const stackedData = stack().keys(chart.data.valueFields.map(field => field.name))(data);
+        const stackedData = getStackedDataWithOwn(data, chart.data.valueFields.map(field => field.name));
         let groups = block.getChartGroup(chart.index)
             .selectAll(`g.${this.barSegmentGroupClass}${Helper.getCssClassesLine(chart.cssClasses)}`)
             .data(stackedData);
@@ -129,7 +129,7 @@ export class Bar {
         return promises;
     }
     static updateSegmented(block, newData, scales, margin, keyAxisOrient, chart, blockSize, barsAmounts, keyField, firstBarIndex, barSettings) {
-        const stackedData = stack().keys(chart.data.valueFields.map(field => field.name))(newData);
+        const stackedData = getStackedDataWithOwn(newData, chart.data.valueFields.map(field => field.name));
         block.getChartGroup(chart.index)
             .selectAll(`.${this.barItemClass}${Helper.getCssClassesLine(chart.cssClasses)}`)
             .filter(d => newData.findIndex(row => row[keyField.name] === d.data[keyField.name]) === -1)
@@ -171,15 +171,15 @@ export class Bar {
                 resolve('');
                 return;
             }
-            let barsHander = bars;
+            let barsHandler = bars;
             if (transitionDuration > 0) {
-                barsHander = barsHander
+                barsHandler = barsHandler
                     .interrupt()
                     .transition()
                     .duration(transitionDuration)
                     .on('end', () => resolve(''));
             }
-            barsHander.attr('x', d => barAttrs.x(d))
+            barsHandler.attr('x', d => barAttrs.x(d))
                 .attr('y', d => barAttrs.y(d))
                 .attr('height', d => barAttrs.height(d))
                 .attr('width', d => barAttrs.width(d));

package/lib/engine/twoDimensionalNotation/bar/barHelper.js

@@ -66,38 +66,38 @@ export class BarHelper {
     }
     static setGroupedBarAttrsByValue(attrs, keyAxisOrient, margin, scaleValue, valueFieldName, blockSize) {
         if (keyAxisOrient === 'top') {
-            attrs.y = d => margin.top;
-            attrs.height = d => Helper.getValueOrZero(scaleValue(d[valueFieldName]));
+            attrs.y = d => scaleValue(Math.min(d[valueFieldName], 0)) + margin.top;
+            attrs.height = d => Math.abs(scaleValue(d[valueFieldName]) - scaleValue(0));
         }
         if (keyAxisOrient === 'bottom') {
-            attrs.y = d => scaleValue(d[valueFieldName]) + margin.top;
-            attrs.height = d => Helper.getValueOrZero(blockSize.height - margin.top - margin.bottom - scaleValue(d[valueFieldName]));
+            attrs.y = d => scaleValue(Math.max(d[valueFieldName], 0)) + margin.top;
+            attrs.height = d => Math.abs(scaleValue(d[valueFieldName]) - scaleValue(0));
         }
         if (keyAxisOrient === 'left') {
-            attrs.x = d => margin.left + 1;
-            attrs.width = d => Helper.getValueOrZero(scaleValue(d[valueFieldName]));
+            attrs.x = d => scaleValue(Math.min(d[valueFieldName], 0)) + margin.left;
+            attrs.width = d => Math.abs(scaleValue(d[valueFieldName]) - scaleValue(0));
         }
         if (keyAxisOrient === 'right') {
-            attrs.x = d => scaleValue(d[valueFieldName]) + margin.left;
-            attrs.width = d => Helper.getValueOrZero(blockSize.width - margin.left - margin.right - scaleValue(d[valueFieldName]));
+            attrs.x = d => scaleValue(Math.max(d[valueFieldName], 0)) + margin.left;
+            attrs.width = d => Math.abs(scaleValue(d[valueFieldName]) - scaleValue(0));
         }
     }
     static setSegmentedBarAttrsByValue(attrs, keyAxisOrient, scaleValue, margin, blockSize) {
         if (keyAxisOrient === 'top') {
-            attrs.y = d => margin.top + scaleValue(d[0]);
-            attrs.height = d => Helper.getValueOrZero(scaleValue(d[1] - d[0]));
+            attrs.y = d => scaleValue(Math.min(d[1], d[0])) + margin.top;
+            attrs.height = d => Math.abs(scaleValue(d[1]) - scaleValue(d[0]));
         }
         if (keyAxisOrient === 'bottom') {
-            attrs.y = d => scaleValue(d[1]) + margin.top;
-            attrs.height = d => Helper.getValueOrZero(blockSize.height - margin.top - margin.bottom - scaleValue(d[1] - d[0]));
+            attrs.y = d => scaleValue(Math.max(d[1], d[0])) + margin.top;
+            attrs.height = d => Math.abs(scaleValue(d[1]) - scaleValue(d[0]));
         }
         if (keyAxisOrient === 'left') {
-            attrs.x = d => margin.left + scaleValue(d[0]) + 1;
-            attrs.width = d => Helper.getValueOrZero(scaleValue(d[1] - d[0]));
+            attrs.x = d => scaleValue(Math.min(d[1], d[0])) + margin.left;
+            attrs.width = d => Math.abs(scaleValue(d[1]) - scaleValue(d[0]));
         }
         if (keyAxisOrient === 'right') {
-            attrs.x = d => scaleValue(d[1]) + margin.left;
-            attrs.width = d => Helper.getValueOrZero(blockSize.width - margin.left - margin.right - scaleValue(d[1] - d[0]));
+            attrs.x = d => scaleValue(Math.max(d[1], d[0])) + margin.left;
+            attrs.width = d => Math.abs(scaleValue(d[1]) - scaleValue(d[0]));
         }
     }
 }

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.d.ts

@@ -0,0 +1,13 @@
+import { MdtChartsDataRow } from "../../../../config/config";
+export interface StackedDataRow {
+    0: number;
+    1: number;
+    data: MdtChartsDataRow;
+}
+export declare type StackedDataFull = StackedDataRow[][];
+export declare class DataStacker {
+    private service;
+    getStackedData(rawData: MdtChartsDataRow[], valueFields: string[]): StackedDataFull;
+}
+export declare function getStackedDataWithOwn(rawData: MdtChartsDataRow[], valueFields: string[]): StackedDataFull;
+export declare function getStackedDataWithD3(rawData: MdtChartsDataRow[], valueFields: string[]): StackedDataFull;

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.js

@@ -0,0 +1,32 @@
+import { stack } from "d3-shape";
+import { DataStackerService } from "./dataStackerService";
+export class DataStacker {
+    constructor() {
+        this.service = new DataStackerService();
+    }
+    getStackedData(rawData, valueFields) {
+        const stackedData = [];
+        valueFields.forEach((vField, vfIndex) => {
+            const fieldStack = [];
+            rawData.forEach((dataRow, drIndex) => {
+                const valueFromData = dataRow[vField];
+                const value0 = this.service.getValue0(stackedData, vfIndex, drIndex, valueFromData);
+                const value1 = this.service.getValue1(value0, valueFromData);
+                fieldStack.push({
+                    "0": value0,
+                    "1": value1,
+                    data: dataRow
+                });
+            });
+            stackedData.push(fieldStack);
+        });
+        return stackedData;
+    }
+}
+export function getStackedDataWithOwn(rawData, valueFields) {
+    const stacker = new DataStacker();
+    return stacker.getStackedData(rawData, valueFields);
+}
+export function getStackedDataWithD3(rawData, valueFields) {
+    return stack().keys(valueFields)(rawData);
+}

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.test.js

@@ -0,0 +1,199 @@
+import { DataStacker } from "./dataStacker";
+import { DataStackerService } from "./dataStackerService";
+describe('DataStacker', () => {
+    const stacker = new DataStacker();
+    describe('getStackedData', () => {
+        describe('for positive values', () => {
+            let dataRows = [
+                { price: 12, count: 30 },
+                { price: 30, count: 12 },
+                { price: 0, count: 100 },
+                { price: 10, count: 0 }
+            ];
+            const valueFields = ["price", "count"];
+            test('should return right stack', () => {
+                const res = stacker.getStackedData(dataRows, valueFields);
+                expect(res).toEqual([
+                    [
+                        { "0": 0, "1": 12, data: dataRows[0] },
+                        { "0": 0, "1": 30, data: dataRows[1] },
+                        { "0": 0, "1": 0, data: dataRows[2] },
+                        { "0": 0, "1": 10, data: dataRows[3] },
+                    ],
+                    [
+                        { "0": 12, "1": 42, data: dataRows[0] },
+                        { "0": 30, "1": 42, data: dataRows[1] },
+                        { "0": 0, "1": 100, data: dataRows[2] },
+                        { "0": 10, "1": 10, data: dataRows[3] },
+                    ]
+                ]);
+            });
+        });
+        describe('for negative values', () => {
+            let dataRows = [
+                { price: -12, count: -30 },
+                { price: -30, count: -12 },
+                { price: 0, count: -100 },
+                { price: -10, count: 0 }
+            ];
+            const valueFields = ["price", "count"];
+            test('should return right stack', () => {
+                const res = stacker.getStackedData(dataRows, valueFields);
+                expect(res).toEqual([
+                    [
+                        { "0": 0, "1": -12, data: dataRows[0] },
+                        { "0": 0, "1": -30, data: dataRows[1] },
+                        { "0": 0, "1": 0, data: dataRows[2] },
+                        { "0": 0, "1": -10, data: dataRows[3] },
+                    ],
+                    [
+                        { "0": -12, "1": -42, data: dataRows[0] },
+                        { "0": -30, "1": -42, data: dataRows[1] },
+                        { "0": 0, "1": -100, data: dataRows[2] },
+                        { "0": -10, "1": -10, data: dataRows[3] },
+                    ]
+                ]);
+            });
+        });
+    });
+});
+describe('DataStackerService', () => {
+    const service = new DataStackerService();
+    let data = [
+        [
+            { "0": 0, "1": 42, data: {} },
+            { "0": 0, "1": -123, data: {} }
+        ]
+    ];
+    describe('getLastValue', () => {
+        test('should return 0 if vfIndex is 0', () => {
+            const res = service.getValue0(data, 0, 0, 0);
+            expect(res).toBe(0);
+        });
+        test('should return last positive values if positive value exists and need positive', () => {
+            const res = service.getValue0(data, 1, 0, 12);
+            expect(res).toBe(42);
+        });
+        test('should return 0 if positive value not exists and need positive', () => {
+            const res = service.getValue0(data, 1, 1, 12);
+            expect(res).toBe(0);
+        });
+        test('should return last negative value if negative value exists and need negative', () => {
+            const res = service.getValue0(data, 1, 1, -12);
+            expect(res).toBe(-123);
+        });
+        test('should return 0 if negative value not exists and need negative', () => {
+            const res = service.getValue0(data, 1, 0, -12);
+            expect(res).toBe(0);
+        });
+    });
+    describe('getValue1', () => {
+        test('should return sum of value0 + value from data', () => {
+            let res = service.getValue1(0, 12);
+            expect(res).toBe(12);
+            res = service.getValue1(-12, -30);
+            expect(res).toBe(-42);
+            res = service.getValue1(0, 30);
+            expect(res).toBe(30);
+            res = service.getValue1(0, -30);
+            expect(res).toBe(-30);
+        });
+    });
+});
+describe('real example (positive only)', () => {
+    const stacker = new DataStacker();
+    const data = [
+        {
+            $id: 1,
+            brand: "BMW BMW",
+            price: 100000,
+            count: 12000,
+            color: "red"
+        },
+        {
+            $id: 2,
+            brand: "LADA",
+            price: 0,
+            count: 1000,
+            color: "green"
+        },
+        {
+            $id: 3,
+            brand: "MERCEDES",
+            price: 15000,
+            count: 1200,
+            color: "blue"
+        },
+        {
+            $id: 4,
+            brand: "AUDI",
+            price: 20000,
+            count: 500,
+            color: "yellow"
+        },
+        {
+            $id: 5,
+            brand: "VOLKSWAGEN",
+            price: 115000,
+            count: 6000,
+            color: "cyan"
+        },
+        {
+            $id: 6,
+            brand: "DODGE",
+            price: 115000,
+            count: 4000,
+            color: "red"
+        },
+        {
+            $id: 7,
+            brand: "SAAB",
+            price: 50000,
+            count: 11000,
+            color: "orange"
+        },
+        {
+            $id: 8,
+            brand: "HONDA",
+            price: 20000,
+            count: 2000,
+            color: "brown"
+        },
+        {
+            $id: 9,
+            brand: "TOYOTA",
+            price: 40000,
+            count: 15000,
+            color: "pink"
+        }
+    ];
+    const valueFields = ["price", "count"];
+    const stackedData = [
+        [
+            { "0": 0, "1": 100000, data: data[0] },
+            { "0": 0, "1": 0, data: data[1] },
+            { "0": 0, "1": 15000, data: data[2] },
+            { "0": 0, "1": 20000, data: data[3] },
+            { "0": 0, "1": 115000, data: data[4] },
+            { "0": 0, "1": 115000, data: data[5] },
+            { "0": 0, "1": 50000, data: data[6] },
+            { "0": 0, "1": 20000, data: data[7] },
+            { "0": 0, "1": 40000, data: data[8] }
+        ],
+        [
+            { "0": 100000, "1": 112000, data: data[0] },
+            { "0": 0, "1": 1000, data: data[1] },
+            { "0": 15000, "1": 16200, data: data[2] },
+            { "0": 20000, "1": 20500, data: data[3] },
+            { "0": 115000, "1": 121000, data: data[4] },
+            { "0": 115000, "1": 119000, data: data[5] },
+            { "0": 50000, "1": 61000, data: data[6] },
+            { "0": 20000, "1": 22000, data: data[7] },
+            { "0": 40000, "1": 55000, data: data[8] }
+        ]
+    ];
+    test('check on real example', () => {
+        const res = stacker.getStackedData(data, valueFields);
+        expect(res).toEqual(stackedData);
+    });
+});

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStackerService.d.ts

@@ -0,0 +1,5 @@
+import { StackedDataFull } from "./dataStacker";
+export declare class DataStackerService {
+    getValue0(stackedData: StackedDataFull, vfIndex: number, drIndex: number, valueFromData: number): number;
+    getValue1(value0: number, valueFromData: number): number;
+}

package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStackerService.js

@@ -0,0 +1,19 @@
+export class DataStackerService {
+    getValue0(stackedData, vfIndex, drIndex, valueFromData) {
+        if (vfIndex === 0)
+            return 0;
+        for (let i = vfIndex - 1; i >= 0; i--) {
+            if (valueFromData === 0) {
+                return stackedData[i][drIndex][1];
+            }
+            const needed = stackedData[i][drIndex][1] >= 0 === valueFromData >= 0;
+            if (needed) {
+                return stackedData[i][drIndex][1];
+            }
+        }
+        return 0;
+    }
+    getValue1(value0, valueFromData) {
+        return value0 + valueFromData;
+    }
+}

package/lib/engine/twoDimensionalNotation/twoDimensionalManager.js

@@ -20,8 +20,9 @@ export class TwoDimensionalManager {
         engine.block.scales = scales;
         engine.block.renderSvg(model.blockCanvas.size);
         Axis.render(engine.block, scales, options.scale, options.axis, model.blockCanvas.size);
-        GridLine.render(engine.block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.render(engine.block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         this.renderCharts(engine.block, options.charts, scales, engine.data, options.data, model.chartBlock.margin, options.axis.key.orient, options.chartSettings.bar, model.blockCanvas.size);
+        Axis.raiseKeyAxis(engine.block, options.axis.key);
         engine.block.filterEventManager.registerEventFor2D(scales.key, model.chartBlock.margin, model.blockCanvas.size, options);
         engine.block.filterEventManager.event2DUpdate(options);
         Title.render(engine.block, options.title, model.otherComponents.titleBlock, model.blockCanvas.size);
@@ -49,7 +50,7 @@ export class TwoDimensionalManager {
         const keyDomainEquality = Helper.checkDomainsEquality(block.scales.key.domain(), scales.key.domain());
         block.scales = scales;
         Axis.update(block, scales, options.scale, options.axis, model.blockCanvas.size, keyDomainEquality);
-        GridLine.update(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, options.scale.key);
+        GridLine.update(block, options.additionalElements.gridLine.flag, options.axis, model.blockCanvas.size, model.chartBlock.margin, scales);
         const promises = this.updateCharts(block, options.charts, scales, data, model.options.data, model.chartBlock.margin, options.axis.key.orient, model.blockCanvas.size, options.chartSettings.bar);
         Promise.all(promises)
             .then(() => {