Skip to content

Fix bug in scattergl text update #3536

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

Merged
merged 2 commits into from
Feb 12, 2019
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
13 changes: 13 additions & 0 deletions src/traces/scattergl/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,19 @@ function plot(gd, subplot, cdata) {

// update main marker options
if(scene.glText) {
if(scene.count > scene.glText.length) {
// add gl text marker
var textsToAdd = scene.count - scene.glText.length;
for(i = 0; i < textsToAdd; i++) {
scene.glText.push(new Text(regl));
}
} else if(scene.count < scene.glText.length) {
// remove gl text marker
var textsToRemove = scene.glText.length - scene.count;
var removedTexts = scene.glText.splice(scene.count, textsToRemove);
removedTexts.forEach(function(text) { text.destroy(); });
}

for(i = 0; i < scene.count; i++) {
scene.glText[i].update(scene.textOptions[i]);
}
Expand Down
97 changes: 97 additions & 0 deletions test/jasmine/tests/scattergl_test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
var Plotly = require('@lib/index');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var failTest = require('../assets/fail_test');

describe('end-to-end scattergl tests', function() {
var gd;

beforeEach(function() {
gd = createGraphDiv();
});

afterEach(destroyGraphDiv);

it('should create a plot with text labels', function(done) {
Plotly.react(gd, [{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [2, 3, 4, 5, 6, 7, 8],
text: 'Test'
}]).then(function() {
var fullLayout = gd._fullLayout;
var subplot = fullLayout._plots.xy;
var scene = subplot._scene;
expect(scene.glText.length).toEqual(1);
}).catch(failTest).then(done);
});

it('should update a plot with text labels', function(done) {
Plotly.react(gd, [{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [2, 3, 4, 5, 6, 7, 8],
text: 'Test'
}]).then(function() {
var fullLayout = gd._fullLayout;
var subplot = fullLayout._plots.xy;
var scene = subplot._scene;
expect(scene.glText.length).toEqual(1);

// add plots
return Plotly.react(gd, [
{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [2, 3, 4, 5, 6, 7, 8],
text: 'Test'
},
{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [3, 4, 5, 6, 7, 8, 9],
text: 'Test 2'
},
{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [4, 5, 6, 7, 8, 9, 10],
text: 'Test 3'
}
]);
}).then(function() {
var fullLayout = gd._fullLayout;
var subplot = fullLayout._plots.xy;
var scene = subplot._scene;
expect(scene.glText.length).toEqual(3);

// remove plots
return Plotly.react(gd, [
{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [2, 3, 4, 5, 6, 7, 8],
text: 'Test'
},
{
type: 'scattergl',
mode: 'text+lines',
x: [1, 2, 3, 4, 5, 6, 7],
y: [3, 4, 5, 6, 7, 8, 9],
text: 'Test 2'
}
]);
}).then(function() {
var fullLayout = gd._fullLayout;
var subplot = fullLayout._plots.xy;
var scene = subplot._scene;
expect(scene.glText.length).toEqual(2);
}).catch(failTest).then(done);
});
});