@nativescript-community/ui-chart 1.2.35 → 2.0.0

package/formatter/DefaultAxisValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultAxisValueFormatter.js","sourceRoot":"../src/","sources":["formatter/DefaultAxisValueFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAK3C,MAAM,OAAO,yBAA0B,SAAQ,cAAc;IAiBzD,YAAY,MAAM;QACd,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7B,CAAC,IAAI,GAAG,CAAC;SACZ;QAED,IAAI,CAAC,OAAO,GAAG,kBAAkB,GAAG,CAAC,CAAC;IAC1C,CAAC;IAEM,iBAAiB,CAAC,KAAK;QAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAOM,gBAAgB;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ"}
+{"version":3,"file":"DefaultAxisValueFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/DefaultAxisValueFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,MAAM,MAAM,kBAAkB,CAAC;AAEtC;;GAEG;AACH,MAAM,OAAO,yBAA0B,SAAQ,cAAc;IAWzD;;;;;OAKG;IACH,YAAY,MAAM;QACd,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAE5B,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,CAAC,IAAI,GAAG,CAAC;QACb,CAAC;QACD,kEAAkE;QAClE,IAAI,CAAC,OAAO,GAAG,kBAAkB,GAAG,CAAC,CAAC;IAC1C,CAAC;IAEM,iBAAiB,CAAC,KAAK;QAC1B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;CACJ"}

package/formatter/DefaultFillFormatter.js

@@ -1,27 +1,27 @@
 export class DefaultFillFormatter {
     getFillLinePosition(dataSet, dataProvider) {
         let fillMin = 0;
-        const chartMaxY = dataProvider.getYChartMax();
-        const chartMinY = dataProvider.getYChartMin();
-        const data = dataProvider.getLineData();
-        if (dataSet.getYMax() > 0 && dataSet.getYMin() < 0) {
+        const chartMaxY = dataProvider.yChartMax;
+        const chartMinY = dataProvider.yChartMin;
+        const data = dataProvider.lineData;
+        if (dataSet.yMax > 0 && dataSet.yMin < 0) {
             fillMin = 0;
         }
         else {
             let max, min;
-            if (data.getYMax() > 0) {
+            if (data.yMax > 0) {
                 max = 0;
             }
             else {
                 max = chartMaxY;
             }
-            if (data.getYMin() < 0) {
+            if (data.yMin < 0) {
                 min = 0;
             }
             else {
                 min = chartMinY;
             }
-            fillMin = dataSet.getYMin() >= 0 ? min : max;
+            fillMin = dataSet.yMin >= 0 ? min : max;
         }
         return fillMin;
     }

package/formatter/DefaultFillFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultFillFormatter.js","sourceRoot":"../src/","sources":["formatter/DefaultFillFormatter.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,oBAAoB;IACtB,mBAAmB,CAAC,OAAqB,EAAE,YAA8B;QAC5E,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;QAE9C,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAExC,IAAI,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;YAChD,OAAO,GAAG,CAAC,CAAC;SACf;aAAM;YACH,IAAI,GAAG,EAAE,GAAG,CAAC;YAEb,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACpB,GAAG,GAAG,CAAC,CAAC;aACX;iBAAM;gBACH,GAAG,GAAG,SAAS,CAAC;aACnB;YACD,IAAI,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACpB,GAAG,GAAG,CAAC,CAAC;aACX;iBAAM;gBACH,GAAG,GAAG,SAAS,CAAC;aACnB;YAED,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;SAChD;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ"}
+{"version":3,"file":"DefaultFillFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/DefaultFillFormatter.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,oBAAoB;IACtB,mBAAmB,CAAC,OAAqB,EAAE,YAA8B;QAC5E,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;QACzC,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;QAEzC,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC;QAEnC,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACvC,OAAO,GAAG,CAAC,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,EAAE,GAAG,CAAC;YAEb,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAChB,GAAG,GAAG,CAAC,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACJ,GAAG,GAAG,SAAS,CAAC;YACpB,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAChB,GAAG,GAAG,CAAC,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACJ,GAAG,GAAG,SAAS,CAAC;YACpB,CAAC;YAED,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC5C,CAAC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;CACJ"}

package/formatter/DefaultValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultValueFormatter.js","sourceRoot":"../src/","sources":["formatter/DefaultValueFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,OAAO,qBAAsB,SAAQ,yBAAyB;CAAG"}
+{"version":3,"file":"DefaultValueFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/DefaultValueFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,OAAO,qBAAsB,SAAQ,yBAAyB;CAAG"}

package/formatter/IAxisValueFormatter.d.ts

@@ -1,5 +1,23 @@
 import { AxisBase } from '../components/AxisBase';
-import { ViewPortHandler } from '../utils/ViewPortHandler';
+/**
+ * Created by Philipp Jahoda on 20/09/15.
+ * Custom formatter interface that allows formatting of
+ * axis labels before they are being drawn.
+ *
+ *  Extend {@link ValueFormatter} instead
+ */
 export interface IAxisValueFormatter {
-    getAxisLabel(value: any, axis: AxisBase, viewPortHandler: ViewPortHandler): string;
+    /**
+     * Called when a value from an axis is to be formatted
+     * before being drawn. For performance reasons, avoid excessive calculations
+     * and memory allocations inside this method.
+     *
+     * @param value the value to be formatted
+     * @param axis  the axis the value belongs to
+     * @param viewPortHandler  the viewPortHandler
+     * @return
+     *
+     *  Extend {@link ValueFormatter} and use {@link ValueFormatter#getAxisLabel(float, AxisBase)}
+     */
+    getAxisLabel(value: any, axis: AxisBase): string;
 }

package/formatter/IAxisValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"IAxisValueFormatter.js","sourceRoot":"../src/","sources":["formatter/IAxisValueFormatter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"IAxisValueFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/IAxisValueFormatter.ts"],"names":[],"mappings":""}

package/formatter/IFillFormatter.d.ts

@@ -1,5 +1,30 @@
 import { ILineDataSet } from '../interfaces/datasets/ILineDataSet';
 import { LineDataProvider } from '../interfaces/dataprovider/LineDataProvider';
+import { Path } from '@nativescript-community/ui-canvas';
+/**
+ * Interface for providing a custom logic to where the filling line of a LineDataSet
+ * should end. This of course only works if setFillEnabled(...) is set to true.
+ *
+
+ */
 export interface IFillFormatter {
+    /**
+     * Returns the vertical (y-axis) position where the filled-line of the
+     * LineDataSet should end.
+     *
+     * @param dataSet the ILineDataSet that is currently drawn
+     * @param dataProvider
+     * @return
+     */
     getFillLinePosition(dataSet: ILineDataSet, dataProvider: LineDataProvider): any;
+    /**
+     * update the fill line Path for the dataset
+     *
+     * @param dataSet the ILineDataSet that is currently drawn
+     * @param dataProvider
+     * @param linePath
+     * @param lastLinePath
+     * @return
+     */
+    getFillLinePath?(dataSet: ILineDataSet, dataProvider: LineDataProvider, linePath: Path, lastLinePath: Path): any;
 }

package/formatter/IFillFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"IFillFormatter.js","sourceRoot":"../src/","sources":["formatter/IFillFormatter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"IFillFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/IFillFormatter.ts"],"names":[],"mappings":""}

package/formatter/IValueFormatter.d.ts

@@ -1,4 +1,25 @@
 import { Entry } from '../data/Entry';
+/**
+ * Interface to format all values before they are drawn as labels.
+ *
+
+ *  Extend {@link ValueFormatter} instead
+ */
 export interface IValueFormatter {
+    /**
+     * Called when a value (from labels inside the chart) is formatted
+     * before being drawn. For performance reasons, avoid excessive calculations
+     * and memory allocations inside this method.
+     *
+     * @param value           the value to be formatted
+     * @param entry           the entry the value belongs to - in e.g. BarChart, this is of class BarEntry
+     * @param index    index of the drawn value
+     * @param count    total number of values drawn (useful to draw first or last)
+     * @param dataSetIndex    the index of the DataSet the entry in focus belongs to
+     * @param viewPortHandler provides information about the current chart state (scale, translation, ...)
+     * @return the formatted label ready for being drawn
+     *
+     * @deprecated Extend {@link ValueFormatter} and override an appropriate method
+     */
     getFormattedValue(value: number, entry: Entry, index: any, count: any, dataSetIndex: any, viewPortHandler: any): string;
 }

package/formatter/IValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"IValueFormatter.js","sourceRoot":"../src/","sources":["formatter/IValueFormatter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"IValueFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/IValueFormatter.ts"],"names":[],"mappings":""}

package/formatter/ValueFormatter.d.ts

@@ -8,14 +8,74 @@ import { RadarEntry } from '../data/RadarEntry';
 import { BubbleEntry } from '../data/BubbleEntry';
 import { CandleEntry } from '../data/CandleEntry';
 import { BaseEntry } from '../data/BaseEntry';
+/**
+ * Class to format all values before they are drawn as labels.
+ */
 export declare abstract class ValueFormatter implements IAxisValueFormatter, IValueFormatter {
+    /**
+     * Called when drawing any label, used to change numbers into formatted strings.
+     *
+     * @param value float to be formatted
+     * @return formatted string label
+     */
     getFormattedValue(value: number, entry?: BaseEntry): string;
+    /**
+     * Used to draw axis labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value float to be formatted
+     * @param axis  axis being labeled
+     * @return formatted string label
+     */
     getAxisLabel(value: number, axis: AxisBase): string;
+    /**
+     * Used to draw bar labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value current value to be formatted
+     * @return formatted string label
+     */
     getBarLabel(value: any, entry: BarEntry): string;
+    /**
+     * Used to draw stacked bar labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value        current value to be formatted
+     * @param entry stacked entry being labeled, contains all Y values
+     * @return formatted string label
+     */
     getBarStackedLabel(value: any, entry: BarEntry): string;
+    /**
+     * Used to draw line and scatter labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry point being labeled, contains X value
+     * @return formatted string label
+     */
     getPointLabel(value: any, entry: Entry): string;
+    /**
+     * Used to draw pie value labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value    float to be formatted, may have been converted to percentage
+     * @param entry slice being labeled, contains original, non-percentage Y value
+     * @return formatted string label
+     */
     getPieLabel(value: any, entry: PieEntry): string;
+    /**
+     * Used to draw radar value labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry entry being labeled
+     * @return formatted string label
+     */
     getRadarLabel(value: any, entry: RadarEntry): string;
+    /**
+     * Used to draw bubble size labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry bubble being labeled, also contains X and Y values
+     * @return formatted string label
+     */
     getBubbleLabel(value: any, entry: BubbleEntry): string;
+    /**
+     * Used to draw high labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry candlestick being labeled
+     * @return formatted string label
+     */
     getCandleLabel(value: any, entry: CandleEntry): string;
 }

package/formatter/ValueFormatter.js

@@ -1,28 +1,88 @@
+/**
+ * Class to format all values before they are drawn as labels.
+ */
 export class ValueFormatter {
+    /**
+     * Called when drawing any label, used to change numbers into formatted strings.
+     *
+     * @param value float to be formatted
+     * @return formatted string label
+     */
     getFormattedValue(value, entry) {
         return value + '';
     }
+    /**
+     * Used to draw axis labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value float to be formatted
+     * @param axis  axis being labeled
+     * @return formatted string label
+     */
     getAxisLabel(value, axis) {
         return this.getFormattedValue(value);
     }
+    /**
+     * Used to draw bar labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value current value to be formatted
+     * @return formatted string label
+     */
     getBarLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw stacked bar labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value        current value to be formatted
+     * @param entry stacked entry being labeled, contains all Y values
+     * @return formatted string label
+     */
     getBarStackedLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw line and scatter labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry point being labeled, contains X value
+     * @return formatted string label
+     */
     getPointLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw pie value labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param value    float to be formatted, may have been converted to percentage
+     * @param entry slice being labeled, contains original, non-percentage Y value
+     * @return formatted string label
+     */
     getPieLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw radar value labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry entry being labeled
+     * @return formatted string label
+     */
     getRadarLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw bubble size labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry bubble being labeled, also contains X and Y values
+     * @return formatted string label
+     */
     getBubbleLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }
+    /**
+     * Used to draw high labels, calls {@link #getFormattedValue} by default.
+     *
+     * @param entry candlestick being labeled
+     * @return formatted string label
+     */
     getCandleLabel(value, entry) {
         return this.getFormattedValue(value, entry);
     }

package/formatter/ValueFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValueFormatter.js","sourceRoot":"../src/","sources":["formatter/ValueFormatter.ts"],"names":[],"mappings":"AAeA,MAAM,OAAgB,cAAc;IAgCzB,iBAAiB,CAAC,KAAa,EAAE,KAAiB;QACrD,OAAO,KAAK,GAAG,EAAE,CAAC;IACtB,CAAC;IASM,YAAY,CAAC,KAAa,EAAE,IAAc;QAC7C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAQM,WAAW,CAAC,KAAK,EAAE,KAAe;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IASM,kBAAkB,CAAC,KAAK,EAAE,KAAe;QAC5C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAQM,aAAa,CAAC,KAAK,EAAE,KAAY;QACpC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IASM,WAAW,CAAC,KAAK,EAAE,KAAe;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAQM,aAAa,CAAC,KAAK,EAAE,KAAiB;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAQM,cAAc,CAAC,KAAK,EAAE,KAAkB;QAC3C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAQM,cAAc,CAAC,KAAK,EAAE,KAAkB;QAC3C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;CACJ"}
+{"version":3,"file":"ValueFormatter.js","sourceRoot":"","sources":["../../../src/ui-chart/formatter/ValueFormatter.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,OAAgB,cAAc;IAChC;;;;;OAKG;IACI,iBAAiB,CAAC,KAAa,EAAE,KAAiB;QACrD,OAAO,KAAK,GAAG,EAAE,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,KAAa,EAAE,IAAc;QAC7C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACI,WAAW,CAAC,KAAK,EAAE,KAAe;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACI,kBAAkB,CAAC,KAAK,EAAE,KAAe;QAC5C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,KAAK,EAAE,KAAY;QACpC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAAC,KAAK,EAAE,KAAe;QACrC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,KAAK,EAAE,KAAiB;QACzC,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,KAAK,EAAE,KAAkB;QAC3C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACI,cAAc,CAAC,KAAK,EAAE,KAAkB;QAC3C,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;CACJ"}

package/highlight/BarHighlighter.d.ts

@@ -5,8 +5,28 @@ import { BarDataProvider } from '../interfaces/dataprovider/BarDataProvider';
 import { IBarDataSet } from '../interfaces/datasets/IBarDataSet';
 export declare class BarHighlighter extends ChartHighlighter<BarDataProvider> {
     constructor(chart: BarDataProvider);
-    getHighlight(x: number, y: number): Highlight;
-    getStackedHighlight(high: Highlight, set: IBarDataSet, xVal: any, yVal: any): Highlight;
+    protected getChartData(): BarData;
+    getHighlight(x: number, y: number): Highlight<import("../data/Entry").Entry>[];
+    /**
+     * This method creates the Highlight object that also indicates which value of a stacked BarEntry has been
+     * selected.
+     *
+     * @param high the Highlight to work with looking for stacked values
+     * @param set
+     * @param xVal
+     * @param yVal
+     * @return
+     */
+    getStackedHighlight(high: Highlight, set: IBarDataSet, touchX: any, touchY: any, xVal: any, yVal: any): Highlight;
+    /**
+     * Returns the index of the closest value inside the values array / ranges (stacked barchart) to the value
+     * given as
+     * a parameter.
+     *
+     * @param ranges
+     * @param value
+     * @return
+     */
     protected getClosestStackIndex(ranges: any[], value: any): number;
     protected getDistance(x1: any, y1: any, x2: any, y2: any): number;
     protected getData(): BarData;

package/highlight/BarHighlighter.js

@@ -3,46 +3,72 @@ export class BarHighlighter extends ChartHighlighter {
     constructor(chart) {
         super(chart);
     }
+    getChartData() {
+        return this.mChart.barData;
+    }
     getHighlight(x, y) {
-        const high = super.getHighlight(x, y);
-        if (high === null) {
-            return null;
-        }
         const pos = this.getValsForTouch(x, y);
-        const barData = this.mChart.getBarData();
-        const set = barData.getDataSetByIndex(high.dataSetIndex);
-        if (set.isStacked()) {
-            return this.getStackedHighlight(high, set, pos.x, pos.y);
-        }
-        return high;
+        const xVal = pos.x;
+        return this.getHighlightForX(xVal, x, y).map((high) => {
+            const barData = this.getChartData();
+            const set = barData.getDataSetByIndex(high.dataSetIndex);
+            if (set.stacked) {
+                return this.getStackedHighlight(high, set, x, y, xVal, pos.y);
+            }
+            // MPPointD.recycleInstance(pos);
+            return high;
+        });
     }
-    getStackedHighlight(high, set, xVal, yVal) {
+    /**
+     * This method creates the Highlight object that also indicates which value of a stacked BarEntry has been
+     * selected.
+     *
+     * @param high the Highlight to work with looking for stacked values
+     * @param set
+     * @param xVal
+     * @param yVal
+     * @return
+     */
+    getStackedHighlight(high, set, touchX, touchY, xVal, yVal) {
         const { entry, index } = set.getEntryAndIndexForXValue(xVal, yVal);
-        if (entry == null) {
+        if (!entry) {
             return null;
         }
-        if (entry.yVals == null) {
+        // not stacked
+        if (!entry.yVals) {
             return high;
         }
         const ranges = entry.ranges;
         if (ranges.length > 0) {
             const yKey = set.yProperty;
             const stackIndex = this.getClosestStackIndex(ranges, yVal);
-            const pixels = this.mChart.getTransformer(set.getAxisDependency()).getPixelForValues(high.x, ranges[stackIndex][1]);
+            const pixels = this.mChart.getTransformer(set.axisDependency).getPixelForValues(high.x, ranges[stackIndex][1]);
+            //MPPointD.recycleInstance(pixels);
             return {
                 x: set.getEntryXValue(entry, index),
                 y: entry[yKey],
+                xTouchPx: touchX,
+                yTouchPx: touchY,
                 xPx: pixels.x,
                 yPx: pixels.y,
                 dataSetIndex: high.dataSetIndex,
                 stackIndex,
-                axis: high.axis,
+                axis: high.axis
             };
         }
         return null;
     }
+    /**
+     * Returns the index of the closest value inside the values array / ranges (stacked barchart) to the value
+     * given as
+     * a parameter.
+     *
+     * @param ranges
+     * @param value
+     * @return
+     */
     getClosestStackIndex(ranges, value) {
-        if (ranges === null || ranges.length === 0) {
+        if (!ranges || ranges.length === 0) {
             return 0;
         }
         for (let i = 0; i < ranges.length; i++) {
@@ -57,7 +83,7 @@ export class BarHighlighter extends ChartHighlighter {
         return Math.abs(x1 - x2);
     }
     getData() {
-        return this.mChart.getBarData();
+        return this.mChart.barData;
     }
 }
 //# sourceMappingURL=BarHighlighter.js.map

package/highlight/BarHighlighter.js.map

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

package/highlight/ChartHighlighter.d.ts

@@ -1,20 +1,102 @@
 import { BarLineScatterCandleBubbleDataProvider } from '../interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider';
 import { IHighlighter } from './IHighlighter';
 import { Highlight } from './Highlight';
+import { AxisDependency } from '../components/YAxis';
 import { IDataSet } from '../interfaces/datasets/IDataSet';
 import { Entry } from '../data/Entry';
 export declare class ChartHighlighter<T extends BarLineScatterCandleBubbleDataProvider> implements IHighlighter {
+    /**
+     * instance of the data-provider
+     */
     protected mChart: T;
+    /**
+     * buffer for storing previously highlighted values
+     */
     protected mHighlightBuffer: Highlight[];
     constructor(chart: T);
-    getHighlight(x: any, y: any): any;
+    getHighlight(x: any, y: any): Highlight<Entry>[];
+    /**
+     * Returns a recyclable MPPointD instance.
+     * Returns the corresponding xPos for a given touch-position in pixels.
+     *
+     * @param x
+     * @param y
+     * @return
+     */
     protected getValsForTouch(x: any, y: any): any;
-    protected getHighlightForX(xVal: any, x: any, y: any): any;
+    /**
+     * Returns the corresponding Highlight for a given xVal and x- and y-touch position in pixels.
+     *
+     * @param xVal
+     * @param x
+     * @param y
+     * @return
+     */
+    protected getHighlightForX(xVal: any, x: any, y: any): Highlight<Entry>[];
+    /**
+     * Returns the minimum distance from a touch value (in pixels) to the
+     * closest value (in pixels) that is displayed in the chart.
+     *
+     * @param closestValues
+     * @param pos
+     * @param axis
+     * @return
+     */
     protected getMinimumDistance(closestValues: Highlight[], pos: any, axis: any): number;
     protected getHighlightPos(h: Highlight): number;
+    protected getChartData(): import("../data/BarLineScatterCandleBubbleData").BarLineScatterCandleBubbleData<any, any>;
+    /**
+     * Returns a list of Highlight objects representing the entries closest to the given xVal.
+     * The returned list contains two objects per DataSet (closest rounding up, closest rounding down).
+     *
+     * @param xVal the transformed x-value of the x-touch position
+     * @return
+     */
     getHighlightsAtXValue(xVal: any, x?: any, y?: any): Highlight<Entry>[];
-    protected buildHighlights(set: IDataSet<Entry>, dataSetIndex: any, xVal: any, rounding: any): Highlight<Entry>[];
-    getClosestHighlightByPixel(closestValues: Highlight[], x: any, y: any, axis: any, minSelectionDistance: any): any;
-    protected getDistance(x1: any, y1: any, x2: any, y2: any): number;
+    /**
+     * An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
+     *
+     * @param set
+     * @param dataSetIndex
+     * @param xVal
+     * @param rounding
+     * @return
+     */
+    protected buildHighlights(set: IDataSet<Entry>, dataSetIndex: any, touchX: any, touchY: any, xVal: any, rounding: any): Highlight<Entry>[];
+    /**
+     * Returns the Highlight of the DataSet that contains the closest value on the
+     * y-axis.
+     *
+     * @param closestValues        contains two Highlight objects per DataSet closest to the selected x-position (determined by
+     *                             rounding up an down)
+     * @param x
+     * @param y
+     * @param minSelectionDistance
+     * @param axis                 the closest axis
+     * @return
+     */
+    getClosestHighlightByPixel(closestValues: Highlight[], x: number, y: number, minSelectionDistance: number, axis?: AxisDependency): Highlight<Entry>;
+    /**
+     * Returns sorted highlights based on distance to touch x,y
+     *
+     * @param closestValues        contains two Highlight objects per DataSet closest to the selected x-position (determined by
+     *                             rounding up an down)
+     * @param x
+     * @param y
+     * @param minSelectionDistance
+     * @param axis                 the closest axis
+     * @return
+     */
+    sortedHighlights(closestValues: Highlight[], x: number, y: number, minSelectionDistance: number, axis?: AxisDependency): Highlight<Entry>[];
+    /**
+     * Calculates the distance between the two given points.
+     *
+     * @param x1
+     * @param y1
+     * @param x2
+     * @param y2
+     * @return
+     */
+    protected getDistance(x1: number, y1: number, x2: number, y2: number): number;
     protected getData(): import("../data/BarLineScatterCandleBubbleData").BarLineScatterCandleBubbleData<any, any>;
 }