Skip to content

Commit 13b925c

Browse files
authored
Merge pull request #3575 from plotly/scattergl-text-select-then-pan-bug
Call styleTextSelection only on hasText traces
2 parents 2da4e44 + 98fadff commit 13b925c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/traces/scattergl/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,8 @@ function plot(gd, subplot, cdata) {
634634

635635
if(scene.glText) {
636636
cdata.forEach(function(cdscatter) {
637-
if(cdscatter && cdscatter[0] && cdscatter[0].trace) {
637+
var trace = ((cdscatter || [])[0] || {}).trace || {};
638+
if(subTypes.hasText(trace)) {
638639
styleTextSelection(cdscatter);
639640
}
640641
});

test/jasmine/tests/gl2d_plot_interact_test.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -932,8 +932,9 @@ describe('Test gl2d plots', function() {
932932
var trace = {
933933
x: [2],
934934
y: [1],
935+
text: ['a'],
935936
type: 'scattergl',
936-
mode: 'markers',
937+
mode: 'markers+text',
937938
marker: {color: 'red'}
938939
};
939940

@@ -947,6 +948,8 @@ describe('Test gl2d plots', function() {
947948
expect(scene.unselectBatch).toEqual([[]]);
948949
expect(scene.markerOptions.length).toBe(2);
949950
expect(scene.markerOptions[1].color).toEqual(new Uint8Array([255, 0, 0, 255]));
951+
expect(scene.textOptions.length).toBe(2);
952+
expect(scene.textOptions[1].color).toEqual('#444');
950953
expect(scene.scatter2d.draw).toHaveBeenCalled();
951954

952955
return Plotly.restyle(gd, 'selectedpoints', null);

0 commit comments

Comments
 (0)