@nstudio/ncharts 1.0.3 → 1.1.0

package/charts/chart-paging-detector/chart-paging-detector.android.d.ts

@@ -0,0 +1,28 @@
+import { ChartPagingDetectorOptions, PageHandler } from './chart-paging-detector';
+import { ChartPagingDetectorBase } from './chart-paging-detector-base';
+export declare class ChartPagingDetector extends ChartPagingDetectorBase {
+    private readonly chartView;
+    private readonly nativeChart;
+    private lastX;
+    private lastY;
+    private startX;
+    private startY;
+    private horizontalPagingActive;
+    private gestureLocked;
+    private touchSlop;
+    private tracking;
+    private readonly touchHandler;
+    private readonly gestureListener;
+    constructor(chartView: any, onPage: PageHandler, opts?: ChartPagingDetectorOptions);
+    private _handleTouch;
+    handleScaled(): void;
+    detach(): void;
+    protected getLowestVisibleX(): number;
+    protected getHighestVisibleX(): number;
+    protected getScaleX(): number;
+    protected getScaleY(): number;
+    protected getDataXBounds(): {
+        dataMin: number;
+        dataMax: number;
+    } | null;
+}

package/charts/chart-paging-detector/chart-paging-detector.android.js

@@ -0,0 +1,136 @@
+import { ChartPagingDetectorBase } from './chart-paging-detector-base';
+export class ChartPagingDetector extends ChartPagingDetectorBase {
+    constructor(chartView, onPage, opts) {
+        super(onPage, opts);
+        this.lastX = 0;
+        this.lastY = 0;
+        this.startX = 0;
+        this.startY = 0;
+        this.horizontalPagingActive = false;
+        this.gestureLocked = false;
+        this.touchSlop = 8;
+        this.tracking = false;
+        this.chartView = chartView;
+        this.nativeChart = chartView.android;
+        this.touchHandler = (args) => {
+            this._handleTouch(args);
+        };
+        this.gestureListener = new com.github.mikephil.charting.listener.OnChartGestureListener({
+            onChartGestureStart: (me, lastPerformedGesture) => { },
+            onChartGestureEnd: (me, lastPerformedGesture) => { },
+            onChartLongPressed: (me) => { },
+            onChartDoubleTapped: (me) => { },
+            onChartSingleTapped: (me) => { },
+            onChartFling: (me1, me2, velocityX, velocityY) => { },
+            onChartScale: (me, scaleX, scaleY) => {
+                this.handleScaled();
+            },
+            onChartTranslate: (me, dX, dY) => { },
+        });
+        this.chartView.on('touch', this.touchHandler, this);
+        this.nativeChart.setOnChartGestureListener(this.gestureListener);
+    }
+    _handleTouch(args) {
+        const action = args.action;
+        const x = args.getX();
+        const y = args.getY();
+        switch (action) {
+            case 'down':
+                this.startX = x;
+                this.startY = y;
+                this.lastX = x;
+                this.lastY = y;
+                this.tracking = true;
+                this.horizontalPagingActive = false;
+                this.gestureLocked = false;
+                break;
+            case 'move':
+                // recovery path in case of missing down
+                if (!this.tracking) {
+                    this.startX = x;
+                    this.startY = y;
+                    this.lastX = x;
+                    this.lastY = y;
+                    this.tracking = true;
+                    this.horizontalPagingActive = false;
+                    this.gestureLocked = false;
+                    break;
+                }
+                const totalDx = x - this.startX;
+                const totalDy = y - this.startY;
+                const absTotalX = Math.abs(totalDx);
+                const absTotalY = Math.abs(totalDy);
+                // decision pending: Tap vs horizontal vs vertikal
+                if (!this.gestureLocked) {
+                    // not enough displacement => Tap/Jitter
+                    if (absTotalX < this.touchSlop && absTotalY < this.touchSlop) {
+                        return;
+                    }
+                    // Horizontal dominates => activate paging
+                    if (absTotalX > absTotalY * 1.5) {
+                        this.gestureLocked = true;
+                        this.horizontalPagingActive = true;
+                    }
+                    else {
+                        // not enough horizontal => treat as non-paging
+                        this.gestureLocked = true;
+                        this.horizontalPagingActive = false;
+                        return;
+                    }
+                }
+                if (!this.horizontalPagingActive) {
+                    return;
+                }
+                // use incremental deltas
+                const fingerDx = x - this.lastX;
+                this.lastX = x;
+                this.lastY = y;
+                // ignore jitter
+                if (Math.abs(fingerDx) < 1) {
+                    return;
+                }
+                super.handleTranslated(fingerDx);
+                break;
+            case 'up':
+            case 'cancel':
+                this.tracking = false;
+                // only emit end when horizontal paging gesture has finished
+                if (this.horizontalPagingActive) {
+                    super.handleEnd();
+                }
+                this.horizontalPagingActive = false;
+                this.gestureLocked = false;
+                break;
+        }
+    }
+    handleScaled() {
+        super.handleScaled();
+    }
+    detach() {
+        super.detach();
+        this.chartView.off('touch', this.touchHandler, this);
+        this.nativeChart.setOnChartGestureListener(null);
+    }
+    getLowestVisibleX() {
+        return this.nativeChart.getLowestVisibleX();
+    }
+    getHighestVisibleX() {
+        return this.nativeChart.getHighestVisibleX();
+    }
+    getScaleX() {
+        return this.nativeChart.getViewPortHandler().getScaleX();
+    }
+    getScaleY() {
+        return this.nativeChart.getViewPortHandler().getScaleY();
+    }
+    getDataXBounds() {
+        const data = this.nativeChart.getData();
+        if (!data)
+            return null;
+        return {
+            dataMin: data.getXMin(),
+            dataMax: data.getXMax(),
+        };
+    }
+}
+//# sourceMappingURL=chart-paging-detector.android.js.map

package/charts/chart-paging-detector/chart-paging-detector.android.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chart-paging-detector.android.js","sourceRoot":"","sources":["../../../../../packages/ncharts/charts/chart-paging-detector/chart-paging-detector.android.ts"],"names":[],"mappings":"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"}

package/charts/chart-paging-detector/chart-paging-detector.ios.d.ts

@@ -0,0 +1,34 @@
+import { ChartPagingDetectorBase } from './chart-paging-detector-base';
+import { ChartPagingDetectorOptions, PageHandler } from './chart-paging-detector';
+import { LineChartBase } from '../../common';
+export declare class PanActionTarget extends NSObject implements UIGestureRecognizerDelegate {
+    static ObjCProtocols: {
+        prototype: UIGestureRecognizerDelegate;
+    }[];
+    static ObjCExposedMethods: {
+        'handlePan:': {
+            returns: interop.Type<void>;
+            params: interop.Type<any>[];
+        };
+    };
+    private owner;
+    static initWithOwner(owner: any): PanActionTarget;
+    'handlePan:'(recognizer: any): void;
+    gestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer?(gestureRecognizer: UIGestureRecognizer, otherGestureRecognizer: UIGestureRecognizer): boolean;
+}
+export declare class ChartPagingDetector extends ChartPagingDetectorBase {
+    private readonly nativeChart;
+    private readonly panTarget;
+    private readonly pan;
+    constructor(chartView: LineChartBase, onPage: PageHandler, opts?: ChartPagingDetectorOptions);
+    _handlePan(recognizer: UIPanGestureRecognizer): void;
+    handleScaled(): void;
+    protected getLowestVisibleX(): number;
+    protected getHighestVisibleX(): number;
+    protected getScaleX(): number;
+    protected getScaleY(): number;
+    protected getDataXBounds(): {
+        dataMin: number;
+        dataMax: number;
+    } | null;
+}

package/charts/chart-paging-detector/chart-paging-detector.ios.js

@@ -0,0 +1,88 @@
+import { ChartPagingDetectorBase } from './chart-paging-detector-base';
+var PanActionTarget = (function (_super) {
+    __extends(PanActionTarget, _super);
+    function PanActionTarget() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PanActionTarget.initWithOwner = function (owner) {
+        var instance = PanActionTarget.alloc().init();
+        instance.owner = owner;
+        return instance;
+    };
+    PanActionTarget.prototype["handlePan:"] = function (recognizer) {
+        if (this.owner && this.owner._handlePan) {
+            this.owner._handlePan(recognizer);
+        }
+    };
+    PanActionTarget.prototype.gestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer = function (gestureRecognizer, otherGestureRecognizer) {
+        return true;
+    };
+    PanActionTarget.ObjCProtocols = [UIGestureRecognizerDelegate];
+    PanActionTarget.ObjCExposedMethods = {
+        "handlePan:": {
+            returns: interop.types.void,
+            params: [interop.types.id],
+        },
+    };
+    return PanActionTarget;
+}(NSObject));
+export { PanActionTarget };
+export class ChartPagingDetector extends ChartPagingDetectorBase {
+    constructor(chartView, onPage, opts) {
+        super(onPage, opts);
+        this.nativeChart = chartView.ios;
+        // pan via custom recognizer as it should also work in case we are zoomed out
+        this.panTarget = PanActionTarget.initWithOwner(this);
+        this.pan = UIPanGestureRecognizer.alloc().initWithTargetAction(this.panTarget, 'handlePan:');
+        this.pan.cancelsTouchesInView = false;
+        this.pan.delegate = this.panTarget;
+        // deactivate pinzoom for custom gesture recognizer
+        this.pan.minimumNumberOfTouches = 1;
+        this.pan.maximumNumberOfTouches = 1;
+        this.nativeChart.addGestureRecognizer(this.pan);
+    }
+    _handlePan(recognizer) {
+        const tr = recognizer.translationInView(this.nativeChart);
+        const dx = tr.x;
+        const dy = tr.y;
+        // Reset translation early so we always work with deltas
+        recognizer.setTranslationInView(CGPointZero, this.nativeChart);
+        // Gate: ignore if gesture is primarily vertical (or too small)
+        const absX = Math.abs(dx);
+        const absY = Math.abs(dy);
+        // 1) minimum horizontal movement (avoid jitter)
+        if (absX < 3)
+            return;
+        // 2) horizontal dominance (tune factor 1.2..2.0)
+        if (absX < absY * 1.5)
+            return;
+        // Only now treat as horizontal paging intent
+        this.handleTranslated(dx);
+        const s = recognizer.state;
+        if (s === 3 /* UIGestureRecognizerState.Ended */ || s === 4 /* UIGestureRecognizerState.Cancelled */) {
+            this.handleEnd();
+        }
+    }
+    handleScaled() {
+        super.handleScaled();
+    }
+    getLowestVisibleX() {
+        return this.nativeChart.lowestVisibleX;
+    }
+    getHighestVisibleX() {
+        return this.nativeChart.highestVisibleX;
+    }
+    getScaleX() {
+        return this.nativeChart.scaleX;
+    }
+    getScaleY() {
+        return this.nativeChart.scaleY;
+    }
+    getDataXBounds() {
+        const data = this.nativeChart.data;
+        if (!data)
+            return null;
+        return { dataMin: this.nativeChart.chartXMin, dataMax: this.nativeChart.chartXMax };
+    }
+}
+//# sourceMappingURL=chart-paging-detector.ios.js.map

package/charts/chart-paging-detector/chart-paging-detector.ios.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chart-paging-detector.ios.js","sourceRoot":"","sources":["../../../../../packages/ncharts/charts/chart-paging-detector/chart-paging-detector.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;;;;;IAIvE,CAAC;;;;;IAIa,CAAC;;;;QAQW,CAAC;IAAS,CAAC;;;IAKG,CAAC;;;;;;;;;AAMyH,CAAC;;AAKnK,MAAM,OAAO,mBAAoB,SAAQ,uBAAuB;IAK9D,YAAY,SAAwB,EAAE,MAAmB,EAAE,IAAiC;QAC1F,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEpB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,GAA2B,CAAC;QAEzD,6EAA6E;QAC7E,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,GAAG,sBAAsB,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAC7F,IAAI,CAAC,GAAG,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAEnC,mDAAmD;QACnD,IAAI,CAAC,GAAG,CAAC,sBAAsB,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,CAAC,sBAAsB,GAAG,CAAC,CAAC;QAEpC,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAEM,UAAU,CAAC,UAAkC;QAClD,MAAM,EAAE,GAAG,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAChB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAEhB,wDAAwD;QACxD,UAAU,CAAC,oBAAoB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAE/D,+DAA+D;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE1B,gDAAgD;QAChD,IAAI,IAAI,GAAG,CAAC;YAAE,OAAO;QAErB,iDAAiD;QACjD,IAAI,IAAI,GAAG,IAAI,GAAG,GAAG;YAAE,OAAO;QAE9B,6CAA6C;QAC7C,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAE1B,MAAM,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,2CAAmC,IAAI,CAAC,+CAAuC,EAAE,CAAC;YACrF,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC;IACH,CAAC;IACM,YAAY;QACjB,KAAK,CAAC,YAAY,EAAE,CAAC;IACvB,CAAC;IAES,iBAAiB;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC;IACzC,CAAC;IAES,kBAAkB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC;IAC1C,CAAC;IAES,SAAS;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACjC,CAAC;IACS,SAAS;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACjC,CAAC;IAES,cAAc;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;IACtF,CAAC;CACF"}

package/charts/combined-chart.android.d.ts

@@ -1,15 +1,27 @@
 /**
  * CombinedChart - Android Implementation
  */
-import { CombinedChartBase, ChartAnimation, LegendConfig, XAxisConfig, ChartDescription, MarkerConfig, Highlight } from '../common';
+import { CombinedChartBase, ChartAnimation, LegendConfig, XAxisConfig, ChartDescription, MarkerConfig, Highlight, ViewPortOffset, extraOffsetsProperty, touchEnabledProperty, dragEnabledProperty, scaleEnabledProperty, pinchZoomProperty, highlightPerDragEnabledProperty, highlightPerTapEnabledProperty } from '../common';
 export declare class CombinedChart extends CombinedChartBase {
+    [extraOffsetsProperty.setNative]: (value: ViewPortOffset) => void;
+    [touchEnabledProperty.setNative]: (value: boolean) => void;
+    [dragEnabledProperty.setNative]: (value: boolean) => void;
+    [scaleEnabledProperty.setNative]: (value: boolean) => void;
+    [pinchZoomProperty.setNative]: (value: boolean) => void;
+    [highlightPerDragEnabledProperty.setNative]: (value: boolean) => void;
+    [highlightPerTapEnabledProperty.setNative]: (value: boolean) => void;
     private _native;
     private _selectionListener;
+    private _combinedRenderer;
+    private _pageDetector;
+    private _retainedChartObjects;
+    private _retainedDataObjects;
     createNativeView(): any;
     initNativeView(): void;
     disposeNativeView(): void;
     get nativeChart(): any;
     applyData(): void;
+    private _updateCustomRenderer;
     protected _applyAnimation(animation: ChartAnimation): void;
     protected _applyHighlights(highlights: Highlight[] | null): void;
     protected _invalidateChart(): void;

package/charts/combined-chart.android.js

@@ -1,10 +1,14 @@
 /**
  * CombinedChart - Android Implementation
  */
-import { CombinedChartBase, nchartsLog } from '../common';
+import { CombinedChartBase, nchartsLog, extraOffsetsProperty, touchEnabledProperty, dragEnabledProperty, scaleEnabledProperty, pinchZoomProperty, highlightPerDragEnabledProperty, highlightPerTapEnabledProperty } from '../common';
 import { toAndroidColor } from './utils';
-import { applyNoDataTextColorAndroid, applyLegendAndroid, applyXAxisAndroid, applyYAxisDualAndroid, applyDescriptionAndroid } from './style-helpers.android';
-function applyLineDataSetConfig(dataSet, config) {
+import { applyNoDataTextColorAndroid, applyLegendAndroid, applyXAxisAndroid, applyYAxisDualAndroid, applyDescriptionAndroid, applyMarkerAndroid } from './style-helpers.android';
+import { NSCustomLabelsArrayFormatter } from './formatters/custom-labels-array-formatter.android';
+import { NSCombinedChartRenderer } from './renderers/combined-chart-renderer.android';
+import { NSSuffixValueFormatter } from './formatters/suffix-value-formatter.android';
+import { ChartPagingDetector } from './chart-paging-detector/chart-paging-detector';
+function applyLineDataSetConfig(dataSet, config, retainedDataObjects) {
     if (!dataSet || !config)
         return;
     if (config.color) {
@@ -90,8 +94,18 @@ function applyLineDataSetConfig(dataSet, config) {
     }
     if (config.drawCubicIntensity !== undefined)
         dataSet.setCubicIntensity(config.drawCubicIntensity);
+    if (config.valueFormatter === 'number') {
+        const vf = NSSuffixValueFormatter.initWithPattern(config.valueFormatterPattern);
+        dataSet.setValueFormatter(vf);
+        retainedDataObjects.push(vf);
+    }
+    else if (Array.isArray(config.valueFormatter)) {
+        const vf = new NSCustomLabelsArrayFormatter(config.valueFormatter);
+        dataSet.setValueFormatter(vf);
+        retainedDataObjects.push(vf);
+    }
 }
-function applyBarDataSetConfig(dataSet, config) {
+function applyBarDataSetConfig(dataSet, config, retainedDataObjects) {
     if (!dataSet || !config)
         return;
     if (config.color) {
@@ -108,6 +122,9 @@ function applyBarDataSetConfig(dataSet, config) {
         });
         dataSet.setColors(colors);
     }
+    if (config.axisDependency) {
+        dataSet.setAxisDependency(config.axisDependency === 'RIGHT' ? com.github.mikephil.charting.components.YAxis.AxisDependency.RIGHT : com.github.mikephil.charting.components.YAxis.AxisDependency.LEFT);
+    }
     if (config.highlightEnabled !== undefined)
         dataSet.setHighlightEnabled(config.highlightEnabled);
     if (config.drawValues !== undefined)
@@ -128,6 +145,19 @@ function applyBarDataSetConfig(dataSet, config) {
     }
     if (config.highlightAlpha !== undefined)
         dataSet.setHighLightAlpha(Math.round(config.highlightAlpha));
+    if (config.barBorderWidth !== undefined) {
+        dataSet.setBarBorderWidth(config.barBorderWidth);
+    }
+    if (config.barBorderColor) {
+        const color = toAndroidColor(config.barBorderColor);
+        if (color !== undefined)
+            dataSet.setBarBorderColor(color);
+    }
+    if (config.valueFormatter === 'percent' || config.valueFormatter === 'suffix') {
+        const vf = NSSuffixValueFormatter.initWithPattern(config.valueFormatterPattern);
+        dataSet.setValueFormatter(vf);
+        retainedDataObjects.push(vf);
+    }
 }
 function applyScatterDataSetConfig(dataSet, config) {
     if (!dataSet || !config)
@@ -305,6 +335,10 @@ export class CombinedChart extends CombinedChartBase {
         super(...arguments);
         this._native = null;
         this._selectionListener = null;
+        this._combinedRenderer = null;
+        this._pageDetector = null;
+        this._retainedChartObjects = [];
+        this._retainedDataObjects = [];
     }
     createNativeView() {
         nchartsLog('[ncharts] CombinedChart.createNativeView()');
@@ -316,7 +350,6 @@ export class CombinedChart extends CombinedChartBase {
         nchartsLog('[ncharts] CombinedChart.initNativeView()');
         super.initNativeView();
         const instance = this._native;
-        instance.setHighlightPerTapEnabled(this.highlightPerTapEnabled);
         if (this.chartBackgroundColor) {
             const color = toAndroidColor(this.chartBackgroundColor);
             if (color !== undefined)
@@ -325,6 +358,17 @@ export class CombinedChart extends CombinedChartBase {
         if (this.noDataText)
             instance.setNoDataText(this.noDataText);
         applyNoDataTextColorAndroid(instance, this.noDataTextColor);
+        // angular directive does not await presence of native chart, hence setup needs to happen here
+        if (this.touchEnabled !== undefined)
+            instance.setTouchEnabled(this.touchEnabled);
+        if (this.dragEnabled !== undefined)
+            instance.setDragEnabled(this.dragEnabled);
+        if (this.scaleEnabled !== undefined)
+            instance.setScaleEnabled(this.scaleEnabled);
+        if (this.pinchZoom !== undefined)
+            instance.setPinchZoom(this.pinchZoom);
+        if (this.highlightPerDragEnabled !== undefined)
+            instance.setHighlightPerDragEnabled(this.highlightPerDragEnabled);
         // Set up selection listener
         const owner = new WeakRef(this);
         this._selectionListener = new com.github.mikephil.charting.listener.OnChartValueSelectedListener({
@@ -349,6 +393,15 @@ export class CombinedChart extends CombinedChartBase {
             },
         });
         instance.setOnChartValueSelectedListener(this._selectionListener);
+        // Set up page change detector
+        this._pageDetector = new ChartPagingDetector(this, async (dir, info) => {
+            this.notify({
+                eventName: CombinedChart.pageEvent,
+                object: this,
+                dir,
+                info,
+            });
+        }, { idleMs: 160, edgeRatio: 0.08, cooldownMs: 500, pagingMaxScaleX: 1, pagingMaxScaleY: 1 });
         if (this.legend)
             this._applyLegend(this.legend);
         if (this.xAxis)
@@ -361,6 +414,12 @@ export class CombinedChart extends CombinedChartBase {
             this.applyData();
     }
     disposeNativeView() {
+        this._pageDetector?.detach();
+        this._pageDetector = null;
+        this._combinedRenderer?.detach();
+        this._combinedRenderer = null;
+        this._retainedChartObjects.length = 0;
+        this._retainedDataObjects.length = 0;
         this._selectionListener = null;
         this._native = null;
         this._nativeChart = null;
@@ -374,6 +433,18 @@ export class CombinedChart extends CombinedChartBase {
             return;
         nchartsLog('[ncharts] CombinedChart._applyDataAndroid called');
         const instance = this._native;
+        // remove retained data objects
+        this._retainedDataObjects.length = 0;
+        // Setup of non-default draw order, order matters (before setting data)
+        if (this.data?.drawOrder) {
+            const order = this.data.drawOrder;
+            const toAndroidDrawOrder = (value) => com.github.mikephil.charting.charts.CombinedChart.DrawOrder[value];
+            const orderArray = java.lang.reflect.Array.newInstance(com.github.mikephil.charting.charts.CombinedChart.DrawOrder.class, order.length);
+            for (let i = 0; i < order.length; i++) {
+                orderArray[i] = toAndroidDrawOrder(order[i]);
+            }
+            instance.setDrawOrder(orderArray);
+        }
         const combinedData = new com.github.mikephil.charting.data.CombinedData();
         // Line data
         if (this.data.lineData) {
@@ -386,13 +457,19 @@ export class CombinedChart extends CombinedChartBase {
                         entry = new com.github.mikephil.charting.data.Entry(index, value);
                     }
                     else {
-                        entry = new com.github.mikephil.charting.data.Entry(value.x ?? index, value.y);
+                        const x = value.x ?? index;
+                        if (!value.marker) {
+                            entry = new com.github.mikephil.charting.data.Entry(x, value.y);
+                        }
+                        else {
+                            entry = new com.github.mikephil.charting.data.Entry(x, value.y, value.marker);
+                        }
                     }
                     entries.add(entry);
                 });
                 const dataSet = new com.github.mikephil.charting.data.LineDataSet(entries, ds.label);
                 if (ds.config)
-                    applyLineDataSetConfig(dataSet, ds.config);
+                    applyLineDataSetConfig(dataSet, ds.config, this._retainedDataObjects);
                 lineDataSets.add(dataSet);
             }
             const lineData = new com.github.mikephil.charting.data.LineData(lineDataSets);
@@ -409,16 +486,31 @@ export class CombinedChart extends CombinedChartBase {
                         entry = new com.github.mikephil.charting.data.BarEntry(index, value);
                     }
                     else if (Array.isArray(value.y)) {
-                        entry = new com.github.mikephil.charting.data.BarEntry(value.x ?? index, value.y);
+                        const x = value.x ?? index;
+                        const stack = Array.create('float', value.y.length);
+                        for (let i = 0; i < value.y.length; i++) {
+                            stack[i] = value.y[i];
+                        }
+                        if (!value.marker) {
+                            entry = new com.github.mikephil.charting.data.BarEntry(x, stack);
+                        }
+                        else {
+                            entry = new com.github.mikephil.charting.data.BarEntry(x, stack, value.marker);
+                        }
                     }
                     else {
-                        entry = new com.github.mikephil.charting.data.BarEntry(value.x ?? index, value.y);
+                        if (!value.marker) {
+                            entry = new com.github.mikephil.charting.data.BarEntry(value.x ?? index, value.y);
+                        }
+                        else {
+                            entry = new com.github.mikephil.charting.data.BarEntry(value.x ?? index, value.y, value.marker);
+                        }
                     }
                     entries.add(entry);
                 });
                 const dataSet = new com.github.mikephil.charting.data.BarDataSet(entries, ds.label);
                 if (ds.config)
-                    applyBarDataSetConfig(dataSet, ds.config);
+                    applyBarDataSetConfig(dataSet, ds.config, this._retainedDataObjects);
                 barDataSets.add(dataSet);
             }
             const barData = new com.github.mikephil.charting.data.BarData(barDataSets);
@@ -484,8 +576,27 @@ export class CombinedChart extends CombinedChartBase {
             const candleData = new com.github.mikephil.charting.data.CandleData(candleDataSets);
             combinedData.setData(candleData);
         }
+        // install custom renderer if needed
+        this._updateCustomRenderer();
         instance.setData(combinedData);
         instance.invalidate();
+        // data and animation properties cannot be set in a guranteed order
+        // hence after each data update an animation needs to be executed
+        if (this.animation)
+            this._applyAnimation(this.animation);
+    }
+    _updateCustomRenderer() {
+        const barConfigs = this.data?.barData?.dataSets?.map((ds) => ds.config).filter(Boolean) ?? [];
+        const needsCustomRenderer = this.yAxis?.plotBands?.length || barConfigs.some((cfg) => cfg?.drawValuesInside);
+        if (!needsCustomRenderer) {
+            this._combinedRenderer?.detach();
+            this._combinedRenderer = null;
+        }
+        else {
+            this._combinedRenderer?.detach();
+            this._combinedRenderer = NSCombinedChartRenderer.create(this._native, barConfigs, this.yAxis?.plotBands);
+            this._native.notifyDataSetChanged();
+        }
     }
     _applyAnimation(animation) {
         if (!this._native)
@@ -524,19 +635,58 @@ export class CombinedChart extends CombinedChartBase {
         applyLegendAndroid(this._native, legend);
     }
     _applyXAxis(xAxis) {
-        applyXAxisAndroid(this._native, xAxis);
+        applyXAxisAndroid(this._native, xAxis, this._retainedChartObjects);
     }
     _applyYAxis(yAxis) {
-        applyYAxisDualAndroid(this._native, yAxis);
+        applyYAxisDualAndroid(this._native, yAxis, this._retainedChartObjects);
+        this._updateCustomRenderer();
     }
     _applyDescription(description) {
         applyDescriptionAndroid(this._native, description);
     }
-    _applyMarker(marker) { }
+    _applyMarker(marker) {
+        applyMarkerAndroid(this._native, marker, this._retainedChartObjects);
+    }
     _moveViewToX(xValue) { }
     _moveViewTo(xValue, yValue, axisDependency) { }
     _centerViewTo(xValue, yValue, axisDependency) { }
     _zoom(scaleX, scaleY, x, y) { }
     _fitScreen() { }
+    [extraOffsetsProperty.setNative](value) {
+        if (this._native && value) {
+            this._native.setExtraOffsets(value.left, value.top, value.right, value.bottom);
+            this._native.invalidate();
+        }
+    }
+    [touchEnabledProperty.setNative](value) {
+        if (this._native) {
+            this._native.setTouchEnabled(value);
+        }
+    }
+    [dragEnabledProperty.setNative](value) {
+        if (this._native) {
+            this._native.setDragEnabled(value);
+        }
+    }
+    [scaleEnabledProperty.setNative](value) {
+        if (this._native) {
+            this._native.setScaleEnabled(value);
+        }
+    }
+    [pinchZoomProperty.setNative](value) {
+        if (this._native) {
+            this._native.setPinchZoom(value);
+        }
+    }
+    [highlightPerDragEnabledProperty.setNative](value) {
+        if (this._native) {
+            this._native.setHighlightPerDragEnabled(value);
+        }
+    }
+    [highlightPerTapEnabledProperty.setNative](value) {
+        if (this._native) {
+            this._native.setHighlightPerTapEnabled(value);
+        }
+    }
 }
 //# sourceMappingURL=combined-chart.android.js.map