Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Don't use clip/unclipArea when clip: false #9286

Merged
merged 1 commit into from Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/controllers/controller.bar.js
@@ -1,6 +1,6 @@
import DatasetController from '../core/core.datasetController';
import {
clipArea, unclipArea, _arrayUnique, isArray, isNullOrUndef,
_arrayUnique, isArray, isNullOrUndef,
valueOrDefault, resolveObjectKey, sign, defined
} from '../helpers';

Expand Down Expand Up @@ -224,6 +224,14 @@ export default class BarController extends DatasetController {
}
}

/**
* @return {number|boolean}
* @protected
*/
getMaxOverflow() {
return 0;
}

/**
* @protected
*/
Expand Down Expand Up @@ -514,22 +522,17 @@ export default class BarController extends DatasetController {

draw() {
const me = this;
const chart = me.chart;
const meta = me._cachedMeta;
const vScale = meta.vScale;
const rects = meta.data;
const ilen = rects.length;
let i = 0;

clipArea(chart.ctx, chart.chartArea);

for (; i < ilen; ++i) {
if (me.getParsed(i)[vScale.axis] !== null) {
rects[i].draw(me._ctx);
}
}

unclipArea(chart.ctx);
}

}
Expand Down
19 changes: 12 additions & 7 deletions src/core/core.controller.js
Expand Up @@ -706,6 +706,7 @@ class Chart {
const me = this;
const ctx = me.ctx;
const clip = meta._clip;
const useClip = !clip.disabled;
const area = me.chartArea;
const args = {
meta,
Expand All @@ -717,16 +718,20 @@ class Chart {
return;
}

clipArea(ctx, {
left: clip.left === false ? 0 : area.left - clip.left,
right: clip.right === false ? me.width : area.right + clip.right,
top: clip.top === false ? 0 : area.top - clip.top,
bottom: clip.bottom === false ? me.height : area.bottom + clip.bottom
});
if (useClip) {
clipArea(ctx, {
left: clip.left === false ? 0 : area.left - clip.left,
right: clip.right === false ? me.width : area.right + clip.right,
top: clip.top === false ? 0 : area.top - clip.top,
bottom: clip.bottom === false ? me.height : area.bottom + clip.bottom
});
}

meta.controller.draw();

unclipArea(ctx);
if (useClip) {
unclipArea(ctx);
}

args.cancelable = false;
me.notifyPlugins('afterDatasetDraw', args);
Expand Down
3 changes: 2 additions & 1 deletion src/core/core.datasetController.js
Expand Up @@ -51,7 +51,8 @@ function toClip(value) {
top: t,
right: r,
bottom: b,
left: l
left: l,
disabled: value === false
};
}

Expand Down
27 changes: 27 additions & 0 deletions test/specs/controller.bar.tests.js
Expand Up @@ -1628,4 +1628,31 @@ describe('Chart.controllers.bar', function() {
expect(chart.scales.y.getMinMax()).toEqual({min: -10, max: 10});
});
});

describe('clip', function() {
it('Should not use ctx.clip when clip=false', function() {
var ctx = window.createMockContext();
ctx.resetTransform = function() {};

var chart = window.acquireChart({
type: 'bar',
data: {
labels: ['a', 'b', 'c'],
datasets: [{
data: [1, 2, 3],
clip: false
}]
}
});
var orig = chart.ctx;

// Draw on mock context
chart.ctx = ctx;
chart.draw();

chart.ctx = orig;

expect(ctx.getCalls().filter(x => x.name === 'clip').length).toEqual(0);
});
});
});