@elastic/charts 45.1.1 → 46.0.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/CHANGELOG.md +22 -0
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js +1 -2
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js +36 -9
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.d.ts +24 -3
- package/dist/chart_types/goal_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.js.map +1 -1
- package/dist/chart_types/xy_chart/domains/y_domain.js +12 -10
- package/dist/chart_types/xy_chart/domains/y_domain.js.map +1 -1
- package/dist/chart_types/xy_chart/legend/legend.js +7 -5
- package/dist/chart_types/xy_chart/legend/legend.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_annotation.d.ts +2 -2
- package/dist/chart_types/xy_chart/state/selectors/compute_legend.js +1 -2
- package/dist/chart_types/xy_chart/state/selectors/compute_legend.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js +1 -0
- package/dist/chart_types/xy_chart/state/selectors/compute_series_domains.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_api_scale_configs.js +14 -14
- package/dist/chart_types/xy_chart/state/selectors/get_api_scale_configs.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/merge_y_custom_domains.js +1 -2
- package/dist/chart_types/xy_chart/state/selectors/merge_y_custom_domains.js.map +1 -1
- package/dist/chart_types/xy_chart/state/utils/utils.js +24 -2
- package/dist/chart_types/xy_chart/state/utils/utils.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts +8 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/scales/scale_continuous.js +22 -9
- package/dist/scales/scale_continuous.js.map +1 -1
- package/dist/scales/utils.d.ts +2 -0
- package/dist/scales/utils.d.ts.map +1 -0
- package/dist/scales/utils.js +16 -0
- package/dist/scales/utils.js.map +1 -0
- package/dist/specs/constants.d.ts +1 -1
- package/dist/specs/constants.d.ts.map +1 -1
- package/dist/specs/settings.d.ts +4 -0
- package/dist/specs/settings.d.ts.map +1 -1
- package/dist/specs/settings.js.map +1 -1
- package/dist/utils/common.d.ts.map +1 -1
- package/dist/utils/common.js +20 -1
- package/dist/utils/common.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,25 @@
|
|
|
1
|
+
# [46.0.0](https://github.com/elastic/elastic-charts/compare/v45.1.1...v46.0.0) (2022-04-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **axis:** ticks generation for linear scale on bar charts ([#1645](https://github.com/elastic/elastic-charts/issues/1645)) ([65d0e7d](https://github.com/elastic/elastic-charts/commit/65d0e7deeba4f6b98d13e3eeff5442aefcb85132))
|
|
7
|
+
* **axis:** use correct desired tick count based on axis type ([#1646](https://github.com/elastic/elastic-charts/issues/1646)) ([512a6cd](https://github.com/elastic/elastic-charts/commit/512a6cda80a6df0fc7709b4a0b1d5516df8782f2))
|
|
8
|
+
* **deps:** update dependency @elastic/eui to v53 ([#1639](https://github.com/elastic/elastic-charts/issues/1639)) ([34bf325](https://github.com/elastic/elastic-charts/commit/34bf3251d69e07dde3537a2bececd84905836732))
|
|
9
|
+
* **deps:** update dependency @elastic/eui to v54 ([#1642](https://github.com/elastic/elastic-charts/issues/1642)) ([6eaca0a](https://github.com/elastic/elastic-charts/commit/6eaca0a5052fd877aa380216a155982ca2198a2c))
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* **axes:** option to fit domain to list of annotation `SpecIds` ([#1641](https://github.com/elastic/elastic-charts/issues/1641)) ([220350d](https://github.com/elastic/elastic-charts/commit/220350df862b52de364b7e96088f6c5651cb396b))
|
|
15
|
+
* **goal:** auto generated linear ticks ([#1637](https://github.com/elastic/elastic-charts/issues/1637)) ([5437d8e](https://github.com/elastic/elastic-charts/commit/5437d8e985ecc8cfa32651ccc97fdf7b9da84b01))
|
|
16
|
+
* **legend:** expose sorting function ([#1644](https://github.com/elastic/elastic-charts/issues/1644)) ([128114c](https://github.com/elastic/elastic-charts/commit/128114c57d722702faceb1d3277f5b12f3407dac))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### BREAKING CHANGES
|
|
20
|
+
|
|
21
|
+
* **goal:** goal chart now requires domain min and max to be defined
|
|
22
|
+
|
|
1
23
|
## [45.1.1](https://github.com/elastic/elastic-charts/compare/v45.1.0...v45.1.1) (2022-03-30)
|
|
2
24
|
|
|
3
25
|
|
|
@@ -19,9 +19,8 @@ var constants_2 = require("../../specs/constants");
|
|
|
19
19
|
var commonDefaults = {
|
|
20
20
|
base: 0,
|
|
21
21
|
actual: 50,
|
|
22
|
-
ticks: [0, 25, 50, 75, 100],
|
|
23
22
|
};
|
|
24
|
-
exports.defaultGoalSpec = __assign(__assign({}, commonDefaults), {
|
|
23
|
+
exports.defaultGoalSpec = __assign(__assign({}, commonDefaults), { bandFillColor: function (_a) {
|
|
25
24
|
var value = _a.value, highestValue = _a.highestValue, lowestValue = _a.lowestValue;
|
|
26
25
|
return (0, color_library_wrappers_1.getGreensColorScale)(0.5, [highestValue, lowestValue])(value);
|
|
27
26
|
}, tickValueFormatter: function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewmodel_types.js","sourceRoot":"","sources":["../../../../../src/chart_types/goal_chart/layout/types/viewmodel_types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,oFAAgF;AAEhF,yDAAuD;AAEvD,oEAAmE;AAGnE,mDAAoD;AA8CpD,IAAM,cAAc,GAAG;IACrB,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"viewmodel_types.js","sourceRoot":"","sources":["../../../../../src/chart_types/goal_chart/layout/types/viewmodel_types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,oFAAgF;AAEhF,yDAAuD;AAEvD,oEAAmE;AAGnE,mDAAoD;AA8CpD,IAAM,cAAc,GAAG;IACrB,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,EAAE;CACX,CAAC;AAGW,QAAA,eAAe,yBACvB,cAAc,KACjB,aAAa,EAAE,UAAC,EAAgE;YAA9D,KAAK,WAAA,EAAE,YAAY,kBAAA,EAAE,WAAW,iBAAA;QAChD,OAAO,IAAA,4CAAmB,EAAC,GAAG,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC,EACD,kBAAkB,EAAE,UAAC,EAAqC;YAAnC,KAAK,WAAA;QAAmC,OAAA,MAAM,CAAC,KAAK,CAAC;IAAb,CAAa,EAC5E,UAAU,EAAE,UAAC,EAAoC;YAAlC,IAAI,UAAA;QAAmC,OAAA,MAAM,CAAC,IAAI,CAAC;IAAZ,CAAY,EAClE,UAAU,EAAE,cAAM,OAAA,MAAM,EAAN,CAAM,EACxB,YAAY,EAAE,UAAC,EAAoC;YAAlC,IAAI,UAAA;QAAmC,OAAA,MAAM,CAAC,IAAI,CAAC;IAAZ,CAAY,EACpE,YAAY,EAAE,UAAC,EAAsC;YAApC,MAAM,YAAA;QAAmC,OAAA,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAA9B,CAA8B,EACxF,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,EACjC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EACtB,qBAAqB,EAAE,UAAC,KAAa,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,EAAb,CAAa,IACvD;AAGW,QAAA,iBAAiB,yBACzB,cAAc,KACjB,QAAQ,EAAE,oBAAQ,CAAC,MAAM,EACzB,OAAO,EAAE,uBAAW,CAAC,IAAI,EACzB,KAAK,EAAE,EAAE,EACT,KAAK,EAAE,EAAE,EACT,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,EAAE,EACd,YAAY,EAAE,EAAE,EAChB,YAAY,EAAE,EAAE,EAChB,YAAY,EAAE,GAAG,EACjB,WAAW,EAAE,CAAC,EACd,cAAc,EAAE,CAAC,EACjB,cAAc,EAAE,CAAC,EACjB,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,qBAAqB,EAAE,cAAM,OAAA,EAAE,EAAF,CAAE,IAC/B;AAGK,IAAM,kBAAkB,GAAG,UAAC,EAA6B;QAA7B,qBAAkB,yBAAW,KAAA,EAA3B,IAAI,UAAA;IAA4C,OAAA,CAAC;QACpF,KAAK,EAAE,IAAI;QACX,eAAe,EAAE,yBAAiB;QAClC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;QAC3B,SAAS,EAAE,cAAM,OAAA,EAAE,EAAF,CAAE;KACpB,CAAC;AALmF,CAKnF,CAAC;AALU,QAAA,kBAAkB,sBAK5B"}
|
|
@@ -37,6 +37,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.shapeViewModel = void 0;
|
|
40
|
+
var scales_1 = require("../../../../scales");
|
|
41
|
+
var constants_1 = require("../../specs/constants");
|
|
42
|
+
var common_1 = require("./../../../../utils/common");
|
|
40
43
|
function shapeViewModel(spec, theme, chartDimensions) {
|
|
41
44
|
var width = chartDimensions.width, height = chartDimensions.height;
|
|
42
45
|
var margin = theme.chartMargins;
|
|
@@ -46,13 +49,31 @@ function shapeViewModel(spec, theme, chartDimensions) {
|
|
|
46
49
|
x: margin.left + innerWidth / 2,
|
|
47
50
|
y: margin.top + innerHeight / 2,
|
|
48
51
|
};
|
|
49
|
-
var subtype = spec.subtype,
|
|
50
|
-
var
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
var
|
|
55
|
-
var
|
|
52
|
+
var subtype = spec.subtype, ticks = spec.ticks, bands = spec.bands, domain = spec.domain, bandFillColor = spec.bandFillColor, tickValueFormatter = spec.tickValueFormatter, labelMajor = spec.labelMajor, labelMinor = spec.labelMinor, centralMajor = spec.centralMajor, centralMinor = spec.centralMinor, bandLabels = spec.bandLabels, angleStart = spec.angleStart, angleEnd = spec.angleEnd;
|
|
53
|
+
var lowestValue = (0, common_1.isFiniteNumber)(domain.min) ? domain.min : 0;
|
|
54
|
+
var highestValue = (0, common_1.isFiniteNumber)(domain.max) ? domain.max : 1;
|
|
55
|
+
var base = (0, common_1.clamp)(spec.base, lowestValue, highestValue);
|
|
56
|
+
var target = !(0, common_1.isNil)(spec.target) && spec.target <= highestValue && spec.target >= lowestValue ? spec.target : undefined;
|
|
57
|
+
var actual = (0, common_1.clamp)(spec.actual, lowestValue, highestValue);
|
|
58
|
+
var finalTicks = Array.isArray(ticks)
|
|
59
|
+
? ticks.filter((0, common_1.isBetween)(lowestValue, highestValue))
|
|
60
|
+
: new scales_1.ScaleContinuous({
|
|
61
|
+
type: 'linear',
|
|
62
|
+
domain: [lowestValue, highestValue],
|
|
63
|
+
range: [0, 1],
|
|
64
|
+
}, {
|
|
65
|
+
desiredTickCount: ticks !== null && ticks !== void 0 ? ticks : getDesiredTicks(subtype, angleStart, angleEnd),
|
|
66
|
+
}).ticks();
|
|
67
|
+
var finalBands = Array.isArray(bands)
|
|
68
|
+
? bands.reduce.apply(bands, __spreadArray([], __read((0, common_1.clampAll)(lowestValue, highestValue)), false)) : new scales_1.ScaleContinuous({
|
|
69
|
+
type: 'linear',
|
|
70
|
+
domain: [lowestValue, highestValue],
|
|
71
|
+
range: [0, 1],
|
|
72
|
+
}, {
|
|
73
|
+
desiredTickCount: bands !== null && bands !== void 0 ? bands : getDesiredTicks(subtype, angleStart, angleEnd),
|
|
74
|
+
}).ticks();
|
|
75
|
+
var aboveBaseCount = finalBands.filter(function (b) { return b > base; }).length;
|
|
76
|
+
var belowBaseCount = finalBands.filter(function (b) { return b <= base; }).length;
|
|
56
77
|
var callbackArgs = {
|
|
57
78
|
base: base,
|
|
58
79
|
target: target,
|
|
@@ -67,12 +88,12 @@ function shapeViewModel(spec, theme, chartDimensions) {
|
|
|
67
88
|
base: base,
|
|
68
89
|
target: target,
|
|
69
90
|
actual: actual,
|
|
70
|
-
bands:
|
|
91
|
+
bands: finalBands.map(function (value, index) { return ({
|
|
71
92
|
value: value,
|
|
72
93
|
fillColor: bandFillColor(__assign({ value: value, index: index }, callbackArgs)),
|
|
73
94
|
text: bandLabels,
|
|
74
95
|
}); }),
|
|
75
|
-
ticks:
|
|
96
|
+
ticks: finalTicks.map(function (value, index) { return ({
|
|
76
97
|
value: value,
|
|
77
98
|
text: tickValueFormatter(__assign({ value: value, index: index }, callbackArgs)),
|
|
78
99
|
}); }),
|
|
@@ -101,4 +122,10 @@ function shapeViewModel(spec, theme, chartDimensions) {
|
|
|
101
122
|
};
|
|
102
123
|
}
|
|
103
124
|
exports.shapeViewModel = shapeViewModel;
|
|
125
|
+
function getDesiredTicks(subtype, angleStart, angleEnd) {
|
|
126
|
+
if (subtype !== constants_1.GoalSubtype.Goal)
|
|
127
|
+
return 5;
|
|
128
|
+
var arc = Math.abs(angleStart - angleEnd);
|
|
129
|
+
return Math.ceil(arc / (Math.PI / 4));
|
|
130
|
+
}
|
|
104
131
|
//# sourceMappingURL=viewmodel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewmodel.js","sourceRoot":"","sources":["../../../../../src/chart_types/goal_chart/layout/viewmodel/viewmodel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"viewmodel.js","sourceRoot":"","sources":["../../../../../src/chart_types/goal_chart/layout/viewmodel/viewmodel.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,17 @@ export declare type BandFillColorAccessor = (input: BandFillColorAccessorInput)
|
|
|
22
22
|
/** @alpha */
|
|
23
23
|
export declare type GoalLabelAccessor = LabelAccessor<BandFillColorAccessorInput>;
|
|
24
24
|
/** @alpha */
|
|
25
|
+
export interface GoalDomainRange {
|
|
26
|
+
/**
|
|
27
|
+
* A finite number to defined the lower bound of the domain. Defaults to 0 if _not_ finite.
|
|
28
|
+
*/
|
|
29
|
+
min: number;
|
|
30
|
+
/**
|
|
31
|
+
* A finite number to defined the upper bound of the domain. Defaults to 1 if _not_ finite.
|
|
32
|
+
*/
|
|
33
|
+
max: number;
|
|
34
|
+
}
|
|
35
|
+
/** @alpha */
|
|
25
36
|
export interface GoalSpec extends Spec {
|
|
26
37
|
specType: typeof SpecType.Series;
|
|
27
38
|
chartType: typeof ChartType.Goal;
|
|
@@ -29,8 +40,18 @@ export interface GoalSpec extends Spec {
|
|
|
29
40
|
base: number;
|
|
30
41
|
target?: number;
|
|
31
42
|
actual: number;
|
|
32
|
-
|
|
33
|
-
|
|
43
|
+
/**
|
|
44
|
+
* array of discrete band intervals or approximate number of desired bands
|
|
45
|
+
*/
|
|
46
|
+
bands?: number | number[];
|
|
47
|
+
/**
|
|
48
|
+
* Array of discrete tick values or approximate number of desired ticks
|
|
49
|
+
*/
|
|
50
|
+
ticks?: number | number[];
|
|
51
|
+
/**
|
|
52
|
+
* Domain of goal charts. Limits every value to within domain.
|
|
53
|
+
*/
|
|
54
|
+
domain: GoalDomainRange;
|
|
34
55
|
bandFillColor: BandFillColorAccessor;
|
|
35
56
|
tickValueFormatter: GoalLabelAccessor;
|
|
36
57
|
labelMajor: string | GoalLabelAccessor;
|
|
@@ -42,7 +63,7 @@ export interface GoalSpec extends Spec {
|
|
|
42
63
|
bandLabels: string[];
|
|
43
64
|
tooltipValueFormatter: ValueFormatter;
|
|
44
65
|
}
|
|
45
|
-
declare const buildProps: import("../../../state/spec_factory").BuildProps<GoalSpec, "chartType" | "specType", "base" | "actual" | "
|
|
66
|
+
declare const buildProps: import("../../../state/spec_factory").BuildProps<GoalSpec, "chartType" | "specType", "base" | "actual" | "bandFillColor" | "tickValueFormatter" | "labelMajor" | "labelMinor" | "centralMajor" | "centralMinor" | "angleStart" | "angleEnd" | "bandLabels" | "tooltipValueFormatter", "target" | "bands" | "ticks", "id" | "domain" | "subtype">;
|
|
46
67
|
/**
|
|
47
68
|
* Add Goal spec to chart
|
|
48
69
|
* @alpha
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/goal_chart/specs/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAgB,OAAO,EAAkB,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,aAAa,EAAyB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG7F,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,aAAa;AACb,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,aAAa;AACb,oBAAY,qBAAqB,GAAG,CAAC,KAAK,EAAE,0BAA0B,KAAK,KAAK,CAAC;AAEjF,aAAa;AACb,oBAAY,iBAAiB,GAAG,aAAa,CAAC,0BAA0B,CAAC,CAAC;AAE1E,aAAa;AACb,MAAM,WAAW,QAAS,SAAQ,IAAI;IACpC,QAAQ,EAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;IACjC,SAAS,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC;IACjC,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/chart_types/goal_chart/specs/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAgB,OAAO,EAAkB,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,aAAa,EAAyB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG7F,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,aAAa;AACb,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,aAAa;AACb,oBAAY,qBAAqB,GAAG,CAAC,KAAK,EAAE,0BAA0B,KAAK,KAAK,CAAC;AAEjF,aAAa;AACb,oBAAY,iBAAiB,GAAG,aAAa,CAAC,0BAA0B,CAAC,CAAC;AAE1E,aAAa;AACb,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACb;AAED,aAAa;AACb,MAAM,WAAW,QAAS,SAAQ,IAAI;IACpC,QAAQ,EAAE,OAAO,QAAQ,CAAC,MAAM,CAAC;IACjC,SAAS,EAAE,OAAO,SAAS,CAAC,IAAI,CAAC;IACjC,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B;;OAEG;IACH,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,qBAAqB,CAAC;IACrC,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACvC,UAAU,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACvC,YAAY,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qBAAqB,EAAE,cAAc,CAAC;CACvC;AAED,QAAA,MAAM,UAAU,kVAQf,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,IAAI,UACR,QACL,QAAQ,EACR,MAAM,iBAAiB,CAAC,WAAW,CAAC,EACpC,MAAM,iBAAiB,CAAC,UAAU,CAAC,EACnC,MAAM,iBAAiB,CAAC,WAAW,CAAC,EACpC,MAAM,iBAAiB,CAAC,UAAU,CAAC,CACpC,SAyBF,CAAC;AAEF,cAAc;AACd,oBAAY,SAAS,GAAG,cAAc,CAAC,OAAO,IAAI,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/chart_types/goal_chart/specs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,2BAAkC;AAElC,uDAAgD;AAEhD,sDAAoD;AACpD,4DAAoF;AACpF,gDAA6F;AAC7F,gDAA+C;AAC/C,mEAAkE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/chart_types/goal_chart/specs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,2BAAkC;AAElC,uDAAgD;AAEhD,sDAAoD;AACpD,4DAAoF;AACpF,gDAA6F;AAC7F,gDAA+C;AAC/C,mEAAkE;AAiElE,IAAM,UAAU,GAAG,IAAA,2BAAY,GAAY,CACzC;IACE,QAAQ,EAAE,oBAAQ,CAAC,MAAM;IACzB,SAAS,EAAE,aAAS,CAAC,IAAI;CAC1B,eAEI,iCAAe,EAErB,CAAC;AAMK,IAAM,IAAI,GAAG,UAClB,KAMC;;IAEO,IAAA,QAAQ,GAAgB,UAAU,SAA1B,EAAE,SAAS,GAAK,UAAU,UAAf,CAAgB;IAC3C,IAAM,UAAU,GAAG,MAAA,KAAK,CAAC,UAAU,mCAAI,QAAQ,CAAC,UAAU,CAAC;IAC3D,IAAM,QAAQ,GAAG,MAAA,KAAK,CAAC,QAAQ,mCAAI,QAAQ,CAAC,QAAQ,CAAC;IACrD,IAAM,WAAW,GAAmC,EAAE,CAAC;IAEvD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,eAAG,EAAE;QACzC,WAAW,CAAC,QAAQ,GAAG,UAAU,GAAG,eAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC;QAE3E,eAAM,CAAC,IAAI,CAAC,wJAGF,QAAQ,WAAM,IAAA,cAAK,EAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,6BAC1C,WAAW,CAAC,QAAQ,WAAM,IAAA,cAAK,EAAC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,cAC/E,CAAC,CAAC;KACA;IAED,IAAA,6BAAc,0CACT,QAAQ,GACR,IAAA,uBAAc,EAAC,KAAK,CAAC,GACrB,SAAS,GACT,WAAW,EACd,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAhCW,QAAA,IAAI,QAgCf"}
|
|
@@ -55,7 +55,7 @@ var get_api_scales_1 = require("../scales/get_api_scales");
|
|
|
55
55
|
var spec_1 = require("../state/utils/spec");
|
|
56
56
|
var group_data_series_1 = require("../utils/group_data_series");
|
|
57
57
|
var specs_1 = require("../utils/specs");
|
|
58
|
-
function mergeYDomain(dataSeries,
|
|
58
|
+
function mergeYDomain(yScaleAPIConfig, dataSeries, annotationYValueMap) {
|
|
59
59
|
var dataSeriesByGroupId = (0, group_data_series_1.groupBy)(dataSeries, function (_a) {
|
|
60
60
|
var spec = _a.spec;
|
|
61
61
|
return (0, spec_1.getSpecDomainGroupId)(spec);
|
|
@@ -73,18 +73,19 @@ function mergeYDomain(dataSeries, yScaleAPIConfig) {
|
|
|
73
73
|
var seriesType = _a.seriesType, isFiltered = _a.isFiltered;
|
|
74
74
|
return seriesType === specs_1.SeriesType.Bar || (seriesType === specs_1.SeriesType.Area && !isFiltered);
|
|
75
75
|
});
|
|
76
|
-
var domain = mergeYDomainForGroup(stacked, nonStacked, hasNonZeroBaselineTypes, yScaleAPIConfig);
|
|
76
|
+
var domain = mergeYDomainForGroup(stacked, nonStacked, annotationYValueMap, hasNonZeroBaselineTypes, yScaleAPIConfig);
|
|
77
77
|
return domain ? __spreadArray(__spreadArray([], __read(acc), false), [domain], false) : acc;
|
|
78
78
|
}, []);
|
|
79
79
|
}
|
|
80
80
|
exports.mergeYDomain = mergeYDomain;
|
|
81
|
-
function mergeYDomainForGroup(stacked, nonStacked, hasZeroBaselineSpecs, yScaleConfig) {
|
|
81
|
+
function mergeYDomainForGroup(stacked, nonStacked, annotationYValueMap, hasZeroBaselineSpecs, yScaleConfig) {
|
|
82
|
+
var _a;
|
|
82
83
|
var dataSeries = __spreadArray(__spreadArray([], __read(stacked), false), __read(nonStacked), false);
|
|
83
84
|
if (dataSeries.length === 0)
|
|
84
85
|
return null;
|
|
85
|
-
var
|
|
86
|
+
var _b = __read(dataSeries, 1), _c = _b[0], isStacked = _c.isStacked, stackMode = _c.stackMode, spec = _c.spec;
|
|
86
87
|
var groupId = (0, spec_1.getSpecDomainGroupId)(spec);
|
|
87
|
-
var
|
|
88
|
+
var _d = yScaleConfig[groupId], customDomain = _d.customDomain, type = _d.type, nice = _d.nice, desiredTickCount = _d.desiredTickCount;
|
|
88
89
|
var newCustomDomain = customDomain ? __assign({}, customDomain) : { min: NaN, max: NaN };
|
|
89
90
|
var paddingUnit = newCustomDomain.paddingUnit, padding = newCustomDomain.padding, constrainPadding = newCustomDomain.constrainPadding;
|
|
90
91
|
var mergedDomain;
|
|
@@ -92,10 +93,11 @@ function mergeYDomainForGroup(stacked, nonStacked, hasZeroBaselineSpecs, yScaleC
|
|
|
92
93
|
mergedDomain = (0, domain_1.computeContinuousDataDomain)([0, 1], type, customDomain);
|
|
93
94
|
}
|
|
94
95
|
else {
|
|
95
|
-
var
|
|
96
|
-
var
|
|
96
|
+
var annotationData = (_a = annotationYValueMap.get(groupId)) !== null && _a !== void 0 ? _a : [];
|
|
97
|
+
var stackedDomain = computeYDomain(stacked, annotationData, hasZeroBaselineSpecs, type, newCustomDomain);
|
|
98
|
+
var nonStackedDomain = computeYDomain(nonStacked, annotationData, hasZeroBaselineSpecs, type, newCustomDomain);
|
|
97
99
|
mergedDomain = (0, domain_1.computeContinuousDataDomain)(__spreadArray(__spreadArray([], __read(stackedDomain), false), __read(nonStackedDomain), false), type, newCustomDomain);
|
|
98
|
-
var
|
|
100
|
+
var _e = __read(mergedDomain, 2), computedDomainMin = _e[0], computedDomainMax = _e[1];
|
|
99
101
|
if (newCustomDomain && Number.isFinite(newCustomDomain.min) && Number.isFinite(newCustomDomain.max)) {
|
|
100
102
|
mergedDomain = [newCustomDomain.min, newCustomDomain.max];
|
|
101
103
|
}
|
|
@@ -131,7 +133,7 @@ function mergeYDomainForGroup(stacked, nonStacked, hasZeroBaselineSpecs, yScaleC
|
|
|
131
133
|
constrainDomainPadding: constrainPadding,
|
|
132
134
|
};
|
|
133
135
|
}
|
|
134
|
-
function computeYDomain(dataSeries, hasZeroBaselineSpecs, scaleType, customDomain) {
|
|
136
|
+
function computeYDomain(dataSeries, annotationYValues, hasZeroBaselineSpecs, scaleType, customDomain) {
|
|
135
137
|
var yValues = new Set();
|
|
136
138
|
dataSeries.forEach(function (_a) {
|
|
137
139
|
var e_1, _b;
|
|
@@ -156,7 +158,7 @@ function computeYDomain(dataSeries, hasZeroBaselineSpecs, scaleType, customDomai
|
|
|
156
158
|
return [];
|
|
157
159
|
}
|
|
158
160
|
var domainOptions = __assign(__assign({}, customDomain), { padding: 0 });
|
|
159
|
-
return (0, domain_1.computeContinuousDataDomain)(__spreadArray([], __read(yValues), false), scaleType, domainOptions);
|
|
161
|
+
return (0, domain_1.computeContinuousDataDomain)(__spreadArray(__spreadArray([], __read(yValues), false), __read(annotationYValues), false), scaleType, domainOptions);
|
|
160
162
|
}
|
|
161
163
|
function groupSeriesByYGroup(specs) {
|
|
162
164
|
var specsByGroupIds = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"y_domain.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/domains/y_domain.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,uDAAsD;AACtD,gDAAsF;AAEtF,gDAA+C;AAC/C,2DAAmF;AAEnF,4CAA2D;AAC3D,gEAAqD;AAErD,wCAAuH;AAUvH,SAAgB,YAAY,
|
|
1
|
+
{"version":3,"file":"y_domain.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/domains/y_domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,8 @@ function getPointStyle(spec, theme) {
|
|
|
87
87
|
return (0, common_1.mergePartial)(theme.areaSeriesStyle.point, (_c = spec.areaSeriesStyle) === null || _c === void 0 ? void 0 : _c.point);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs,
|
|
90
|
+
function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, settingsSpec, serialIdentifierDataSeriesMap, deselectedDataSeries, theme) {
|
|
91
|
+
var _a;
|
|
91
92
|
if (deselectedDataSeries === void 0) { deselectedDataSeries = []; }
|
|
92
93
|
var legendItems = [];
|
|
93
94
|
var defaultColor = theme.colors.defaultVizColor;
|
|
@@ -110,7 +111,7 @@ function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, s
|
|
|
110
111
|
return;
|
|
111
112
|
var postFixes = getPostfix(spec);
|
|
112
113
|
var labelY1 = banded ? getBandedLegendItemLabel(name, geometry_1.BandedAccessorType.Y1, postFixes) : name;
|
|
113
|
-
var yAxis = (0, spec_1.getAxesSpecForSpecId)(axesSpecs, spec.groupId,
|
|
114
|
+
var yAxis = (0, spec_1.getAxesSpecForSpecId)(axesSpecs, spec.groupId, settingsSpec.rotation).yAxis;
|
|
114
115
|
var formatter = (_b = (_a = spec.tickFormat) !== null && _a !== void 0 ? _a : yAxis === null || yAxis === void 0 ? void 0 : yAxis.tickFormat) !== null && _b !== void 0 ? _b : axis_utils_1.defaultTickFormatter;
|
|
115
116
|
var hideInLegend = spec.hideInLegend;
|
|
116
117
|
var lastValue = lastValues.get(key);
|
|
@@ -125,7 +126,7 @@ function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, s
|
|
|
125
126
|
isSeriesHidden: isSeriesHidden,
|
|
126
127
|
isItemHidden: hideInLegend,
|
|
127
128
|
isToggleable: true,
|
|
128
|
-
defaultExtra: getLegendExtra(showLegendExtra, xScaleType, formatter, 'y1', lastValue),
|
|
129
|
+
defaultExtra: getLegendExtra(settingsSpec.showLegendExtra, xScaleType, formatter, 'y1', lastValue),
|
|
129
130
|
path: [{ index: 0, value: seriesIdentifier.key }],
|
|
130
131
|
keys: __spreadArray([specId, spec.groupId, yAccessor], __read(series.splitAccessors.values()), false),
|
|
131
132
|
pointStyle: pointStyle,
|
|
@@ -140,7 +141,7 @@ function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, s
|
|
|
140
141
|
isSeriesHidden: isSeriesHidden,
|
|
141
142
|
isItemHidden: hideInLegend,
|
|
142
143
|
isToggleable: true,
|
|
143
|
-
defaultExtra: getLegendExtra(showLegendExtra, xScaleType, formatter, 'y0', lastValue),
|
|
144
|
+
defaultExtra: getLegendExtra(settingsSpec.showLegendExtra, xScaleType, formatter, 'y0', lastValue),
|
|
144
145
|
path: [{ index: 0, value: seriesIdentifier.key }],
|
|
145
146
|
keys: __spreadArray([specId, spec.groupId, yAccessor], __read(series.splitAccessors.values()), false),
|
|
146
147
|
pointStyle: pointStyle,
|
|
@@ -152,7 +153,8 @@ function computeLegend(dataSeries, lastValues, seriesColors, specs, axesSpecs, s
|
|
|
152
153
|
var bDs = serialIdentifierDataSeriesMap[b.key];
|
|
153
154
|
return (0, default_series_sort_fn_1.defaultXYLegendSeriesSort)(aDs, bDs);
|
|
154
155
|
});
|
|
155
|
-
|
|
156
|
+
var sortFn = (_a = settingsSpec.legendSort) !== null && _a !== void 0 ? _a : legendSortFn;
|
|
157
|
+
return (0, group_data_series_1.groupBy)(legendItems.sort(function (a, b) { return sortFn(a.seriesIdentifiers[0], b.seriesIdentifiers[0]); }), function (_a) {
|
|
156
158
|
var keys = _a.keys, childId = _a.childId;
|
|
157
159
|
return __spreadArray(__spreadArray([], __read(keys), false), [childId], false).join('__');
|
|
158
160
|
}, true).map(function (d) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legend.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/legend/legend.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,uDAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"legend.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/legend/legend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { ComponentProps } from 'react';
|
|
2
2
|
import { SFProps } from '../../../state/spec_factory';
|
|
3
3
|
import { LineAnnotationSpec } from '../utils/specs';
|
|
4
|
-
declare const buildProps: import("../../../state/spec_factory").BuildProps<LineAnnotationSpec<any>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "
|
|
4
|
+
declare const buildProps: import("../../../state/spec_factory").BuildProps<LineAnnotationSpec<any>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "domainType" | "dataValues">;
|
|
5
5
|
/**
|
|
6
6
|
* Adds bar series to chart specs
|
|
7
7
|
* @public
|
|
8
8
|
*/
|
|
9
|
-
export declare const LineAnnotation: <D = any>(props: SFProps<LineAnnotationSpec<D>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "
|
|
9
|
+
export declare const LineAnnotation: <D = any>(props: SFProps<LineAnnotationSpec<D>, "chartType" | "specType", "style" | "zIndex" | "groupId" | "hideLines" | "hideLinesTooltips" | "annotationType" | "hideTooltips", "offset" | "fallbackPlacements" | "placement" | "boundary" | "boundaryPadding" | "marker" | "customTooltip" | "markerBody" | "markerDimensions" | "markerPosition" | "customTooltipDetails", "id" | "domainType" | "dataValues">) => null;
|
|
10
10
|
/** @public */
|
|
11
11
|
export declare type LineAnnotationProps = ComponentProps<typeof LineAnnotation>;
|
|
12
12
|
export {};
|
|
@@ -22,7 +22,6 @@ exports.computeLegendSelector = (0, create_selector_1.createCustomCachedSelector
|
|
|
22
22
|
get_si_dataseries_map_1.getSiDataSeriesMapSelector,
|
|
23
23
|
], function (seriesSpecs, _a, chartTheme, seriesColors, axesSpecs, deselectedDataSeries, settings, siDataSeriesMap) {
|
|
24
24
|
var formattedDataSeries = _a.formattedDataSeries, xDomain = _a.xDomain;
|
|
25
|
-
|
|
26
|
-
return (0, legend_1.computeLegend)(formattedDataSeries, lastValues, seriesColors, seriesSpecs, axesSpecs, settings.showLegendExtra, siDataSeriesMap, deselectedDataSeries, chartTheme, settings.rotation);
|
|
25
|
+
return (0, legend_1.computeLegend)(formattedDataSeries, (0, get_last_value_1.getLastValues)(formattedDataSeries, xDomain), seriesColors, seriesSpecs, axesSpecs, settings, siDataSeriesMap, deselectedDataSeries, chartTheme);
|
|
27
26
|
});
|
|
28
27
|
//# sourceMappingURL=compute_legend.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute_legend.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_legend.ts"],"names":[],"mappings":";;;AASA,qEAA+E;AAC/E,+EAAoF;AACpF,qGAAqG;AACrG,qFAAyF;AACzF,8CAAoD;AAEpD,0DAAwD;AACxD,mEAAwE;AACxE,+DAAiE;AACjE,iEAAqE;AACrE,yCAA2E;AAG9D,QAAA,qBAAqB,GAAG,IAAA,4CAA0B,EAC7D;IACE,kCAAsB;IACtB,qDAA4B;IAC5B,uCAAqB;IACrB,8CAAuB;IACvB,gCAAoB;IACpB,wDAA2B;IAC3B,4CAAuB;IACvB,kDAA0B;CAC3B,EACD,UACE,WAAW,EACX,EAAgC,EAChC,UAAU,EACV,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,QAAQ,EACR,eAA2C;QANzC,mBAAmB,yBAAA,EAAE,OAAO,aAAA;IAQ9B,
|
|
1
|
+
{"version":3,"file":"compute_legend.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_legend.ts"],"names":[],"mappings":";;;AASA,qEAA+E;AAC/E,+EAAoF;AACpF,qGAAqG;AACrG,qFAAyF;AACzF,8CAAoD;AAEpD,0DAAwD;AACxD,mEAAwE;AACxE,+DAAiE;AACjE,iEAAqE;AACrE,yCAA2E;AAG9D,QAAA,qBAAqB,GAAG,IAAA,4CAA0B,EAC7D;IACE,kCAAsB;IACtB,qDAA4B;IAC5B,uCAAqB;IACrB,8CAAuB;IACvB,gCAAoB;IACpB,wDAA2B;IAC3B,4CAAuB;IACvB,kDAA0B;CAC3B,EACD,UACE,WAAW,EACX,EAAgC,EAChC,UAAU,EACV,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,QAAQ,EACR,eAA2C;QANzC,mBAAmB,yBAAA,EAAE,OAAO,aAAA;IAQ9B,OAAO,IAAA,sBAAa,EAClB,mBAAmB,EACnB,IAAA,8BAAa,EAAC,mBAAmB,EAAE,OAAO,CAAC,EAC3C,YAAY,EACZ,WAAW,EACX,SAAS,EACT,QAAQ,EACR,eAAe,EACf,oBAAoB,EACpB,UAAU,CACX,CAAC;AACJ,CAAC,CACF,CAAC"}
|
|
@@ -10,6 +10,7 @@ var getDeselectedSeriesSelector = function (state) { return state.interactions.d
|
|
|
10
10
|
exports.computeSeriesDomainsSelector = (0, create_selector_1.createCustomCachedSelector)([
|
|
11
11
|
get_specs_1.getSeriesSpecsSelector,
|
|
12
12
|
get_api_scale_configs_1.getScaleConfigsFromSpecsSelector,
|
|
13
|
+
get_specs_1.getAnnotationSpecsSelector,
|
|
13
14
|
getDeselectedSeriesSelector,
|
|
14
15
|
get_settings_specs_1.getSettingsSpecSelector,
|
|
15
16
|
get_specs_1.getSmallMultiplesIndexOrderSelector,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute_series_domains.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_series_domains.ts"],"names":[],"mappings":";;;AASA,qEAA+E;AAC/E,qFAAyF;AACzF,wCAAsD;AACtD,iEAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"compute_series_domains.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/compute_series_domains.ts"],"names":[],"mappings":";;;AASA,qEAA+E;AAC/E,qFAAyF;AACzF,wCAAsD;AACtD,iEAA2E;AAC3E,yCAAsH;AAEtH,IAAM,2BAA2B,GAAG,UAAC,KAAuB,IAAK,OAAA,KAAK,CAAC,YAAY,CAAC,oBAAoB,EAAvC,CAAuC,CAAC;AAG5F,QAAA,4BAA4B,GAAG,IAAA,4CAA0B,EACpE;IACE,kCAAsB;IACtB,wDAAgC;IAChC,sCAA0B;IAC1B,2BAA2B;IAC3B,4CAAuB;IACvB,+CAAmC;CACpC,EACD,4BAAoB,CACrB,CAAC"}
|
|
@@ -17,37 +17,37 @@ var get_settings_specs_1 = require("../../../../state/selectors/get_settings_spe
|
|
|
17
17
|
var x_domain_1 = require("../../domains/x_domain");
|
|
18
18
|
var y_domain_1 = require("../../domains/y_domain");
|
|
19
19
|
var scale_defaults_1 = require("../../scales/scale_defaults");
|
|
20
|
-
var
|
|
20
|
+
var axis_utils_1 = require("../../utils/axis_utils");
|
|
21
21
|
var group_data_series_1 = require("../../utils/group_data_series");
|
|
22
|
-
var common_1 = require("../utils/common");
|
|
23
22
|
var spec_1 = require("../utils/spec");
|
|
24
23
|
var get_specs_1 = require("./get_specs");
|
|
25
24
|
var merge_y_custom_domains_1 = require("./merge_y_custom_domains");
|
|
26
25
|
exports.getScaleConfigsFromSpecsSelector = (0, create_selector_1.createCustomCachedSelector)([get_specs_1.getAxisSpecsSelector, get_specs_1.getSeriesSpecsSelector, get_settings_specs_1.getSettingsSpecSelector], getScaleConfigsFromSpecs);
|
|
27
26
|
function getScaleConfigsFromSpecs(axisSpecs, seriesSpecs, settingsSpec) {
|
|
28
|
-
var
|
|
29
|
-
var
|
|
30
|
-
var xTicks = xAxes.reduce(function (acc, _a) {
|
|
27
|
+
var xAxesSpecs = axisSpecs.filter(function (spec) { return (0, axis_utils_1.isXDomain)(spec.position, settingsSpec.rotation); });
|
|
28
|
+
var maxTickCountForXAxes = xAxesSpecs.reduce(function (acc, _a) {
|
|
31
29
|
var _b = _a.ticks, ticks = _b === void 0 ? scale_defaults_1.X_SCALE_DEFAULT.desiredTickCount : _b;
|
|
32
30
|
return Math.max(acc, ticks);
|
|
33
|
-
},
|
|
31
|
+
}, -Infinity);
|
|
34
32
|
var xScaleConfig = (0, x_domain_1.convertXScaleTypes)(seriesSpecs);
|
|
35
|
-
var x = __assign(__assign({ customDomain: settingsSpec.xDomain }, xScaleConfig), { desiredTickCount:
|
|
33
|
+
var x = __assign(__assign({ customDomain: settingsSpec.xDomain }, xScaleConfig), { desiredTickCount: Number.isFinite(maxTickCountForXAxes) ? maxTickCountForXAxes : scale_defaults_1.X_SCALE_DEFAULT.desiredTickCount });
|
|
36
34
|
var scaleConfigsByGroupId = (0, group_data_series_1.groupBy)(seriesSpecs, spec_1.getSpecDomainGroupId, true).reduce(function (acc, series) {
|
|
37
35
|
var groupId = (0, spec_1.getSpecDomainGroupId)(series[0]);
|
|
38
36
|
acc[groupId] = (0, y_domain_1.coerceYScaleTypes)(series);
|
|
39
37
|
return acc;
|
|
40
38
|
}, {});
|
|
41
39
|
var customDomainByGroupId = (0, merge_y_custom_domains_1.mergeYCustomDomainsByGroupId)(axisSpecs, settingsSpec.rotation);
|
|
42
|
-
var
|
|
40
|
+
var yAxisSpecs = axisSpecs.filter(function (spec) { return !(0, axis_utils_1.isXDomain)(spec.position, settingsSpec.rotation); });
|
|
43
41
|
var y = Object.keys(scaleConfigsByGroupId).reduce(function (acc, groupId) {
|
|
44
|
-
var
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
42
|
+
var maxTickCountYAxes = yAxisSpecs.reduce(function (maxTickCount, yAxis) {
|
|
43
|
+
var _a;
|
|
44
|
+
return yAxis.groupId === groupId
|
|
45
|
+
? Math.max(maxTickCount, (_a = yAxis.ticks) !== null && _a !== void 0 ? _a : scale_defaults_1.Y_SCALE_DEFAULT.desiredTickCount)
|
|
46
|
+
: maxTickCount;
|
|
47
|
+
}, -Infinity);
|
|
48
|
+
var desiredTickCount = Number.isFinite(maxTickCountYAxes) ? maxTickCountYAxes : scale_defaults_1.Y_SCALE_DEFAULT.desiredTickCount;
|
|
49
49
|
if (!acc[groupId]) {
|
|
50
|
-
acc[groupId] = __assign(__assign({ customDomain:
|
|
50
|
+
acc[groupId] = __assign(__assign({ customDomain: customDomainByGroupId.get(groupId) }, scaleConfigsByGroupId[groupId]), { desiredTickCount: desiredTickCount });
|
|
51
51
|
}
|
|
52
52
|
acc[groupId].desiredTickCount = Math.max(acc[groupId].desiredTickCount, desiredTickCount);
|
|
53
53
|
return acc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_api_scale_configs.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_api_scale_configs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAWA,qEAA+E;AAC/E,qFAAyF;AAEzF,mDAA4D;AAC5D,mDAA2D;AAC3D,8DAA+E;AAC/E
|
|
1
|
+
{"version":3,"file":"get_api_scale_configs.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/get_api_scale_configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,8 @@ function mergeYCustomDomainsByGroupId(axesSpecs, chartRotation) {
|
|
|
6
6
|
var domainsByGroupId = new Map();
|
|
7
7
|
axesSpecs.forEach(function (spec) {
|
|
8
8
|
var id = spec.id, groupId = spec.groupId, domain = spec.domain;
|
|
9
|
-
if (!domain)
|
|
9
|
+
if (!domain)
|
|
10
10
|
return;
|
|
11
|
-
}
|
|
12
11
|
if ((0, axis_utils_1.isXDomain)(spec.position, chartRotation)) {
|
|
13
12
|
throw new Error("[Axis " + id + "]: custom domain for xDomain should be defined in Settings");
|
|
14
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge_y_custom_domains.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/merge_y_custom_domains.ts"],"names":[],"mappings":";;;AAUA,qDAAmD;AAInD,SAAgB,4BAA4B,CAC1C,SAAqB,EACrB,aAAuB;IAEvB,IAAM,gBAAgB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE1D,SAAS,CAAC,OAAO,CAAC,UAAC,IAAc;QACvB,IAAA,EAAE,GAAsB,IAAI,GAA1B,EAAE,OAAO,GAAa,IAAI,QAAjB,EAAE,MAAM,GAAK,IAAI,OAAT,CAAU;QAErC,IAAI,CAAC,MAAM
|
|
1
|
+
{"version":3,"file":"merge_y_custom_domains.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/state/selectors/merge_y_custom_domains.ts"],"names":[],"mappings":";;;AAUA,qDAAmD;AAInD,SAAgB,4BAA4B,CAC1C,SAAqB,EACrB,aAAuB;IAEvB,IAAM,gBAAgB,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE1D,SAAS,CAAC,OAAO,CAAC,UAAC,IAAc;QACvB,IAAA,EAAE,GAAsB,IAAI,GAA1B,EAAE,OAAO,GAAa,IAAI,QAAjB,EAAE,MAAM,GAAK,IAAI,OAAT,CAAU;QAErC,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,IAAA,sBAAS,EAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,WAAS,EAAE,+DAA4D,CAAC,CAAC;SAC1F;QAED,IAAI,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,WAAS,EAAE,yDAAsD,CAAC,CAAC;SACpF;QAED,IAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtD,IAAI,eAAe,EAAE;YACnB,IAAM,YAAY,GAAG;gBACnB,GAAG,EAAE,IAAI,CAAC,GAAG,CACX,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EACnD,eAAe,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CACzF;gBACD,GAAG,EAAE,IAAI,CAAC,GAAG,CACX,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EACpD,eAAe,IAAI,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAC1F;aACF,CAAC;YAEF,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;gBAC1E,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;aAC7C;SACF;aAAM;YACL,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SACvC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAzCD,oEAyCC"}
|
|
@@ -101,7 +101,7 @@ function getCustomSeriesColors(dataSeries) {
|
|
|
101
101
|
return updatedCustomSeriesColors;
|
|
102
102
|
}
|
|
103
103
|
exports.getCustomSeriesColors = getCustomSeriesColors;
|
|
104
|
-
function computeSeriesDomains(seriesSpecs, scaleConfigs, deselectedDataSeries, settingsSpec, smallMultiples) {
|
|
104
|
+
function computeSeriesDomains(seriesSpecs, scaleConfigs, annotations, deselectedDataSeries, settingsSpec, smallMultiples) {
|
|
105
105
|
var _a, _b, _c, _d;
|
|
106
106
|
if (deselectedDataSeries === void 0) { deselectedDataSeries = []; }
|
|
107
107
|
var orderOrdinalBinsBy = settingsSpec === null || settingsSpec === void 0 ? void 0 : settingsSpec.orderOrdinalBinsBy;
|
|
@@ -112,7 +112,8 @@ function computeSeriesDomains(seriesSpecs, scaleConfigs, deselectedDataSeries, s
|
|
|
112
112
|
return (0, default_series_sort_fn_1.defaultXYSeriesSort)(a, b);
|
|
113
113
|
});
|
|
114
114
|
var formattedDataSeries = (0, series_1.getFormattedDataSeries)(seriesSpecs, filledDataSeries, xValues, xDomain.type).sort(seriesSortFn);
|
|
115
|
-
var
|
|
115
|
+
var annotationYValueMap = getAnnotationYValueMap(annotations, scaleConfigs.y);
|
|
116
|
+
var yDomains = (0, y_domain_1.mergeYDomain)(scaleConfigs.y, formattedDataSeries, annotationYValueMap);
|
|
116
117
|
var horizontalPredicate = (_b = (_a = smallMultiples === null || smallMultiples === void 0 ? void 0 : smallMultiples.horizontal) === null || _a === void 0 ? void 0 : _a.sort) !== null && _b !== void 0 ? _b : predicate_1.Predicate.DataIndex;
|
|
117
118
|
var smHDomain = __spreadArray([], __read(smHValues), false).sort((0, predicate_1.getPredicateFn)(horizontalPredicate));
|
|
118
119
|
var verticalPredicate = (_d = (_c = smallMultiples === null || smallMultiples === void 0 ? void 0 : smallMultiples.vertical) === null || _c === void 0 ? void 0 : _c.sort) !== null && _d !== void 0 ? _d : predicate_1.Predicate.DataIndex;
|
|
@@ -126,6 +127,27 @@ function computeSeriesDomains(seriesSpecs, scaleConfigs, deselectedDataSeries, s
|
|
|
126
127
|
};
|
|
127
128
|
}
|
|
128
129
|
exports.computeSeriesDomains = computeSeriesDomains;
|
|
130
|
+
function getAnnotationYValueMap(annotations, yScaleConfig) {
|
|
131
|
+
return annotations.reduce(function (acc, spec) {
|
|
132
|
+
var _a, _b, _c;
|
|
133
|
+
var _d = ((_b = (_a = yScaleConfig[spec.groupId]) === null || _a === void 0 ? void 0 : _a.customDomain) !== null && _b !== void 0 ? _b : {}).includeDataFromIds, includeDataFromIds = _d === void 0 ? [] : _d;
|
|
134
|
+
if (!includeDataFromIds.includes(spec.id))
|
|
135
|
+
return acc.set(spec.groupId, []);
|
|
136
|
+
var yValues = (0, specs_1.isLineAnnotation)(spec)
|
|
137
|
+
? spec.domainType === specs_1.AnnotationDomainType.YDomain
|
|
138
|
+
? spec.dataValues.map(function (_a) {
|
|
139
|
+
var dataValue = _a.dataValue;
|
|
140
|
+
return dataValue;
|
|
141
|
+
})
|
|
142
|
+
: []
|
|
143
|
+
: spec.dataValues.flatMap(function (_a) {
|
|
144
|
+
var _b = _a.coordinates, y0 = _b.y0, y1 = _b.y1;
|
|
145
|
+
return [y0, y1];
|
|
146
|
+
});
|
|
147
|
+
var groupValues = (_c = acc.get(spec.groupId)) !== null && _c !== void 0 ? _c : [];
|
|
148
|
+
return acc.set(spec.groupId, __spreadArray(__spreadArray([], __read(groupValues), false), __read(yValues.filter(common_1.isFiniteNumber)), false));
|
|
149
|
+
}, new Map());
|
|
150
|
+
}
|
|
129
151
|
function computeSeriesGeometries(seriesSpecs, _a, seriesColorMap, chartTheme, _b, axesSpecs, smallMultiplesScales, enableHistogramMode, fallbackTickFormatter, measureText) {
|
|
130
152
|
var xDomain = _a.xDomain, yDomains = _a.yDomains, nonFilteredDataSeries = _a.formattedDataSeries;
|
|
131
153
|
var chartRotation = _b.rotation;
|