npm - abstract-chart - Versions diffs - 7.0.0 → 7.1.0 - Mend

abstract-chart 7.0.0 → 7.1.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.

Files changed (7) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+## [7.1.0] - 2024-05-10
+### Added
+- Support for id parameter on chart objects to support abstract-image click functionality
+- Text color and text outline color in charts
+### Changed
+- Changed text growth direction from down/right to automatic for point and line labels to keep them inside the grid
 ## [7.0.0] - 2024-05-06
 ### Added

package/lib/chart.d.ts CHANGED Viewed

@@ -19,6 +19,8 @@ export interface Chart {
     readonly yGrid: ChartGrid;
     readonly font: string;
     readonly fontSize: number;
+    readonly textColor: AI.Color;
+    readonly textOutlineColor: AI.Color;
     readonly labelLayout: LabelLayout;
     readonly padding: Padding;
 }
@@ -41,11 +43,16 @@ export interface ChartPoint {
     readonly shape: ChartPointShape;
     readonly position: AI.Point;
     readonly color: AI.Color;
+    readonly strokeColor: AI.Color;
+    readonly strokeThickness: number;
     readonly size: AI.Size;
     readonly label: string;
     readonly xAxis: XAxis;
     readonly yAxis: YAxis;
     readonly fontSize?: number;
+    readonly textColor?: AI.Color;
+    readonly textOutlineColor?: AI.Color;
+    readonly id?: string;
 }
 export type ChartPointProps = Partial<ChartPoint>;
 export declare function createChartPoint(props?: ChartPointProps): ChartPoint;
@@ -57,12 +64,16 @@ export interface ChartLine {
     readonly xAxis: XAxis;
     readonly yAxis: YAxis;
     readonly fontSize?: number;
+    readonly textColor?: AI.Color;
+    readonly textOutlineColor?: AI.Color;
+    readonly id?: string;
 }
 export type ChartLineProps = Partial<ChartLine>;
 export declare function createChartLine(props: ChartLineProps): ChartLine;
 export interface ChartStackConfig {
     readonly color: AI.Color;
     readonly label: string;
+    readonly id?: string;
 }
 export type ChartStackConfigProps = Partial<ChartStackConfig>;
 export declare function createChartStackConfig(props: ChartStackConfigProps): ChartStackConfig;

package/lib/chart.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../src/chart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAK/B,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,KAAK,GAAG,QAAQ,CAAC;AAExD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACxC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,KAAK,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjF,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAExC,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK,~~CAwBpD~~;AAED,KAAK,OAAO,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhH,MAAM,MAAM,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;AACrC,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;AAErC,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE/D,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;~~CAC5B~~;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAElD,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,eAAe,GAAG,UAAU,~~CAWpE~~;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;~~CAC5B~~;AAED,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEhD,wBAAgB,eAAe,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,~~CAGhE~~;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;~~CACxB~~;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE9D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,CAGrF;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC;CAClD;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAElD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,CAGnE;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,EAAE,CAAC,KAAK,EACf,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,GACf,EAAE,CAAC,KAAK,GAAG,SAAS,CAWtB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,aAAa,CAsC1D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,SAAS,CAQrH;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,EAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,~~CAkDd~~;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,EAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,~~CAkDd~~;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,EAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,~~CAmDd~~;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,GAAG,SAAS,EAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,~~CAmDd~~;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,SAAS,CAsBhH;AA8CD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,SAAS,~~CA4BhH~~;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,SAAS,~~CA0BjH~~;~~AAuBD~~,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAC7C,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,IAAI,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7D,EAAE,CAAC,SAAS,CASd;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,MAAM,EACT,YAAY,EAAE,EAAE,CAAC,eAAe,EAChC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,CAoBd;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,yBAAyB,EAAE,EAAE,CAAC,eAAe,EAC7C,uBAAuB,EAAE,EAAE,CAAC,eAAe,EAC3C,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,CAiBd;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAC7C,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,IAAI,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC7D,EAAE,CAAC,SAAS,CAQd;AAED,wBAAgB,mBAAmB,CACjC,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,EAAE,CAAC,eAAe,EAClC,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAC7C,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,CAoBd;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,yBAAyB,EAAE,EAAE,CAAC,eAAe,EAC7C,uBAAuB,EAAE,EAAE,CAAC,eAAe,EAC3C,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,KAAK,EAAE,KAAK,GACX,EAAE,CAAC,SAAS,CAiBd"}
1	+ {"version":3,"file":"chart.d.ts","sourceRoot":"","sources":["../src/chart.ts"],"names":[],"mappings":"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"}

package/lib/chart.js CHANGED Viewed

@@ -28,7 +28,7 @@ const AI = __importStar(require("abstract-image"));
 const Axis = __importStar(require("./axis"));
 const ts_exhaustive_check_1 = require("ts-exhaustive-check");
 function createChart(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
     return {
         width: (_a = props.width) !== null && _a !== void 0 ? _a : 600,
         height: (_b = props.height) !== null && _b !== void 0 ? _b : 600,
@@ -42,26 +42,42 @@ function createChart(props) {
         backgroundColor: (_k = props.backgroundColor) !== null && _k !== void 0 ? _k : AI.white,
         font: (_l = props.font) !== null && _l !== void 0 ? _l : "Arial",
         fontSize: (_m = props.fontSize) !== null && _m !== void 0 ? _m : 12,
-        labelLayout: (_o = props.labelLayout) !== null && _o !== void 0 ? _o : "original",
+        textColor: (_o = props.textColor) !== null && _o !== void 0 ? _o : AI.black,
+        textOutlineColor: (_p = props.textOutlineColor) !== null && _p !== void 0 ? _p : AI.transparent,
+        labelLayout: (_q = props.labelLayout) !== null && _q !== void 0 ? _q : "original",
         padding: {
-            top: (_q = (_p = props.padding) === null || _p === void 0 ? void 0 : _p.top) !== null && _q !== void 0 ? _q : (props.xAxisTop !== undefined ? 45 : 10),
-            right: (_s = (_r = props.padding) === null || _r === void 0 ? void 0 : _r.right) !== null && _s !== void 0 ? _s : (props.yAxisRight !== undefined ? 45 : 10),
-            bottom: (_u = (_t = props.padding) === null || _t === void 0 ? void 0 : _t.bottom) !== null && _u !== void 0 ? _u : (props.xAxisBottom === undefined ? 10 : 45),
-            left: (_w = (_v = props.padding) === null || _v === void 0 ? void 0 : _v.left) !== null && _w !== void 0 ? _w : (!props.yAxisLeft === undefined ? 10 : 45),
+            top: (_s = (_r = props.padding) === null || _r === void 0 ? void 0 : _r.top) !== null && _s !== void 0 ? _s : (props.xAxisTop !== undefined ? 45 : 10),
+            right: (_u = (_t = props.padding) === null || _t === void 0 ? void 0 : _t.right) !== null && _u !== void 0 ? _u : (props.yAxisRight !== undefined ? 45 : 10),
+            bottom: (_w = (_v = props.padding) === null || _v === void 0 ? void 0 : _v.bottom) !== null && _w !== void 0 ? _w : (props.xAxisBottom === undefined ? 10 : 45),
+            left: (_y = (_x = props.padding) === null || _x === void 0 ? void 0 : _x.left) !== null && _y !== void 0 ? _y : (!props.yAxisLeft === undefined ? 10 : 45),
         },
-        xGrid: { color: (_y = (_x = props.xGrid) === null || _x === void 0 ? void 0 : _x.color) !== null && _y !== void 0 ? _y : AI.gray, thickness: (_0 = (_z = props.xGrid) === null || _z === void 0 ? void 0 : _z.thickness) !== null && _0 !== void 0 ? _0 : 1 },
-        yGrid: { color: (_2 = (_1 = props.yGrid) === null || _1 === void 0 ? void 0 : _1.color) !== null && _2 !== void 0 ? _2 : AI.gray, thickness: (_4 = (_3 = props.yGrid) === null || _3 === void 0 ? void 0 : _3.thickness) !== null && _4 !== void 0 ? _4 : 1 },
+        xGrid: { color: (_0 = (_z = props.xGrid) === null || _z === void 0 ? void 0 : _z.color) !== null && _0 !== void 0 ? _0 : AI.gray, thickness: (_2 = (_1 = props.xGrid) === null || _1 === void 0 ? void 0 : _1.thickness) !== null && _2 !== void 0 ? _2 : 1 },
+        yGrid: { color: (_4 = (_3 = props.yGrid) === null || _3 === void 0 ? void 0 : _3.color) !== null && _4 !== void 0 ? _4 : AI.gray, thickness: (_6 = (_5 = props.yGrid) === null || _5 === void 0 ? void 0 : _5.thickness) !== null && _6 !== void 0 ? _6 : 1 },
     };
 }
 exports.createChart = createChart;
 function createChartPoint(props) {
-    const { shape = "circle", position = AI.createPoint(0, 0), color = AI.black, size = AI.createSize(6, 6), label = "", xAxis = "bottom", yAxis = "left", } = props || {};
-    return { shape, position, color, size, label, xAxis, yAxis };
+    const { shape = "circle", position = AI.createPoint(0, 0), color = AI.black, strokeColor = AI.black, strokeThickness = 1, size = AI.createSize(6, 6), label = "", xAxis = "bottom", yAxis = "left", fontSize, textColor, textOutlineColor, id, } = props || {};
+    return {
+        shape,
+        position,
+        color,
+        strokeColor,
+        strokeThickness,
+        size,
+        label,
+        xAxis,
+        yAxis,
+        fontSize,
+        textColor,
+        textOutlineColor,
+        id,
+    };
 }
 exports.createChartPoint = createChartPoint;
 function createChartLine(props) {
-    const { points = [], color = AI.black, thickness = 1, label = "", xAxis = "bottom", yAxis = "left" } = props || {};
-    return { points, color, thickness, label, xAxis, yAxis };
+    const { points = [], color = AI.black, thickness = 1, label = "", xAxis = "bottom", yAxis = "left", fontSize, textColor, textOutlineColor, id, } = props || {};
+    return { points, color, thickness, label, xAxis, yAxis, fontSize, textColor, textOutlineColor, id };
 }
 exports.createChartLine = createChartLine;
 function createChartStackConfig(props) {
@@ -125,20 +141,20 @@ function generateBackground(xMin, xMax, yMin, yMax, chart) {
 }
 exports.generateBackground = generateBackground;
 function generateXAxisBottom(xNumTicks, axis, xMin, xMax, yMin, yMax, chart) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const components = Array();
     if (!axis) {
         return AI.createGroup("XAxisBottom", components);
     }
-    const axisLabelPosY = yMin + chart.padding.bottom - chart.fontSize;
+    const axisLabelPosY = yMin + chart.padding.bottom - ((_a = axis.axisFontSize) !== null && _a !== void 0 ? _a : chart.fontSize);
     const xTicks = Axis.getTicks(xNumTicks, axis);
     if (chart.xGrid) {
         components.push(generateXAxisGridLines(xMin, xMax, yMin + 10, yMax, xTicks, axis, chart.xGrid));
     }
-    components.push(AI.createLine({ x: xMin, y: yMin }, { x: xMax, y: yMin }, (_a = axis.axisColor) !== null && _a !== void 0 ? _a : AI.gray, (_b = axis.thickness) !== null && _b !== void 0 ? _b : 1), generateXAxisLabels(xMin, xMax, yMin + ((_c = axis.tickLabelDisp) !== null && _c !== void 0 ? _c : 10), "down", xTicks, axis, chart));
+    components.push(AI.createLine({ x: xMin, y: yMin }, { x: xMax, y: yMin }, (_b = axis.axisColor) !== null && _b !== void 0 ? _b : AI.gray, (_c = axis.thickness) !== null && _c !== void 0 ? _c : 1), generateXAxisLabels(xMin, xMax, yMin + ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 10), "down", xTicks, axis, chart));
     switch (chart.labelLayout) {
         case "original":
-            components.push(generateXAxisLabel(xMax + chart.padding.right, yMin + ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 10), "uniform", "down", axis, chart));
+            components.push(generateXAxisLabel(xMax + chart.padding.right, yMin + ((_e = axis.tickLabelDisp) !== null && _e !== void 0 ? _e : 10), "uniform", "down", axis, chart));
             break;
         case "end":
             components.push(generateXAxisLabel(xMax, axisLabelPosY, "left", "down", axis, chart));
@@ -153,20 +169,20 @@ function generateXAxisBottom(xNumTicks, axis, xMin, xMax, yMin, yMax, chart) {
 }
 exports.generateXAxisBottom = generateXAxisBottom;
 function generateXAxisTop(xNumTicks, axis, xMin, xMax, yMax, chart) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const components = Array();
     if (!axis) {
         return AI.createGroup("XAxisTop", components);
     }
-    const axisLabelPosY = yMax - chart.padding.top + chart.fontSize;
+    const axisLabelPosY = yMax - chart.padding.top + ((_a = axis.axisFontSize) !== null && _a !== void 0 ? _a : chart.fontSize);
     const xTicks = Axis.getTicks(xNumTicks, axis);
     if (chart.xGrid) {
         components.push(generateXAxisGridLines(xMin, xMax, yMax - 10, yMax, xTicks, axis, chart.xGrid));
     }
-    components.push(AI.createLine({ x: xMin, y: yMax }, { x: xMax, y: yMax }, (_a = axis.axisColor) !== null && _a !== void 0 ? _a : AI.gray, (_b = axis.thickness) !== null && _b !== void 0 ? _b : 1), generateXAxisLabels(xMin, xMax, yMax - ((_c = axis.tickLabelDisp) !== null && _c !== void 0 ? _c : 13), "up", xTicks, axis, chart));
+    components.push(AI.createLine({ x: xMin, y: yMax }, { x: xMax, y: yMax }, (_b = axis.axisColor) !== null && _b !== void 0 ? _b : AI.gray, (_c = axis.thickness) !== null && _c !== void 0 ? _c : 1), generateXAxisLabels(xMin, xMax, yMax - ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 13), "up", xTicks, axis, chart));
     switch (chart.labelLayout) {
         case "original":
-            components.push(generateXAxisLabel(xMax + 0.5 * chart.padding.right, yMax - ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 13), "uniform", "up", axis, chart));
+            components.push(generateXAxisLabel(xMax + 0.5 * chart.padding.right, yMax - ((_e = axis.tickLabelDisp) !== null && _e !== void 0 ? _e : 13), "uniform", "up", axis, chart));
             break;
         case "end":
             components.push(generateXAxisLabel(xMax, axisLabelPosY, "left", "up", axis, chart));
@@ -181,17 +197,17 @@ function generateXAxisTop(xNumTicks, axis, xMin, xMax, yMax, chart) {
 }
 exports.generateXAxisTop = generateXAxisTop;
 function generateYAxisLeft(yNumTicks, axis, xMin, xMax, yMin, yMax, chart) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const components = Array();
     if (!axis) {
         return AI.createGroup("YAxisLeft", components);
     }
-    const axisLabelPosX = xMin - chart.padding.left + chart.fontSize;
+    const axisLabelPosX = xMin - chart.padding.left + ((_a = axis.axisFontSize) !== null && _a !== void 0 ? _a : chart.fontSize);
     const yTicks = Axis.getTicks(yNumTicks, axis);
     if (chart.yGrid) {
         components.push(generateYAxisLines(xMin - 5, xMax, yMin, yMax, yTicks, axis, chart.yGrid));
     }
-    components.push(AI.createLine({ x: xMin, y: yMin }, { x: xMin, y: yMax }, (_a = axis.axisColor) !== null && _a !== void 0 ? _a : AI.gray, (_b = axis.thickness) !== null && _b !== void 0 ? _b : 1), generateYAxisLabels(xMin - ((_c = axis.tickLabelDisp) !== null && _c !== void 0 ? _c : 7), yMin, yMax, "left", yTicks, axis, chart));
+    components.push(AI.createLine({ x: xMin, y: yMin }, { x: xMin, y: yMax }, (_b = axis.axisColor) !== null && _b !== void 0 ? _b : AI.gray, (_c = axis.thickness) !== null && _c !== void 0 ? _c : 1), generateYAxisLabels(xMin - ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 7), yMin, yMax, "left", yTicks, axis, chart));
     switch (chart.labelLayout) {
         case "original":
             components.push(generateYAxisLabel(axisLabelPosX, yMax + 0.5 * chart.padding.bottom, "uniform", "up", axis, chart));
@@ -209,17 +225,17 @@ function generateYAxisLeft(yNumTicks, axis, xMin, xMax, yMin, yMax, chart) {
 }
 exports.generateYAxisLeft = generateYAxisLeft;
 function generateYAxisRight(yNumTicks, axis, xMax, yMin, yMax, chart) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const components = Array();
     if (!axis) {
         return AI.createGroup("YAxisRight", components);
     }
-    const axisLabelPosX = xMax + chart.padding.right - chart.fontSize;
+    const axisLabelPosX = xMax + chart.padding.right - ((_a = axis.axisFontSize) !== null && _a !== void 0 ? _a : chart.fontSize);
     const yTicks = Axis.getTicks(yNumTicks, axis);
     if (chart.yGrid) {
         components.push(generateYAxisLines(xMax - 5, xMax + 5, yMin, yMax, yTicks, axis, chart.yGrid));
     }
-    components.push(AI.createLine({ x: xMax, y: yMin }, { x: xMax, y: yMax }, (_a = axis.axisColor) !== null && _a !== void 0 ? _a : AI.gray, (_b = axis.thickness) !== null && _b !== void 0 ? _b : 1), generateYAxisLabels(xMax + ((_c = axis.tickLabelDisp) !== null && _c !== void 0 ? _c : 7), yMin, yMax, "right", yTicks, axis, chart));
+    components.push(AI.createLine({ x: xMax, y: yMin }, { x: xMax, y: yMax }, (_b = axis.axisColor) !== null && _b !== void 0 ? _b : AI.gray, (_c = axis.thickness) !== null && _c !== void 0 ? _c : 1), generateYAxisLabels(xMax + ((_d = axis.tickLabelDisp) !== null && _d !== void 0 ? _d : 7), yMin, yMax, "right", yTicks, axis, chart));
     switch (chart.labelLayout) {
         case "original":
             components.push(generateYAxisLabel(axisLabelPosX, yMax + 0.5 * chart.padding.bottom, "uniform", "up", axis, chart));
@@ -283,43 +299,57 @@ function generateUnsignedStack(xMin, xMax, yMin, yMax, chart) {
         const color = config.color;
         const points = [...line, ...lastLine.slice().reverse()];
         lastLine = line;
-        polygons.push(AI.createPolygon(points, color, 0, color));
+        polygons.push(AI.createPolygon(points, color, 0, color, config.id));
     });
     return AI.createGroup("Stack", polygons);
 }
 function generateLines(xMin, xMax, yMin, yMax, chart) {
     const lines = chart.chartLines.map((l) => {
-        var _a;
+        var _a, _b, _c;
         if (l.points.length < 2) {
             return AI.createGroup(l.label, []);
         }
         const xAxis = l.xAxis === "top" ? chart.xAxisTop : chart.xAxisBottom;
         const yAxis = l.yAxis === "right" ? chart.yAxisRight : chart.yAxisLeft;
         const points = l.points.map((p) => Axis.transformPoint(p, xMin, xMax, yMin, yMax, xAxis, yAxis));
-        return AI.createGroup(l.label, [
-            AI.createPolyLine(points, l.color, l.thickness),
-            AI.createText(points.at(-1), l.label, chart.font, (_a = l.fontSize) !== null && _a !== void 0 ? _a : chart.fontSize, AI.black, "normal", 0, "center", "right", "down", 0, AI.black, false),
-        ]);
+        const components = [];
+        const outlineColor = (_a = l.textOutlineColor) !== null && _a !== void 0 ? _a : chart.textOutlineColor;
+        const last = points.at(-1);
+        components.push(AI.createPolyLine(points, l.color, l.thickness), AI.createText(last, l.label, chart.font, (_b = l.fontSize) !== null && _b !== void 0 ? _b : chart.fontSize, (_c = l.textColor) !== null && _c !== void 0 ? _c : chart.textColor, "normal", 0, "center", textHorizontalGrowth(last.x, xMin, xMax), textVerticalGrowth(last.y, yMin, yMax), outlineColor !== AI.transparent ? 3 : 0, outlineColor, false));
+        if (l.id !== undefined) {
+            components.push(AI.createPolyLine(points, AI.transparent, l.thickness + 8, l.id));
+        }
+        return AI.createGroup(l.label, components);
     });
     return AI.createGroup("Lines", lines);
 }
 exports.generateLines = generateLines;
 function generatePoints(xMin, xMax, yMin, yMax, chart) {
     const points = chart.chartPoints.map((p) => {
-        var _a;
+        var _a, _b, _c;
         const xAxis = p.xAxis === "top" ? chart.xAxisTop : chart.xAxisBottom;
         const yAxis = p.yAxis === "right" ? chart.yAxisRight : chart.yAxisLeft;
         const position = Axis.transformPoint(p.position, xMin, xMax, yMin, yMax, xAxis, yAxis);
-        const shape = generatePointShape(p, position);
-        return AI.createGroup(p.label, [
-            shape,
-            AI.createText(position, p.label, chart.font, (_a = p.fontSize) !== null && _a !== void 0 ? _a : chart.fontSize, AI.black, "normal", 0, "center", "right", "down", 0, AI.black, false),
-        ]);
+        const outlineColor = (_a = p.textOutlineColor) !== null && _a !== void 0 ? _a : chart.textOutlineColor;
+        const components = [
+            generatePointShape(p, position, undefined),
+            AI.createText(position, p.label, chart.font, (_b = p.fontSize) !== null && _b !== void 0 ? _b : chart.fontSize, (_c = p.textColor) !== null && _c !== void 0 ? _c : chart.textColor, "normal", 0, "center", textHorizontalGrowth(position.x, xMin, xMax), textVerticalGrowth(position.y, yMin, yMax), outlineColor !== AI.transparent ? 3 : 0, outlineColor, false),
+        ];
+        if (p.id !== undefined) {
+            components.push(generatePointShape(Object.assign(Object.assign({}, p), { color: AI.transparent, strokeColor: AI.transparent, strokeThickness: 0, size: { width: p.size.width + 10, height: p.size.height + 10 } }), position, p.id));
+        }
+        return AI.createGroup(p.label, components);
     });
     return AI.createGroup("Points", points);
 }
 exports.generatePoints = generatePoints;
-function generatePointShape(p, position) {
+function textHorizontalGrowth(position, xMin, xMax) {
+    return position > (xMin + xMax) * 0.5 ? "left" : "right";
+}
+function textVerticalGrowth(position, yMin, yMax) {
+    return position < (yMin + yMax) * 0.5 ? "down" : "up";
+}
+function generatePointShape(p, position, id) {
     const halfWidth = p.size.width * 0.5;
     const halfHeight = p.size.height * 0.5;
     if (p.shape === "triangle") {
@@ -328,17 +358,17 @@ function generatePointShape(p, position) {
             AI.createPoint(position.x - halfWidth, position.y - halfHeight),
             AI.createPoint(position.x + halfWidth, position.y - halfHeight),
         ];
-        return AI.createPolygon(trianglePoints, AI.black, 1, p.color);
+        return AI.createPolygon(trianglePoints, p.strokeColor, p.strokeThickness, p.color, id);
     }
     else if (p.shape === "square") {
         const topLeft = AI.createPoint(position.x - halfWidth, position.y - halfHeight);
         const bottomRight = AI.createPoint(position.x + halfWidth, position.y + halfHeight);
-        return AI.createRectangle(topLeft, bottomRight, AI.black, 1, p.color);
+        return AI.createRectangle(topLeft, bottomRight, p.strokeColor, p.strokeThickness, p.color, id);
     }
     else {
         const topLeft = AI.createPoint(position.x - halfWidth, position.y - halfHeight);
         const bottomRight = AI.createPoint(position.x + halfWidth, position.y + halfHeight);
-        return AI.createEllipse(topLeft, bottomRight, AI.black, 1, p.color);
+        return AI.createEllipse(topLeft, bottomRight, p.strokeColor, p.strokeThickness, p.color, id);
     }
 }
 function generateXAxisGridLines(xMin, xMax, yMin, yMax, xTicks, xAxis, grid) {

package/lib/chart.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chart.js","sourceRoot":"","sources":["../src/chart.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"chart.js","sourceRoot":"","sources":["../src/chart.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "abstract-chart",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Drawing charts using multiple unit of measure axes as coordinate system",
   "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-chart",
   "main": "lib/index.js",
@@ -18,5 +18,5 @@
     "abstract-image": "^7.0.1",
     "ts-exhaustive-check": "^1.0.0"
   },
-  "gitHead": "0171adcd8cf6d50e0a2f00a9bb07e53c427f6fd4"
+  "gitHead": "5b63dcc2ecfc728a85beccb0fae5115c85b6841a"
 }

package/src/chart.ts CHANGED Viewed

@@ -23,6 +23,8 @@ export interface Chart {
   readonly yGrid: ChartGrid;
   readonly font: string;
   readonly fontSize: number;
+  readonly textColor: AI.Color;
+  readonly textOutlineColor: AI.Color;
   readonly labelLayout: LabelLayout;
   readonly padding: Padding;
 }
@@ -45,6 +47,8 @@ export function createChart(props: ChartProps): Chart {
     backgroundColor: props.backgroundColor ?? AI.white,
     font: props.font ?? "Arial",
     fontSize: props.fontSize ?? 12,
+    textColor: props.textColor ?? AI.black,
+    textOutlineColor: props.textOutlineColor ?? AI.transparent,
     labelLayout: props.labelLayout ?? "original",
     padding: {
       top: props.padding?.top ?? (props.xAxisTop !== undefined ? 45 : 10),
@@ -68,11 +72,16 @@ export interface ChartPoint {
   readonly shape: ChartPointShape;
   readonly position: AI.Point;
   readonly color: AI.Color;
+  readonly strokeColor: AI.Color;
+  readonly strokeThickness: number;
   readonly size: AI.Size;
   readonly label: string;
   readonly xAxis: XAxis;
   readonly yAxis: YAxis;
   readonly fontSize?: number;
+  readonly textColor?: AI.Color;
+  readonly textOutlineColor?: AI.Color;
+  readonly id?: string;
 }
 export type ChartPointProps = Partial<ChartPoint>;
@@ -82,12 +91,32 @@ export function createChartPoint(props?: ChartPointProps): ChartPoint {
     shape = "circle",
     position = AI.createPoint(0, 0),
     color = AI.black,
+    strokeColor = AI.black,
+    strokeThickness = 1,
     size = AI.createSize(6, 6),
     label = "",
     xAxis = "bottom",
     yAxis = "left",
+    fontSize,
+    textColor,
+    textOutlineColor,
+    id,
   } = props || {};
-  return { shape, position, color, size, label, xAxis, yAxis };
+  return {
+    shape,
+    position,
+    color,
+    strokeColor,
+    strokeThickness,
+    size,
+    label,
+    xAxis,
+    yAxis,
+    fontSize,
+    textColor,
+    textOutlineColor,
+    id,
+  };
 }
 export interface ChartLine {
@@ -98,18 +127,33 @@ export interface ChartLine {
   readonly xAxis: XAxis;
   readonly yAxis: YAxis;
   readonly fontSize?: number;
+  readonly textColor?: AI.Color;
+  readonly textOutlineColor?: AI.Color;
+  readonly id?: string;
 }
 export type ChartLineProps = Partial<ChartLine>;
 export function createChartLine(props: ChartLineProps): ChartLine {
-  const { points = [], color = AI.black, thickness = 1, label = "", xAxis = "bottom", yAxis = "left" } = props || {};
-  return { points, color, thickness, label, xAxis, yAxis };
+  const {
+    points = [],
+    color = AI.black,
+    thickness = 1,
+    label = "",
+    xAxis = "bottom",
+    yAxis = "left",
+    fontSize,
+    textColor,
+    textOutlineColor,
+    id,
+  } = props || {};
+  return { points, color, thickness, label, xAxis, yAxis, fontSize, textColor, textOutlineColor, id };
 }
 export interface ChartStackConfig {
   readonly color: AI.Color;
   readonly label: string;
+  readonly id?: string;
 }
 export type ChartStackConfigProps = Partial<ChartStackConfig>;
@@ -220,7 +264,7 @@ export function generateXAxisBottom(
   if (!axis) {
     return AI.createGroup("XAxisBottom", components);
   }
-  const axisLabelPosY = yMin + chart.padding.bottom - chart.fontSize;
+  const axisLabelPosY = yMin + chart.padding.bottom - (axis.axisFontSize ?? chart.fontSize);
   const xTicks = Axis.getTicks(xNumTicks, axis);
   if (chart.xGrid) {
     components.push(generateXAxisGridLines(xMin, xMax, yMin + 10, yMax, xTicks, axis, chart.xGrid));
@@ -268,7 +312,7 @@ export function generateXAxisTop(
   if (!axis) {
     return AI.createGroup("XAxisTop", components);
   }
-  const axisLabelPosY = yMax - chart.padding.top + chart.fontSize;
+  const axisLabelPosY = yMax - chart.padding.top + (axis.axisFontSize ?? chart.fontSize);
   const xTicks = Axis.getTicks(xNumTicks, axis);
   if (chart.xGrid) {
     components.push(generateXAxisGridLines(xMin, xMax, yMax - 10, yMax, xTicks, axis, chart.xGrid));
@@ -317,7 +361,7 @@ export function generateYAxisLeft(
   if (!axis) {
     return AI.createGroup("YAxisLeft", components);
   }
-  const axisLabelPosX = xMin - chart.padding.left + chart.fontSize;
+  const axisLabelPosX = xMin - chart.padding.left + (axis.axisFontSize ?? chart.fontSize);
   const yTicks = Axis.getTicks(yNumTicks, axis);
   if (chart.yGrid) {
@@ -359,7 +403,7 @@ export function generateYAxisRight(
   if (!axis) {
     return AI.createGroup("YAxisRight", components);
   }
-  const axisLabelPosX = xMax + chart.padding.right - chart.fontSize;
+  const axisLabelPosX = xMax + chart.padding.right - (axis.axisFontSize ?? chart.fontSize);
   const yTicks = Axis.getTicks(yNumTicks, axis);
   if (chart.yGrid) {
@@ -451,7 +495,7 @@ function generateUnsignedStack(xMin: number, xMax: number, yMin: number, yMax: n
     const color = config.color;
     const points = [...line, ...lastLine.slice().reverse()];
     lastLine = line;
-    polygons.push(AI.createPolygon(points, color, 0, color));
+    polygons.push(AI.createPolygon(points, color, 0, color, config.id));
   });
   return AI.createGroup("Stack", polygons);
@@ -465,24 +509,31 @@ export function generateLines(xMin: number, xMax: number, yMin: number, yMax: nu
     const xAxis = l.xAxis === "top" ? chart.xAxisTop : chart.xAxisBottom;
     const yAxis = l.yAxis === "right" ? chart.yAxisRight : chart.yAxisLeft;
     const points = l.points.map((p) => Axis.transformPoint(p, xMin, xMax, yMin, yMax, xAxis, yAxis));
-    return AI.createGroup(l.label, [
+    const components = [];
+    const outlineColor = l.textOutlineColor ?? chart.textOutlineColor;
+    const last = points.at(-1)!;
+    components.push(
       AI.createPolyLine(points, l.color, l.thickness),
       AI.createText(
-        points.at(-1)!,
+        last,
         l.label,
         chart.font,
         l.fontSize ?? chart.fontSize,
-        AI.black,
+        l.textColor ?? chart.textColor,
         "normal",
         0,
         "center",
-        "right",
-        "down",
-        0,
-        AI.black,
+        textHorizontalGrowth(last.x, xMin, xMax),
+        textVerticalGrowth(last.y, yMin, yMax),
+        outlineColor !== AI.transparent ? 3 : 0,
+        outlineColor,
         false
-      ),
-    ]);
+      )
+    );
+    if (l.id !== undefined) {
+      components.push(AI.createPolyLine(points, AI.transparent, l.thickness + 8, l.id));
+    }
+    return AI.createGroup(l.label, components);
   });
   return AI.createGroup("Lines", lines);
 }
@@ -492,30 +543,54 @@ export function generatePoints(xMin: number, xMax: number, yMin: number, yMax: n
     const xAxis = p.xAxis === "top" ? chart.xAxisTop : chart.xAxisBottom;
     const yAxis = p.yAxis === "right" ? chart.yAxisRight : chart.yAxisLeft;
     const position = Axis.transformPoint(p.position, xMin, xMax, yMin, yMax, xAxis, yAxis);
-    const shape = generatePointShape(p, position);
-    return AI.createGroup(p.label, [
-      shape,
+    const outlineColor = p.textOutlineColor ?? chart.textOutlineColor;
+    const components = [
+      generatePointShape(p, position, undefined),
       AI.createText(
         position,
         p.label,
         chart.font,
         p.fontSize ?? chart.fontSize,
-        AI.black,
+        p.textColor ?? chart.textColor,
         "normal",
         0,
         "center",
-        "right",
-        "down",
-        0,
-        AI.black,
+        textHorizontalGrowth(position.x, xMin, xMax),
+        textVerticalGrowth(position.y, yMin, yMax),
+        outlineColor !== AI.transparent ? 3 : 0,
+        outlineColor,
         false
       ),
-    ]);
+    ];
+    if (p.id !== undefined) {
+      components.push(
+        generatePointShape(
+          {
+            ...p,
+            color: AI.transparent,
+            strokeColor: AI.transparent,
+            strokeThickness: 0,
+            size: { width: p.size.width + 10, height: p.size.height + 10 },
+          },
+          position,
+          p.id
+        )
+      );
+    }
+    return AI.createGroup(p.label, components);
   });
   return AI.createGroup("Points", points);
 }
-function generatePointShape(p: ChartPoint, position: AI.Point): AI.Component {
+function textHorizontalGrowth(position: number, xMin: number, xMax: number): AI.GrowthDirection {
+  return position > (xMin + xMax) * 0.5 ? "left" : "right";
+}
+function textVerticalGrowth(position: number, yMin: number, yMax: number): AI.GrowthDirection {
+  return position < (yMin + yMax) * 0.5 ? "down" : "up";
+}
+function generatePointShape(p: ChartPoint, position: AI.Point, id: string | undefined): AI.Component {
   const halfWidth = p.size.width * 0.5;
   const halfHeight = p.size.height * 0.5;
   if (p.shape === "triangle") {
@@ -524,15 +599,15 @@ function generatePointShape(p: ChartPoint, position: AI.Point): AI.Component {
       AI.createPoint(position.x - halfWidth, position.y - halfHeight),
       AI.createPoint(position.x + halfWidth, position.y - halfHeight),
     ];
-    return AI.createPolygon(trianglePoints, AI.black, 1, p.color);
+    return AI.createPolygon(trianglePoints, p.strokeColor, p.strokeThickness, p.color, id);
   } else if (p.shape === "square") {
     const topLeft = AI.createPoint(position.x - halfWidth, position.y - halfHeight);
     const bottomRight = AI.createPoint(position.x + halfWidth, position.y + halfHeight);
-    return AI.createRectangle(topLeft, bottomRight, AI.black, 1, p.color);
+    return AI.createRectangle(topLeft, bottomRight, p.strokeColor, p.strokeThickness, p.color, id);
   } else {
     const topLeft = AI.createPoint(position.x - halfWidth, position.y - halfHeight);
     const bottomRight = AI.createPoint(position.x + halfWidth, position.y + halfHeight);
-    return AI.createEllipse(topLeft, bottomRight, AI.black, 1, p.color);
+    return AI.createEllipse(topLeft, bottomRight, p.strokeColor, p.strokeThickness, p.color, id);
   }
 }