mdt-charts 1.28.1 → 1.29.0

package/lib/engine/elementHighlighter/selectHighlighter.d.ts

@@ -4,8 +4,33 @@ import { MdtChartsDataRow, Size } from "../../config/config";
 import { BlockMargin, DonutChartSettings, PolarOptionsModel, TwoDimensionalOptionsModel } from "../../model/model";
 import { Block } from "../block/block";
 export declare class SelectHighlighter {
-    static click2DHandler(multySelection: boolean, appendKey: boolean, keyValue: string, selectedKeys: string[], block: Block, options: TwoDimensionalOptionsModel): void;
-    static clickPolarHandler(multySelection: boolean, appendKey: boolean, selectedSegment: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, BaseType, unknown>, selectedKeys: string[], margin: BlockMargin, blockSize: Size, block: Block, options: PolarOptionsModel, arcItems: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, SVGGElement, unknown>, donutSettings: DonutChartSettings): void;
-    static clear2D(block: Block, options: TwoDimensionalOptionsModel): void;
-    static clearPolar(margin: BlockMargin, blockSize: Size, block: Block, options: PolarOptionsModel, arcItems: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, SVGGElement, unknown>, donutSettings: DonutChartSettings): void;
+	static click2DHandler(
+		multySelection: boolean,
+		appendKey: boolean,
+		keyValue: string,
+		selectedKeys: string[],
+		block: Block,
+		options: TwoDimensionalOptionsModel
+	): void;
+	static clickPolarHandler(
+		multySelection: boolean,
+		appendKey: boolean,
+		selectedSegment: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, BaseType, unknown>,
+		selectedKeys: string[],
+		margin: BlockMargin,
+		blockSize: Size,
+		block: Block,
+		options: PolarOptionsModel,
+		arcItems: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, SVGGElement, unknown>,
+		donutSettings: DonutChartSettings
+	): void;
+	static clear2D(block: Block, options: TwoDimensionalOptionsModel): void;
+	static clearPolar(
+		margin: BlockMargin,
+		blockSize: Size,
+		block: Block,
+		options: PolarOptionsModel,
+		arcItems: Selection<SVGGElement, PieArcDatum<MdtChartsDataRow>, SVGGElement, unknown>,
+		donutSettings: DonutChartSettings
+	): void;
 }

package/lib/engine/elementHighlighter/selectHighlighter.js

@@ -6,91 +6,193 @@ import { DonutHelper } from "../polarNotation/donut/DonutHelper";
 import { ElementHighlighter } from "./elementHighlighter";
 import { MarkDot } from "../../engine/features/markDots/markDot";
 export class SelectHighlighter {
-    static click2DHandler(multySelection, appendKey, keyValue, selectedKeys, block, options) {
-        options.charts.forEach((chart) => {
-            const selectedElements = DomHelper.getChartElementsByKeys(DomHelper.get2DChartElements(block, chart), chart.isSegmented, options.data.keyField.name, [keyValue]);
-            const elements = DomHelper.get2DChartElements(block, chart);
-            if (!appendKey) {
-                ElementHighlighter.toggle2DElements(selectedElements, false, chart, block.transitionManager.durations.markerHover);
-                if (chart.type !== "bar")
-                    MarkDot.tryMakeMarkDotVisible(selectedElements, chart.markersOptions, false);
-                if (selectedKeys.length > 0) {
-                    ElementHighlighter.toggleActivityStyle(selectedElements, false);
-                }
-                else {
-                    ElementHighlighter.toggleActivityStyle(elements, true);
-                    if (chart.type !== "bar")
-                        MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
-                }
-                return;
-            }
-            if (multySelection) {
-                ElementHighlighter.toggle2DElements(selectedElements, true, chart, block.transitionManager.durations.markerHover);
-                ElementHighlighter.toggleActivityStyle(selectedElements, true);
-                ElementHighlighter.toggleActivityStyle(DomHelper.getChartElementsByKeys(elements, chart.isSegmented, options.data.keyField.name, selectedKeys, SelectionCondition.Exclude), false);
-            }
-            else {
-                ElementHighlighter.toggle2DElements(DomHelper.getChartElementsByKeys(elements, chart.isSegmented, options.data.keyField.name, selectedKeys, SelectionCondition.Exclude), false, chart, block.transitionManager.durations.markerHover);
-                ElementHighlighter.toggleActivityStyle(elements, false);
-                if (chart.type !== "bar")
-                    MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
-                ElementHighlighter.toggleActivityStyle(selectedElements, true);
-                ElementHighlighter.toggle2DElements(selectedElements, true, chart, block.transitionManager.durations.markerHover);
-            }
-            if (chart.type !== "bar")
-                MarkDot.tryMakeMarkDotVisible(selectedElements, chart.markersOptions, true);
-        });
-    }
-    static clickPolarHandler(multySelection, appendKey, selectedSegment, selectedKeys, margin, blockSize, block, options, arcItems, donutSettings) {
-        const donutThickness = DonutHelper.getThickness(donutSettings, blockSize, margin);
-        if (!appendKey) {
-            ElementHighlighter.toggleDonutHighlightState(selectedSegment, margin, blockSize, donutThickness, block.transitionManager.durations.higlightedScale, false);
-            ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, selectedSegment);
-            ElementHighlighter.removeShadowClone(block, options.data.keyField.name, selectedSegment, margin, blockSize, donutThickness);
-            if (selectedKeys.length > 0) {
-                ElementHighlighter.toggleActivityStyle(selectedSegment, false);
-                ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, selectedKeys, SelectionCondition.Exclude), false);
-            }
-            else {
-                ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), true);
-                ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, [], SelectionCondition.Exclude), true);
-            }
-            return;
-        }
-        if (multySelection) {
-            ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, selectedSegment);
-            ElementHighlighter.removeShadowClone(block, options.data.keyField.name, selectedSegment, margin, blockSize, donutThickness);
-            ElementHighlighter.renderArcCloneAndHighlight(block, margin, selectedSegment, blockSize, donutThickness);
-            ElementHighlighter.toggleActivityStyle(selectedSegment, true);
-            ElementHighlighter.toggleActivityStyle(DomHelper.getChartElementsByKeys(Donut.getAllArcGroups(block), true, options.data.keyField.name, selectedKeys, SelectionCondition.Exclude), false);
-        }
-        else {
-            ElementHighlighter.removeDonutHighlightingByKeys(arcItems, options.data.keyField.name, selectedKeys, margin, blockSize, donutThickness);
-            ElementHighlighter.removeDonutArcClones(block);
-            ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), false);
-            ElementHighlighter.toggleActivityStyle(selectedSegment, true);
-            ElementHighlighter.renderArcCloneAndHighlight(block, margin, selectedSegment, blockSize, donutThickness);
-        }
-        ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, selectedKeys, SelectionCondition.Exclude), false);
-        ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, selectedKeys), true);
-    }
-    static clear2D(block, options) {
-        options.charts.forEach((chart) => {
-            const elements = DomHelper.get2DChartElements(block, chart);
-            ElementHighlighter.toggle2DElements(elements, false, chart, block.transitionManager.durations.markerHover);
-            ElementHighlighter.toggleActivityStyle(elements, true);
-            if (chart.type !== "bar")
-                MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
-        });
-    }
-    static clearPolar(margin, blockSize, block, options, arcItems, donutSettings) {
-        const donutThickness = DonutHelper.getThickness(donutSettings, blockSize, margin);
-        ElementHighlighter.toggleDonutHighlightState(arcItems, margin, blockSize, donutThickness, block.transitionManager.durations.higlightedScale, false);
-        arcItems.each(function () {
-            ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, select(this));
-            ElementHighlighter.removeShadowClone(block, options.data.keyField.name, select(this), margin, blockSize, donutThickness);
-        });
-        ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), true);
-        ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, [], SelectionCondition.Exclude), true);
-    }
+	static click2DHandler(multySelection, appendKey, keyValue, selectedKeys, block, options) {
+		options.charts.forEach((chart) => {
+			const selectedElements = DomHelper.getChartElementsByKeys(
+				DomHelper.get2DChartElements(block, chart),
+				chart.isSegmented,
+				options.data.keyField.name,
+				[keyValue]
+			);
+			const elements = DomHelper.get2DChartElements(block, chart);
+			if (!appendKey) {
+				ElementHighlighter.toggle2DElements(
+					selectedElements,
+					false,
+					chart,
+					block.transitionManager.durations.markerHover
+				);
+				if (chart.type !== "bar") MarkDot.tryMakeMarkDotVisible(selectedElements, chart.markersOptions, false);
+				if (selectedKeys.length > 0) {
+					ElementHighlighter.toggleActivityStyle(selectedElements, false);
+				} else {
+					ElementHighlighter.toggleActivityStyle(elements, true);
+					if (chart.type !== "bar") MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
+				}
+				return;
+			}
+			if (multySelection) {
+				ElementHighlighter.toggle2DElements(
+					selectedElements,
+					true,
+					chart,
+					block.transitionManager.durations.markerHover
+				);
+				ElementHighlighter.toggleActivityStyle(selectedElements, true);
+				ElementHighlighter.toggleActivityStyle(
+					DomHelper.getChartElementsByKeys(
+						elements,
+						chart.isSegmented,
+						options.data.keyField.name,
+						selectedKeys,
+						SelectionCondition.Exclude
+					),
+					false
+				);
+			} else {
+				ElementHighlighter.toggle2DElements(
+					DomHelper.getChartElementsByKeys(
+						elements,
+						chart.isSegmented,
+						options.data.keyField.name,
+						selectedKeys,
+						SelectionCondition.Exclude
+					),
+					false,
+					chart,
+					block.transitionManager.durations.markerHover
+				);
+				ElementHighlighter.toggleActivityStyle(elements, false);
+				if (chart.type !== "bar") MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
+				ElementHighlighter.toggleActivityStyle(selectedElements, true);
+				ElementHighlighter.toggle2DElements(
+					selectedElements,
+					true,
+					chart,
+					block.transitionManager.durations.markerHover
+				);
+			}
+			if (chart.type !== "bar") MarkDot.tryMakeMarkDotVisible(selectedElements, chart.markersOptions, true);
+		});
+	}
+	static clickPolarHandler(
+		multySelection,
+		appendKey,
+		selectedSegment,
+		selectedKeys,
+		margin,
+		blockSize,
+		block,
+		options,
+		arcItems,
+		donutSettings
+	) {
+		const donutThickness = DonutHelper.getThickness(donutSettings, blockSize, margin);
+		if (!appendKey) {
+			ElementHighlighter.toggleDonutHighlightState(
+				selectedSegment,
+				margin,
+				blockSize,
+				donutThickness,
+				block.transitionManager.durations.higlightedScale,
+				false
+			);
+			ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, selectedSegment);
+			ElementHighlighter.removeShadowClone(
+				block,
+				options.data.keyField.name,
+				selectedSegment,
+				margin,
+				blockSize,
+				donutThickness
+			);
+			if (selectedKeys.length > 0) {
+				ElementHighlighter.toggleActivityStyle(selectedSegment, false);
+				ElementHighlighter.toggleActivityStyle(
+					Legend.getItemsByKeys(block, selectedKeys, SelectionCondition.Exclude),
+					false
+				);
+			} else {
+				ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), true);
+				ElementHighlighter.toggleActivityStyle(
+					Legend.getItemsByKeys(block, [], SelectionCondition.Exclude),
+					true
+				);
+			}
+			return;
+		}
+		if (multySelection) {
+			ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, selectedSegment);
+			ElementHighlighter.removeShadowClone(
+				block,
+				options.data.keyField.name,
+				selectedSegment,
+				margin,
+				blockSize,
+				donutThickness
+			);
+			ElementHighlighter.renderArcCloneAndHighlight(block, margin, selectedSegment, blockSize, donutThickness);
+			ElementHighlighter.toggleActivityStyle(selectedSegment, true);
+			ElementHighlighter.toggleActivityStyle(
+				DomHelper.getChartElementsByKeys(
+					Donut.getAllArcGroups(block),
+					true,
+					options.data.keyField.name,
+					selectedKeys,
+					SelectionCondition.Exclude
+				),
+				false
+			);
+		} else {
+			ElementHighlighter.removeDonutHighlightingByKeys(
+				arcItems,
+				options.data.keyField.name,
+				selectedKeys,
+				margin,
+				blockSize,
+				donutThickness
+			);
+			ElementHighlighter.removeDonutArcClones(block);
+			ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), false);
+			ElementHighlighter.toggleActivityStyle(selectedSegment, true);
+			ElementHighlighter.renderArcCloneAndHighlight(block, margin, selectedSegment, blockSize, donutThickness);
+		}
+		ElementHighlighter.toggleActivityStyle(
+			Legend.getItemsByKeys(block, selectedKeys, SelectionCondition.Exclude),
+			false
+		);
+		ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, selectedKeys), true);
+	}
+	static clear2D(block, options) {
+		options.charts.forEach((chart) => {
+			const elements = DomHelper.get2DChartElements(block, chart);
+			ElementHighlighter.toggle2DElements(elements, false, chart, block.transitionManager.durations.markerHover);
+			ElementHighlighter.toggleActivityStyle(elements, true);
+			if (chart.type !== "bar") MarkDot.tryMakeMarkDotVisible(elements, chart.markersOptions, false);
+		});
+	}
+	static clearPolar(margin, blockSize, block, options, arcItems, donutSettings) {
+		const donutThickness = DonutHelper.getThickness(donutSettings, blockSize, margin);
+		ElementHighlighter.toggleDonutHighlightState(
+			arcItems,
+			margin,
+			blockSize,
+			donutThickness,
+			block.transitionManager.durations.higlightedScale,
+			false
+		);
+		arcItems.each(function () {
+			ElementHighlighter.removeCloneForElem(block, options.data.keyField.name, select(this));
+			ElementHighlighter.removeShadowClone(
+				block,
+				options.data.keyField.name,
+				select(this),
+				margin,
+				blockSize,
+				donutThickness
+			);
+		});
+		ElementHighlighter.toggleActivityStyle(Donut.getAllArcGroups(block), true);
+		ElementHighlighter.toggleActivityStyle(Legend.getItemsByKeys(block, [], SelectionCondition.Exclude), true);
+	}
 }

package/lib/engine/engine.d.ts

@@ -3,20 +3,20 @@ import { Model } from "../model/model";
 import { FilterCallback } from "./filterManager/filterEventManager";
 import { MdtChartsDataSource } from "../config/config";
 export declare class Engine {
-    private filterCallback;
-    private initializeSelected;
-    block: Block;
-    data: MdtChartsDataSource;
-    private filterEventManager;
-    private chartId;
-    private contentManager;
-    constructor(id: number, filterCallback: FilterCallback, initializeSelected: number[]);
-    render(model: Model, data: MdtChartsDataSource, parentElement: HTMLElement): void;
-    updateFullBlock(model: Model, data: MdtChartsDataSource): void;
-    destroy(): void;
-    updateData(model: Model, newData: MdtChartsDataSource): void;
-    clearSelection(model: Model): void;
-    updateColors(model: Model): void;
-    private renderCharts;
-    private setFilterEventManager;
+	private filterCallback;
+	private initializeSelected;
+	block: Block;
+	data: MdtChartsDataSource;
+	private filterEventManager;
+	private chartId;
+	private contentManager;
+	constructor(id: number, filterCallback: FilterCallback, initializeSelected: number[]);
+	render(model: Model, data: MdtChartsDataSource, parentElement: HTMLElement): void;
+	updateFullBlock(model: Model, data: MdtChartsDataSource): void;
+	destroy(): void;
+	updateData(model: Model, newData: MdtChartsDataSource): void;
+	clearSelection(model: Model): void;
+	updateColors(model: Model): void;
+	private renderCharts;
+	private setFilterEventManager;
 }

package/lib/engine/engine.js

@@ -4,66 +4,91 @@ import { ContentManager } from "./contentManager/contentManager";
 import { FilterEventManager } from "./filterManager/filterEventManager";
 import { Helper } from "./helpers/helper";
 export class Engine {
-    constructor(id, filterCallback, initializeSelected) {
-        this.filterCallback = filterCallback;
-        this.initializeSelected = initializeSelected;
-        this.chartId = id;
-    }
-    render(model, data, parentElement) {
-        var _a;
-        this.data = data;
-        this.setFilterEventManager(model === null || model === void 0 ? void 0 : model.options);
-        this.block = new Block(model.blockCanvas.cssClass, parentElement, this.chartId, this.filterEventManager, model.transitions);
-        (_a = this.filterEventManager) === null || _a === void 0 ? void 0 : _a.setBlock(this.block);
-        this.block.renderWrapper(model.blockCanvas.size);
-        if (model.options) {
-            this.contentManager = new ContentManager(model);
-            ValueFormatter.setFormatFunction(model.dataSettings.format.formatters);
-            this.renderCharts(model);
-        }
-    }
-    updateFullBlock(model, data) {
-        this.destroy();
-        this.render(model, data, this.block.parentElement);
-    }
-    destroy() {
-        this.block.destroy();
-    }
-    updateData(model, newData) {
-        if (!newData) {
-            this.data = newData;
-            this.block.clearWrapper();
-        }
-        else {
-            if (!this.data) {
-                this.data = newData;
-                this.updateFullBlock(model, this.data);
-            }
-            else if (!Helper.compareData(this.data, newData, model.options.data.dataSource)) {
-                for (let source in newData) {
-                    this.data[source] = newData[source];
-                }
-                this.contentManager.updateData(this.block, model, newData);
-            }
-        }
-    }
-    clearSelection(model) {
-        this.contentManager.clearSelection(this, model);
-    }
-    updateColors(model) {
-        this.contentManager.updateColors(this, model);
-    }
-    renderCharts(model) {
-        this.contentManager.render(model, this);
-    }
-    setFilterEventManager(options) {
-        var _a, _b, _c;
-        let highlightIds = [];
-        if (this.initializeSelected instanceof Array && this.initializeSelected.length > 0)
-            highlightIds = [...this.initializeSelected];
-        if ((_a = options === null || options === void 0 ? void 0 : options.data) === null || _a === void 0 ? void 0 : _a.dataSource)
-            this.filterEventManager = new FilterEventManager(this.filterCallback, this.data[options.data.dataSource], options.selectable, options.data.keyField.name, highlightIds);
-        else
-            this.filterEventManager = new FilterEventManager(this.filterCallback, [], options === null || options === void 0 ? void 0 : options.selectable, (_c = (_b = options === null || options === void 0 ? void 0 : options.data) === null || _b === void 0 ? void 0 : _b.keyField) === null || _c === void 0 ? void 0 : _c.name, highlightIds);
-    }
+	constructor(id, filterCallback, initializeSelected) {
+		this.filterCallback = filterCallback;
+		this.initializeSelected = initializeSelected;
+		this.chartId = id;
+	}
+	render(model, data, parentElement) {
+		var _a;
+		this.data = data;
+		this.setFilterEventManager(model === null || model === void 0 ? void 0 : model.options);
+		this.block = new Block(
+			model.blockCanvas.cssClass,
+			parentElement,
+			this.chartId,
+			this.filterEventManager,
+			model.transitions
+		);
+		(_a = this.filterEventManager) === null || _a === void 0 ? void 0 : _a.setBlock(this.block);
+		this.block.renderWrapper(model.blockCanvas.size);
+		if (model.options) {
+			this.contentManager = new ContentManager(model);
+			ValueFormatter.setFormatFunction(model.dataSettings.format.formatters);
+			this.renderCharts(model);
+		}
+	}
+	updateFullBlock(model, data) {
+		this.destroy();
+		this.render(model, data, this.block.parentElement);
+	}
+	destroy() {
+		this.block.destroy();
+	}
+	updateData(model, newData) {
+		if (!newData) {
+			this.data = newData;
+			this.block.clearWrapper();
+		} else {
+			if (!this.data) {
+				this.data = newData;
+				this.updateFullBlock(model, this.data);
+			} else if (!Helper.compareData(this.data, newData, model.options.data.dataSource)) {
+				for (let source in newData) {
+					this.data[source] = newData[source];
+				}
+				this.contentManager.updateData(this.block, model, newData);
+			}
+		}
+	}
+	clearSelection(model) {
+		this.contentManager.clearSelection(this, model);
+	}
+	updateColors(model) {
+		this.contentManager.updateColors(this, model);
+	}
+	renderCharts(model) {
+		this.contentManager.render(model, this);
+	}
+	setFilterEventManager(options) {
+		var _a, _b, _c;
+		let highlightIds = [];
+		if (this.initializeSelected instanceof Array && this.initializeSelected.length > 0)
+			highlightIds = [...this.initializeSelected];
+		if (
+			(_a = options === null || options === void 0 ? void 0 : options.data) === null || _a === void 0
+				? void 0
+				: _a.dataSource
+		)
+			this.filterEventManager = new FilterEventManager(
+				this.filterCallback,
+				this.data[options.data.dataSource],
+				options.selectable,
+				options.data.keyField.name,
+				highlightIds
+			);
+		else
+			this.filterEventManager = new FilterEventManager(
+				this.filterCallback,
+				[],
+				options === null || options === void 0 ? void 0 : options.selectable,
+				(_c =
+					(_b = options === null || options === void 0 ? void 0 : options.data) === null || _b === void 0
+						? void 0
+						: _b.keyField) === null || _c === void 0
+					? void 0
+					: _c.name,
+				highlightIds
+			);
+	}
 }

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

@@ -3,23 +3,30 @@ import { DonutAggregatorModel, Field } from "../../../model/model";
 import { Block } from "../../block/block";
 import { Translate } from "../../polarNotation/donut/donut";
 export interface AggregatorInfo {
-    name: string;
-    value: number | string;
-    format: DataType;
-    marginInPercent: number;
+	name: string;
+	value: number | string;
+	format: DataType;
+	marginInPercent: number;
 }
 export declare class Aggregator {
-    static readonly aggregatorValueClass = "aggregator-value";
-    private static readonly aggregatorTitleClass;
-    private static readonly aggregatorObjectClass;
-    static render(block: Block, valueField: Field, innerRadius: number, translate: Translate, fontSize: number, settings: DonutAggregatorModel): void;
-    static update(block: Block, valueField: Field, settings: DonutAggregatorModel): void;
-    private static buildConfig;
-    private static renderText;
-    private static formatValue;
-    private static updateText;
-    private static reCalculateAggregatorFontSize;
-    private static setTitleFontSize;
-    private static renderAggregatorObject;
-    private static renderWrapper;
+	static readonly aggregatorValueClass = "aggregator-value";
+	private static readonly aggregatorTitleClass;
+	private static readonly aggregatorObjectClass;
+	static render(
+		block: Block,
+		valueField: Field,
+		innerRadius: number,
+		translate: Translate,
+		fontSize: number,
+		settings: DonutAggregatorModel
+	): void;
+	static update(block: Block, valueField: Field, settings: DonutAggregatorModel): void;
+	private static buildConfig;
+	private static renderText;
+	private static formatValue;
+	private static updateText;
+	private static reCalculateAggregatorFontSize;
+	private static setTitleFontSize;
+	private static renderAggregatorObject;
+	private static renderWrapper;
 }