mdt-charts 1.34.0 → 1.35.1

package/lib/config/config.d.ts

@@ -239,7 +239,7 @@ export interface TwoDimGroupingItem {
     labels?: TwoDimGroupingItemLabels;
 }
 interface TwoDimGroupingItemData {
-    field: MdtChartsField;
+    field: MdtChartsBaseField;
 }
 interface TwoDimGroupingItemLabels {
     position?: ItemPositionByOrientation;

package/lib/designer/designerConfig.d.ts

@@ -17,7 +17,7 @@ export interface DesignerConfig {
 }
 interface Canvas {
     axisLabel: AxisLabelCanvas;
-    chartBlockMargin: BlockMargin;
+    chartBlockMargin?: BlockMargin;
     legendBlock: LegendBlockCanvas;
     chartOptions: ChartOptionsCanvas;
     markers?: MarkerCanvas;

package/lib/model/featuresModel/legendModel/legendModel.js

@@ -11,7 +11,7 @@ export class LegendModel {
                 },
                 bottom: {
                     size: 0,
-                    margin: { top: 2, bottom: 0, left: 0, right: 0 },
+                    margin: { top: 7, bottom: 0, left: 0, right: 0 },
                     pad: 0
                 },
                 right: {

package/lib/model/margin/marginModel.d.ts

@@ -3,9 +3,10 @@ import { DesignerConfig } from "../../designer/designerConfig";
 import { OtherCommonComponents } from "../model";
 import { ModelInstance } from "../modelInstance/modelInstance";
 export declare class MarginModel {
-    private designerConfig;
-    private config;
+    private readonly designerConfig;
+    private readonly config;
     private twoDimModel;
+    private readonly configReader;
     constructor(designerConfig: DesignerConfig, config: MdtChartsConfig);
     initMargin(otherComponents: OtherCommonComponents, modelInstance: ModelInstance): void;
     recalcMarginByVerticalAxisLabel(modelInstance: ModelInstance): void;

package/lib/model/margin/marginModel.js

@@ -1,16 +1,17 @@
 import { TwoDimMarginModel } from "./twoDim/twoDimMarginModel";
-import { TwoDimConfigReader } from "../modelInstance/configReader/twoDimConfigReader.ts/twoDimConfigReader";
+import { getConfigReader } from "../modelInstance/configReader/baseConfigReader";
 export class MarginModel {
     constructor(designerConfig, config) {
         this.designerConfig = designerConfig;
         this.config = config;
+        this.configReader = getConfigReader(this.config, this.designerConfig);
     }
     initMargin(otherComponents, modelInstance) {
         const canvasModel = modelInstance.canvasModel;
-        canvasModel.initMargin(Object.assign({}, this.designerConfig.canvas.chartBlockMargin));
+        canvasModel.initMargin(this.configReader.getChartBlockMargin());
         this.recalcMarginByTitle(canvasModel);
         if (this.config.options.type === "2d") {
-            this.twoDimModel = new TwoDimMarginModel(this.designerConfig, new TwoDimConfigReader(this.config, this.designerConfig));
+            this.twoDimModel = new TwoDimMarginModel(this.designerConfig, this.configReader);
             this.twoDimModel.recalcMargin(otherComponents, modelInstance);
         }
     }

package/lib/model/modelInstance/configReader/baseConfigReader.d.ts

@@ -1,6 +1,8 @@
 import { MdtChartsConfig, MdtChartsField } from "../../../config/config";
 import { DesignerConfig } from "../../../designer/designerConfig";
+import { BlockMargin } from "../../model";
 export interface BaseConfigReader {
     getValueFields(): MdtChartsField[];
+    getChartBlockMargin(): BlockMargin;
 }
 export declare function getConfigReader(config: MdtChartsConfig, designerConfig: DesignerConfig): BaseConfigReader;

package/lib/model/modelInstance/configReader/baseConfigReader.js

@@ -4,6 +4,6 @@ export function getConfigReader(config, designerConfig) {
     if (config.options.type === "2d")
         return new TwoDimConfigReader(config, designerConfig);
     if (config.options.type === "polar")
-        return new PolarConfigReader(config);
+        return new PolarConfigReader(config, designerConfig);
     throw new Error(`Config reader for type "${config.options.type}" not exists`);
 }

package/lib/model/modelInstance/configReader/polarConfigReader/polarConfigReader.d.ts

@@ -1,7 +1,11 @@
 import { MdtChartsConfig, MdtChartsField } from "../../../../config/config";
+import { DesignerConfig } from "../../../../designer/designerConfig";
+import { BlockMargin } from "../../../model";
 import { BaseConfigReader } from "../baseConfigReader";
 export declare class PolarConfigReader implements BaseConfigReader {
+    private readonly designerConfig;
     private options;
-    constructor(config: MdtChartsConfig);
+    constructor(config: MdtChartsConfig, designerConfig: DesignerConfig);
     getValueFields(): MdtChartsField[];
+    getChartBlockMargin(): BlockMargin;
 }

package/lib/model/modelInstance/configReader/polarConfigReader/polarConfigReader.js

@@ -1,8 +1,18 @@
 export class PolarConfigReader {
-    constructor(config) {
+    constructor(config, designerConfig) {
+        this.designerConfig = designerConfig;
         this.options = config.options;
     }
     getValueFields() {
         return [this.options.chart.data.valueField];
     }
+    getChartBlockMargin() {
+        const defaultBlockMargin = {
+            top: 5,
+            bottom: 5,
+            left: 5,
+            right: 5
+        };
+        return Object.assign(Object.assign({}, defaultBlockMargin), this.designerConfig.canvas.chartBlockMargin);
+    }
 }

package/lib/model/modelInstance/configReader/twoDimConfigReader.ts/groupingConfigReader/groupingConfigReader.d.ts

@@ -1,4 +1,4 @@
-import { ChartOrientation, DiscreteAxisOptions, MdtChartsDataRow, MdtChartsField, TwoDimGroupingOptions } from "../../../../../config/config";
+import { ChartOrientation, DiscreteAxisOptions, MdtChartsBaseField, MdtChartsDataRow, TwoDimGroupingOptions } from "../../../../../config/config";
 import { DominantBaseline, Orient, TextAnchor } from "../../../../model";
 export declare class GroupingConfigReader {
     private readonly keyAxisOptions;
@@ -19,7 +19,7 @@ export declare class GroupingConfigReader {
         domain: string[];
         orient: Orient;
         sideIndex: number;
-        field: MdtChartsField;
+        field: MdtChartsBaseField;
         textAnchor: TextAnchor;
         dominantBaseline: DominantBaseline;
     }[];

package/lib/model/modelInstance/configReader/twoDimConfigReader.ts/twoDimConfigReader.d.ts

@@ -1,6 +1,6 @@
 import { AxisLabelFormatter, MdtChartsConfig, MdtChartsField, MdtChartsFieldName, MdtChartsTwoDimensionalOptions, TwoDimensionalChartType, TwoDimensionalValueGroup, ValueLabelsFormatter } from "../../../../config/config";
 import { DesignerConfig } from "../../../../designer/designerConfig";
-import { ValueLabelsStyleModel } from "../../../model";
+import { BlockMargin, ValueLabelsStyleModel } from "../../../model";
 import { BaseConfigReader } from "../baseConfigReader";
 import { GroupingConfigReader } from "./groupingConfigReader/groupingConfigReader";
 export declare class TwoDimConfigReader implements BaseConfigReader {
@@ -8,6 +8,7 @@ export declare class TwoDimConfigReader implements BaseConfigReader {
     readonly options: MdtChartsTwoDimensionalOptions;
     readonly grouping: GroupingConfigReader;
     constructor(config: MdtChartsConfig, designerConfig: DesignerConfig);
+    getChartBlockMargin(): BlockMargin;
     getValueFields(): MdtChartsField[];
     getFieldsBySegments(valueGroup: TwoDimensionalValueGroup): MdtChartsFieldName[][];
     getAxisLabelFormatter(): AxisLabelFormatter;

package/lib/model/modelInstance/configReader/twoDimConfigReader.ts/twoDimConfigReader.js

@@ -5,6 +5,15 @@ export class TwoDimConfigReader {
         this.options = config.options;
         this.grouping = new GroupingConfigReader(this.options.axis.key, this.options.orientation, this.options.grouping);
     }
+    getChartBlockMargin() {
+        const defaultBlockMargin = {
+            top: 5,
+            bottom: 0,
+            left: 0,
+            right: 0
+        };
+        return Object.assign(Object.assign({}, defaultBlockMargin), this.designerConfig.canvas.chartBlockMargin);
+    }
     getValueFields() {
         const fields = [];
         this.options.charts.forEach((chart) => {

package/package.json

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