@axdspub/axiom-charts 1.0.7 → 1.0.9

package/library/Libraries/axiom/index.js

@@ -4085,7 +4085,7 @@ class AxiomScatter extends AxiomPlotRoot {
                     const radius = r !== undefined ? +r : defaultPointW;
                     ctx.arc(xPosition(d), yPosition(d), radius, 0, 2 * Math.PI);
                     if (colorAccessor !== undefined) {
-                        const color = colorAccessor(d);
+                        const color = colorAccessor.apply(this, [d]);
                         if (color !== undefined && color !== null) {
                             ctx.fillStyle = color.toString();
                         }
@@ -4094,7 +4094,7 @@ class AxiomScatter extends AxiomPlotRoot {
                         }
                     }
                     if (strokeColorAccessor !== undefined) {
-                        const sc = strokeColorAccessor(d);
+                        const sc = strokeColorAccessor.apply(this, [d]);
                         if (sc !== undefined && sc !== null) {
                             ctx.strokeStyle = sc.toString();
                         }
@@ -4103,7 +4103,7 @@ class AxiomScatter extends AxiomPlotRoot {
                         }
                     }
                     if (strokeWidthAccessor !== undefined) {
-                        const sw = strokeWidthAccessor(d);
+                        const sw = strokeWidthAccessor.apply(this, [d]);
                         if (sw !== undefined && sw !== null) {
                             ctx.lineWidth = +sw;
                         }
@@ -4228,6 +4228,8 @@ class AxiomBar extends AxiomPlotRoot {
                     return p === undefined ? 0 : (p + offset);
                 };
             };
+            const xDataSpan = Math.abs(+xAxisScale.domain[1] - +xAxisScale.domain[0]);
+            const yDataSpan = Math.abs(+yAxisScale.domain[1] - +yAxisScale.domain[0]);
             ctx.save();
             ctx.beginPath();
             ctx.rect(this.chart.settings.margin.left, this.chart.settings.margin.top, xScale.range()[1], yScale.range()[0]);
@@ -4265,16 +4267,21 @@ class AxiomBar extends AxiomPlotRoot {
             const barSpacePercent = 20;
             const visibleData = parsedData.filter(row => {
                 return isVert
-                    ? +rect.y(row) >= yAxisScale.range[0] && +rect.y(row) <= yAxisScale.range[1]
+                    ? +rect.y(row) >= yAxisScale.range[1] && +rect.y(row) <= yAxisScale.range[0]
                     : +rect.x(row) >= (xAxisScale.range[0] + offset.x) && +rect.x(row) <= (xAxisScale.range[1] + offset.x);
             });
             const colorAccessor = (_o = this.getStringAccessorAtAxis('color')) !== null && _o !== void 0 ? _o : this.getStringAccessorAtAxis('fill');
             const strokeWidthAccessor = this.getAccessorAtAxis('strokeWidth');
             const strokeColorAccessor = this.getStringAccessorAtAxis('strokeColor');
             const sizeAccessor = this.getAccessorAtAxis('size');
-            const defaultBarSize = (_q = (_p = this.style) === null || _p === void 0 ? void 0 : _p.barSize) !== null && _q !== void 0 ? _q : Math.round(((isVert ? height : width) - visibleData.length) / visibleData.length);
+            const dataSpanAccessor = this.getAccessorAtAxis('dataSpan');
+            const sizeOfVisibleData = visibleData.length > 0 ?
+                isVert
+                    ? rect.y(visibleData[0]) - rect.y(visibleData[visibleData.length - 1])
+                    : rect.x(visibleData[visibleData.length - 1]) - rect.x(visibleData[0])
+                : 1;
+            const defaultBarSize = (_q = (_p = this.style) === null || _p === void 0 ? void 0 : _p.barSize) !== null && _q !== void 0 ? _q : Math.round((sizeOfVisibleData - visibleData.length) / visibleData.length);
             const defaultFill = style.fill !== undefined ? style.fill : '#EDEDED';
-            const defaultSize = Math.max(1, defaultBarSize - defaultBarSize * (barSpacePercent / 100));
             const defaultStrokeWidth = style.strokeWidth !== undefined ? style.strokeWidth : 0;
             const defaultStrokeColor = style.strokeColor !== undefined ? style.strokeColor : '#FFF';
             ctx.fillStyle = defaultFill;
@@ -4282,15 +4289,61 @@ class AxiomBar extends AxiomPlotRoot {
             ctx.lineWidth = defaultStrokeWidth;
             ctx.beginPath();
             visibleData.forEach((row, i) => {
-                const s = sizeAccessor === null || sizeAccessor === void 0 ? void 0 : sizeAccessor(row);
-                const size = s !== undefined && s !== null ? +s : defaultSize;
+                var _a, _b;
+                const s = (_a = sizeAccessor === null || sizeAccessor === void 0 ? void 0 : sizeAccessor.apply) === null || _a === void 0 ? void 0 : _a.call(sizeAccessor, this, [row]);
+                const ds = s === undefined && dataSpanAccessor !== undefined
+                    ? (_b = dataSpanAccessor === null || dataSpanAccessor === void 0 ? void 0 : dataSpanAccessor.apply) === null || _b === void 0 ? void 0 : _b.call(dataSpanAccessor, this, [row])
+                    : undefined;
+                const dataSpanLength = ds !== undefined
+                    ? isVert
+                        ? yDataSpan / +ds
+                        : xDataSpan / +ds
+                    : undefined;
+                const dataSize = dataSpanLength !== undefined
+                    ? Math.round(((isVert ? height : width) - dataSpanLength) / dataSpanLength)
+                    : undefined;
+                const sizeWithoutSpace = s !== undefined && s !== null
+                    ? +s
+                    : dataSize !== undefined
+                        ? dataSize
+                        : defaultBarSize;
+                const size = Math.max(1, sizeWithoutSpace - sizeWithoutSpace * (barSpacePercent / 100));
+                if (colorAccessor !== undefined) {
+                    const color = colorAccessor.apply(this, [row]);
+                    if (color !== undefined && color !== null) {
+                        ctx.fillStyle = color.toString();
+                    }
+                    else if (ctx.fillStyle !== defaultFill) {
+                        ctx.fillStyle = defaultFill;
+                    }
+                }
+                if (strokeColorAccessor !== undefined) {
+                    const sc = strokeColorAccessor.apply(this, [row]);
+                    if (sc !== undefined && sc !== null) {
+                        ctx.strokeStyle = sc.toString();
+                    }
+                    else if (ctx.strokeStyle !== defaultStrokeColor) {
+                        ctx.strokeStyle = defaultStrokeColor;
+                    }
+                }
+                if (strokeWidthAccessor !== undefined) {
+                    const sw = strokeWidthAccessor.apply(this, [row]);
+                    if (sw !== undefined && sw !== null) {
+                        ctx.lineWidth = +sw;
+                    }
+                    else if (ctx.lineWidth !== defaultStrokeWidth) {
+                        ctx.lineWidth = defaultStrokeWidth;
+                    }
+                }
                 if (isVert) {
                     const xVal = rect.x0(row);
                     if (isDefined(row) && xVal !== undefined && xVal !== null) {
                         const xW = Math.abs(rect.x1(row) - xVal);
                         const yVal = rect.y(row);
                         const yH = size;
-                        ctx.rect(xVal, yVal, xW, yH);
+                        ctx.fillRect(xVal, yVal, xW, yH);
+                        ctx.strokeRect(xVal, yVal, xW, yH);
+                        //ctx.rect(xVal, yVal, xW, yH)
                     }
                 }
                 else {
@@ -4298,36 +4351,9 @@ class AxiomBar extends AxiomPlotRoot {
                     const y1 = rect.y1(row);
                     if (isDefined(row) && y0 !== undefined && y1 !== undefined) {
                         // make sure bar doesn't go outside of chart area
-                        const xVal = rect.x(row) - defaultSize / 2;
+                        const xVal = rect.x(row) - size / 2;
                         // add per feature style option
                         // ctx.fillStyle = i % 2 === 0 ? '#FF0000' : '#006699'
-                        if (colorAccessor !== undefined) {
-                            const color = colorAccessor(row);
-                            if (color !== undefined && color !== null) {
-                                ctx.fillStyle = color.toString();
-                            }
-                            else if (ctx.fillStyle !== defaultFill) {
-                                ctx.fillStyle = defaultFill;
-                            }
-                        }
-                        if (strokeColorAccessor !== undefined) {
-                            const sc = strokeColorAccessor(row);
-                            if (sc !== undefined && sc !== null) {
-                                ctx.strokeStyle = sc.toString();
-                            }
-                            else if (ctx.strokeStyle !== defaultStrokeColor) {
-                                ctx.strokeStyle = defaultStrokeColor;
-                            }
-                        }
-                        if (strokeWidthAccessor !== undefined) {
-                            const sw = strokeWidthAccessor(row);
-                            if (sw !== undefined && sw !== null) {
-                                ctx.lineWidth = +sw;
-                            }
-                            else if (ctx.lineWidth !== defaultStrokeWidth) {
-                                ctx.lineWidth = defaultStrokeWidth;
-                            }
-                        }
                         ctx.fillRect(xVal, y0, size, y1 - y0);
                         ctx.strokeRect(xVal, y0, size, y1 - y0);
                     }