mdt-charts 1.12.7 → 1.12.8

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/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)

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

@@ -84,20 +84,20 @@ export class BarHelper {
     }
     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/model/featuresModel/axisModel.js

@@ -111,11 +111,15 @@ export class AxisModel {
         let translateY;
         let translateX;
         if (chartOrientation === "vertical") {
-            translateY = getZeroCoordinate() + canvasModel.getMarginSide("top");
+            translateY = getZeroCoordinate
+                ? getZeroCoordinate() + canvasModel.getMarginSide("top")
+                : AxisModel.getAxisTranslateY(AxisType.Key, chartOrientation, axisPosition, canvasModel);
             translateX = AxisModel.getAxisTranslateX(AxisType.Key, chartOrientation, axisPosition, canvasModel);
         }
         else {
-            translateX = getZeroCoordinate() + canvasModel.getMarginSide("left");
+            translateX = getZeroCoordinate
+                ? getZeroCoordinate() + canvasModel.getMarginSide("left")
+                : AxisModel.getAxisTranslateX(AxisType.Key, chartOrientation, axisPosition, canvasModel);
             translateY = AxisModel.getAxisTranslateY(AxisType.Key, chartOrientation, axisPosition, canvasModel);
         }
         return {

package/lib/model/featuresModel/scaleModel/scaleModel.js

@@ -86,7 +86,7 @@ export class ScaleModel {
             dataRows.forEach(dataRow => {
                 let sumInRow = 0;
                 chart.data.valueFields.forEach(field => {
-                    if (chart.isSegmented)
+                    if (chart.isSegmented && dataRow[field.name] > 0)
                         sumInRow += dataRow[field.name];
                     else if (dataRow[field.name] > sumInRow)
                         sumInRow = dataRow[field.name];
@@ -103,7 +103,10 @@ export class ScaleModel {
             dataRows.forEach(dataRow => {
                 let sumInRow = 0;
                 chart.data.valueFields.forEach(field => {
-                    if (dataRow[field.name] < sumInRow)
+                    if (chart.isSegmented && dataRow[field.name] < 0) {
+                        sumInRow += dataRow[field.name];
+                    }
+                    else if (dataRow[field.name] < sumInRow)
                         sumInRow = dataRow[field.name];
                 });
                 if (min > sumInRow)

package/lib/style/charts-main.css

@@ -62,7 +62,7 @@
     /* will-change: opacity;      */
 }
 .legend-block-column .legend-item:not(:first-of-type) {
-    margin-top: 15px;
+    margin-top: 10px;
 }
 .legend-item-inline {
     white-space: nowrap;
@@ -73,7 +73,7 @@
     margin-left: 20px;
 }
 .legend-wrapper-with-wrap .legend-item-inline {
-    margin: 5px;
+    margin: 2px;
 }
 .legend-item-row {
     display: flex;

package/lib/style/charts-main.less

@@ -62,7 +62,7 @@
     /* will-change: opacity;      */
 }
 .legend-block-column .legend-item:not(:first-of-type) {
-    margin-top: 15px;
+    margin-top: 10px;
 }
 .legend-item-inline {
     white-space: nowrap;
@@ -73,7 +73,7 @@
     margin-left: 20px;
 }
 .legend-wrapper-with-wrap .legend-item-inline {
-    margin: 5px;
+    margin: 2px;
 }
 .legend-item-row {
     display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdt-charts",
-  "version": "1.12.7",
+  "version": "1.12.8",
   "description": "",
   "main": "lib/main.js",
   "scripts": {