@nativescript-community/ui-chart 1.2.36 → 2.0.1

package/package.json

@@ -1,21 +1,31 @@
 {
     "name": "@nativescript-community/ui-chart",
-    "version": "1.2.36",
-    "sideEffects": false,
+    "version": "2.0.1",
     "description": "A powerful chart / graph plugin, supporting line, bar, pie, radar, bubble, and candlestick charts as well as scaling, panning and animations.",
+    "main": "./index",
+    "sideEffects": false,
+    "typings": "./index.d.ts",
+    "nativescript": {
+        "platforms": {
+            "android": "6.0.0",
+            "ios": "6.0.0"
+        }
+    },
     "keywords": [
         "NativeScript",
         "JavaScript",
         "Android",
         "iOS",
-        "Vue"
+        "chart",
+        "NativeScript UI",
+        "nativescript-community",
+        "Angular",
+        "Vue",
+        "Svelte",
+        "React",
+        "preview|https://raw.githubusercontent.com/nativescript-community/ui-chart/master/images/example1.gif|Example1",
+        "preview|https://raw.githubusercontent.com/nativescript-community/ui-chart/master/images/example2.gif|Example2"
     ],
-    "nativescript": {
-        "platforms": {
-            "android": "6.5.2",
-            "ios": "6.5.2"
-        }
-    },
     "author": {
         "name": "Martin Guillon",
         "email": "martin@akylas.fr"
@@ -29,15 +39,13 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "main": "charts/index.js",
-    "typings": "charts/index.d.ts",
     "dependencies": {
+        "@nativescript-community/additween": "^4.0.5",
         "@nativescript-community/arraybuffers": "^1.1.5",
-        "@nativescript-community/gesturehandler": "^2.0.23",
-        "@nativescript-community/ui-canvas": "^4.6.13",
-        "additween": "^3.0.0",
+        "@nativescript-community/gesturehandler": "^2.0.31",
+        "@nativescript-community/ui-canvas": "^4.6.21",
         "downsample": "^1.4.0",
         "number-format.js": "^2.0.9"
     },
-    "gitHead": "03e0d6b4bfc69ab3ed51c3df87483b73b8f38fda"
+    "gitHead": "c62dd8e371462025130668ef3fa4a1bbcd393e82"
 }

package/renderer/AxisRenderer.d.ts

@@ -5,38 +5,97 @@ import { Transformer } from '../utils/Transformer';
 import { ViewPortHandler } from '../utils/ViewPortHandler';
 import { BaseCustomRenderer } from './DataRenderer';
 import { Renderer } from './Renderer';
-export declare type CustomRendererGridLineFunction = (c: Canvas, renderer: AxisRenderer, rect: RectF, x: any, y: any, axisValue: any, paint: Paint) => void;
-export declare type CustomRendererLimitLineFunction = (c: Canvas, renderer: AxisRenderer, limitLine: LimitLine, rect: RectF, x: number, paint: Paint) => void;
-export declare type CustomRendererLabelFunction = (c: Canvas, renderer: AxisRenderer, text: any, x: any, y: any, paint: Paint, anchor: any, angleDegrees: any) => void;
-export declare type CustomRendererTickFunction = (c: Canvas, renderer: AxisRenderer, startX: number, startY: number, stopX: number, stopY: number, paint: Paint) => void;
+import { MPPointF } from '../utils/MPPointF';
+export type CustomRendererGridLineFunction = (c: Canvas, axis: AxisBase, rect: RectF, x: any, y: any, axisValue: any, paint: Paint) => void;
+export type CustomRendererLimitLineFunction = (c: Canvas, axis: AxisBase, limitLine: LimitLine, rect: RectF, x: number, paint: Paint) => void;
+export type CustomRendererLabelFunction = (c: Canvas, axis: AxisBase, text: string, x: number, y: number, paint: Paint, anchor?: MPPointF, angleDegrees?: number) => void;
+export type CustomRendererTickFunction = (c: Canvas, renderer: AxisRenderer, startX: number, startY: number, stopX: number, stopY: number, paint: Paint) => void;
 export interface CustomRenderer extends BaseCustomRenderer {
     drawLabel?: CustomRendererLabelFunction;
     drawGridLine?: CustomRendererGridLineFunction;
     drawLimitLine?: CustomRendererLimitLineFunction;
-    drawMarkTicket?: CustomRendererTickFunction;
+    drawMarkTick?: CustomRendererTickFunction;
 }
+/**
+ * Baseclass of all axis renderers.
+ *
+
+ */
 export declare abstract class AxisRenderer extends Renderer {
+    /** base axis this axis renderer works with */
     protected mAxis: AxisBase;
-    protected mTrans: Transformer;
+    /** transformer to transform values to screen pixels and return */
+    readonly transformer: Transformer;
+    /**
+     * palet object for the grid lines
+     */
     protected mGridPaint: Paint;
+    /**
+     * palet for the x-label values
+     */
     protected mAxisLabelPaint: Paint;
+    /**
+     * palet for the line surrounding the chart
+     */
     protected mAxisLinePaint: Paint;
+    /**
+     * palet used for the limit lines
+     */
     protected mLimitLinePaint: Paint;
     constructor(viewPortHandler: ViewPortHandler, trans: Transformer, axis: AxisBase);
+    /**
+     * Returns the Paint object that is used for drawing the axis-line that goes
+     * alongside the axis.
+     */
     get axisLinePaint(): Paint;
     get limitLinePaint(): Paint;
+    /**
+     * Returns the Paint object used for drawing the axis (labels).
+     */
     get axisLabelsPaint(): Paint;
     protected createAxisLabelsPaint(): Paint;
+    /**
+     * Returns the Paint object that is used for drawing the grid-lines of the
+     * axis.
+     */
     get gridPaint(): Paint;
-    getTransformer(): Transformer;
     getCurrentMinMax(min?: any, max?: any, inverted?: any): {
         min: any;
         max: any;
     };
+    /**
+     * Computes the axis values.
+     *
+     * @param min - the minimum value in the data object for this axis
+     * @param max - the maximum value in the data object for this axis
+     */
     computeAxis(min: any, max: any, inverted: any): void;
+    /**
+     * Sets up the axis values. Computes the desired number of labels between the two given extremes.
+     */
     protected computeAxisValues(min: any, max: any): void;
+    /**
+     * Draws the axis labels to the screen.
+     *
+     * @param c
+     */
     abstract renderAxisLabels(c: Canvas): any;
+    /**
+     * Draws the grid lines belonging to the axis.
+     *
+     * @param c
+     */
     abstract renderGridLines(c: Canvas): any;
+    /**
+     * Draws the line that goes alongside the axis.
+     *
+     * @param c
+     */
     abstract renderAxisLine(c: Canvas): any;
+    /**
+     * Draws the LimitLines associated with this axis to the screen.
+     *
+     * @param c
+     */
     abstract renderLimitLines(c: Canvas): any;
 }

package/renderer/AxisRenderer.js

@@ -2,12 +2,21 @@ import { Align } from '@nativescript-community/ui-canvas';
 import { profile } from '@nativescript/core';
 import { Utils } from '../utils/Utils';
 import { Renderer } from './Renderer';
+/**
+ * Baseclass of all axis renderers.
+ *
+
+ */
 export class AxisRenderer extends Renderer {
     constructor(viewPortHandler, trans, axis) {
         super(viewPortHandler);
-        this.mTrans = trans;
+        this.transformer = trans;
         this.mAxis = axis;
     }
+    /**
+     * Returns the Paint object that is used for drawing the axis-line that goes
+     * alongside the axis.
+     */
     get axisLinePaint() {
         if (!this.mAxisLinePaint) {
             this.mAxisLinePaint = Utils.getTemplatePaint('black-stroke');
@@ -20,6 +29,9 @@ export class AxisRenderer extends Renderer {
         }
         return this.mLimitLinePaint;
     }
+    /**
+     * Returns the Paint object used for drawing the axis (labels).
+     */
     get axisLabelsPaint() {
         if (!this.mAxisLabelPaint) {
             this.mAxisLabelPaint = this.createAxisLabelsPaint();
@@ -31,32 +43,33 @@ export class AxisRenderer extends Renderer {
         paint.setTextAlign(Align.LEFT);
         return paint;
     }
+    /**
+     * Returns the Paint object that is used for drawing the grid-lines of the
+     * axis.
+     */
     get gridPaint() {
         if (!this.mGridPaint) {
             this.mGridPaint = Utils.getTemplatePaint('grid');
         }
         return this.mGridPaint;
     }
-    getTransformer() {
-        return this.mTrans;
-    }
     getCurrentMinMax(min, max, inverted) {
         if (min === undefined || max === undefined || inverted === undefined) {
             const axis = this.mAxis;
             if (min === undefined) {
-                min = axis.mAxisMinimum;
+                min = axis.axisMinimum;
             }
             if (max === undefined) {
-                max = axis.mAxisMaximum;
+                max = axis.axisMaximum;
             }
             if (inverted === undefined) {
                 inverted = axis['isInverted'] ? axis['isInverted']() : false;
             }
         }
-        if (this.mViewPortHandler != null && this.mViewPortHandler.getContentRect().width() > 10 && !this.mViewPortHandler.isFullyZoomedOutY()) {
-            const rect = this.mAxis.isIgnoringOffsets() ? this.mViewPortHandler.getChartRect() : this.mViewPortHandler.getContentRect();
-            const p1 = this.mTrans.getValuesByTouchPoint(rect.left, rect.top);
-            const p2 = this.mTrans.getValuesByTouchPoint(rect.left, rect.bottom);
+        if (this.mViewPortHandler && this.mViewPortHandler.contentRect.width() > 10 && !this.mViewPortHandler.isFullyZoomedOutY()) {
+            const rect = this.mAxis.ignoreOffsets ? this.mViewPortHandler.chartRect : this.mViewPortHandler.contentRect;
+            const p1 = this.transformer.getValuesByTouchPoint(rect.left, rect.top);
+            const p2 = this.transformer.getValuesByTouchPoint(rect.left, rect.bottom);
             if (!inverted) {
                 min = p2.y;
                 max = p1.y;
@@ -68,15 +81,30 @@ export class AxisRenderer extends Renderer {
         }
         return { min, max };
     }
+    /**
+     * Computes the axis values.
+     *
+     * @param min - the minimum value in the data object for this axis
+     * @param max - the maximum value in the data object for this axis
+     */
     computeAxis(min, max, inverted) {
+        const axis = this.mAxis;
+        if (!axis.enabled) {
+            return;
+        }
+        // calculate the starting and entry polet of the y-labels (depending on
+        // zoom / contentrect bounds)
         const result = this.getCurrentMinMax(min, max, inverted);
         this.computeAxisValues(result.min, result.max);
     }
+    /**
+     * Sets up the axis values. Computes the desired number of labels between the two given extremes.
+     */
     computeAxisValues(min, max) {
         const axis = this.mAxis;
         const yMin = min;
         const yMax = max;
-        const labelCount = axis.getLabelCount();
+        const labelCount = axis.labelCount;
         const range = Math.abs(yMax - yMin);
         if (labelCount === 0 || range <= 0 || !Number.isFinite(range)) {
             axis.mEntries = [];
@@ -85,22 +113,30 @@ export class AxisRenderer extends Renderer {
             axis.mEntryCount = 0;
             return;
         }
+        // Find out how much spacing (in y value space) between axis values
         const rawInterval = range / (labelCount - 1);
-        let interval = axis.isForceIntervalEnabled() ? axis.getForcedInterval() : axis.ensureLastLabel ? rawInterval : Utils.roundToNextSignificant(rawInterval);
-        if (axis.isGranularityEnabled() && interval < axis.getGranularity()) {
-            interval = axis.getGranularity();
+        let interval = axis.forcedInterval > 0 ? axis.forcedInterval : axis.ensureLastLabel ? rawInterval : Utils.roundToNextSignificant(rawInterval);
+        // If granularity is enabled, then do not allow the interval to go below specified granularity.
+        // This is used to avoid repeated values when rounding values for display.
+        if (axis.granularity && interval < axis.granularity) {
+            interval = axis.granularity;
         }
+        // Normalize interval
         const intervalMagnitude = Utils.roundToNextSignificant(Math.pow(10, Math.log10(interval)));
         const intervalSigDigit = interval / intervalMagnitude;
         if (intervalSigDigit > 5) {
+            // Use one order of magnitude higher, to avoid intervals like 0.9 or
+            // 90
             interval = Math.floor(10 * intervalMagnitude);
         }
-        let n = axis.isCenterAxisLabelsEnabled() ? 1 : 0;
-        const formatter = axis.getValueFormatter();
-        if (axis.isForceLabelsEnabled()) {
+        let n = axis.centerAxisLabels ? 1 : 0;
+        const formatter = axis.valueFormatter;
+        // force label count
+        if (axis.forceLabelsEnabled) {
             interval = range / (labelCount - 1);
             axis.mEntryCount = Math.floor(labelCount);
             if (axis.mEntries.length < axis.mEntryCount) {
+                // Ensure stops contains at least numStops elements.
                 axis.mEntries = [];
                 axis.mLabels = [];
             }
@@ -110,16 +146,22 @@ export class AxisRenderer extends Renderer {
                     v = max;
                 }
                 axis.mEntries[i] = v;
-                axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler);
+                axis.mLabels[i] = formatter.getAxisLabel(v, axis);
                 v += interval;
             }
             n = axis.mEntryCount;
+            // no forced count
         }
         else {
+            // if we use  Math.ceil(yMin / interval) * interval and the min value is 20
+            // then we will see 0 as axis first when it should be 20
+            // let first = interval === 0 ? 0 : Math.ceil(yMin / interval) * interval;
             let first = interval === 0 ? 0 : Math.ceil(yMin / interval) * interval;
-            if (axis.isCenterAxisLabelsEnabled()) {
+            if (axis.centerAxisLabels) {
                 first -= interval;
             }
+            // use Math.floor(yMax / interval) + 1 instead of
+            // Math.floor(yMax / interval) to make sure the axis is showed "above" the higghest value
             let last = interval === 0 ? 0 : Utils.nextUp(Math.floor(yMax / interval) * interval);
             if (axis.ensureLastLabel && last < max) {
                 last = Math.min(max, last + interval);
@@ -131,29 +173,35 @@ export class AxisRenderer extends Renderer {
                     ++n;
                 }
             }
+            // if (axis.ensureLastLabel && (n - 1) * interval < last) {
+            //     n++;
+            // }
             axis.mEntryCount = n;
             if (axis.mEntries.length < n) {
+                // Ensure stops contains at least numStops elements.
                 axis.mEntries = [];
                 axis.mLabels = [];
             }
             for (f = first, i = 0; i <= n; f += interval, ++i) {
                 if (f === 0.0) {
+                    // Fix for negative zero case (Where value === -0.0, and 0.0 === -0.0)
                     f = 0.0;
                 }
                 else if (!axis.allowLastLabelAboveMax && f > max) {
                     f = max;
                 }
                 axis.mEntries[i] = f;
-                axis.mLabels[i] = formatter.getAxisLabel(f, axis, this.mViewPortHandler);
+                axis.mLabels[i] = formatter.getAxisLabel(f, axis);
             }
         }
+        // set decimals
         if (interval < 1) {
             axis.mDecimals = Math.ceil(-Math.log10(interval));
         }
         else {
             axis.mDecimals = 0;
         }
-        if (axis.isCenterAxisLabelsEnabled()) {
+        if (axis.centerAxisLabels) {
             if (axis.mCenteredEntries.length < n) {
                 axis.mCenteredEntries = [];
             }

package/renderer/AxisRenderer.js.map

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

package/renderer/BarChartRenderer.d.ts

@@ -12,7 +12,13 @@ export declare class BarChartRenderer extends BarLineScatterCandleBubbleRenderer
     mChart: BarChart;
     protected mBarBuffers: BarBuffer[];
     protected mTransformedBuffer: TypedArray;
+    /**
+     * palet for the bar shadow
+     */
     protected mShadowPaint: Paint;
+    /**
+     * palet for the bar border
+     */
     protected mBarBorderPaint: Paint;
     constructor(chart: BarChart, animator: ChartAnimator, viewPortHandler: ViewPortHandler);
     get highlightPaint(): Paint;
@@ -24,6 +30,11 @@ export declare class BarChartRenderer extends BarLineScatterCandleBubbleRenderer
     protected prepareBarHighlight(x: number, y1: number, y2: number, barWidthHalf: number, trans: Transformer, barRect: RectF): void;
     drawValues(c: Canvas): void;
     drawHighlighted(c: Canvas, indices: Highlight[]): void;
+    /**
+     * Sets the drawing position of the highlight object based on the riven bar-rect.
+     * @param high
+     * @param bar
+     */
     protected setHighlightDrawPos(high: Highlight, bar: RectF): void;
     drawExtras(c: Canvas): void;
 }