Skip to content

Commit da273e3

Browse files
Charts: remove deprecated event.cancel for LegendClickEvent, PointClickEvent (DevExpress#30132)
1 parent 9b4e84a commit da273e3

File tree

2 files changed

+2
-64
lines changed

2 files changed

+2
-64
lines changed

packages/devextreme/js/viz/chart_components/tracker.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import pointerEvents from '../../common/core/events/pointer';
99
import { addNamespace } from '../../common/core/events/utils/index';
1010
import { isDefined } from '../../core/utils/type';
1111
import { noop as _noop } from '../../core/utils/common';
12-
import errors from '../../core/errors';
1312
const _floor = Math.floor;
1413
const eventsConsts = consts.events;
1514
const statesConsts = consts.states;
@@ -57,15 +56,8 @@ function getData(event, dataKey, tryCheckParent) {
5756
return data;
5857
}
5958

60-
function eventCanceled({ event, cancel }, target, clickTarget) {
61-
const deprecatedCancel = event.cancel; // DEPRECATED_22_1
62-
const eventCanceled = cancel || deprecatedCancel;
63-
64-
if(deprecatedCancel) {
65-
errors.log('W0003', `${clickTarget}Click handler argument`, 'event.cancel', '22.1', 'Use the \'cancel\' field instead');
66-
}
67-
68-
return eventCanceled || !target.getOptions();
59+
function eventCanceled({ cancel }, target) {
60+
return cancel || !target.getOptions();
6961
}
7062

7163
function correctLegendHoverMode(mode) {

packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,30 +1020,6 @@ QUnit.test('dxpointermove on series, click', function(assert) {
10201020
assert.deepEqual(this.options.eventTrigger.withArgs('seriesClick').lastCall.args[1], { target: this.point.series, event: clickEvent }, 'series event arg');
10211021
});
10221022

1023-
QUnit.test('dxpointermove on series, click, pointClick with cancel (DEPRECATED) seriesClick', function(assert) {
1024-
const clickEvent = getEvent('dxclick', { pageX: 100, pageY: 50, target: this.seriesGroup.element });
1025-
this.series.getPointByCoord.withArgs(97, 45).returns(this.point);
1026-
1027-
// Act
1028-
$(this.renderer.root.element).trigger(getEvent('dxpointermove', { pageX: 100, pageY: 50, target: this.seriesGroup.element }));
1029-
$(this.renderer.root.element).trigger(clickEvent);
1030-
1031-
assert.ok(this.options.eventTrigger.withArgs('pointClick').calledOnce);
1032-
assert.deepEqual(this.options.eventTrigger.withArgs('pointClick').lastCall.args[1], { target: this.point, event: clickEvent });
1033-
assert.ok(!this.options.eventTrigger.withArgs('seriesClick').calledOnce);
1034-
clickEvent.cancel = true;
1035-
this.options.eventTrigger.withArgs('pointClick').lastCall.args[2]();
1036-
1037-
assert.ok(!this.options.eventTrigger.withArgs('seriesClick').called);
1038-
assert.deepEqual(errors.log.lastCall.args, [
1039-
'W0003',
1040-
'pointClick handler argument',
1041-
'event.cancel',
1042-
'22.1',
1043-
'Use the \'cancel\' field instead'
1044-
], 'args of the log method');
1045-
});
1046-
10471023
QUnit.test('dxpointermove on series, click, pointClick with cancel seriesClick', function(assert) {
10481024
this.options.eventTrigger = sinon.spy((eventName, eventArgs) => {
10491025
if(eventName === 'pointClick') {
@@ -1413,36 +1389,6 @@ QUnit.test('legendClick', function(assert) {
14131389
assert.deepEqual(this.options.eventTrigger.withArgs('seriesClick').lastCall.args[1], { target: this.series, event: event }, 'series event arg');
14141390
});
14151391

1416-
QUnit.test('click on legend with chancel (DEPRECATED) in legendClick handler', function(assert) {
1417-
const event = getEvent('dxclick', { pageX: 100, pageY: 50 });
1418-
1419-
this.tracker = this.createTracker(this.options, this.canvases);
1420-
this.legend.coordsIn.withArgs(97, 45).returns(true);
1421-
this.legend.getItemByCoord.withArgs(97, 45).returns({
1422-
id: 0
1423-
});
1424-
1425-
$(this.renderer.root.element).trigger(event);
1426-
1427-
assert.ok(this.options.eventTrigger.withArgs('legendClick').calledOnce);
1428-
assert.deepEqual(this.options.eventTrigger.withArgs('legendClick').lastCall.args[1], { target: this.series, event: event });
1429-
1430-
assert.ok(!this.options.eventTrigger.withArgs('seriesClick').calledOnce);
1431-
1432-
event.cancel = true;
1433-
this.options.eventTrigger.withArgs('legendClick').lastCall.args[2]();
1434-
1435-
1436-
assert.ok(!this.options.eventTrigger.withArgs('seriesClick').called);
1437-
assert.deepEqual(errors.log.lastCall.args, [
1438-
'W0003',
1439-
'legendClick handler argument',
1440-
'event.cancel',
1441-
'22.1',
1442-
'Use the \'cancel\' field instead'
1443-
], 'args of the log method');
1444-
});
1445-
14461392
QUnit.test('click on legend with chancel in legendClick handler', function(assert) {
14471393
this.options.eventTrigger = sinon.spy((eventName, eventArgs) => {
14481394
if(eventName === 'legendClick') {

0 commit comments

Comments
 (0)