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.

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

Jump to bottom

Fix responsive issue when the chart is recreated #4774

Merged
merged 1 commit into from Oct 7, 2017
Merged

Fix responsive issue when the chart is recreated #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/platforms/platform.dom.js
View file
Open in desktop
Expand Up @@ -236,6 +236,13 @@ function watchForRender(node, handler) {
addEventListener(node, type, proxy);
});

// #4737: Chrome might skip the CSS animation when the CSS_RENDER_MONITOR class
// is removed then added back immediately (same animation frame?). Accessing the
// `offsetParent` property will force a reflow and re-evaluate the CSS animation.
// https://gist.github.com/paulirish/5d52fb081b3570c81e3a#box-metrics
// https://github.com/chartjs/Chart.js/issues/4737
expando.reflow = !!node.offsetParent;

node.classList.add(CSS_RENDER_MONITOR);
}

Expand Down
8 changes: 7 additions & 1 deletion test/jasmine.utils.js
View file
Open in desktop
Expand Up @@ -75,7 +75,13 @@ function acquireChart(config, options) {
wrapper.appendChild(canvas);
window.document.body.appendChild(wrapper);

chart = new Chart(canvas.getContext('2d'), config);
try {
chart = new Chart(canvas.getContext('2d'), config);
} catch (e) {
window.document.body.removeChild(wrapper);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was leaking because the chart construction throws and the wrapper/canvas wasn't removed.

throw e;
}

chart.$test = {
persistent: options.persistent,
wrapper: wrapper
Expand Down
41 changes: 40 additions & 1 deletion test/specs/core.controller.tests.js
View file
Open in desktop
Expand Up @@ -495,6 +495,45 @@ describe('Chart', function() {
});
});
});

// https://github.com/chartjs/Chart.js/issues/4737
it('should resize the canvas when re-creating the chart', function(done) {
var chart = acquireChart({
options: {
responsive: true
}
}, {
wrapper: {
style: 'width: 320px'
}
});

waitForResize(chart, function() {
var canvas = chart.canvas;
expect(chart).toBeChartOfSize({
dw: 320, dh: 320,
rw: 320, rh: 320,
});

chart.destroy();
chart = new Chart(canvas, {
type: 'line',
options: {
responsive: true
}
});

canvas.parentNode.style.width = '455px';
waitForResize(chart, function() {
expect(chart).toBeChartOfSize({
dw: 455, dh: 455,
rw: 455, rh: 455,
});

done();
});
});
});
});

describe('config.options.responsive: true (maintainAspectRatio: true)', function() {
Expand Down Expand Up @@ -627,7 +666,7 @@ describe('Chart', function() {
});
});

describe('config.options.devicePixelRatio 3', function() {
describe('config.options.devicePixelRatio', function() {
beforeEach(function() {
this.devicePixelRatio = window.devicePixelRatio;
window.devicePixelRatio = 1;
Expand Down