Skip to content

do not attempt to clear canvas if one does not exist #11764

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
May 17, 2024
Merged

do not attempt to clear canvas if one does not exist #11764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80df1f8
do not attempt to clear canvas if one does not exist
DAcodedBEAT May 7, 2024
e1d670d
update test to explicitly run clearCanvas method to ensure it doesn't…
DAcodedBEAT May 13, 2024
6e1e356
explicitly set canvas and ctx to null in test since the helper in tes…
DAcodedBEAT May 16, 2024
c4363ec
Update test/specs/helpers.canvas.tests.js
LeeLenaleee May 16, 2024
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
6 changes: 5 additions & 1 deletion src/helpers/helpers.canvas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ export function _alignPixel(chart: Chart, pixel: number, width: number) {
/**
* Clears the entire canvas.
*/
export function clearCanvas(canvas: HTMLCanvasElement, ctx?: CanvasRenderingContext2D) {
export function clearCanvas(canvas?: HTMLCanvasElement, ctx?: CanvasRenderingContext2D) {
if (!ctx && !canvas) {
return;
}

ctx = ctx || canvas.getContext('2d');

ctx.save();
Expand Down
15 changes: 15 additions & 0 deletions test/specs/helpers.canvas.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ describe('Chart.helpers.canvas', function() {
expect(chart.ctx.clearRect.calls.first().object).toBe(chart.ctx);
expect(chart.ctx.clearRect.calls.first().args).toEqual([0, 0, 150, 245]);
});

it('should not throw error when chart is null', function() {
function createAndClearChart() {
var chart = acquireChart({}, {
canvas: null
});
// explicitly set canvas and ctx to null since setting it in acquireChart doesn't do anything
chart.canvas = null;
chart.ctx = null;

helpers.clearCanvas(chart.canvas, chart.ctx);
}

expect(createAndClearChart).not.toThrow();
});
});

describe('isPointInArea', function() {
Expand Down