mdt-charts 1.28.1 → 1.29.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/config.d.ts +164 -165
- package/lib/designer/designerConfig.d.ts +62 -59
- package/lib/engine/block/block.d.ts +22 -16
- package/lib/engine/block/block.js +51 -51
- package/lib/engine/block/blockHelper.d.ts +6 -6
- package/lib/engine/block/blockHelper.js +16 -16
- package/lib/engine/block/blockHtml.d.ts +8 -8
- package/lib/engine/block/blockHtml.js +15 -15
- package/lib/engine/block/blockSvg.d.ts +20 -20
- package/lib/engine/block/blockSvg.js +65 -66
- package/lib/engine/block/defs/LinearGradientDef.d.ts +2 -2
- package/lib/engine/block/defs/LinearGradientDef.js +27 -27
- package/lib/engine/block/defs/hatchPattern.d.ts +4 -4
- package/lib/engine/block/defs/hatchPattern.js +9 -9
- package/lib/engine/colorReader/colorReader.d.ts +5 -5
- package/lib/engine/colorReader/colorReader.js +18 -18
- package/lib/engine/contentManager/contentManager.d.ts +6 -6
- package/lib/engine/contentManager/contentManager.js +15 -15
- package/lib/engine/contentManager/contentManagerFactory.d.ts +6 -6
- package/lib/engine/contentManager/contentManagerFactory.js +12 -12
- package/lib/engine/elementHighlighter/elementHighlighter.d.ts +70 -22
- package/lib/engine/elementHighlighter/elementHighlighter.js +230 -181
- package/lib/engine/elementHighlighter/selectHighlighter.d.ts +29 -4
- package/lib/engine/elementHighlighter/selectHighlighter.js +189 -87
- package/lib/engine/engine.d.ts +16 -16
- package/lib/engine/engine.js +87 -62
- package/lib/engine/features/aggregator/aggregator.d.ts +24 -17
- package/lib/engine/features/aggregator/aggregator.js +113 -102
- package/lib/engine/features/axis/axis.d.ts +22 -9
- package/lib/engine/features/axis/axis.js +159 -150
- package/lib/engine/features/axis/axisDomHelper.d.ts +7 -2
- package/lib/engine/features/axis/axisDomHelper.js +19 -20
- package/lib/engine/features/axis/axisHelper.d.ts +9 -5
- package/lib/engine/features/axis/axisHelper.js +28 -33
- package/lib/engine/features/axis/axisLabelDomHelper.d.ts +26 -11
- package/lib/engine/features/axis/axisLabelDomHelper.js +156 -152
- package/lib/engine/features/axis/axisLabelsEventManager.d.ts +2 -2
- package/lib/engine/features/axis/axisLabelsEventManager.js +32 -32
- package/lib/engine/features/embeddedLabels/embeddedLabels.d.ts +51 -16
- package/lib/engine/features/embeddedLabels/embeddedLabels.js +234 -134
- package/lib/engine/features/embeddedLabels/embeddedLabelsDomHelper.d.ts +13 -2
- package/lib/engine/features/embeddedLabels/embeddedLabelsDomHelper.js +20 -23
- package/lib/engine/features/embeddedLabels/embeddedLabelsHelper.d.ts +32 -15
- package/lib/engine/features/embeddedLabels/embeddedLabelsHelper.js +56 -63
- package/lib/engine/features/gridLine/gidLineHelper.d.ts +13 -7
- package/lib/engine/features/gridLine/gidLineHelper.js +42 -49
- package/lib/engine/features/gridLine/gridLine.d.ts +19 -5
- package/lib/engine/features/gridLine/gridLine.js +35 -36
- package/lib/engine/features/legend/legend.d.ts +38 -29
- package/lib/engine/features/legend/legend.js +117 -92
- package/lib/engine/features/legend/legendDomHelper.d.ts +13 -6
- package/lib/engine/features/legend/legendDomHelper.js +63 -62
- package/lib/engine/features/legend/legendEventsManager.d.ts +13 -8
- package/lib/engine/features/legend/legendEventsManager.js +48 -47
- package/lib/engine/features/legend/legendHelper.d.ts +39 -14
- package/lib/engine/features/legend/legendHelper.js +98 -93
- package/lib/engine/features/legend/legendHelperService.d.ts +13 -6
- package/lib/engine/features/legend/legendHelperService.js +24 -25
- package/lib/engine/features/legend/legendMarkerCreator.d.ts +18 -9
- package/lib/engine/features/legend/legendMarkerCreator.js +79 -76
- package/lib/engine/features/legend/legendWidthCalculator.d.ts +7 -7
- package/lib/engine/features/legend/legendWidthCalculator.js +126 -122
- package/lib/engine/features/markDots/markDot.d.ts +42 -15
- package/lib/engine/features/markDots/markDot.js +101 -70
- package/lib/engine/features/markDots/markDotsHelper.d.ts +8 -1
- package/lib/engine/features/markDots/markDotsHelper.js +13 -12
- package/lib/engine/features/recordOverflowAlert/recordOverflowAlertCore.d.ts +17 -17
- package/lib/engine/features/recordOverflowAlert/recordOverflowAlertCore.js +42 -47
- package/lib/engine/features/scale/scale.d.ts +17 -12
- package/lib/engine/features/scale/scale.js +76 -69
- package/lib/engine/features/tipBox/tipBox.d.ts +9 -5
- package/lib/engine/features/tipBox/tipBox.js +24 -24
- package/lib/engine/features/tipBox/tipBoxHelper.d.ts +16 -9
- package/lib/engine/features/tipBox/tipBoxHelper.js +60 -45
- package/lib/engine/features/title/title.d.ts +6 -6
- package/lib/engine/features/title/title.js +34 -35
- package/lib/engine/features/tolltip/newTooltip/newTooltip.d.ts +15 -11
- package/lib/engine/features/tolltip/newTooltip/newTooltip.js +21 -21
- package/lib/engine/features/tolltip/newTooltip/newTooltipService.d.ts +13 -8
- package/lib/engine/features/tolltip/newTooltip/newTooltipService.js +26 -23
- package/lib/engine/features/tolltip/tooltip.d.ts +17 -11
- package/lib/engine/features/tolltip/tooltip.js +296 -142
- package/lib/engine/features/tolltip/tooltipComponentsManager.d.ts +21 -10
- package/lib/engine/features/tolltip/tooltipComponentsManager.js +113 -114
- package/lib/engine/features/tolltip/tooltipDomHelper.d.ts +43 -21
- package/lib/engine/features/tolltip/tooltipDomHelper.js +144 -120
- package/lib/engine/features/tolltip/tooltipHelper.d.ts +39 -9
- package/lib/engine/features/tolltip/tooltipHelper.js +114 -91
- package/lib/engine/features/valueLabels/valueLabels.d.ts +58 -38
- package/lib/engine/features/valueLabels/valueLabels.js +205 -169
- package/lib/engine/features/valueLabels/valueLabelsHelper.d.ts +7 -1
- package/lib/engine/features/valueLabels/valueLabelsHelper.js +23 -18
- package/lib/engine/features/valueLabelsCollision/valueLabelsCollision.d.ts +18 -15
- package/lib/engine/features/valueLabelsCollision/valueLabelsCollision.js +46 -47
- package/lib/engine/features/valueLabelsCollision/valueLabelsCollisionHelper.d.ts +6 -3
- package/lib/engine/features/valueLabelsCollision/valueLabelsCollisionHelper.js +49 -45
- package/lib/engine/filterManager/filterEventManager.d.ts +37 -26
- package/lib/engine/filterManager/filterEventManager.js +174 -129
- package/lib/engine/helpers/domHelper.d.ts +45 -20
- package/lib/engine/helpers/domHelper.js +62 -61
- package/lib/engine/helpers/fontResizer/fontResizer.d.ts +10 -10
- package/lib/engine/helpers/fontResizer/fontResizer.js +21 -16
- package/lib/engine/helpers/fontResizer/fontResizerService.d.ts +1 -1
- package/lib/engine/helpers/fontResizer/fontResizerService.js +9 -10
- package/lib/engine/helpers/helper.d.ts +27 -27
- package/lib/engine/helpers/helper.js +91 -92
- package/lib/engine/helpers/namesHelper.d.ts +3 -3
- package/lib/engine/helpers/namesHelper.js +6 -6
- package/lib/engine/helpers/pipeline/Pipeline.d.ts +5 -5
- package/lib/engine/helpers/pipeline/Pipeline.js +33 -33
- package/lib/engine/polarNotation/donut/DonutHelper.d.ts +25 -11
- package/lib/engine/polarNotation/donut/DonutHelper.js +71 -70
- package/lib/engine/polarNotation/donut/donut.d.ts +38 -23
- package/lib/engine/polarNotation/donut/donut.js +109 -99
- package/lib/engine/polarNotation/extenders/polarRecordOverflowAlert.d.ts +7 -7
- package/lib/engine/polarNotation/extenders/polarRecordOverflowAlert.js +36 -36
- package/lib/engine/polarNotation/polarManager.d.ts +5 -5
- package/lib/engine/polarNotation/polarManager.js +66 -52
- package/lib/engine/transitionManager.d.ts +13 -14
- package/lib/engine/transitionManager.js +48 -49
- package/lib/engine/twoDimensionalNotation/area/area.d.ts +44 -28
- package/lib/engine/twoDimensionalNotation/area/area.js +272 -238
- package/lib/engine/twoDimensionalNotation/area/areaGenerator.d.ts +13 -5
- package/lib/engine/twoDimensionalNotation/area/areaGenerator.js +13 -13
- package/lib/engine/twoDimensionalNotation/area/areaHelper.d.ts +4 -4
- package/lib/engine/twoDimensionalNotation/area/areaHelper.js +57 -41
- package/lib/engine/twoDimensionalNotation/bar/bar.d.ts +54 -29
- package/lib/engine/twoDimensionalNotation/bar/bar.js +362 -224
- package/lib/engine/twoDimensionalNotation/bar/barHelper.d.ts +71 -32
- package/lib/engine/twoDimensionalNotation/bar/barHelper.js +162 -126
- package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.d.ts +6 -6
- package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStacker.js +24 -24
- package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStackerService.d.ts +2 -2
- package/lib/engine/twoDimensionalNotation/bar/stackedData/dataStackerService.js +16 -17
- package/lib/engine/twoDimensionalNotation/dot/dotChart.d.ts +23 -23
- package/lib/engine/twoDimensionalNotation/dot/dotChart.js +135 -114
- package/lib/engine/twoDimensionalNotation/extenders/twoDimRecordOverflowAlert.d.ts +7 -7
- package/lib/engine/twoDimensionalNotation/extenders/twoDimRecordOverflowAlert.js +28 -28
- package/lib/engine/twoDimensionalNotation/line/line.d.ts +37 -16
- package/lib/engine/twoDimensionalNotation/line/line.js +162 -132
- package/lib/engine/twoDimensionalNotation/line/lineBuilder.d.ts +14 -11
- package/lib/engine/twoDimensionalNotation/line/lineBuilder.js +47 -48
- package/lib/engine/twoDimensionalNotation/line/lineGenerator.d.ts +4 -4
- package/lib/engine/twoDimensionalNotation/line/lineGenerator.js +8 -8
- package/lib/engine/twoDimensionalNotation/line/lineHelper.d.ts +12 -6
- package/lib/engine/twoDimensionalNotation/line/lineHelper.js +76 -60
- package/lib/engine/twoDimensionalNotation/lineLike/generatorFactory/lineLikeGeneratorFactory.d.ts +6 -6
- package/lib/engine/twoDimensionalNotation/lineLike/generatorMiddleware/lineLikeGeneratorCurveMiddleware.d.ts +5 -5
- package/lib/engine/twoDimensionalNotation/lineLike/generatorMiddleware/lineLikeGeneratorCurveMiddleware.js +16 -17
- package/lib/engine/twoDimensionalNotation/lineLike/generatorMiddleware/lineLikeGeneratorDefineMiddleware.d.ts +11 -10
- package/lib/engine/twoDimensionalNotation/lineLike/generatorMiddleware/lineLikeGeneratorDefineMiddleware.js +9 -7
- package/lib/engine/twoDimensionalNotation/lineLike/generatorMiddleware/lineLikeGeneratorMiddleware.d.ts +3 -1
- package/lib/engine/twoDimensionalNotation/twoDimensionalManager.d.ts +9 -9
- package/lib/engine/twoDimensionalNotation/twoDimensionalManager.js +252 -143
- package/lib/engine/valueFormatter.d.ts +3 -3
- package/lib/engine/valueFormatter.js +6 -6
- package/lib/main.d.ts +82 -75
- package/lib/main.js +79 -84
- package/lib/model/EventEmitter.d.ts +8 -8
- package/lib/model/EventEmitter.js +24 -24
- package/lib/model/chartStyleModel/chartStyleModel.d.ts +5 -5
- package/lib/model/chartStyleModel/chartStyleModel.js +27 -25
- package/lib/model/chartStyleModel/colorRange.d.ts +3 -3
- package/lib/model/chartStyleModel/colorRange.js +19 -24
- package/lib/model/chartStyleModel/twoDimensionalChartStyleModel.d.ts +22 -12
- package/lib/model/chartStyleModel/twoDimensionalChartStyleModel.js +69 -60
- package/lib/model/configsValidator/configValidator.d.ts +1 -1
- package/lib/model/configsValidator/configValidator.js +4 -4
- package/lib/model/dataManagerModel/dataManagerModel.d.ts +36 -26
- package/lib/model/dataManagerModel/dataManagerModel.js +179 -128
- package/lib/model/dataManagerModel/dataManagerModelService.d.ts +2 -2
- package/lib/model/dataManagerModel/dataManagerModelService.js +25 -26
- package/lib/model/featuresModel/axisModel.d.ts +69 -18
- package/lib/model/featuresModel/axisModel.js +224 -169
- package/lib/model/featuresModel/axisModelService.d.ts +10 -6
- package/lib/model/featuresModel/axisModelService.js +27 -27
- package/lib/model/featuresModel/legendModel/legendCanvasModel.d.ts +16 -11
- package/lib/model/featuresModel/legendModel/legendCanvasModel.js +55 -59
- package/lib/model/featuresModel/legendModel/legendModel.d.ts +7 -3
- package/lib/model/featuresModel/legendModel/legendModel.js +59 -41
- package/lib/model/featuresModel/legendModel/polarMarginCalculator.d.ts +8 -3
- package/lib/model/featuresModel/legendModel/polarMarginCalculator.js +18 -20
- package/lib/model/featuresModel/legendModel/twoDimLegendModel.d.ts +8 -4
- package/lib/model/featuresModel/legendModel/twoDimLegendModel.js +40 -27
- package/lib/model/featuresModel/otherComponents.d.ts +7 -4
- package/lib/model/featuresModel/otherComponents.js +9 -9
- package/lib/model/featuresModel/scaleModel/scaleAxisRecalcer.d.ts +6 -6
- package/lib/model/featuresModel/scaleModel/scaleAxisRecalcer.js +27 -23
- package/lib/model/featuresModel/scaleModel/scaleDomainService.d.ts +19 -5
- package/lib/model/featuresModel/scaleModel/scaleDomainService.js +44 -55
- package/lib/model/featuresModel/scaleModel/scaleModel.d.ts +10 -10
- package/lib/model/featuresModel/scaleModel/scaleModel.js +61 -50
- package/lib/model/featuresModel/scaleModel/scaleModelServices.js +15 -22
- package/lib/model/featuresModel/titleModel.d.ts +1 -1
- package/lib/model/featuresModel/titleModel.js +14 -14
- package/lib/model/featuresModel/tooltipModel.d.ts +1 -1
- package/lib/model/featuresModel/tooltipModel.js +5 -5
- package/lib/model/featuresModel/valueLabelsModel/valueLabelsModel.d.ts +23 -11
- package/lib/model/featuresModel/valueLabelsModel/valueLabelsModel.js +53 -51
- package/lib/model/helpers/modelHelper.d.ts +7 -7
- package/lib/model/helpers/modelHelper.js +38 -42
- package/lib/model/helpers/twoDimensionalModelHelper.d.ts +37 -9
- package/lib/model/helpers/twoDimensionalModelHelper.js +147 -125
- package/lib/model/helpers/unitsFromConfigReader.js +4 -4
- package/lib/model/helpers/unitsReader.d.ts +2 -2
- package/lib/model/helpers/unitsReader.js +11 -13
- package/lib/model/margin/marginModel.d.ts +7 -7
- package/lib/model/margin/marginModel.js +23 -20
- package/lib/model/margin/twoDim/twoDimMarginModel.d.ts +13 -13
- package/lib/model/margin/twoDim/twoDimMarginModel.js +184 -113
- package/lib/model/model.d.ts +308 -280
- package/lib/model/model.js +4 -4
- package/lib/model/modelBuilder.d.ts +27 -18
- package/lib/model/modelBuilder.js +85 -79
- package/lib/model/modelInstance/canvasModel/canvasModel.d.ts +17 -17
- package/lib/model/modelInstance/canvasModel/canvasModel.js +42 -43
- package/lib/model/modelInstance/canvasModel/canvasSizesModel/canvasMarginModel.d.ts +7 -7
- package/lib/model/modelInstance/canvasModel/canvasSizesModel/canvasSizeModel.d.ts +2 -2
- package/lib/model/modelInstance/canvasModel/canvasSizesModel/marginModelService.d.ts +6 -6
- package/lib/model/modelInstance/canvasModel/canvasSizesModel/marginModelService.js +24 -24
- package/lib/model/modelInstance/canvasModel/legendCanvasModel.d.ts +4 -4
- package/lib/model/modelInstance/canvasModel/legendCanvasModel.js +11 -11
- package/lib/model/modelInstance/canvasModel/titleCanvas.d.ts +4 -4
- package/lib/model/modelInstance/canvasModel/titleCanvas.js +9 -9
- package/lib/model/modelInstance/chartBlockVersion/chartBlockVersion.d.ts +3 -3
- package/lib/model/modelInstance/chartBlockVersion/chartBlockVersion.js +6 -6
- package/lib/model/modelInstance/configReader.d.ts +32 -23
- package/lib/model/modelInstance/configReader.js +125 -94
- package/lib/model/modelInstance/dataModel/dataModel.d.ts +9 -9
- package/lib/model/modelInstance/dataModel/dataModel.js +24 -24
- package/lib/model/modelInstance/dataModel/dataRepository.d.ts +14 -14
- package/lib/model/modelInstance/dataModel/dataRepository.js +42 -42
- package/lib/model/modelInstance/modelInstance.d.ts +11 -6
- package/lib/model/modelInstance/modelInstance.js +16 -16
- package/lib/model/modelInstance/titleConfigReader.d.ts +8 -8
- package/lib/model/modelInstance/titleConfigReader.js +37 -30
- package/lib/model/notations/polar/donut/donutAggregatorService.d.ts +9 -6
- package/lib/model/notations/polar/donut/donutAggregatorService.js +40 -37
- package/lib/model/notations/polar/donut/donutModel.d.ts +9 -5
- package/lib/model/notations/polar/donut/donutModel.js +28 -28
- package/lib/model/notations/polar/donut/donutThicknessService.d.ts +3 -3
- package/lib/model/notations/polar/donut/donutThicknessService.js +13 -15
- package/lib/model/notations/polar/polarModel.d.ts +18 -7
- package/lib/model/notations/polar/polarModel.js +79 -65
- package/lib/model/notations/twoDimensional/styles.d.ts +44 -7
- package/lib/model/notations/twoDimensional/styles.js +234 -125
- package/lib/model/notations/twoDimensionalModel.d.ts +23 -13
- package/lib/model/notations/twoDimensionalModel.js +330 -162
- package/lib/optionsServices/publicOptionsService.d.ts +1 -1
- package/lib/optionsServices/publicOptionsService.js +4 -4
- package/lib/optionsServices/validators/sizeValidator.d.ts +2 -2
- package/lib/optionsServices/validators/sizeValidator.js +10 -11
- package/lib/style/charts-main.css +150 -151
- package/lib/style/charts-main.less +150 -151
- package/package.json +1 -1
|
@@ -1,50 +1,45 @@
|
|
|
1
1
|
class RecordOverflowAlertCoreClass {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
.style("left", attrs.left)
|
|
45
|
-
.style("right", attrs.right)
|
|
46
|
-
.style("top", attrs.top)
|
|
47
|
-
.style("bottom", attrs.bottom);
|
|
48
|
-
}
|
|
2
|
+
constructor() {
|
|
3
|
+
this.blockClass = "record-overflow-alert";
|
|
4
|
+
}
|
|
5
|
+
render(block, options) {
|
|
6
|
+
const alertBlock = block
|
|
7
|
+
.getWrapper()
|
|
8
|
+
.append("div")
|
|
9
|
+
.attr("class", this.blockClass)
|
|
10
|
+
.text(this.getAlertText(options));
|
|
11
|
+
this.setAlertPosition(alertBlock, options.positionAttrs);
|
|
12
|
+
}
|
|
13
|
+
update(block, options) {
|
|
14
|
+
let alertBlock = block.getWrapper().select(`div.${this.blockClass}`);
|
|
15
|
+
if (alertBlock.empty()) {
|
|
16
|
+
if (options.hidedRecordsAmount === 0) return;
|
|
17
|
+
else this.render(block, options);
|
|
18
|
+
} else {
|
|
19
|
+
if (options.hidedRecordsAmount === 0) alertBlock.remove();
|
|
20
|
+
else alertBlock.text(this.getAlertText(options));
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
getAlertText(options) {
|
|
24
|
+
return `+ ${options.hidedRecordsAmount} ${this.getWordTextEndingByAmount(
|
|
25
|
+
options.hidedRecordsAmount,
|
|
26
|
+
options.text
|
|
27
|
+
)}`;
|
|
28
|
+
}
|
|
29
|
+
getWordTextEndingByAmount(hidedRecordsAmount, text) {
|
|
30
|
+
const lastDigit = hidedRecordsAmount % 10;
|
|
31
|
+
if (hidedRecordsAmount >= 10 && hidedRecordsAmount <= 20) return text.tenToTwenty;
|
|
32
|
+
if (lastDigit === 1) return text.one;
|
|
33
|
+
if (lastDigit >= 2 && lastDigit <= 4) return text.twoToFour;
|
|
34
|
+
return text.other;
|
|
35
|
+
}
|
|
36
|
+
setAlertPosition(alertBlock, attrs) {
|
|
37
|
+
alertBlock
|
|
38
|
+
.style("position", "absolute")
|
|
39
|
+
.style("left", attrs.left)
|
|
40
|
+
.style("right", attrs.right)
|
|
41
|
+
.style("top", attrs.top)
|
|
42
|
+
.style("bottom", attrs.bottom);
|
|
43
|
+
}
|
|
49
44
|
}
|
|
50
45
|
export const RecordOverflowAlertCore = new RecordOverflowAlertCoreClass();
|
|
@@ -2,20 +2,25 @@ import { ScaleLinear } from "d3-scale";
|
|
|
2
2
|
import { AxisScale } from "d3-axis";
|
|
3
3
|
import { BarChartSettings, ScaleKeyModel, ScaleValueModel } from "../../../model/model";
|
|
4
4
|
export interface Scales {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
key: AxisScale<any>;
|
|
6
|
+
value: AxisScale<any>;
|
|
7
7
|
}
|
|
8
8
|
export interface ScalesWithSecondary extends Scales {
|
|
9
|
-
|
|
9
|
+
valueSecondary: AxisScale<any>;
|
|
10
10
|
}
|
|
11
11
|
export declare class Scale {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
static getScales(scaleKey: ScaleKeyModel, scaleValue: ScaleValueModel, bandSettings: BarChartSettings): Scales;
|
|
13
|
+
static getScalesWithSecondary(
|
|
14
|
+
scaleKey: ScaleKeyModel,
|
|
15
|
+
scaleValue: ScaleValueModel,
|
|
16
|
+
scaleValueSecondary: ScaleValueModel,
|
|
17
|
+
bandSettings: BarChartSettings
|
|
18
|
+
): ScalesWithSecondary;
|
|
19
|
+
static getScaleValue(scaleValue: ScaleValueModel): ScaleLinear<number, number, never>;
|
|
20
|
+
static getScaleBandWidth(scale: AxisScale<any>): number;
|
|
21
|
+
static getScaleStep(scale: AxisScale<any>): number;
|
|
22
|
+
static getScaledValue(scale: AxisScale<any>, value: any): number;
|
|
23
|
+
private static getScaleBand;
|
|
24
|
+
private static getScaleLinear;
|
|
25
|
+
private static getScalePoint;
|
|
21
26
|
}
|
|
@@ -1,72 +1,79 @@
|
|
|
1
1
|
import { scaleBand, scaleLinear, scalePoint } from "d3-scale";
|
|
2
2
|
export class Scale {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
3
|
+
static getScales(scaleKey, scaleValue, bandSettings) {
|
|
4
|
+
const scales = {
|
|
5
|
+
key: null,
|
|
6
|
+
value: null
|
|
7
|
+
};
|
|
8
|
+
if (scaleKey.type === "band")
|
|
9
|
+
scales.key = this.getScaleBand(scaleKey.domain, scaleKey.range, bandSettings, scaleKey.elementsAmount);
|
|
10
|
+
else if (scaleKey.type === "point") scales.key = this.getScalePoint(scaleKey.domain, scaleKey.range);
|
|
11
|
+
scales.value = this.getScaleValue(scaleValue);
|
|
12
|
+
return scales;
|
|
13
|
+
}
|
|
14
|
+
static getScalesWithSecondary(scaleKey, scaleValue, scaleValueSecondary, bandSettings) {
|
|
15
|
+
const scales = this.getScales(scaleKey, scaleValue, bandSettings);
|
|
16
|
+
return Object.assign(
|
|
17
|
+
Object.assign({}, scales),
|
|
18
|
+
scaleValueSecondary && {
|
|
19
|
+
valueSecondary: this.getScaleValue(scaleValueSecondary)
|
|
20
|
+
}
|
|
21
|
+
);
|
|
22
|
+
}
|
|
23
|
+
static getScaleValue(scaleValue) {
|
|
24
|
+
return this.getScaleLinear(scaleValue.domain, scaleValue.range);
|
|
25
|
+
}
|
|
26
|
+
static getScaleBandWidth(scale) {
|
|
27
|
+
if (scale.bandwidth && scale.bandwidth() !== 0) {
|
|
28
|
+
return scale.bandwidth();
|
|
29
|
+
} else if (scale.step) {
|
|
30
|
+
return scale.step();
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
static getScaleStep(scale) {
|
|
34
|
+
if (scale.step) {
|
|
35
|
+
return scale.step();
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
static getScaledValue(scale, value) {
|
|
39
|
+
if (scale.bandwidth && scale.bandwidth() !== 0) {
|
|
40
|
+
return scale(value) + this.getScaleBandWidth(scale) / 2;
|
|
41
|
+
}
|
|
42
|
+
return scale(value);
|
|
43
|
+
}
|
|
44
|
+
static getScaleBand(domain, range, bandSettings, elementsInGroupAmount) {
|
|
45
|
+
const scale = scaleBand().domain(domain).range([range.start, range.end]);
|
|
46
|
+
const bandSize = scale.bandwidth();
|
|
47
|
+
if (bandSettings.groupMinDistance < bandSize) {
|
|
48
|
+
scale.paddingInner(bandSettings.groupMinDistance / bandSize);
|
|
49
|
+
scale.paddingOuter(bandSettings.groupMinDistance / bandSize / 2);
|
|
50
|
+
}
|
|
51
|
+
// Padding inner = 10. If bandwidth more than needed, paddingInner is increased to number less than 35
|
|
52
|
+
let paddingInner = bandSettings.groupMinDistance;
|
|
53
|
+
while (
|
|
54
|
+
scale.bandwidth() >
|
|
55
|
+
bandSettings.maxBarWidth * elementsInGroupAmount +
|
|
56
|
+
bandSettings.barDistance * (elementsInGroupAmount - 1) &&
|
|
57
|
+
paddingInner < bandSettings.groupMaxDistance
|
|
58
|
+
) {
|
|
59
|
+
scale.paddingInner(++paddingInner / bandSize);
|
|
60
|
+
}
|
|
61
|
+
// if bandwidth more than all bars widths in group + distance between it + distance between groups
|
|
62
|
+
let paddingOuter = 1;
|
|
63
|
+
while (
|
|
64
|
+
scale.step() >
|
|
65
|
+
bandSettings.maxBarWidth * elementsInGroupAmount +
|
|
66
|
+
bandSettings.groupMaxDistance +
|
|
67
|
+
bandSettings.barDistance * (elementsInGroupAmount - 1)
|
|
68
|
+
) {
|
|
69
|
+
scale.paddingOuter(++paddingOuter / bandSize);
|
|
70
|
+
}
|
|
71
|
+
return scale;
|
|
72
|
+
}
|
|
73
|
+
static getScaleLinear(domain, range) {
|
|
74
|
+
return scaleLinear().domain(domain).range([range.start, range.end]);
|
|
75
|
+
}
|
|
76
|
+
static getScalePoint(domain, range) {
|
|
77
|
+
return scalePoint().domain(domain).range([range.start, range.end]);
|
|
78
|
+
}
|
|
72
79
|
}
|
|
@@ -3,9 +3,13 @@ import { Block } from "../../block/block";
|
|
|
3
3
|
import { BlockMargin } from "../../../model/model";
|
|
4
4
|
import { Size } from "../../../config/config";
|
|
5
5
|
export declare class TipBox {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
static readonly tipBoxClass = "tipbox";
|
|
7
|
+
static renderOrGet(
|
|
8
|
+
block: Block,
|
|
9
|
+
margin: BlockMargin,
|
|
10
|
+
blockSize: Size
|
|
11
|
+
): Selection<SVGRectElement, unknown, HTMLElement, any>;
|
|
12
|
+
static get(block: Block): Selection<SVGRectElement, unknown, HTMLElement, any>;
|
|
13
|
+
static clearEvents(block: Block): void;
|
|
14
|
+
private static renderBlock;
|
|
11
15
|
}
|
|
@@ -1,28 +1,28 @@
|
|
|
1
1
|
import { TipBoxHelper } from "./tipBoxHelper";
|
|
2
2
|
export class TipBox {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
3
|
+
static renderOrGet(block, margin, blockSize) {
|
|
4
|
+
const attributes = TipBoxHelper.getAttributes(margin, blockSize);
|
|
5
|
+
return this.renderBlock(block, attributes);
|
|
6
|
+
}
|
|
7
|
+
static get(block) {
|
|
8
|
+
return block.getSvg().select(`.${this.tipBoxClass}`);
|
|
9
|
+
}
|
|
10
|
+
static clearEvents(block) {
|
|
11
|
+
block.getSvg().select(`.${this.tipBoxClass}`).on("mousemove", null).on("mouseleave", null).on("click", null);
|
|
12
|
+
}
|
|
13
|
+
static renderBlock(block, attributes) {
|
|
14
|
+
let tipBox = block.getSvg().select(`rect.${this.tipBoxClass}`);
|
|
15
|
+
if (tipBox.empty())
|
|
16
|
+
tipBox = block
|
|
17
|
+
.getSvg()
|
|
18
|
+
.append("rect")
|
|
19
|
+
.attr("class", this.tipBoxClass)
|
|
20
|
+
.attr("x", attributes.x)
|
|
21
|
+
.attr("y", attributes.y)
|
|
22
|
+
.attr("width", attributes.width)
|
|
23
|
+
.attr("height", attributes.height)
|
|
24
|
+
.style("opacity", 0);
|
|
25
|
+
return tipBox;
|
|
26
|
+
}
|
|
27
27
|
}
|
|
28
28
|
TipBox.tipBoxClass = "tipbox";
|
|
@@ -2,15 +2,22 @@ import { AxisScale } from "d3-axis";
|
|
|
2
2
|
import { ChartOrientation, Size } from "../../../config/config";
|
|
3
3
|
import { BlockMargin, ScaleKeyType } from "../../../model/model";
|
|
4
4
|
export interface TipBoxAttributes {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
x: number;
|
|
6
|
+
y: number;
|
|
7
|
+
width: number;
|
|
8
|
+
height: number;
|
|
9
9
|
}
|
|
10
10
|
export declare class TipBoxHelper {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
static getKeyValueByPointer(
|
|
12
|
+
pointer: [number, number],
|
|
13
|
+
chartOrient: ChartOrientation,
|
|
14
|
+
margin: BlockMargin,
|
|
15
|
+
blockSize: Size,
|
|
16
|
+
scaleKey: AxisScale<any>,
|
|
17
|
+
scaleKeyType: ScaleKeyType
|
|
18
|
+
): string;
|
|
19
|
+
static getAttributes(margin: BlockMargin, blockSize: Size): TipBoxAttributes;
|
|
20
|
+
private static getKeyIndex;
|
|
21
|
+
private static getKeyIndexOfPoint;
|
|
22
|
+
private static getKeyIndexOfBand;
|
|
16
23
|
}
|
|
@@ -1,48 +1,63 @@
|
|
|
1
1
|
import { Scale } from "../scale/scale";
|
|
2
2
|
export class TipBoxHelper {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
3
|
+
static getKeyValueByPointer(pointer, chartOrient, margin, blockSize, scaleKey, scaleKeyType) {
|
|
4
|
+
const index = TipBoxHelper.getKeyIndex(pointer, chartOrient, margin, blockSize, scaleKey, scaleKeyType);
|
|
5
|
+
let keyValue = scaleKey.domain()[index];
|
|
6
|
+
if (index >= scaleKey.domain().length) keyValue = scaleKey.domain()[scaleKey.domain().length - 1];
|
|
7
|
+
return keyValue;
|
|
8
|
+
}
|
|
9
|
+
static getAttributes(margin, blockSize) {
|
|
10
|
+
const pad = 5;
|
|
11
|
+
return {
|
|
12
|
+
x: margin.left - pad,
|
|
13
|
+
y: margin.top - pad,
|
|
14
|
+
width: blockSize.width - margin.left - margin.right + pad * 2,
|
|
15
|
+
height: blockSize.height - margin.top - margin.bottom + pad * 2
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
static getKeyIndex(pointer, chartOrient, margin, blockSize, scaleKey, scaleKeyType) {
|
|
19
|
+
const pointerAxisType = chartOrient === "vertical" ? 0 : 1; // 0 - координата поинтера по оси x, 1 - по оси y
|
|
20
|
+
const marginByOrient = chartOrient === "vertical" ? margin.left : margin.top;
|
|
21
|
+
const scaleStep = Scale.getScaleStep(scaleKey);
|
|
22
|
+
if (scaleKeyType === "point") {
|
|
23
|
+
return this.getKeyIndexOfPoint(pointer, scaleStep, marginByOrient, pointerAxisType);
|
|
24
|
+
} else {
|
|
25
|
+
return this.getKeyIndexOfBand(
|
|
26
|
+
pointer,
|
|
27
|
+
scaleStep,
|
|
28
|
+
marginByOrient,
|
|
29
|
+
pointerAxisType,
|
|
30
|
+
blockSize,
|
|
31
|
+
margin,
|
|
32
|
+
chartOrient,
|
|
33
|
+
scaleKey
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
static getKeyIndexOfPoint(pointer, scaleStep, marginByOrient, pointerAxisType) {
|
|
38
|
+
const point = pointer[pointerAxisType] - marginByOrient + scaleStep / 2;
|
|
39
|
+
if (point < 0) return 0;
|
|
40
|
+
return Math.floor(point / scaleStep);
|
|
41
|
+
}
|
|
42
|
+
static getKeyIndexOfBand(
|
|
43
|
+
pointer,
|
|
44
|
+
scaleStep,
|
|
45
|
+
marginByOrient,
|
|
46
|
+
pointerAxisType,
|
|
47
|
+
blockSize,
|
|
48
|
+
margin,
|
|
49
|
+
chartOrient,
|
|
50
|
+
scaleKey
|
|
51
|
+
) {
|
|
52
|
+
const chartBlockSizeByDir =
|
|
53
|
+
chartOrient === "vertical"
|
|
54
|
+
? blockSize.width - margin.left - margin.right
|
|
55
|
+
: blockSize.height - margin.top - margin.bottom;
|
|
56
|
+
const outerPadding = chartBlockSizeByDir - scaleStep * scaleKey.domain().length;
|
|
57
|
+
if (pointer[pointerAxisType] - marginByOrient - 1 < outerPadding / 2) return 0; // Самый первый элемент
|
|
58
|
+
if (pointer[pointerAxisType] - marginByOrient - 1 + outerPadding / 2 > chartBlockSizeByDir)
|
|
59
|
+
return scaleKey.domain().length - 1; // последний индекс
|
|
60
|
+
const point = pointer[pointerAxisType] - outerPadding / 2 - marginByOrient - 1;
|
|
61
|
+
return Math.floor(point / scaleStep);
|
|
62
|
+
}
|
|
48
63
|
}
|
|
@@ -2,10 +2,10 @@ import { Size } from "../../../config/config";
|
|
|
2
2
|
import { OptionsModelTitle, TitleBlockModel } from "../../../model/model";
|
|
3
3
|
import { Block } from "../../block/block";
|
|
4
4
|
export declare class Title {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
private static readonly titleCssClass;
|
|
6
|
+
static render(block: Block, title: OptionsModelTitle, titleBlockModel: TitleBlockModel, blockSize: Size): void;
|
|
7
|
+
static updateData(block: Block, title: OptionsModelTitle): void;
|
|
8
|
+
private static fillTitleBlockAttributes;
|
|
9
|
+
private static getTitleAttributes;
|
|
10
|
+
private static setTitleTooltip;
|
|
11
11
|
}
|
|
@@ -1,39 +1,38 @@
|
|
|
1
1
|
import { DomHelper } from "../../helpers/domHelper";
|
|
2
2
|
export class Title {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
3
|
+
static render(block, title, titleBlockModel, blockSize) {
|
|
4
|
+
if (!title.textContent) return;
|
|
5
|
+
const titleBlock = block.getSvg().append("text").attr("class", this.titleCssClass);
|
|
6
|
+
const titleCoordinate = this.getTitleAttributes(blockSize, titleBlockModel);
|
|
7
|
+
this.fillTitleBlockAttributes(titleBlock, titleCoordinate, title);
|
|
8
|
+
this.setTitleTooltip(titleBlock, title.textContent);
|
|
9
|
+
}
|
|
10
|
+
static updateData(block, title) {
|
|
11
|
+
block.getSvg().select(`.${this.titleCssClass}`).text(title.textContent);
|
|
12
|
+
}
|
|
13
|
+
static fillTitleBlockAttributes(titleBlock, attributes, title) {
|
|
14
|
+
titleBlock
|
|
15
|
+
.attr("x", attributes.x)
|
|
16
|
+
.attr("y", attributes.y)
|
|
17
|
+
.attr("dominant-baseline", attributes.dominantBaseline)
|
|
18
|
+
.text(title.textContent)
|
|
19
|
+
.style("font-size", `${title.fontSize}px`);
|
|
20
|
+
DomHelper.cropSvgLabels(titleBlock, attributes.maxWidth);
|
|
21
|
+
}
|
|
22
|
+
static getTitleAttributes(blockSize, titleBlockModel) {
|
|
23
|
+
const coordinate = {
|
|
24
|
+
x: 0,
|
|
25
|
+
y: 0,
|
|
26
|
+
maxWidth: 0,
|
|
27
|
+
dominantBaseline: "hanging"
|
|
28
|
+
};
|
|
29
|
+
coordinate.x = titleBlockModel.margin.left;
|
|
30
|
+
coordinate.y = titleBlockModel.margin.top;
|
|
31
|
+
coordinate.maxWidth = blockSize.width - titleBlockModel.margin.left - titleBlockModel.margin.right;
|
|
32
|
+
return coordinate;
|
|
33
|
+
}
|
|
34
|
+
static setTitleTooltip(titleBlock, text) {
|
|
35
|
+
titleBlock.append("title").text(text);
|
|
36
|
+
}
|
|
38
37
|
}
|
|
39
38
|
Title.titleCssClass = "chart-title";
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import { Selection } from "d3-selection";
|
|
2
2
|
export interface TooltipCoordinate {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
left: string;
|
|
4
|
+
top: string;
|
|
5
|
+
right: string;
|
|
6
|
+
bottom: string;
|
|
7
7
|
}
|
|
8
8
|
export declare class NewTooltip {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
static tooltipBlockClass: string;
|
|
10
|
+
private elSelection;
|
|
11
|
+
getEl(): Selection<HTMLElement, unknown, HTMLElement, any>;
|
|
12
|
+
findInWrapper(
|
|
13
|
+
wrapper: Selection<HTMLElement, unknown, HTMLElement, any>
|
|
14
|
+
): Selection<HTMLElement, unknown, HTMLElement, any>;
|
|
15
|
+
render(
|
|
16
|
+
wrapper: Selection<HTMLElement, unknown, HTMLElement, any>
|
|
17
|
+
): Selection<HTMLElement, unknown, HTMLElement, any>;
|
|
18
|
+
appendContent(content: HTMLElement): void;
|
|
19
|
+
setCoordinate(coordinate: TooltipCoordinate): void;
|
|
16
20
|
}
|