saherelm/xFrameworkComponentsHolder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: saherelm/xFrameworkComponentsHolder:master
Branches Tags
saherelm/xFrameworkComponentsHolder:master saherelm/xFrameworkComponentsHolder:dev-xchart-properties
..
pull from: saherelm/xFrameworkComponentsHolder:dev-xchart-properties
Branches Tags
saherelm/xFrameworkComponentsHolder:master saherelm/xFrameworkComponentsHolder:dev-xchart-properties
1 Commits
master .. dev-xchart-properties
Author SHA1 Message Date
saherelm 752efe3e3c add color properties has issues ... 2026-08-31 22:24:40 +03:30
2 changed files with 209 additions and 1058 deletions
Expand all files Collapse all files
projects/x-framework-components/src/lib/x-chart/x-chart.component.ts
+7 -809
View File
@@ -6,48 +6,32 @@ import {
} from '@angular/core'; } from '@angular/core';
import { import {
nameof, nameof,
toArray,
isString,
XMimeType, XMimeType,
downloadFile, downloadFile,
generateUuid, generateUuid,
getXColorValue, getXColorValue,
XOneOrManyType,
XColorIdentifier,
downloadFileByUrl, downloadFileByUrl,
isNullOrUndefined, isNullOrUndefined,
XResourceIdentifier,
isNullOrEmptyString, isNullOrEmptyString,
XColorWithBrightness, XColorWithBrightness,
downloadArrayBufferedFile, downloadArrayBufferedFile,
} from 'x-framework-core'; } from 'x-framework-core';
import { import {
XChartFill,
isChartType, isChartType,
XChartXAxis,
XChartYAxis,
XChartStroke,
XChartAction, XChartAction,
XChartTooltip,
XChartOptions, XChartOptions,
XChartColorStop,
XChartColorType,
XChartEventOpts, XChartEventOpts,
XChartTextAlign, XChartTextAlign,
XChartSeriesType, XChartSeriesType,
isChartTextAlign, isChartTextAlign,
XChartAnnotations,
XChartActionBarItem, XChartActionBarItem,
XChartDrilldownEvent, XChartDrilldownEvent,
XChartAnnotationLabel,
XChartAnnotationStyle,
XChartMarkerAnnotations,
XChartTooltipAnnotations,
XChartContainerComponent, XChartContainerComponent,
XChartStoryboardBeatInfo, XChartStoryboardBeatInfo,
XChartColorFormatterOpts,
} from './x-chart.typings'; } from './x-chart.typings';
import ApexCharts from 'apexcharts'; import ApexCharts from 'apexcharts';
import { Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { import {
XActionBarItem, XActionBarItem,
XActionBarItemSlot, XActionBarItemSlot,
@@ -192,32 +176,6 @@ export class XChartComponent extends XChartContainerComponent {
await this.prepareActionBar(); await this.prepareActionBar();
} }
//
// Stroke ...
isChanged = changeKeys.includes(nameof<XChartComponent>('stroke'));
if (isChanged) {
//
if (isNullOrUndefined(this.stroke)) {
this.stroke = this.propertyProvider.stroke;
}
//
this.handleChartUpdate();
}
//
// Colors ...
isChanged = changeKeys.includes(nameof<XChartComponent>('colors'));
if (isChanged) {
//
if (isNullOrUndefined(this.colors)) {
this.colors = this.propertyProvider.colors;
}
//
this.handleChartUpdate();
}
// //
// Zoom Step ... // Zoom Step ...
isChanged = changeKeys.includes(nameof<XChartComponent>('zoomStep')); isChanged = changeKeys.includes(nameof<XChartComponent>('zoomStep'));
@@ -232,58 +190,6 @@ export class XChartComponent extends XChartContainerComponent {
zoomStep = await this.getValueAsync(this.zoomStep); zoomStep = await this.getValueAsync(this.zoomStep);
} }
//
// Toolbar ...
isChanged = changeKeys.includes(nameof<XChartComponent>('tooltip'));
if (isChanged) {
//
if (isNullOrUndefined(this.tooltip)) {
this.tooltip = this.propertyProvider.tooltip;
}
//
await this.handleChartUpdate();
}
//
// XAxis ...
isChanged = changeKeys.includes(nameof<XChartComponent>('xAxis'));
if (isChanged) {
//
if (isNullOrUndefined(this.xAxis)) {
this.xAxis = this.propertyProvider.xAxis;
}
//
await this.handleChartUpdate();
}
//
// YAxis ...
isChanged = changeKeys.includes(nameof<XChartComponent>('yAxis'));
if (isChanged) {
//
if (isNullOrUndefined(this.yAxis)) {
this.yAxis = this.propertyProvider.yAxis;
}
//
await this.handleChartUpdate();
}
//
// Annotations ...
isChanged = changeKeys.includes(nameof<XChartComponent>('annotations'));
if (isChanged) {
//
if (isNullOrUndefined(this.annotations)) {
this.annotations = this.propertyProvider.annotations;
}
//
await this.handleChartUpdate();
}
// //
// Chart Title ... // Chart Title ...
isChanged = changeKeys.includes(nameof<XChartComponent>('title')); isChanged = changeKeys.includes(nameof<XChartComponent>('title'));
@@ -820,20 +726,12 @@ export class XChartComponent extends XChartContainerComponent {
const chartId = await this.getValueAsync(this.uuid); const chartId = await this.getValueAsync(this.uuid);
const series = await this.getValueAsync(this.series); const series = await this.getValueAsync(this.series);
//
const stroke = await this.getPreparedStroke();
const colors = await this.getPreparedColors();
// //
const cOptions = await this.getValueAsync(this.options); const cOptions = await this.getValueAsync(this.options);
// //
const xAxis = await this.getPreparedXAxis(cOptions?.xaxis); const colors: Array<string | ((opts: XChartColorFormatterOpts) => string)> =
const yAxis = await this.getPreparedYAxis(cOptions?.yaxis); [getXColorValue(XColorWithBrightness.PrimaryShade)];
//
const tooltip = await this.getPreparedTooltip();
const annotations = await this.getPreparedAnnotations();
// //
const title = await this.getResourceValueAsync(this.title); const title = await this.getResourceValueAsync(this.title);
@@ -868,6 +766,9 @@ export class XChartComponent extends XChartContainerComponent {
// //
const primaryColorValue = getXColorValue(XColorWithBrightness.Primary); const primaryColorValue = getXColorValue(XColorWithBrightness.Primary);
//
console.log('cOptions: ', cOptions);
// //
// Normalize Directional Properties .... // Normalize Directional Properties ....
if (this.managerService.uiDirection == 'ltr') { if (this.managerService.uiDirection == 'ltr') {
@@ -908,14 +809,6 @@ export class XChartComponent extends XChartContainerComponent {
this.CHART_OPTIONS = { this.CHART_OPTIONS = {
...cOptions, ...cOptions,
series: series, series: series,
stroke: {
...cOptions?.stroke,
...stroke
},
annotations: {
...cOptions?.annotations,
...annotations,
},
title: { title: {
...cOptions?.title, ...cOptions?.title,
text: title, text: title,
@@ -1488,17 +1381,10 @@ export class XChartComponent extends XChartContainerComponent {
palette: cOptions?.theme?.palette || 'palette1', palette: cOptions?.theme?.palette || 'palette1',
}, },
colors: colors, colors: colors,
xaxis: {
...xAxis,
},
yaxis: [...yAxis],
grid: { grid: {
...cOptions?.grid, ...cOptions?.grid,
borderColor: gridColorValue, borderColor: gridColorValue,
}, },
tooltip: {
...tooltip,
},
dataLabels: { dataLabels: {
...cOptions?.dataLabels, ...cOptions?.dataLabels,
}, },
@@ -2365,693 +2251,5 @@ export class XChartComponent extends XChartContainerComponent {
this.CARD_ACTION_PROVIDER_SUBSCRIPTION.unsubscribe(); this.CARD_ACTION_PROVIDER_SUBSCRIPTION.unsubscribe();
this.CARD_ACTION_PROVIDER_SUBSCRIPTION = null; this.CARD_ACTION_PROVIDER_SUBSCRIPTION = null;
} }
//
//#region Preparers ...
private async getPreparedStroke() {
//
let result: XChartStroke = undefined;
//
if (!isNullOrUndefined(this.stroke)) {
//
result = await this.getValueAsync(this.stroke);
//
result = {
...result,
colors: result?.colors.map((c) => this.normalizeColor(c)),
fill: this.normalizeFill(result?.fill),
};
}
//
return result;
}
private async getPreparedColors() {
//
let result: XChartColorType = undefined;
//
if (!isNullOrUndefined(this.colors)) {
//
result = await this.getValueAsync(this.colors);
//
// Try to Normalize ...
if (!isNullOrUndefined(result) && this.hasChild(result)) {
//
result = [
...result.map((x) => {
//
// Only Normalize when color is string ...
if (!isNullOrUndefined(x) && isString(x)) {
x = this.normalizeColor(x as string);
}
//
return x;
}),
];
}
}
//
return result;
}
private async getPreparedTooltip() {
//
let result: XChartTooltip = undefined;
//
if (!isNullOrUndefined(this.tooltip)) {
//
result = await this.getValueAsync(this.tooltip);
//
result = await this.normalizeChartTooltip(result);
}
//
return result;
}
private async getPreparedXAxis(v?: XChartXAxis) {
//
let result: XChartXAxis = undefined;
//
if (!isNullOrUndefined(this.xAxis)) {
//
result = {
...(await this.getValueAsync(this.xAxis)),
};
}
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
...result,
};
}
//
if (!isNullOrUndefined(result)) {
//
result = {
...result,
};
//
if (!isNullOrUndefined(result.labels)) {
//
result.labels = {
...result.labels,
};
//
if (!isNullOrUndefined(result.labels.style)) {
//
result.labels.style = {
...result.labels.style,
colors: toArray(result.labels.style.colors).map((c) =>
this.normalizeColor(c),
),
};
}
}
//
if (!isNullOrUndefined(result.group)) {
//
result.group = {
...result.group,
};
//
if (!isNullOrUndefined(result.group.style)) {
//
result.group.style = {
...result.group.style,
colors: toArray(result.group.style.colors).map((x) =>
this.normalizeColor(x),
),
};
}
}
//
if (!isNullOrUndefined(result.axisBorder)) {
//
result.axisBorder = {
...result.axisBorder,
color: this.normalizeColor(result.axisBorder.color),
};
}
//
if (!isNullOrUndefined(result.axisTicks)) {
//
result.axisTicks = {
...result.axisTicks,
color: this.normalizeColor(result.axisTicks.color),
};
}
//
if (!isNullOrUndefined(result.title)) {
//
result.title = {
...result.title,
text: (await this.normalizeText(result.title.text)) as string,
};
//
if (!isNullOrUndefined(result.title.style)) {
//
result.title.style = {
...result.title.style,
color: this.normalizeColor(result.title.style.color),
};
}
}
//
if (!isNullOrUndefined(result.crosshairs)) {
//
result.crosshairs = {
...result.crosshairs,
};
//
if (!isNullOrUndefined(result.crosshairs.stroke)) {
//
result.crosshairs.stroke = {
...result.crosshairs.stroke,
color: this.normalizeColor(result.crosshairs.stroke.color),
};
}
//
if (!isNullOrUndefined(result.crosshairs.fill)) {
//
result.crosshairs.fill = {
...result.crosshairs.fill,
color: this.normalizeColor(result.crosshairs.fill.color),
};
//
if (!isNullOrUndefined(result.crosshairs.fill.gradient)) {
//
result.crosshairs.fill.gradient = {
...result.crosshairs.fill.gradient,
colorTo: this.normalizeColor(
result.crosshairs.fill.gradient.colorTo,
),
colorFrom: this.normalizeColor(
result.crosshairs.fill.gradient.colorFrom,
),
};
}
}
}
}
//
return result;
}
private async getPreparedYAxis(v?: XOneOrManyType<XChartYAxis>) {
//
let result: XChartYAxis[] = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = [...toArray(v)];
}
//
if (!isNullOrUndefined(this.yAxis)) {
//
result = [
...(this.hasChild(result) ? result : []),
...(await this.getArrayValueAsync(this.yAxis)),
];
//
const mappers = result.map(async (x) => {
//
if (!isNullOrUndefined(x.labels)) {
//
x.labels = {
...x.labels,
};
//
if (!isNullOrUndefined(x.labels.style)) {
//
x.labels.style = {
...x.labels.style,
colors: toArray(x.labels.style.colors).map((c) =>
this.normalizeColor(c),
),
};
}
}
//
if (!isNullOrUndefined(x.axisBorder)) {
//
x.axisBorder = {
...x.axisBorder,
color: this.normalizeColor(x.axisBorder.color),
};
}
//
if (!isNullOrUndefined(x.axisTicks)) {
//
x.axisTicks = {
...x.axisTicks,
color: this.normalizeColor(x.axisTicks.color),
};
}
//
if (!isNullOrUndefined(x.title)) {
//
x.title = {
...x.title,
text: (await this.normalizeText(x.title.text)) as string,
};
//
if (!isNullOrUndefined(x.title.style)) {
//
x.title.style = {
...x.title.style,
color: this.normalizeColor(x.title.style.color),
};
}
}
//
if (!isNullOrUndefined(x.crosshairs)) {
//
x.crosshairs = {
...x.crosshairs,
};
//
if (!isNullOrUndefined(x.crosshairs.stroke)) {
//
x.crosshairs.stroke = {
...x.crosshairs.stroke,
color: this.normalizeColor(x.crosshairs.stroke.color),
};
}
}
//
return x;
});
//
const items = await Promise.all(mappers);
//
result = [...result, ...items];
}
//
return result;
}
private async getPreparedAnnotations() {
//
let result: XChartAnnotations = undefined;
//
if (!isNullOrUndefined(this.annotations)) {
//
result = await this.getValueAsync(this.annotations);
//
// Try to Normalize Colors and Resources ...
//
// Texts ...
if (this.hasChild(result.texts)) {
//
const mappers = result.texts.map(async (x) => {
//
// Normalizing Text ...
x.text = (await this.normalizeText(x.text)) as string;
//
// Normalizing Colors ...
x.foreColor = this.normalizeColor(x.foreColor);
x.borderColor = this.normalizeColor(x.borderColor);
x.backgroundColor = this.normalizeColor(x.backgroundColor);
//
return x;
});
const items = await Promise.all(mappers);
result.texts = [...items];
}
//
// Y Axis ...
if (this.hasChild(result.yaxis)) {
//
const mappers = result.yaxis.map(async (x) => {
//
// Normalizing Text ...
x.label = await this.normalizeLabel(x.label);
//
// Normalizing Colors ...
x.fillColor = this.normalizeColor(x.fillColor);
x.borderColor = this.normalizeColor(x.borderColor);
//
return x;
});
const items = await Promise.all(mappers);
result.yaxis = [...items];
}
//
// X Axis ...
if (this.hasChild(result.xaxis)) {
//
const mappers = result.xaxis.map(async (x) => {
//
// Normalizing Text ...
x.label = await this.normalizeLabel(x.label);
//
// Normalizing Colors ...
x.fillColor = this.normalizeColor(x.fillColor);
x.borderColor = this.normalizeColor(x.borderColor);
//
return x;
});
const items = await Promise.all(mappers);
result.yaxis = [...items];
}
//
// Points ...
if (this.hasChild(result.points)) {
//
const mappers = result.points.map(async (x) => {
//
x.marker = this.normalizeMarker(x.marker);
x.label = await this.normalizeLabel(x.label);
x.tooltip = await this.normalizeTooltip(x.tooltip);
//
return x;
});
const items = await Promise.all(mappers);
result.points = [...items];
}
//
// Images ...
if (this.hasChild(result.images)) {
//
result.images = [...result.images];
}
}
//
return result;
}
//#endregion
//
//#region Normalizers ...
private async normalizeText(
v: XOneOrManyType<XResourceIdentifier>,
forceLocale: boolean = false,
) {
//
let result: XOneOrManyType<string> = undefined;
//
if (!isNullOrUndefined(v)) {
//
let items = toArray(v);
if (this.hasChild(items)) {
//
const mappers = items.map(async (x) => {
//
let r: string = await this.getResourceValueAsync(x);
//
if (forceLocale && !isNullOrEmptyString(r)) {
r = this.applyLocale(r);
}
//
return r;
});
//
var results = await Promise.all(mappers);
//
if (this.hasChild(results)) {
//
if (results.length == 1) {
result = results[0];
} else {
result = [...results];
}
}
}
}
//
return result;
}
private normalizeFill(v: XChartFill) {
//
if (!isNullOrUndefined(v)) {
//
v = {
...v,
colors: v?.colors.map((c) => this.normalizeColor(c)),
};
//
if (!isNullOrUndefined(v.gradient)) {
//
v.gradient = {
...v?.gradient,
gradientToColors: v?.gradient?.gradientToColors.map((c) =>
this.normalizeColor(c),
),
};
//
if (!isNullOrUndefined(v?.gradient?.colorStops)) {
//
const isMatrix =
Array.isArray(v?.gradient?.colorStops) &&
this.hasChild(v?.gradient?.colorStops) &&
Array.isArray(v?.gradient?.colorStops);
if (isMatrix) {
//
// Normalize Matrix ...
for (let c of v?.gradient?.colorStops as XChartColorStop[][]) {
//
c = [...c.map((x) => this.normalizeFillGradientColorStop(x))];
}
} else {
//
// Normalize Array ...
v.gradient.colorStops = [
...(v?.gradient?.colorStops as XChartColorStop[]).map((x) =>
this.normalizeFillGradientColorStop(x),
),
];
}
}
}
}
//
return v;
}
private normalizeColor(v: XColorIdentifier) {
//
let result = '';
//
if (!isNullOrUndefined(v)) {
//
const titleColorValue = getXColorValue(v);
//
result = titleColorValue || v;
}
//
return result;
}
private normalizeMarker(v: XChartMarkerAnnotations) {
//
let result: XChartMarkerAnnotations = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
fillColor: this.normalizeColor(v.fillColor),
strokeColor: this.normalizeColor(v.strokeColor),
};
}
//
return result;
}
private async normalizeStyle(v: XChartAnnotationStyle) {
//
let result: XChartAnnotationStyle = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
//
color: this.normalizeColor(v.color),
background: this.normalizeColor(v.background),
};
}
//
return result;
}
private async normalizeLabel(v: XChartAnnotationLabel) {
//
let result: XChartAnnotationLabel = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
//
text: await this.normalizeText(v.text),
//
style: await this.normalizeStyle(v.style),
//
borderColor: this.normalizeColor(v.borderColor),
};
}
//
return result;
}
private async normalizeTooltip(v: XChartTooltipAnnotations) {
//
let result: XChartTooltipAnnotations = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
//
text: await this.normalizeText(v.text),
};
}
//
return result;
}
private async normalizeChartTooltip(v: XChartTooltip) {
//
let result: XChartTooltip = undefined;
//
if (!isNullOrUndefined(v)) {
//
result = {
...v,
};
//
// Style ...
if (!isNullOrUndefined(v.style)) {
//
result.style = {
...v.style,
background: this.normalizeColor(v.style.background),
};
}
//
// Z ...
if (!isNullOrUndefined(v.z)) {
//
result.z = {
...v.z,
title: (await this.normalizeText(v.z.title)) as string,
};
}
//
// Marker ...
if (!isNullOrUndefined(v.marker)) {
//
result.marker = {
...v.marker,
fillColors: v.marker.fillColors?.map((fc) => this.normalizeColor(fc)),
};
}
}
//
return result;
}
private normalizeFillGradientColorStop(v: XChartColorStop) {
//
if (!isNullOrUndefined(v)) {
//
v = {
...v,
color: this.normalizeColor(v.color),
};
}
//
return v;
}
//#endregion
//#endregion //#endregion
} }
projects/x-framework-components/src/lib/x-chart/x-chart.typings.ts
+202 -249
View File
@@ -13,11 +13,11 @@ import {
import { import {
XStandardType, XStandardType,
isValueInEnum, isValueInEnum,
getXColorValue,
XOneOrManyType, XOneOrManyType,
XColorIdentifier, XColorIdentifier,
XResourceIdentifier, XResourceIdentifier,
XColorWithBrightness, XColorWithBrightness,
getXColorValue,
} from 'x-framework-core'; } from 'x-framework-core';
import { import {
XCardActionModel, XCardActionModel,
@@ -102,41 +102,6 @@ export type XChartXAxisAnnotations = XCahrtAxisBaseAnnotations & {
x2?: null | number | string; x2?: null | number | string;
}; };
export type XChartMarkerAnnotations = {
size?: number;
fillColor?: string;
strokeColor?: string;
strokeWidth?: number;
shape?: string;
offsetX?: number;
offsetY?: number;
cssClass?: string;
};
export type XChartTooltipAnnotations = {
enabled?: boolean;
/**
* Static tooltip content (HTML allowed; an array is joined with line
* breaks). Falls back to `label.text` when omitted.
*/
text?: string | string[];
/**
* Returns the tooltip markup (HTML). Takes precedence over `text`.
*/
formatter?: (opts: {
annotation: XChartPointAnnotations;
seriesIndex?: number;
id?: number | string;
w: any;
}) => string;
/**
* Tooltip theme. Falls back to the global `tooltip.theme`.
*/
theme?: 'light' | 'dark';
offsetX?: number;
offsetY?: number;
};
export type XChartPointAnnotations = { export type XChartPointAnnotations = {
id?: number | string; id?: number | string;
x?: number | string; x?: number | string;
@@ -151,7 +116,16 @@ export type XChartPointAnnotations = {
mouseEnter?: (annotation: XChartPointAnnotations, e: MouseEvent) => void; mouseEnter?: (annotation: XChartPointAnnotations, e: MouseEvent) => void;
mouseLeave?: (annotation: XChartPointAnnotations, e: MouseEvent) => void; mouseLeave?: (annotation: XChartPointAnnotations, e: MouseEvent) => void;
click?: (annotation: XChartPointAnnotations, e: MouseEvent) => void; click?: (annotation: XChartPointAnnotations, e: MouseEvent) => void;
marker?: XChartMarkerAnnotations; marker?: {
size?: number;
fillColor?: string;
strokeColor?: string;
strokeWidth?: number;
shape?: string;
offsetX?: number;
offsetY?: number;
cssClass?: string;
};
label?: XChartAnnotationLabel; label?: XChartAnnotationLabel;
image?: { image?: {
path?: string; path?: string;
@@ -164,7 +138,29 @@ export type XChartPointAnnotations = {
* Show a hover tooltip over the annotation marker, like a regular data * Show a hover tooltip over the annotation marker, like a regular data
* point. Useful for surfacing more detail than fits in the label. * point. Useful for surfacing more detail than fits in the label.
*/ */
tooltip?: XChartTooltipAnnotations; tooltip?: {
enabled?: boolean;
/**
* Static tooltip content (HTML allowed; an array is joined with line
* breaks). Falls back to `label.text` when omitted.
*/
text?: string | string[];
/**
* Returns the tooltip markup (HTML). Takes precedence over `text`.
*/
formatter?: (opts: {
annotation: XChartPointAnnotations;
seriesIndex?: number;
id?: number | string;
w: any;
}) => string;
/**
* Tooltip theme. Falls back to the global `tooltip.theme`.
*/
theme?: 'light' | 'dark';
offsetX?: number;
offsetY?: number;
};
/** /**
* Render arbitrary SVG markup at the annotation's position. Deprecated in * Render arbitrary SVG markup at the annotation's position. Deprecated in
* favor of `image`/`marker`, but still supported. * favor of `image`/`marker`, but still supported.
@@ -375,71 +371,71 @@ export type XChartAxisChartSeries = {
zIndex?: number; zIndex?: number;
parsing?: XChartParsing; parsing?: XChartParsing;
data: data:
| (number | null)[] | (number | null)[]
| { | {
/** /**
* A category label, a timestamp, or a `Date`. On a `datetime` axis all * A category label, a timestamp, or a `Date`. On a `datetime` axis all
* three keep millisecond resolution. * three keep millisecond resolution.
*/ */
x: string | number | Date; x: string | number | Date;
/** /**
* A plain value for most charts. For `candlestick`/`boxPlot`, the * A plain value for most charts. For `candlestick`/`boxPlot`, the
* summary array (`[O,H,L,C]` / `[min,Q1,median,Q3,max]`). For `violin`, an * summary array (`[O,H,L,C]` / `[min,Q1,median,Q3,max]`). For `violin`, an
* object carrying the precomputed density profile (`[value, weight]` pairs) * object carrying the precomputed density profile (`[value, weight]` pairs)
* plus the raw observations rendered as jitter. For a `scatter` strip plot * plus the raw observations rendered as jitter. For a `scatter` strip plot
* (`plotOptions.scatter.jitter`), the array of observations in this category. * (`plotOptions.scatter.jitter`), the array of observations in this category.
*/ */
y: y:
| number | number
| null | null
| number[] | number[]
| { density: [number, number][]; points?: number[] }; | { density: [number, number][]; points?: number[] };
/** /**
* Optional raw observations for a `boxPlot` data point, rendered as jitter * Optional raw observations for a `boxPlot` data point, rendered as jitter
* dots when `plotOptions.boxPlot.points.show` is enabled. * dots when `plotOptions.boxPlot.points.show` is enabled.
*/ */
points?: number[]; points?: number[];
fill?: XChartFill; fill?: XChartFill;
fillColor?: string; fillColor?: string;
strokeColor?: string; strokeColor?: string;
meta?: unknown; meta?: unknown;
/** /**
* A second metric that drives this point's COLOUR, independent of `y` * A second metric that drives this point's COLOUR, independent of `y`
* which drives its size (`treemap`). See * which drives its size (`treemap`). See
* `plotOptions.treemap.colorScale.colorValue` to read a different key. * `plotOptions.treemap.colorScale.colorValue` to read a different key.
*/ */
colorValue?: number; colorValue?: number;
/** /**
* Nested hierarchy: this point is a branch containing these children, * Nested hierarchy: this point is a branch containing these children,
* to any depth (`treemap`, `sunburst`). A branch normally omits `y` and * to any depth (`treemap`, `sunburst`). A branch normally omits `y` and
* takes the sum of its children instead. * takes the sum of its children instead.
*/ */
children?: XChartHierarchyNode[]; children?: XChartHierarchyNode[];
/** /**
* Drilldown target: the `id` of a `drilldown.series` entry. Clicking this * Drilldown target: the `id` of a `drilldown.series` entry. Clicking this
* point drills into that level. Requires the Drilldown feature. * point drills into that level. Requires the Drilldown feature.
*/ */
drilldown?: string | number; drilldown?: string | number;
goals?: { goals?: {
name?: string; name?: string;
value: number; value: number;
strokeHeight?: number; strokeHeight?: number;
strokeWidth?: number; strokeWidth?: number;
strokeColor?: string; strokeColor?: string;
strokeDashArray?: number; strokeDashArray?: number;
strokeLineCap?: 'butt' | 'square' | 'round'; strokeLineCap?: 'butt' | 'square' | 'round';
}[]; }[];
barHeightOffset?: number; barHeightOffset?: number;
columnWidthOffset?: number; columnWidthOffset?: number;
}[] }[]
| [number, number | null][] | [number, number | null][]
| [number, (number | null)[]][] | [number, (number | null)[]][]
| number[][] | number[][]
// A `children` hierarchy for the partition charts, where a branch carries no // A `children` hierarchy for the partition charts, where a branch carries no
// value of its own. Listed before the catch-all so authors get completion on // value of its own. Listed before the catch-all so authors get completion on
// the node shape instead of falling through to `Record<string, any>`. // the node shape instead of falling through to `Record<string, any>`.
| XChartHierarchyNode[] | XChartHierarchyNode[]
| Record<string, any>[]; | Record<string, any>[];
}[]; }[];
export type XChartNonAxisChartSeries = number[] | XChartAxisChartSeries; export type XChartNonAxisChartSeries = number[] | XChartAxisChartSeries;
@@ -936,11 +932,11 @@ export type XChartPlotOptions = {
* property, or an accessor to compute one. * property, or an accessor to compute one.
*/ */
colorValue?: colorValue?:
| string | string
| (( | ((
datum: any, datum: any,
opts: { seriesIndex: number; dataPointIndex: number; w: any }, opts: { seriesIndex: number; dataPointIndex: number; w: any },
) => number); ) => number);
/** /**
* Continuous interpolation between colour stops, for the metric above. * Continuous interpolation between colour stops, for the metric above.
* Active as soon as any datum carries a colour metric; `enabled: false` * Active as soon as any datum carries a colour metric; `enabled: false`
@@ -1073,13 +1069,13 @@ export type XChartPlotOptions = {
* 'custom': positions come from `positions`. * 'custom': positions come from `positions`.
*/ */
layout?: layout?:
| 'grouped' | 'grouped'
| 'packed' | 'packed'
| 'columns' | 'columns'
| 'grid' | 'grid'
| 'scatter' | 'scatter'
| 'arc' | 'arc'
| 'custom'; | 'custom';
/** /**
* `layout: 'custom'` only. The layout provider: either a function returning * `layout: 'custom'` only. The layout provider: either a function returning
* plot-pixel positions, or the name of one registered with * plot-pixel positions, or the name of one registered with
@@ -2107,19 +2103,19 @@ export interface XChartDrilldown {
/** Inline child levels referenced by data-point `drilldown` ids. */ /** Inline child levels referenced by data-point `drilldown` ids. */
series?: XChartDrilldownSeries[]; series?: XChartDrilldownSeries[];
breadcrumb?: breadcrumb?:
| false | false
| { | {
show?: boolean; show?: boolean;
position?: 'top-left' | 'top-right'; position?: 'top-left' | 'top-right';
separator?: string; separator?: string;
rootLabel?: string; rootLabel?: string;
offsetX?: number; offsetX?: number;
offsetY?: number; offsetY?: number;
formatter?( formatter?(
label: string, label: string,
opts: { index: number; depth: number }, opts: { index: number; depth: number },
): string; ): string;
}; };
animation?: { animation?: {
enabled?: boolean; enabled?: boolean;
/** /**
@@ -2168,11 +2164,11 @@ export interface XChartDrilldown {
* name, so the default ships no user-visible English. * name, so the default ships no user-visible English.
*/ */
loading?: loading?:
| false | false
| { | {
show?: boolean; show?: boolean;
text?: string; text?: string;
}; };
/** /**
* Cache levels resolved by `onDrillDown`, keyed by id, so drilling back down * Cache levels resolved by `onDrillDown`, keyed by id, so drilling back down
* a branch does not re-fetch. Default true. Clear it with the drilldown * a branch does not re-fetch. Default true. Clear it with the drilldown
@@ -2278,12 +2274,12 @@ export type XChartStates = {
export type XChartStroke = { export type XChartStroke = {
show?: boolean; show?: boolean;
curve?: curve?:
| 'smooth' | 'smooth'
| 'straight' | 'straight'
| 'stepline' | 'stepline'
| 'linestep' | 'linestep'
| 'monotoneCubic' | 'monotoneCubic'
| ('smooth' | 'straight' | 'stepline' | 'linestep' | 'monotoneCubic')[]; | ('smooth' | 'straight' | 'stepline' | 'linestep' | 'monotoneCubic')[];
lineCap?: 'butt' | 'square' | 'round'; lineCap?: 'butt' | 'square' | 'round';
colors?: string[]; colors?: string[];
width?: number | number[]; width?: number | number[];
@@ -2334,11 +2330,11 @@ export type XChartTheme = {
}; };
accessibility?: { accessibility?: {
colorBlindMode?: colorBlindMode?:
| 'deuteranopia' | 'deuteranopia'
| 'protanopia' | 'protanopia'
| 'tritanopia' | 'tritanopia'
| 'highContrast' | 'highContrast'
| ''; | '';
}; };
}; };
@@ -2367,14 +2363,14 @@ export type XChartTooltip = {
inverseOrder?: boolean; inverseOrder?: boolean;
arrow?: boolean; arrow?: boolean;
custom?: custom?:
| (( | ((
opts: XChartTooltipCustomOpts, opts: XChartTooltipCustomOpts,
) => string | number | Element | { nodeName: string }) ) => string | number | Element | { nodeName: string })
| Array< | Array<
( (
opts: XChartTooltipCustomOpts, opts: XChartTooltipCustomOpts,
) => string | number | Element | { nodeName: string } ) => string | number | Element | { nodeName: string }
>; >;
fillSeriesColor?: boolean; fillSeriesColor?: boolean;
theme?: 'light' | 'dark'; theme?: 'light' | 'dark';
cssClass?: string; cssClass?: string;
@@ -2412,8 +2408,6 @@ export type XChartTooltip = {
}; };
}; };
export type XChartColorType = Array<string | ((opts: XChartColorFormatterOpts) => string)>;
export interface XChartOptions { export interface XChartOptions {
annotations?: XChartAnnotations; annotations?: XChartAnnotations;
chart?: XChart; chart?: XChart;
@@ -2422,7 +2416,7 @@ export interface XChartOptions {
* named) or a function returning one per-datapoint. The list cycles when * named) or a function returning one per-datapoint. The list cycles when
* there are more series than colors. * there are more series than colors.
*/ */
colors?: XChartColorType; colors?: Array<string | ((opts: XChartColorFormatterOpts) => string)>;
dataLabels?: XChartDataLabels; dataLabels?: XChartDataLabels;
/** Opt-in drilldown navigation. Requires `import 'apexcharts/features/drilldown'`. */ /** Opt-in drilldown navigation. Requires `import 'apexcharts/features/drilldown'`. */
drilldown?: XChartDrilldown; drilldown?: XChartDrilldown;
@@ -2453,30 +2447,30 @@ export type XChart = {
width?: string | number; width?: string | number;
height?: string | number; height?: string | number;
type?: type?:
| 'line' | 'line'
| 'area' | 'area'
| 'bar' | 'bar'
| 'pie' | 'pie'
| 'donut' | 'donut'
| 'radialBar' | 'radialBar'
| 'scatter' | 'scatter'
| 'bubble' | 'bubble'
| 'heatmap' | 'heatmap'
| 'candlestick' | 'candlestick'
| 'boxPlot' | 'boxPlot'
| 'violin' | 'violin'
| 'histogram' | 'histogram'
| 'radar' | 'radar'
| 'polarArea' | 'polarArea'
| 'rangeBar' | 'rangeBar'
| 'rangeArea' | 'rangeArea'
| 'treemap' | 'treemap'
| 'unit' | 'unit'
| 'waffle' | 'waffle'
| 'sunburst' | 'sunburst'
| 'funnel' | 'funnel'
| 'pyramid' | 'pyramid'
| 'gauge'; | 'gauge';
/** /**
* Internal — populated when `type` is a first-class alias (`'funnel'`, * Internal — populated when `type` is a first-class alias (`'funnel'`,
* `'pyramid'`, `'gauge'`, `'waffle'`, `'histogram'`). The original requested * `'pyramid'`, `'gauge'`, `'waffle'`, `'histogram'`). The original requested
@@ -2759,9 +2753,9 @@ export type XChart = {
dimension?: (row: any) => any; dimension?: (row: any) => any;
/** FILTER mode: reduction over a bucket's rows. @default 'count' */ /** FILTER mode: reduction over a bucket's rows. @default 'count' */
reduce?: reduce?:
| 'count' | 'count'
| { sum?: string; avg?: string; min?: string; max?: string } | { sum?: string; avg?: string; min?: string; max?: string }
| ((rows: any[]) => number); | ((rows: any[]) => number);
/** /**
* FILTER mode: bucket kind. Else inferred: `bins` present => 'range', a * FILTER mode: bucket kind. Else inferred: `bins` present => 'range', a
* heatmap chart => 'matrix' (2D), otherwise 'category'. * heatmap chart => 'matrix' (2D), otherwise 'category'.
@@ -2879,21 +2873,21 @@ export type XChart = {
| 'yline' | 'yline'
| 'measure' | 'measure'
| { | {
id?: string; id?: string;
label?: string; label?: string;
icon?: string; icon?: string;
onClick?: ( onClick?: (
chart: ApexCharts, chart: ApexCharts,
context: { context: {
x: any; x: any;
y: any; y: any;
seriesIndex: number | null; seriesIndex: number | null;
dataPointIndex: number | null; dataPointIndex: number | null;
clientX: number; clientX: number;
clientY: number; clientY: number;
}, },
) => void; ) => void;
} }
>; >;
/** Override the built-in item labels. */ /** Override the built-in item labels. */
labels?: { labels?: {
@@ -3232,7 +3226,7 @@ export enum XChartAction {
export type XChartActionIdentifier = XChartAction | string; export type XChartActionIdentifier = XChartAction | string;
export interface XChartActionModel extends XBaseActionModel<XChartActionIdentifier> { } export interface XChartActionModel extends XBaseActionModel<XChartActionIdentifier> {}
export type XChartSeriesType = XChartAxisChartSeries | XChartNonAxisChartSeries; export type XChartSeriesType = XChartAxisChartSeries | XChartNonAxisChartSeries;
@@ -3331,16 +3325,7 @@ export interface IXChartContainer extends TXChartContainer {
type: XStandardType<XChartTypeIdentifier>; type: XStandardType<XChartTypeIdentifier>;
// //
stroke: XStandardType<XChartStroke>; colors: Array<string | ((opts: XChartColorFormatterOpts) => string)>;
colors: XStandardType<XChartColorType>;
//
xAxis: XStandardType<XChartXAxis>;
yAxis: XStandardType<XOneOrManyType<XChartYAxis>>;
//
tooltip: XStandardType<XChartTooltip>;
annotations: XStandardType<XChartAnnotations>;
// //
title: XStandardType<XResourceIdentifier>; title: XStandardType<XResourceIdentifier>;
@@ -3479,7 +3464,8 @@ export interface IXChartContainer extends TXChartContainer {
}) })
export class XChartContainer export class XChartContainer
extends XBaseContainer extends XBaseContainer
implements Readonly<IXChartContainer> { implements Readonly<IXChartContainer>
{
// //
readonly actionProvider = new Subject<XChartActionModel>(); readonly actionProvider = new Subject<XChartActionModel>();
readonly cssClass: XStandardType<XOneOrManyType<string>>; readonly cssClass: XStandardType<XOneOrManyType<string>>;
@@ -3489,22 +3475,12 @@ export class XChartContainer
readonly options: XStandardType<XChartOptions>; readonly options: XStandardType<XChartOptions>;
readonly zoomStep: XStandardType<number> = 0.125; readonly zoomStep: XStandardType<number> = 0.125;
readonly series: XStandardType<XChartSeriesType>; readonly series: XStandardType<XChartSeriesType>;
//
readonly stroke: XStandardType<XChartStroke> = {
width: 3,
curve: 'smooth'
};
readonly type: XStandardType<XChartTypeIdentifier> = XChartType.Line; readonly type: XStandardType<XChartTypeIdentifier> = XChartType.Line;
readonly colors: XStandardType<XChartColorType> = [getXColorValue(XColorWithBrightness.PrimaryShade)];
// //
readonly xAxis: XStandardType<XChartXAxis>; readonly colors: Array<
readonly yAxis: XStandardType<XOneOrManyType<XChartYAxis>>; string | ((opts: XChartColorFormatterOpts) => string)
> = [getXColorValue(XColorWithBrightness.PrimaryShade)];
//
readonly tooltip: XStandardType<XChartTooltip>;
readonly annotations: XStandardType<XChartAnnotations>;
// //
readonly title: XStandardType<XResourceIdentifier>; readonly title: XStandardType<XResourceIdentifier>;
@@ -3704,7 +3680,8 @@ export class XChartContainer
@Component({ template: `` }) @Component({ template: `` })
export abstract class XChartContainerComponent export abstract class XChartContainerComponent
extends XBaseContainerComponent extends XBaseContainerComponent
implements IXChartContainer { implements IXChartContainer
{
// //
//#region Props ... //#region Props ...
@Input() @Input()
@@ -3731,22 +3708,7 @@ export abstract class XChartContainerComponent
zoomStep: XStandardType<number> = this.propertyProvider.zoomStep; zoomStep: XStandardType<number> = this.propertyProvider.zoomStep;
@Input() @Input()
xAxis: XStandardType<XChartXAxis> = this.propertyProvider.xAxis; colors: Array<string | ((opts: XChartColorFormatterOpts) => string)> = this.propertyProvider.colors;
@Input()
yAxis: XStandardType<XOneOrManyType<XChartYAxis>> = this.propertyProvider.yAxis;
@Input()
colors: XStandardType<XChartColorType> = this.propertyProvider.colors;
@Input()
stroke: XStandardType<XChartStroke> = this.propertyProvider.stroke;
@Input()
tooltip: XStandardType<XChartTooltip> = this.propertyProvider.tooltip;
@Input()
annotations: XStandardType<XChartAnnotations> = this.propertyProvider.annotations;
@Input() @Input()
defaultActionBarItemColor: XStandardType<XColorIdentifier> = defaultActionBarItemColor: XStandardType<XColorIdentifier> =
@@ -4083,18 +4045,9 @@ export abstract class XChartContainerComponent
series: this.getValue(container ? container.series : this.series), series: this.getValue(container ? container.series : this.series),
options: this.getValue(container ? container.options : this.options), options: this.getValue(container ? container.options : this.options),
zoomStep: this.getValue(container ? container.zoomStep : this.zoomStep), zoomStep: this.getValue(container ? container.zoomStep : this.zoomStep),
//
stroke: this.getValue(container ? container.stroke : this.stroke),
colors: this.getArrayValue(container ? container.colors : this.colors),
// //
xAxis: this.getValue(container ? container.xAxis : this.xAxis), colors: this.getValue(container ? container.colors : this.colors),
yAxis: this.getValue(container ? container.yAxis : this.yAxis),
//
tooltip: this.getValue(container ? container.tooltip : this.tooltip),
annotations: this.getValue(container ? container.annotations : this.annotations),
// //
title: this.getValue(container ? container.title : this.title), title: this.getValue(container ? container.title : this.title),