fix: more fixes

Author: farfromrefug

package.json

@@ -42,7 +42,7 @@
         "cpy-cli": "^3.0.0",
         "husky": "^4.0.7",
         "lerna": "^3.20.2",
-        "nativescript-canvas": "2.1.17",
+        "nativescript-canvas": "2.1.18",
         "nativescript-gesturehandler": "^0.1.4",
         "nativescript-tween": "0.0.5",
         "npm-watch": "^0.6.0",

plugin/package.json

@@ -25,7 +25,7 @@
     "homepage": "https://github.com/Akylas/nativescript-chart",
     "readmeFilename": "README.md",
     "dependencies": {
-        "nativescript-canvas": "^2.1.17",
+        "nativescript-canvas": "^2.1.18",
         "nativescript-gesturehandler": "^0.1.4",
         "nativescript-tween": "^0.0.5",
         "number-format.js": "^2.0.9"

src/charting/charts/BarLineChartBase.ts

@@ -206,9 +206,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
         // make sure the data cannot be drawn outside the content-rect
         let clipRestoreCount = canvas.save();
         canvas.clipRect(this.mViewPortHandler.getContentRect());
-        console.log('about to drawData');
         this.mRenderer.drawData(canvas);
-        console.log('drawData done');
 
         if (!this.mXAxis.isDrawGridLinesBehindDataEnabled()) this.mXAxisRenderer.renderGridLines(canvas);
 
@@ -229,12 +227,10 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
         if (this.mAxisLeft.isEnabled() && !this.mAxisLeft.isDrawLimitLinesBehindDataEnabled()) this.mAxisRendererLeft.renderLimitLines(canvas);
 
         if (this.mAxisRight.isEnabled() && !this.mAxisRight.isDrawLimitLinesBehindDataEnabled()) this.mAxisRendererRight.renderLimitLines(canvas);
-        console.log('onDraw8');
 
         this.mXAxisRenderer.renderAxisLabels(canvas);
         this.mAxisRendererLeft.renderAxisLabels(canvas);
         this.mAxisRendererRight.renderAxisLabels(canvas);
-        console.log('onDraw9');
 
         if (this.isClipValuesToContentEnabled()) {
             clipRestoreCount = canvas.save();
@@ -971,6 +967,11 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
      */
     public setHighlightPerDragEnabled(enabled) {
         this.mHighlightPerDragEnabled = enabled;
+        if (enabled) {
+            this.getOrCreateBarTouchListener().setPan(true);
+        } else if (this.mChartTouchListener) {
+            this.mChartTouchListener.setPan(false);
+        }
     }
 
     public isHighlightPerDragEnabled() {
@@ -996,6 +997,11 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
     public setDragEnabled(enabled) {
         this.mDragXEnabled = enabled;
         this.mDragYEnabled = enabled;
+        if (enabled) {
+            this.getOrCreateBarTouchListener().setPan(true);
+        } else if (this.mChartTouchListener) {
+            this.mChartTouchListener.setPan(false);
+        }
     }
 
     /**
@@ -1052,6 +1058,11 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
     public setScaleEnabled(enabled) {
         this.mScaleXEnabled = enabled;
         this.mScaleYEnabled = enabled;
+        if (enabled) {
+            this.getOrCreateBarTouchListener().setPinch(true);
+        } else if (this.mChartTouchListener) {
+            this.mChartTouchListener.setPinch(false);
+        }
     }
 
     public setScaleXEnabled(enabled) {
@@ -1085,6 +1096,15 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
         }
     }
 
+    public setHighlightPerTapEnabled(enabled) {
+        super.setHighlightPerTapEnabled(enabled);
+        if (enabled) {
+            this.getOrCreateBarTouchListener().setTap(true);
+        } else if (this.mChartTouchListener) {
+            this.mChartTouchListener.setTap(false);
+        }
+    }
+
     /**
      * Returns true if zooming via double-tap is enabled false if not.
      *

src/charting/charts/Chart.ts

@@ -500,6 +500,7 @@ export abstract class Chart<U extends Entry, D extends IDataSet<U>, T extends Ch
      */
     public setHighlightPerTapEnabled(enabled) {
         this.mHighLightPerTapEnabled = enabled;
+        
     }
 
     /**

src/charting/listener/BarLineChartTouchListener.ts

@@ -546,7 +546,6 @@ export class BarLineChartTouchListener extends ChartTouchListener<BarLineChartBa
         let yTrans = 0;
 
         // check if axis is inverted
-        console.log('getTrans', x, y, vph.offsetLeft(), vph.offsetTop(), vph.offsetBottom(), vph.getChartHeight());
         if (this.inverted()) {
             yTrans = -(y - vph.offsetTop());
         } else {
@@ -601,7 +600,6 @@ export class BarLineChartTouchListener extends ChartTouchListener<BarLineChartBa
             }
             if (chart.isDoubleTapToZoomEnabled() && chart.getData().getEntryCount() > 0) {
                 const trans = this.getTrans(event.data.extraData.x, event.data.extraData.y);
-                console.log('onDoubleTapGesture', event.data.extraData.x, event.data.extraData.y, trans.x, trans.y);
 
                 chart.zoom(chart.isScaleXEnabled() ? 1.4 : 1, chart.isScaleYEnabled() ? 1.4 : 1, trans.x, trans.y);
 

src/charting/renderer/YAxisRenderer.ts

@@ -100,7 +100,6 @@ export class YAxisRenderer extends AxisRenderer {
         const mYAxis = this.mYAxis;
         let from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
         let to = mYAxis.isDrawTopYLabelEntryEnabled() ? mYAxis.mEntryCount : mYAxis.mEntryCount - 1;
-        console.log('drawYLabels', fixedPosition, positions, offset, from ,to);
         // draw
         for (let i = from; i < to; i++) {
             let text = mYAxis.getFormattedLabel(i);