mdt-charts 1.11.1 → 1.12.3

package/lib/model/notations/polar/polarModel.d.ts

@@ -0,0 +1,16 @@
+import { MdtChartsDataSource, MdtChartsPolarOptions } from "../../../config/config";
+import { DesignerConfig } from "../../../designer/designerConfig";
+import { PolarOptionsModel, LegendCoordinate } from "../../model";
+import { CanvasModel } from "../../modelInstance/canvasModel/canvasModel";
+import { ModelInstance } from "../../modelInstance/modelInstance";
+/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
+export declare const MIN_DONUT_BLOCK_SIZE = 120;
+export declare class PolarModel {
+    private static donutModel;
+    static getOptions(options: MdtChartsPolarOptions, data: MdtChartsDataSource, designerConfig: DesignerConfig, modelInstance: ModelInstance): PolarOptionsModel;
+    static getLegendPositionByBlockSize(canvasModel: CanvasModel): "bottom" | "right";
+    static doesChartBlockHasEnoughWidthForContainsLegend(chartBlockWidth: number, legendWidth: number, legendCoordinate: LegendCoordinate): boolean;
+    static doesChartBlockHasEnoughHeightForContainsLegend(chartBlockHeight: number, legendCoordinate: LegendCoordinate): boolean;
+    private static getDonutSettings;
+    private static getChartsModel;
+}

package/lib/model/notations/polar/polarModel.js

@@ -0,0 +1,55 @@
+import { ChartStyleModelService } from "../../chartStyleModel/chartStyleModel";
+import { DonutModel } from "./donut/donutModel";
+/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
+export const MIN_DONUT_BLOCK_SIZE = 120;
+export class PolarModel {
+    static getOptions(options, data, designerConfig, modelInstance) {
+        const dataRows = data[options.data.dataSource];
+        return {
+            type: options.type,
+            selectable: !!options.selectable,
+            title: options.title,
+            data: Object.assign({}, options.data),
+            charts: this.getChartsModel(options.chart, dataRows.length, designerConfig.chartStyle),
+            legend: modelInstance.canvasModel.legendCanvas.getModel(),
+            tooltip: options.tooltip,
+            chartCanvas: this.getDonutSettings(designerConfig.canvas.chartOptions.donut, options.chart, dataRows)
+        };
+    }
+    //TODO: type for returned value
+    static getLegendPositionByBlockSize(canvasModel) {
+        const widthCoefficientWhenLegendShouldInBottom = 1.5;
+        const avgLegendWidth = 100;
+        const blockWidth = canvasModel.getBlockSize().width;
+        const blockHeight = canvasModel.getBlockSize().height;
+        return canvasModel.getChartBlockWidth() < MIN_DONUT_BLOCK_SIZE + avgLegendWidth
+            && blockWidth * widthCoefficientWhenLegendShouldInBottom < blockHeight
+            ? 'bottom'
+            : 'right';
+    }
+    static doesChartBlockHasEnoughWidthForContainsLegend(chartBlockWidth, legendWidth, legendCoordinate) {
+        const rightLegendMargin = legendCoordinate.right.margin;
+        return chartBlockWidth - legendWidth - rightLegendMargin.left - rightLegendMargin.right >= MIN_DONUT_BLOCK_SIZE;
+    }
+    static doesChartBlockHasEnoughHeightForContainsLegend(chartBlockHeight, legendCoordinate) {
+        const minHeightForLegend = 30;
+        const bottomLegendMargin = legendCoordinate.bottom.margin;
+        const heightForLegend = chartBlockHeight - bottomLegendMargin.bottom - bottomLegendMargin.top - MIN_DONUT_BLOCK_SIZE;
+        return heightForLegend >= minHeightForLegend;
+    }
+    static getDonutSettings(settings, chartOptions, dataRows) {
+        return this.donutModel.getSettings(settings, chartOptions, dataRows);
+    }
+    static getChartsModel(chart, dataLength, chartStyleConfig) {
+        const chartsModel = [];
+        chartsModel.push({
+            type: chart.type,
+            data: Object.assign({}, chart.data),
+            tooltip: chart.tooltip,
+            cssClasses: ChartStyleModelService.getCssClasses(0),
+            style: ChartStyleModelService.getChartStyle(dataLength, chartStyleConfig)
+        });
+        return chartsModel;
+    }
+}
+PolarModel.donutModel = new DonutModel();

package/lib/model/notations/polarModel.d.ts

@@ -1,9 +1,15 @@
 import { MdtChartsDataSource, MdtChartsPolarOptions } from "../../config/config";
 import { DesignerConfig } from "../../designer/designerConfig";
-import { PolarOptionsModel } from "../model";
+import { PolarOptionsModel, LegendCoordinate } from "../model";
+import { CanvasModel } from "../modelInstance/canvasModel/canvasModel";
 import { ModelInstance } from "../modelInstance/modelInstance";
+/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
+export declare const MIN_DONUT_BLOCK_SIZE = 120;
 export declare class PolarModel {
     static getOptions(options: MdtChartsPolarOptions, data: MdtChartsDataSource, designerConfig: DesignerConfig, modelInstance: ModelInstance): PolarOptionsModel;
+    static getLegendPositionByBlockSize(canvasModel: CanvasModel): "bottom" | "right";
+    static doesChartBlockHasEnoughWidthForContainsLegend(chartBlockWidth: number, legendWidth: number, legendCoordinate: LegendCoordinate): boolean;
+    static doesChartBlockHasEnoughHeightForContainsLegend(chartBlockHeight: number, legendCoordinate: LegendCoordinate): boolean;
     private static getDonutSettings;
     private static getChartsModel;
 }

package/lib/model/notations/polarModel.js

@@ -1,5 +1,6 @@
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
-import { LegendModel } from "../featuresModel/legendModel/legendModel";
+/** If donut block has width less than this const, legend change postion from "right" to "bottom" */
+export const MIN_DONUT_BLOCK_SIZE = 120;
 export class PolarModel {
     static getOptions(options, data, designerConfig, modelInstance) {
         return {
@@ -8,11 +9,32 @@ export class PolarModel {
             title: options.title,
             data: Object.assign({}, options.data),
             charts: this.getChartsModel(options.chart, data[options.data.dataSource].length, designerConfig.chartStyle),
-            legend: LegendModel.getLegendModel(options.type, options.legend.show, modelInstance.canvasModel),
+            legend: modelInstance.canvasModel.legendCanvas.getModel(),
             tooltip: options.tooltip,
             chartCanvas: this.getDonutSettings(designerConfig.canvas.chartOptions.donut, options.chart)
         };
     }
+    //TODO: type for returned value
+    static getLegendPositionByBlockSize(canvasModel) {
+        const widthCoefficientWhenLegendShouldInBottom = 1.5;
+        const avgLegendWidth = 100;
+        const blockWidth = canvasModel.getBlockSize().width;
+        const blockHeight = canvasModel.getBlockSize().height;
+        return canvasModel.getChartBlockWidth() < MIN_DONUT_BLOCK_SIZE + avgLegendWidth
+            && blockWidth * widthCoefficientWhenLegendShouldInBottom < blockHeight
+            ? 'bottom'
+            : 'right';
+    }
+    static doesChartBlockHasEnoughWidthForContainsLegend(chartBlockWidth, legendWidth, legendCoordinate) {
+        const rightLegendMargin = legendCoordinate.right.margin;
+        return chartBlockWidth - legendWidth - rightLegendMargin.left - rightLegendMargin.right >= MIN_DONUT_BLOCK_SIZE;
+    }
+    static doesChartBlockHasEnoughHeightForContainsLegend(chartBlockHeight, legendCoordinate) {
+        const minHeightForLegend = 30;
+        const bottomLegendMargin = legendCoordinate.bottom.margin;
+        const heightForLegend = chartBlockHeight - bottomLegendMargin.bottom - bottomLegendMargin.top - MIN_DONUT_BLOCK_SIZE;
+        return heightForLegend >= minHeightForLegend;
+    }
     static getDonutSettings(settings, chartOptions) {
         return {
             padAngle: settings.padAngle,

package/lib/model/notations/twoDimensionalModel.d.ts

@@ -1,21 +1,21 @@
-import { ChartOrientation, MdtChartsDataSource, TwoDimensionalChart, MdtChartsTwoDimensionalOptions } from "../../config/config";
+import { ChartOrientation, MdtChartsDataSource, MdtChartsTwoDimensionalChart, MdtChartsTwoDimensionalOptions } from "../../config/config";
 import { BarOptionsCanvas, DesignerConfig } from "../../designer/designerConfig";
 import { DataScope, TwoDimensionalOptionsModel, TwoDimChartElementsSettings } from "../model";
 import { ModelInstance } from "../modelInstance/modelInstance";
 export declare class TwoDimensionalModel {
     static getOptions(options: MdtChartsTwoDimensionalOptions, designerConfig: DesignerConfig, dataScope: DataScope, data: MdtChartsDataSource, modelInstance: ModelInstance): TwoDimensionalOptionsModel;
-    static getChartsEmbeddedLabelsFlag(charts: TwoDimensionalChart[], chartOrientation: ChartOrientation): boolean;
+    static getChartsEmbeddedLabelsFlag(charts: MdtChartsTwoDimensionalChart[], chartOrientation: ChartOrientation): boolean;
     /**
      * Сортирует список чартов в порядке: area - bar - line.
      * Используется для того, чтобы при рендере графики с наибольшей площадью (area) не перекрывали графики с меньшей площадью (bar, line).
      * @param charts Чарты из конфига
      */
-    static sortCharts(charts: TwoDimensionalChart[]): void;
+    static sortCharts(charts: MdtChartsTwoDimensionalChart[]): void;
     static getChartsSettings(barSettings: BarOptionsCanvas): TwoDimChartElementsSettings;
     private static getChartsModel;
     private static findChartsWithEmbeddedKeyLabels;
     private static getEmbeddedLabelType;
     private static getAdditionalElements;
     private static getChartsByType;
-    static getChartsValueFieldsAmount(charts: TwoDimensionalChart[]): number[];
+    static getChartsValueFieldsAmount(charts: MdtChartsTwoDimensionalChart[]): number[];
 }

package/lib/model/notations/twoDimensionalModel.js

@@ -1,13 +1,12 @@
 import { ChartStyleModelService } from "../chartStyleModel/chartStyleModel";
 import { TwoDimensionalChartStyleModel } from "../chartStyleModel/TwoDimensionalChartStyleModel";
 import { AxisModel } from "../featuresModel/axisModel";
-import { LegendModel } from "../featuresModel/legendModel/legendModel";
 import { ScaleModel } from "../featuresModel/scaleModel";
 export class TwoDimensionalModel {
     static getOptions(options, designerConfig, dataScope, data, modelInstance) {
         const canvasModel = modelInstance.canvasModel;
         return {
-            legend: LegendModel.getLegendModel(options.type, options.legend.show, canvasModel),
+            legend: canvasModel.legendCanvas.getModel(),
             title: options.title,
             selectable: !!options.selectable,
             orient: options.orientation,
@@ -16,7 +15,7 @@ export class TwoDimensionalModel {
                 value: ScaleModel.getScaleLinear(options, data, canvasModel)
             },
             axis: {
-                key: AxisModel.getKeyAxis(options.charts, data, options.data, options.orientation, options.axis.key, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip),
+                key: AxisModel.getKeyAxis(options, data, designerConfig.canvas.axisLabel, canvasModel, designerConfig.elementsOptions.tooltip),
                 value: AxisModel.getValueAxis(options.orientation, options.axis.value, designerConfig.canvas.axisLabel, canvasModel)
             },
             type: options.type,

package/lib/style/charts-main.css

@@ -41,28 +41,45 @@
 
 
 /*========================================================================== Legend */
+.legend-block {
+    display: flex;
+    height: 100%;
+}
+.legend-block-column {
+    flex-direction: column;
+}
+.legend-block-row {
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+.legend-block-centered {
+    justify-content: center;
+}
 .legend-item {
     cursor: default;
     transition: opacity 0.1s;
+    /* will-change: opacity;      */
+}
+.legend-block-column .legend-item:not(:first-of-type) {
+    margin-top: 15px;
 }
 .legend-item-inline {
     white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
-.legend-item-inline:not(:first-of-type) {
+.legend-wrapper-without-wrap .legend-item-inline:not(:first-of-type) {
     margin-left: 20px;
 }
+.legend-wrapper-with-wrap .legend-item-inline {
+    margin: 5px;
+}
 .legend-item-row {
     display: flex;
 }
 .legend-item-row > span {
     display: block;
 }
-.mt-15 {
-    margin-top: 15px;
-}
-.mt-10 {
-    margin-top: 10px;
-}
 
 .legend-label {
     font-size: 12px;
@@ -183,12 +200,15 @@
     line-height: 1;
 }
 .aggregator-value {
-    margin-top: 20px;
+    margin-top: 0.5em;
     pointer-events: auto;
 }
 .aggregator-name {
-    margin-top: 10px;
+    margin-top: 0.5em;
     pointer-events: auto;
+    max-width: 90%;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 /* Grid */

package/lib/style/charts-main.less

@@ -41,28 +41,45 @@
 
 
 /*========================================================================== Legend */
+.legend-block {
+    display: flex;
+    height: 100%;
+}
+.legend-block-column {
+    flex-direction: column;
+}
+.legend-block-row {
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+.legend-block-centered {
+    justify-content: center;
+}
 .legend-item {
     cursor: default;
     transition: opacity 0.1s;
+    /* will-change: opacity;      */
+}
+.legend-block-column .legend-item:not(:first-of-type) {
+    margin-top: 15px;
 }
 .legend-item-inline {
     white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
-.legend-item-inline:not(:first-of-type) {
+.legend-wrapper-without-wrap .legend-item-inline:not(:first-of-type) {
     margin-left: 20px;
 }
+.legend-wrapper-with-wrap .legend-item-inline {
+    margin: 5px;
+}
 .legend-item-row {
     display: flex;
 }
 .legend-item-row > span {
     display: block;
 }
-.mt-15 {
-    margin-top: 15px;
-}
-.mt-10 {
-    margin-top: 10px;
-}
 
 .legend-label {
     font-size: 12px;
@@ -183,12 +200,15 @@
     line-height: 1;
 }
 .aggregator-value {
-    margin-top: 20px;
+    margin-top: 0.5em;
     pointer-events: auto;
 }
 .aggregator-name {
-    margin-top: 10px;
+    margin-top: 0.5em;
     pointer-events: auto;
+    max-width: 90%;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 /* Grid */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdt-charts",
-  "version": "1.11.1",
+  "version": "1.12.3",
   "description": "",
   "main": "lib/main.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "build": "npx webpack --mode production",
     "watch": "npx webpack --mode development --watch",
     "test": "jest",
-    "build-lib": "npx tsc -p ."
+    "build-lib": "npx tsc -p tsconfig.production.json"
   },
   "homepage": "https://github.com/VishulaKnow/charts",
   "author": "",

package/tsconfig.production.json

@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "outDir": "./lib/",
+        "noImplicitAny": true,
+        "target": "es6",
+        "lib": ["ES2017", "DOM"],
+        "jsx": "react",
+        "allowJs": true,
+        "types": [
+            "jest"
+        ],
+        "declaration": true
+    },
+    "include": [
+        "src"
+    ],
+    "exclude": [
+        "node_modules",
+        "**/__tests__/*",
+        "src/playground/*",
+        "**/*Example.ts"
+    ]
+}

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

@@ -1,14 +0,0 @@
-import { ChartOrientation } from "../../../config/config";
-import { Block } from "../../block/block";
-declare type AlertBlockPosition = 'top' | 'bottom' | 'right' | 'left';
-export declare class RecordOverflowAlert {
-    private static readonly blockClass;
-    static render(block: Block, hidedRecordsAmount: number, position: AlertBlockPosition, chartOrientation?: ChartOrientation): void;
-    static update(block: Block, hidedRecordsAmount: number, position: AlertBlockPosition, chartOrientation?: ChartOrientation): void;
-    private static setAlertPosition;
-    private static getAlertText;
-    private static getWordTextEndingByAmount;
-    private static getBlockPositionAttrs;
-    private static getLeftAttrForRightBlock;
-}
-export {};

package/lib/engine/features/recordOverflowAlert/recordOverflowAlert.js

@@ -1,97 +0,0 @@
-import { DomHelper } from '../../helpers/domHelper';
-import { Legend } from '../legend/legend';
-export class RecordOverflowAlert {
-    static render(block, hidedRecordsAmount, position, chartOrientation = null) {
-        const alertBlock = block.getWrapper()
-            .append('div')
-            .attr('class', this.blockClass)
-            .text(this.getAlertText(hidedRecordsAmount, chartOrientation));
-        const attrs = this.getBlockPositionAttrs(position, block);
-        this.setAlertPosition(alertBlock, attrs);
-    }
-    static update(block, hidedRecordsAmount, position, chartOrientation = null) {
-        let alertBlock = block.getWrapper()
-            .select(`div.${this.blockClass}`);
-        if (alertBlock.empty()) {
-            if (hidedRecordsAmount === 0)
-                return;
-            else
-                this.render(block, hidedRecordsAmount, position, chartOrientation);
-        }
-        else {
-            if (hidedRecordsAmount === 0)
-                alertBlock.remove();
-            else
-                alertBlock.text(this.getAlertText(hidedRecordsAmount, chartOrientation));
-        }
-    }
-    static setAlertPosition(alertBlock, attrs) {
-        alertBlock
-            .style('position', 'absolute')
-            .style('left', attrs.left)
-            .style('right', attrs.right)
-            .style('top', attrs.top)
-            .style('bottom', attrs.bottom);
-    }
-    static getAlertText(hidedRecordsAmount, chartOrientation) {
-        return `+ ${hidedRecordsAmount} ${this.getWordTextEndingByAmount(hidedRecordsAmount, chartOrientation)}`;
-    }
-    static getWordTextEndingByAmount(hidedRecordsAmount, chartOrientation) {
-        const lastDigit = hidedRecordsAmount % 10;
-        if (chartOrientation === 'vertical') {
-            if (hidedRecordsAmount >= 10 && hidedRecordsAmount <= 20)
-                return 'столбцов';
-            if (lastDigit === 1)
-                return 'столбец';
-            if (lastDigit >= 2 && lastDigit <= 4)
-                return 'столбца';
-            return 'столбцов';
-        }
-        else if (chartOrientation === 'horizontal') {
-            if (hidedRecordsAmount >= 10 && hidedRecordsAmount <= 20)
-                return 'строк';
-            if (lastDigit === 1)
-                return 'строка';
-            if (lastDigit >= 2 && lastDigit <= 4)
-                return 'строки';
-            return 'строк';
-        }
-        else {
-            if (hidedRecordsAmount >= 10 && hidedRecordsAmount <= 20)
-                return 'категорий';
-            if (lastDigit === 1)
-                return 'категория';
-            if (lastDigit >= 2 && lastDigit <= 4)
-                return 'категории';
-            return 'категорий';
-        }
-    }
-    static getBlockPositionAttrs(position, block) {
-        const attrs = {
-            bottom: null,
-            top: null,
-            right: null,
-            left: null
-        };
-        if (position === 'top') {
-            attrs.right = '17px';
-            attrs.top = '1rem';
-        }
-        if (position === 'right') {
-            attrs.bottom = '20px';
-            attrs.left = this.getLeftAttrForRightBlock(block) + 'px';
-        }
-        if (position === 'bottom') {
-            attrs.left = '20px';
-            attrs.bottom = '20px';
-        }
-        return attrs;
-    }
-    static getLeftAttrForRightBlock(block) {
-        const legendBlock = block.getSvg().select(`.${Legend.objectClass}`);
-        if (legendBlock.empty())
-            return null;
-        return DomHelper.getSelectionNumericAttr(legendBlock, 'x');
-    }
-}
-RecordOverflowAlert.blockClass = 'record-overflow-alert';