From 739c18f94a4ba6233a1cabe6e82dbd7f069be288 Mon Sep 17 00:00:00 2001 From: stockiNail Date: Thu, 19 May 2022 17:47:57 +0200 Subject: [PATCH 1/2] Use margin option in the callout check for being shown --- src/types/label.js | 19 +++- test/fixtures/label/calloutNoShown.js | 118 +++++++++++++++++++++++++ test/fixtures/label/calloutNoShown.png | Bin 0 -> 29763 bytes 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 test/fixtures/label/calloutNoShown.js create mode 100644 test/fixtures/label/calloutNoShown.png diff --git a/src/types/label.js b/src/types/label.js index e6074309f..f4d9abf3e 100644 --- a/src/types/label.js +++ b/src/types/label.js @@ -144,7 +144,7 @@ function drawCallout(ctx, element) { const {pointX, pointY, options} = element; const callout = options.callout; const calloutPosition = callout && callout.display && resolveCalloutPosition(element, callout, options.rotation); - if (!calloutPosition || element.inRange(pointX, pointY)) { + if (!calloutPosition || isPointInRange(element, callout, calloutPosition)) { return; } @@ -255,3 +255,20 @@ function getLabelSize({x, y, width, height, options}) { height: height - padding.top - padding.bottom - options.borderWidth }; } + +function isPointInRange(element, callout, position) { + const {pointX, pointY} = element; + const margin = callout.margin; + let x = pointX; + let y = pointY; + if (position === 'left') { + x += margin; + } else if (position === 'right') { + x -= margin; + } else if (position === 'top') { + y += margin; + } else if (position === 'bottom') { + y -= margin; + } + return element.inRange(x, y); +} diff --git a/test/fixtures/label/calloutNoShown.js b/test/fixtures/label/calloutNoShown.js new file mode 100644 index 000000000..e95c004f2 --- /dev/null +++ b/test/fixtures/label/calloutNoShown.js @@ -0,0 +1,118 @@ +module.exports = { + tolerance: 0.0075, + config: { + type: 'scatter', + options: { + scales: { + x: { + min: 0, + max: 10 + }, + y: { + min: 0, + max: 10 + } + }, + plugins: { + legend: false, + annotation: { + annotations: { + test1: { + type: 'label', + xValue: 2.5, + yValue: 7.5, + backgroundColor: 'white', + borderColor: 'red', + borderWidth: 1, + content: ['callout is', 'not drawn'], + xAdjust: -10, + yAdjust: 26, + callout: { + display: true, + margin: 5, + } + }, + test2: { + type: 'point', + xValue: 2.5, + yValue: 7.5, + radius: 2, + backgroundColor: 'red', + borderColor: 'red' + }, + test3: { + type: 'label', + xValue: 2.5, + yValue: 2.5, + backgroundColor: 'white', + borderColor: 'red', + borderWidth: 1, + content: ['callout is', 'not drawn'], + xAdjust: -10, + yAdjust: -26, + callout: { + display: true, + margin: 5, + } + }, + test4: { + type: 'point', + xValue: 2.5, + yValue: 2.5, + radius: 2, + backgroundColor: 'red', + borderColor: 'red' + }, + test5: { + type: 'label', + xValue: 7.5, + yValue: 2.5, + backgroundColor: 'white', + borderColor: 'red', + borderWidth: 1, + content: ['callout is', 'not drawn'], + xAdjust: -44, + callout: { + display: true, + margin: 5, + } + }, + test6: { + type: 'point', + xValue: 7.5, + yValue: 2.5, + radius: 2, + backgroundColor: 'red', + borderColor: 'red' + }, + test7: { + type: 'label', + xValue: 7.5, + yValue: 7.5, + backgroundColor: 'white', + borderColor: 'red', + borderWidth: 1, + content: ['callout is', 'not drawn'], + xAdjust: 44, + callout: { + display: true, + margin: 5, + } + }, + test8: { + type: 'point', + xValue: 7.5, + yValue: 7.5, + radius: 2, + backgroundColor: 'red', + borderColor: 'red' + } + } + } + } + } + }, + options: { + spriteText: true + } +}; diff --git a/test/fixtures/label/calloutNoShown.png b/test/fixtures/label/calloutNoShown.png new file mode 100644 index 0000000000000000000000000000000000000000..9ede2aa1cf590014d71793b05716589d3d18dc65 GIT binary patch literal 29763 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 VEW+;(g{h#J|FX2PNZ;pj^>590;LQL4 literal 0 HcmV?d00001 From d01d35ec46c8796ad0083cb7cc83795c0f0e0ec1 Mon Sep 17 00:00:00 2001 From: stockiNail Date: Thu, 19 May 2022 17:54:34 +0200 Subject: [PATCH 2/2] fixes lint --- test/fixtures/label/calloutNoShown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fixtures/label/calloutNoShown.js b/test/fixtures/label/calloutNoShown.js index e95c004f2..75830f4c9 100644 --- a/test/fixtures/label/calloutNoShown.js +++ b/test/fixtures/label/calloutNoShown.js @@ -26,7 +26,7 @@ module.exports = { borderWidth: 1, content: ['callout is', 'not drawn'], xAdjust: -10, - yAdjust: 26, + yAdjust: 26, callout: { display: true, margin: 5, @@ -49,7 +49,7 @@ module.exports = { borderWidth: 1, content: ['callout is', 'not drawn'], xAdjust: -10, - yAdjust: -26, + yAdjust: -26, callout: { display: true, margin: 5,