Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/guide/migrationV2.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ leave: function({element}) {
},
```

`chartjs-plugin-annotation` plugin version 2 removes the clipping of the label to the box annotation size.

`chartjs-plugin-annotation` plugin version 2 hides the following methods in the `line` annotation element because they should be used only internally:

* `intersects`
Expand Down
17 changes: 7 additions & 10 deletions src/annotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,37 +141,34 @@ export default {
};

function draw(chart, caller, clip) {
const {ctx, canvas, chartArea} = chart;
const {ctx, chartArea} = chart;
const {visibleElements} = chartStates.get(chart);
let area = {left: 0, top: 0, width: canvas.width, height: canvas.height};

if (clip) {
clipArea(ctx, chartArea);
area = chartArea;
}

const drawableElements = getDrawableElements(visibleElements, caller, area).sort((a, b) => a.element.options.z - b.element.options.z);
const drawableElements = getDrawableElements(visibleElements, caller).sort((a, b) => a.options.z - b.options.z);

for (const item of drawableElements) {
item.element.draw(chart.ctx, item.area);
for (const element of drawableElements) {
element.draw(chart.ctx, chartArea);
}

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

function getDrawableElements(elements, caller, area) {
function getDrawableElements(elements, caller) {
const drawableElements = [];
for (const el of elements) {
if (el.options.drawTime === caller) {
drawableElements.push({element: el, area});
drawableElements.push(el);
}
if (el.elements && el.elements.length) {
const box = 'getBoundingBox' in el ? el.getBoundingBox() : area;
for (const sub of el.elements) {
if (sub.options.display && sub.options.drawTime === caller) {
drawableElements.push({element: sub, area: box});
drawableElements.push(sub);
}
}
}
Expand Down
14 changes: 0 additions & 14 deletions src/types/box.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,6 @@ export default class BoxAnnotation extends Element {
ctx.restore();
}

getBoundingBox() {
const {x, y, width, height} = this.getProps(['x', 'y', 'width', 'height']);
const label = this.options.label;
const padding = toPadding(label.padding);
const borderWidth = this.options.borderWidth;
const halfBorder = borderWidth / 2;
return {
left: x + halfBorder + padding.left,
top: y + halfBorder + padding.top,
width: width - borderWidth - padding.width,
height: height - borderWidth - padding.height
};
}

get label() {
return this.elements && this.elements[0];
}
Expand Down
8 changes: 1 addition & 7 deletions src/types/label.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class LabelAnnotation extends Element {
return getElementCenterPoint(this, useFinalPosition);
}

draw(ctx, area) {
draw(ctx) {
const options = this.options;
if (!options.display || !options.content) {
return;
Expand All @@ -24,12 +24,6 @@ export default class LabelAnnotation extends Element {
translate(ctx, this.getCenterPoint(), this.rotation);
drawCallout(ctx, this);
drawBox(ctx, this, options);
if (area) {
// clip
ctx.beginPath();
ctx.rect(area.left, area.top, area.width, area.height);
ctx.clip();
}
drawLabel(ctx, getLabelSize(this), options);
ctx.restore();
}
Expand Down
Binary file modified test/fixtures/box/labelMultiline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/fixtures/box/labelPadding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.