@nativescript-community/ui-chart 1.2.35 → 2.0.0

package/highlight/ChartHighlighter.js

@@ -2,30 +2,63 @@ import { AxisDependency } from '../components/YAxis';
 import { Rounding } from '../data/DataSet';
 export class ChartHighlighter {
     constructor(chart) {
+        /**
+         * buffer for storing previously highlighted values
+         */
         this.mHighlightBuffer = [];
         this.mChart = chart;
     }
     getHighlight(x, y) {
         const pos = this.getValsForTouch(x, y);
         const xVal = pos.x;
-        const high = this.getHighlightForX(xVal, x, y);
-        return high;
+        return this.getHighlightForX(xVal, x, y);
     }
+    /**
+     * Returns a recyclable MPPointD instance.
+     * Returns the corresponding xPos for a given touch-position in pixels.
+     *
+     * @param x
+     * @param y
+     * @return
+     */
     getValsForTouch(x, y) {
-        const pos = this.mChart.getTransformer().getValuesByTouchPoint(x, y);
+        // take any transformer to determine the x-axis value
+        const pos = this.mChart.transformer.getValuesByTouchPoint(x, y);
         return pos;
     }
+    /**
+     * Returns the corresponding Highlight for a given xVal and x- and y-touch position in pixels.
+     *
+     * @param xVal
+     * @param x
+     * @param y
+     * @return
+     */
     getHighlightForX(xVal, x, y) {
         const closestValues = this.getHighlightsAtXValue(xVal, x, y);
         if (closestValues.length <= 1) {
-            return closestValues[0];
+            return closestValues;
         }
-        const leftAxisMinDist = this.getMinimumDistance(closestValues, y, AxisDependency.LEFT);
-        const rightAxisMinDist = this.getMinimumDistance(closestValues, y, AxisDependency.RIGHT);
-        const axis = leftAxisMinDist < rightAxisMinDist ? AxisDependency.LEFT : AxisDependency.RIGHT;
-        const detail = this.getClosestHighlightByPixel(closestValues, x, y, axis, this.mChart.getMaxHighlightDistance());
-        return detail;
+        const chart = this.mChart;
+        let axis;
+        if (chart.highlightsFilterByAxis) {
+            const leftAxisMinDist = this.getMinimumDistance(closestValues, y, AxisDependency.LEFT);
+            const rightAxisMinDist = this.getMinimumDistance(closestValues, y, AxisDependency.RIGHT);
+            axis = leftAxisMinDist < rightAxisMinDist ? AxisDependency.LEFT : AxisDependency.RIGHT;
+        }
+        // const detail = this.getClosestHighlightByPixel(closestValues, x, y, chart.maxHighlightDistance, axis);
+        // return [detail];
+        return this.sortedHighlights(closestValues, x, y, chart.maxHighlightDistance, axis);
     }
+    /**
+     * 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
+     */
     getMinimumDistance(closestValues, pos, axis) {
         let distance = Infinity;
         for (let i = 0; i < closestValues.length; i++) {
@@ -42,29 +75,52 @@ export class ChartHighlighter {
     getHighlightPos(h) {
         return h.yPx;
     }
+    getChartData() {
+        return this.mChart.data;
+    }
+    /**
+     * 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, x, y) {
         this.mHighlightBuffer = [];
-        const data = this.getData();
-        if (data == null)
+        const data = this.getChartData();
+        if (!data)
             return this.mHighlightBuffer;
-        for (let i = 0, dataSetCount = data.getDataSetCount(); i < dataSetCount; i++) {
+        for (let i = 0, dataSetCount = data.dataSetCount; i < dataSetCount; i++) {
             const dataSet = data.getDataSetByIndex(i);
-            if (!dataSet.isHighlightEnabled())
+            // don't include DataSets that cannot be highlighted
+            if (!dataSet.highlightEnabled)
                 continue;
-            this.mHighlightBuffer.push(...this.buildHighlights(dataSet, i, xVal, Rounding.CLOSEST));
+            this.mHighlightBuffer.push(...this.buildHighlights(dataSet, i, x, y, xVal, Rounding.CLOSEST));
         }
         return this.mHighlightBuffer;
     }
-    buildHighlights(set, dataSetIndex, xVal, rounding) {
+    /**
+     * An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
+     *
+     * @param set
+     * @param dataSetIndex
+     * @param xVal
+     * @param rounding
+     * @return
+     */
+    buildHighlights(set, dataSetIndex, touchX, touchY, xVal, rounding) {
         const yKey = set.yProperty;
         const highlights = [];
         if (set['setIgnoreFiltered']) {
-            set.setIgnoreFiltered(true);
+            set.ignoreFiltered = true;
         }
+        //noinspection unchecked
         let entries = set.getEntriesAndIndexesForXValue(xVal);
         if (entries.length === 0) {
+            // Try to find closest x-value and take all entries for that x-value
             const closest = set.getEntryAndIndexForXValue(xVal, NaN, rounding);
-            if (closest !== null) {
+            if (closest) {
+                //noinspection unchecked
                 entries = set.getEntriesAndIndexesForXValue(set.getEntryXValue(closest.entry, closest.index));
             }
         }
@@ -74,29 +130,44 @@ export class ChartHighlighter {
             const e = r.entry;
             const index = r.index;
             const xVal = set.getEntryXValue(e, index);
-            const pixels = this.mChart.getTransformer(set.getAxisDependency()).getPixelForValues(xVal, e[yKey]);
+            // const pixels = this.mChart.getTransformer(set.axisDependency).getPixelForValues(xVal, e[yKey]);
+            const pixels = this.mChart.getPixelForEntry(set, e, index);
             highlights.push({
                 entry: e,
                 entryIndex: index,
                 x: xVal,
                 y: e[yKey],
+                xTouchPx: touchX,
+                yTouchPx: touchY,
                 xPx: pixels.x,
                 yPx: pixels.y,
                 dataSetIndex,
-                axis: set.getAxisDependency()
+                axis: set.axisDependency
             });
         }
         if (set['setIgnoreFiltered']) {
-            set.setIgnoreFiltered(false);
+            set.ignoreFiltered = false;
         }
         return highlights;
     }
-    getClosestHighlightByPixel(closestValues, x, y, axis, minSelectionDistance) {
+    /**
+     * 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, x, y, minSelectionDistance, axis) {
         let closest = null;
         let distance = minSelectionDistance;
         for (let i = 0; i < closestValues.length; i++) {
             const high = closestValues[i];
-            if (axis == null || high.axis === axis) {
+            if (axis !== undefined || high.axis === axis) {
                 const cDistance = this.getDistance(x, y, high.xPx, high.yPx);
                 if (cDistance < distance) {
                     closest = high;
@@ -106,11 +177,43 @@ export class ChartHighlighter {
         }
         return closest;
     }
+    /**
+     * 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, x, y, minSelectionDistance, axis) {
+        if (axis !== undefined) {
+            closestValues = closestValues.filter((h) => h.axis === axis);
+        }
+        return closestValues
+            .map((h) => ({ h, d: this.getDistance(x, y, h.xPx, h.yPx) }))
+            .sort((h1, h2) => h1.d - h2.d)
+            .filter((v) => v.d < minSelectionDistance)
+            .map((v) => v.h);
+    }
+    /**
+     * Calculates the distance between the two given points.
+     *
+     * @param x1
+     * @param y1
+     * @param x2
+     * @param y2
+     * @return
+     */
     getDistance(x1, y1, x2, y2) {
+        //return Math.abs(y1 - y2);
+        //return Math.abs(x1 - x2);
         return Math.hypot(x1 - x2, y1 - y2);
     }
     getData() {
-        return this.mChart.getData();
+        return this.mChart.data;
     }
 }
 //# sourceMappingURL=ChartHighlighter.js.map

package/highlight/ChartHighlighter.js.map

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

package/highlight/CombinedHighlighter.d.ts

@@ -3,7 +3,13 @@ import { BarHighlighter } from './BarHighlighter';
 import { IHighlighter } from './IHighlighter';
 import { CombinedDataProvider } from '../interfaces/dataprovider/CombinedDataProvider';
 import { BarDataProvider } from '../interfaces/dataprovider/BarDataProvider';
+/**
+ * Created by Philipp Jahoda on 12/09/15.
+ */
 export declare class CombinedHighlighter extends ChartHighlighter<CombinedDataProvider> implements IHighlighter {
+    /**
+     * bar highlighter for supporting stacked highlighting
+     */
     protected barHighlighter: BarHighlighter;
     constructor(chart: CombinedDataProvider, barChart: BarDataProvider);
     getHighlightsAtXValue(xVal: any, x?: any, y?: any): import("./Highlight").Highlight<import("../data/Entry").Entry>[];

package/highlight/CombinedHighlighter.js

@@ -2,33 +2,48 @@ import { ChartHighlighter } from './ChartHighlighter';
 import { BarHighlighter } from './BarHighlighter';
 import { BarData } from '../data/BarData';
 import { Rounding } from '../data/DataSet';
+/**
+ * Created by Philipp Jahoda on 12/09/15.
+ */
 export class CombinedHighlighter extends ChartHighlighter {
     constructor(chart, barChart) {
         super(chart);
-        this.barHighlighter = barChart.getBarData() == null ? null : new BarHighlighter(barChart);
+        // if there is BarData, create a BarHighlighter
+        this.barHighlighter = !barChart.barData ? null : new BarHighlighter(barChart);
     }
     getHighlightsAtXValue(xVal, x, y) {
         this.mHighlightBuffer = [];
-        const dataObjects = this.mChart.getCombinedData().getAllData();
-        for (let i = 0; i < dataObjects.length; i++) {
-            const dataObject = dataObjects[i];
-            if (this.barHighlighter != null && dataObject instanceof BarData && x !== undefined) {
+        const dataObjects = this.mChart.combinedData.datas;
+        const datasArray = this.mChart.combinedData.datasArray;
+        const keys = Object.keys(dataObjects);
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i];
+            const dataObject = dataObjects[key];
+            if (!dataObject) {
+                continue;
+            }
+            // in case of BarData, let the BarHighlighter take over
+            if (this.barHighlighter && dataObject instanceof BarData && x !== undefined) {
                 const high = this.barHighlighter.getHighlight(x, y);
-                if (high != null) {
-                    high.dataIndex = i;
-                    this.mHighlightBuffer.push(high);
+                if (high) {
+                    this.mHighlightBuffer.push(...this.barHighlighter.getHighlight(x, y).map((h) => {
+                        h.dataIndex = datasArray.indexOf(dataObject);
+                        h.dataType = key;
+                        return h;
+                    }));
                 }
             }
             else {
-                for (let j = 0, dataSetCount = dataObject.getDataSetCount(); j < dataSetCount; j++) {
-                    const dataSet = dataObjects[i].getDataSetByIndex(j);
-                    if (!dataSet.isHighlightEnabled())
+                for (let j = 0, dataSetCount = dataObject.dataSetCount; j < dataSetCount; j++) {
+                    const dataSet = dataObject.getDataSetByIndex(j);
+                    // don't include datasets that cannot be highlighted
+                    if (!dataSet.highlightEnabled)
                         continue;
-                    const highs = this.buildHighlights(dataSet, j, xVal, Rounding.CLOSEST);
-                    for (const high of highs) {
-                        high.dataIndex = i;
-                        this.mHighlightBuffer.push(high);
-                    }
+                    this.mHighlightBuffer.push(...this.buildHighlights(dataSet, j, x, y, xVal, Rounding.CLOSEST).map((h) => {
+                        h.dataIndex = datasArray.indexOf(dataObject);
+                        h.dataType = key;
+                        return h;
+                    }));
                 }
             }
         }

package/highlight/CombinedHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"CombinedHighlighter.js","sourceRoot":"../src/","sources":["highlight/CombinedHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,MAAM,OAAO,mBAAoB,SAAQ,gBAAsC;IAM3E,YAAY,KAA2B,EAAE,QAAyB;QAC9D,KAAK,CAAC,KAAK,CAAC,CAAC;QAGb,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC9F,CAAC;IAEM,qBAAqB,CAAC,IAAI,EAAE,CAAE,EAAE,CAAE;QACrC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,UAAU,EAAE,CAAC;QAE/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAGlC,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,IAAI,UAAU,YAAY,OAAO,IAAI,CAAC,KAAK,SAAS,EAAE;gBACjF,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEpD,IAAI,IAAI,IAAI,IAAI,EAAE;oBACd,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;oBACnB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpC;aACJ;iBAAM;gBACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE;oBAChF,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;oBAGpD,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;wBAAE,SAAS;oBAE5C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;oBACvE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACtB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;wBACnB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACpC;iBACJ;aACJ;SACJ;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;CAsBJ"}
+{"version":3,"file":"CombinedHighlighter.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/CombinedHighlighter.ts"],"names":[],"mappings":"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"}

package/highlight/Highlight.d.ts

@@ -1,16 +1,69 @@
 import { AxisDependency } from '../components/YAxis';
 import { Entry } from '../data/Entry';
+/**
+ * Contains information needed to determine the highlighted value.
+ *
+
+ */
 export declare class Highlight<T extends Entry = Entry> {
+    /**
+     * the x-value of the highlighted value
+     */
     x: number;
+    /**
+     * the y-value of the highlighted value
+     */
     y: number;
+    /**
+     * the x-pixel of the highlight
+     */
     xPx?: number;
+    /**
+     * the y-pixel of the highlight
+     */
     yPx?: number;
+    /**
+     * the x-pixel of the touch corresponding to the highlight
+     */
+    xTouchPx?: number;
+    /**
+     * the y-pixel of the touch corresponding to the highlight
+     */
+    yTouchPx?: number;
+    /**
+     * the index of the data object - in case it refers to more than one
+     */
     dataIndex?: number;
-    dataSetIndex?: number;
+    /**
+     * the type of the data object if within CombinedChart (lineData, barData, scatterData, bubbleData, candleData)
+     */
+    dataType?: string;
+    /**
+     * the index of the dataset the highlighted value is in
+     */
+    dataSetIndex: number;
+    /**
+     * index which value of a stacked bar entry is highlighted, default -1
+     */
     stackIndex?: number;
+    /**
+     * the axis the highlighted value belongs to
+     */
     axis?: AxisDependency;
+    /**
+     * the x-position (pixels) on which this highlight object was last drawn
+     */
     drawX?: number;
+    /**
+     * the y-position (pixels) on which this highlight object was last drawn
+     */
     drawY?: number;
+    /**
+     * the associated entry
+     */
     entry?: T;
+    /**
+     * the index of the dataset the highlighted value is in
+     */
     entryIndex?: number;
 }

package/highlight/Highlight.js

@@ -1,3 +1,8 @@
+/**
+ * Contains information needed to determine the highlighted value.
+ *
+
+ */
 export class Highlight {
 }
 //# sourceMappingURL=Highlight.js.map

package/highlight/Highlight.js.map

@@ -1 +1 @@
-{"version":3,"file":"Highlight.js","sourceRoot":"../src/","sources":["highlight/Highlight.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,SAAS;CA4DrB"}
+{"version":3,"file":"Highlight.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/Highlight.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,OAAO,SAAS;CA2ErB"}

package/highlight/HorizontalBarHighlighter.d.ts

@@ -4,7 +4,7 @@ import { BarDataProvider } from '../interfaces/dataprovider/BarDataProvider';
 import { IBarDataSet } from '../interfaces/datasets/IBarDataSet';
 export declare class HorizontalBarHighlighter extends BarHighlighter {
     constructor(chart: BarDataProvider);
-    getHighlight(x: number, y: number): Highlight;
+    getHighlight(x: number, y: number): Highlight<import("../data/Entry").Entry>[];
     protected buildHighlights(set: IBarDataSet, dataSetIndex: any, xVal: any, rounding: any): Highlight<import("../data/Entry").Entry>[];
     protected getDistance(x1: any, y1: any, x2: any, y2: any): number;
 }

package/highlight/HorizontalBarHighlighter.js

@@ -5,24 +5,25 @@ export class HorizontalBarHighlighter extends BarHighlighter {
     }
     getHighlight(x, y) {
         const pos = this.getValsForTouch(x, y);
-        const high = this.getHighlightForX(pos.y, y, x);
-        if (high === null) {
-            return null;
-        }
-        const barData = this.mChart.getBarData();
-        const set = barData.getDataSetByIndex(high.dataSetIndex);
-        if (set.isStacked()) {
-            return this.getStackedHighlight(high, set, pos.y, pos.x);
-        }
-        return high;
+        const barData = this.mChart.barData;
+        return this.getHighlightForX(pos.y, y, x).map((h) => {
+            const set = barData.getDataSetByIndex(h.dataSetIndex);
+            if (set.stacked) {
+                return this.getStackedHighlight(h, set, x, y, pos.y, pos.x);
+            }
+            return h;
+        });
     }
     buildHighlights(set, dataSetIndex, xVal, rounding) {
         const yKey = set.yProperty;
         const highlights = [];
+        //noinspection unchecked
         let entries = set.getEntriesAndIndexesForXValue(xVal);
         if (entries.length === 0) {
+            // Try to find closest x-value and take all entries for that x-value
             const closest = set.getEntryAndIndexForXValue(xVal, NaN, rounding);
-            if (closest !== null) {
+            if (closest) {
+                //noinspection unchecked
                 entries = set.getEntriesAndIndexesForXValue(set.getEntryXValue(closest.entry, closest.index));
             }
         }
@@ -32,7 +33,7 @@ export class HorizontalBarHighlighter extends BarHighlighter {
         for (const r of entries) {
             const e = r.entry;
             const xVal = set.getEntryXValue(e, r.index);
-            const pixels = this.mChart.getTransformer(set.getAxisDependency()).getPixelForValues(e[yKey], xVal);
+            const pixels = this.mChart.getTransformer(set.axisDependency).getPixelForValues(e[yKey], xVal);
             highlights.push({
                 entry: e,
                 entryIndex: r.index,
@@ -41,7 +42,7 @@ export class HorizontalBarHighlighter extends BarHighlighter {
                 xPx: pixels.x,
                 yPx: pixels.y,
                 dataSetIndex,
-                axis: set.getAxisDependency()
+                axis: set.axisDependency
             });
         }
         return highlights;

package/highlight/HorizontalBarHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"HorizontalBarHighlighter.js","sourceRoot":"../src/","sources":["highlight/HorizontalBarHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD,MAAM,OAAO,wBAAyB,SAAQ,cAAc;IACxD,YAAY,KAAsB;QAC9B,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAEM,YAAY,CAAC,CAAS,EAAE,CAAS;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,IAAI,IAAI,KAAK,IAAI,EAAE;YACf,OAAO,IAAI,CAAC;SACf;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,GAAG,CAAC,SAAS,EAAE,EAAE;YACjB,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,eAAe,CAAC,GAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;QAC3B,MAAM,UAAU,GAAgB,EAAE,CAAC;QAGnC,IAAI,OAAO,GAAG,GAAG,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAEtB,MAAM,OAAO,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YACnE,IAAI,OAAO,KAAK,IAAI,EAAE;gBAElB,OAAO,GAAG,GAAG,CAAC,6BAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aACjG;SACJ;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,UAAU,CAAC;SACrB;QAED,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACrB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YAClB,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;YAEpG,UAAU,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,CAAC;gBACR,UAAU,EAAE,CAAC,CAAC,KAAK;gBACnB,CAAC,EAAE,IAAI;gBACP,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBACV,GAAG,EAAE,MAAM,CAAC,CAAC;gBACb,GAAG,EAAE,MAAM,CAAC,CAAC;gBACb,YAAY;gBACZ,IAAI,EAAE,GAAG,CAAC,iBAAiB,EAAE;aAChC,CAAC,CAAC;SACN;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;QAChC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,CAAC;CACJ"}
+{"version":3,"file":"HorizontalBarHighlighter.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/HorizontalBarHighlighter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD,MAAM,OAAO,wBAAyB,SAAQ,cAAc;IACxD,YAAY,KAAsB;QAC9B,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAEM,YAAY,CAAC,CAAS,EAAE,CAAS;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAChD,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;IACP,CAAC;IAES,eAAe,CAAC,GAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ;QACpE,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;QAC3B,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,wBAAwB;QACxB,IAAI,OAAO,GAAG,GAAG,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,oEAAoE;YACpE,MAAM,OAAO,GAAG,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YACnE,IAAI,OAAO,EAAE,CAAC;gBACV,wBAAwB;gBACxB,OAAO,GAAG,GAAG,CAAC,6BAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAClG,CAAC;QACL,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YAClB,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;YAE/F,UAAU,CAAC,IAAI,CAAC;gBACZ,KAAK,EAAE,CAAC;gBACR,UAAU,EAAE,CAAC,CAAC,KAAK;gBACnB,CAAC,EAAE,IAAI;gBACP,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;gBACV,GAAG,EAAE,MAAM,CAAC,CAAC;gBACb,GAAG,EAAE,MAAM,CAAC,CAAC;gBACb,YAAY;gBACZ,IAAI,EAAE,GAAG,CAAC,cAAc;aAC3B,CAAC,CAAC;QACP,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;QAChC,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,CAAC;CACJ"}

package/highlight/IHighlighter.d.ts

@@ -1,5 +1,15 @@
 import { Highlight } from './Highlight';
+/**
+ * Created by philipp on 10/06/16.
+ */
 export interface IHighlighter {
-    getHighlight(x: any, y: any): Highlight;
+    /**
+     * Returns a Highlight object corresponding to the given x- and y- touch positions in pixels.
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    getHighlight(x: any, y: any): Highlight[];
     getHighlightsAtXValue(xVal: any, x?: any, y?: any): Highlight[];
 }

package/highlight/IHighlighter.js.map

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

package/highlight/PieHighlighter.js

@@ -4,7 +4,7 @@ export class PieHighlighter extends PieRadarHighlighter {
         super(chart);
     }
     getClosestHighlight(index, x, y) {
-        const set = this.mChart.getData().getDataSet();
+        const set = this.mChart.data.getDataSet();
         const entry = set.getEntryForIndex(index);
         const yProperty = set.yProperty;
         return {
@@ -14,7 +14,7 @@ export class PieHighlighter extends PieRadarHighlighter {
             xPx: x,
             yPx: y,
             dataSetIndex: 0,
-            axis: set.getAxisDependency()
+            axis: set.axisDependency
         };
     }
 }

package/highlight/PieHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PieHighlighter.js","sourceRoot":"../src/","sources":["highlight/PieHighlighter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,OAAO,cAAe,SAAQ,mBAAmD;IACnF,YAAY,KAAe;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAES,mBAAmB,CAAC,KAAK,EAAE,CAAS,EAAE,CAAS;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAEhC,OAAO;YACH,KAAK;YACL,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;YACnB,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,GAAG,CAAC,iBAAiB,EAAE;SAChC,CAAC;IACN,CAAC;CACJ"}
+{"version":3,"file":"PieHighlighter.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/PieHighlighter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,MAAM,OAAO,cAAe,SAAQ,mBAAmD;IACnF,YAAY,KAAe;QACvB,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAES,mBAAmB,CAAC,KAAK,EAAE,CAAS,EAAE,CAAS;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAEhC,OAAO;YACH,KAAK;YACL,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;YACnB,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,GAAG,CAAC,cAAc;SAC3B,CAAC;IACN,CAAC;CACJ"}

package/highlight/PieRadarHighlighter.d.ts

@@ -6,9 +6,20 @@ import { DataSet } from '../data/DataSet';
 import { ChartData } from '../data/ChartData';
 export declare abstract class PieRadarHighlighter<E extends Entry, D extends DataSet<E>, T extends PieRadarChartBase<E, DataSet<E>, ChartData<E, D>>> implements IHighlighter {
     protected mChart: T;
+    /**
+     * buffer for storing previously highlighted values
+     */
     protected mHighlightBuffer: Highlight[];
     constructor(chart: T);
     getHighlightsAtXValue(xVal: any, x?: any, y?: any): Highlight[];
-    getHighlight(x: number, y: number): Highlight;
+    getHighlight(x: number, y: number): Highlight<Entry>[];
+    /**
+     * Returns the closest Highlight object of the given objects based on the touch position inside the chart.
+     *
+     * @param index
+     * @param x
+     * @param y
+     * @return
+     */
     protected abstract getClosestHighlight(index: any, x: number, y: number): Highlight;
 }

package/highlight/PieRadarHighlighter.js

@@ -1,25 +1,33 @@
 export class PieRadarHighlighter {
     constructor(chart) {
+        /**
+         * buffer for storing previously highlighted values
+         */
         this.mHighlightBuffer = [];
         this.mChart = chart;
     }
     getHighlightsAtXValue(xVal, x, y) {
+        // not implemented
         return null;
     }
     getHighlight(x, y) {
         const touchDistanceToCenter = this.mChart.distanceToCenter(x, y);
-        if (touchDistanceToCenter > this.mChart.getRadius()) {
+        // Check if a slice was touched
+        if (touchDistanceToCenter > this.mChart.radius) {
+            // if no slice was touched, highlight nothing
             return null;
         }
         let angle = this.mChart.getAngleForPoint(x, y);
+        // detect PieChart while preventing circular dep
         if (!this.mChart['mCircleBox']) {
-            angle /= this.mChart.getAnimator().getPhaseY();
+            angle /= this.mChart.animator.phaseY;
         }
         const index = this.mChart.getIndexForAngle(angle);
-        if (index < 0 || index >= this.mChart.getData().getMaxEntryCountSet().getEntryCount()) {
+        // check if the index could be found
+        if (index < 0 || index >= this.mChart.data.maxEntryCountSet.entryCount) {
             return null;
         }
-        return this.getClosestHighlight(index, x, y);
+        return [this.getClosestHighlight(index, x, y)];
     }
 }
 //# sourceMappingURL=PieRadarHighlighter.js.map

package/highlight/PieRadarHighlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PieRadarHighlighter.js","sourceRoot":"../src/","sources":["highlight/PieRadarHighlighter.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,mBAAmB;IAQrC,YAAY,KAAQ;QAFV,qBAAgB,GAAgB,EAAE,CAAC;QAGzC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,qBAAqB,CAAC,IAAI,EAAE,CAAE,EAAE,CAAE;QAE9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,CAAS,EAAE,CAAS;QACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAGjE,IAAI,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE;YAEjD,OAAO,IAAI,CAAC;SACf;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAG/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC5B,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,CAAC;SAClD;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAGlD,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,mBAAmB,EAAE,CAAC,aAAa,EAAE,EAAE;YACnF,OAAO,IAAI,CAAC;SACf;QACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;CAWJ"}
+{"version":3,"file":"PieRadarHighlighter.js","sourceRoot":"","sources":["../../../src/ui-chart/highlight/PieRadarHighlighter.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,mBAAmB;IAQrC,YAAY,KAAQ;QALpB;;WAEG;QACO,qBAAgB,GAAgB,EAAE,CAAC;QAGzC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,qBAAqB,CAAC,IAAI,EAAE,CAAE,EAAE,CAAE;QAC9B,kBAAkB;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,CAAS,EAAE,CAAS;QACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjE,+BAA+B;QAC/B,IAAI,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7C,6CAA6C;YAC7C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE/C,gDAAgD;QAChD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QACzC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAElD,oCAAoC;QACpC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC;YACrE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;CAWJ"}