mdt-charts 1.16.1 → 1.17.1

package/lib/config/config.d.ts

@@ -45,7 +45,7 @@ interface BasicOptions {
 interface GraphicNotationOptions extends BasicOptions {
     data: DataOptions;
     legend: Legend;
-    title?: string;
+    title?: Title;
     selectable: boolean;
 }
 export interface MdtChartsTwoDimensionalOptions extends GraphicNotationOptions {
@@ -69,6 +69,13 @@ export interface MdtChartsIntervalOptions extends GraphicNotationOptions {
 export interface Legend {
     show: boolean;
 }
+export interface TitleFunctionParams {
+    data: MdtChartsDataRow[];
+}
+export interface TitleFunction {
+    (params: TitleFunctionParams): string;
+}
+export declare type Title = string | TitleFunction;
 export interface MdtChartsBasicDataOptions {
     dataSource: string;
 }

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

@@ -76,6 +76,7 @@ export class Axis {
             else if (axisOptions.orient === 'top')
                 axisGenerator.tickPadding(-6);
         }
+        axisGenerator.tickFormat(axisOptions.labels.showTick);
         const axisElement = block.getSvg()
             .select(`g.${axisOptions.cssClass}`);
         AxisLabelsEventManager.removeEvents(axisElement);

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

@@ -2,7 +2,9 @@ import { Size } from '../../../config/config';
 import { TitleBlockModel } from "../../../model/model";
 import { Block } from "../../block/block";
 export declare class Title {
+    private static readonly titleCssClass;
     static render(block: Block, text: string, titleBlockModel: TitleBlockModel, blockSize: Size): void;
+    static updateData(text: string): void;
     private static fillTitleBlockAttributes;
     private static getTitleAttributes;
     private static setTitleTooltip;

package/lib/engine/features/title/title.js

@@ -1,3 +1,4 @@
+import { select } from 'd3-selection';
 import { DomHelper } from '../../helpers/domHelper';
 export class Title {
     static render(block, text, titleBlockModel, blockSize) {
@@ -5,11 +6,14 @@ export class Title {
             return;
         const titleBlock = block.getSvg()
             .append('text')
-            .attr('class', 'chart-title');
+            .attr('class', this.titleCssClass);
         const titleCoordinate = this.getTitleAttributes(blockSize, titleBlockModel);
         this.fillTitleBlockAttributes(titleBlock, titleCoordinate, text);
         this.setTitleTooltip(titleBlock, text);
     }
+    static updateData(text) {
+        select(`.${this.titleCssClass}`).text(text);
+    }
     static fillTitleBlockAttributes(titleBlock, attributes, text) {
         titleBlock
             .attr('x', attributes.x)
@@ -35,3 +39,4 @@ export class Title {
             .text(text);
     }
 }
+Title.titleCssClass = 'chart-title';

package/lib/engine/polarNotation/polarManager.js

@@ -29,6 +29,7 @@ export class PolarManager {
         block.transitionManager.interruptTransitions();
         block.removeMouseEvents();
         block.filterEventManager.updateData(data[model.options.data.dataSource]);
+        Title.updateData(model.options.title);
         ElementHighlighter.removeDonutArcClones(block);
         ElementHighlighter.removeFilter(Donut.getAllArcGroups(block));
         ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), true);

package/lib/engine/twoDimensionalNotation/twoDimensionalManager.js

@@ -42,6 +42,7 @@ export class TwoDimensionalManager {
     updateData(block, model, data) {
         block.transitionManager.interruptTransitions();
         block.filterEventManager.updateData(data[model.options.data.dataSource]);
+        Title.updateData(model.options.title);
         TipBox.clearEvents(block);
         Tooltip.hide(block);
         const options = model.options;

package/lib/model/featuresModel/titleModel.d.ts

@@ -1,4 +1,6 @@
 import { TitleBlockModel } from "../model";
+import { MdtChartsDataRow, Title } from "../../config/config";
+export declare const getResolvedTitle: (title: Title, dataRows: MdtChartsDataRow[]) => string;
 export declare class TitleModel {
     static getTitleModel(titleText: string): TitleBlockModel;
 }

package/lib/model/featuresModel/titleModel.js

@@ -1,3 +1,8 @@
+export const getResolvedTitle = (title, dataRows) => {
+    return typeof title === 'function'
+        ? title({ data: dataRows })
+        : title;
+};
 export class TitleModel {
     static getTitleModel(titleText) {
         const defaultPads = 20;

package/lib/model/modelBuilder.js

@@ -6,6 +6,7 @@ import { OtherComponentsModel } from './featuresModel/otherComponents';
 import { ConfigValidator } from './configsValidator/configValidator';
 import { ModelInstance } from './modelInstance/modelInstance';
 import { TwoDimConfigReader } from './modelInstance/configReader';
+import { getResolvedTitle } from "../model/featuresModel/titleModel";
 export var AxisType;
 (function (AxisType) {
     AxisType[AxisType["Key"] = 0] = "Key";
@@ -67,6 +68,8 @@ function getTransitions(designerConfig) {
 }
 export function assembleModel(config, data, designerConfig) {
     const modelInstance = ModelInstance.create(config, data, designerConfig);
+    const dataRows = modelInstance.dataModel.repository.getRawRows();
+    const resolvedTitle = getResolvedTitle(config.options.title, dataRows);
     if (!data || Object.keys(data).length === 0)
         return {
             blockCanvas: getBlockCanvas(config, modelInstance),
@@ -79,7 +82,7 @@ export function assembleModel(config, data, designerConfig) {
     const otherComponents = OtherComponentsModel.getOtherComponentsModel({
         elementsOptions: designerConfig.elementsOptions,
         legendConfig: designerConfig.canvas.legendBlock,
-        title: config.options.title
+        title: resolvedTitle
     }, modelInstance);
     const marginModel = new MarginModel(designerConfig, config);
     marginModel.initMargin(otherComponents, modelInstance);

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

@@ -1,12 +1,15 @@
 import { ChartStyleModelService } from "../../chartStyleModel/chartStyleModel";
 import { DonutModel } from "./donut/donutModel";
+import { getResolvedTitle } from "../../../model/featuresModel/titleModel";
 export const MIN_DONUT_BLOCK_SIZE = 120;
 export class PolarModel {
     static getOptions(options, designerConfig, modelInstance) {
+        const dataRows = modelInstance.dataModel.repository.getRawRows();
+        const resolvedTitle = getResolvedTitle(options.title, dataRows);
         return {
             type: options.type,
             selectable: !!options.selectable,
-            title: options.title,
+            title: resolvedTitle,
             data: Object.assign({}, options.data),
             charts: this.getChartsModel(options.chart, modelInstance.dataModel.repository.getScopedRows().length, designerConfig.chartStyle),
             legend: modelInstance.canvasModel.legendCanvas.getModel(),

package/lib/model/notations/twoDimensionalModel.js

@@ -4,18 +4,21 @@ import { AxisModel } from "../featuresModel/axisModel";
 import { ScaleAxisRecalcer } from "../featuresModel/scaleModel/scaleAxisRecalcer";
 import { ScaleModel } from "../featuresModel/scaleModel/scaleModel";
 import { getLegendMarkerOptions, parseDashStyles, parseShape } from "./twoDimensional/styles";
+import { getResolvedTitle } from "../../model/featuresModel/titleModel";
 export class TwoDimensionalModel {
     static getOptions(configReader, designerConfig, modelInstance) {
         const options = configReader.options;
         const canvasModel = modelInstance.canvasModel;
         const dataModelRep = modelInstance.dataModel.repository;
+        const dataRows = dataModelRep.getRawRows();
+        const resolvedTitle = getResolvedTitle(options.title, dataRows);
         const scaleModel = new ScaleModel();
         const scaleMarginRecalcer = new ScaleAxisRecalcer(() => scaleModel.getScaleLinear(options, dataModelRep.getScopedRows(), canvasModel, configReader));
         scaleMarginRecalcer.recalculateMargin(canvasModel, options.orientation, options.axis.key);
         const scaleValueInfo = scaleMarginRecalcer.getScaleValue();
         return {
             legend: canvasModel.legendCanvas.getModel(),
-            title: options.title,
+            title: resolvedTitle,
             selectable: !!options.selectable,
             orient: options.orientation,
             scale: {

package/package.json

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