Skip to content

Commit 458f593

Browse files
authored
Merge pull request #3192 from plotly/typed-array-marker-size-legend-fix
Fix legend for traces with typed array marker.size
2 parents 154317b + c326751 commit 458f593

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/components/legend/style.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ module.exports = function style(s, gd) {
148148

149149
function boundVal(attrIn, arrayToValFn, bounds) {
150150
var valIn = Lib.nestedProperty(trace, attrIn).get();
151-
var valToBound = (Array.isArray(valIn) && arrayToValFn) ?
151+
var valToBound = (Lib.isArrayOrTypedArray(valIn) && arrayToValFn) ?
152152
arrayToValFn(valIn) :
153153
valIn;
154154

test/jasmine/tests/scatter_test.js

+13
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,19 @@ describe('end-to-end scatter tests', function() {
987987
['rgb(0, 255, 0)', 'rgb(0, 0, 255)', 'rgb(255, 0, 0)'],
988988
[40, 30, 20]
989989
);
990+
991+
return Plotly.relayout(gd, 'showlegend', true);
992+
})
993+
.then(function() {
994+
_assert(
995+
['rgb(0, 255, 0)', 'rgb(0, 0, 255)', 'rgb(255, 0, 0)'],
996+
[40, 30, 20]
997+
);
998+
999+
var legendPts = d3.select('.legend').selectAll('.scatterpts');
1000+
expect(legendPts.size()).toBe(1, '# legend items');
1001+
expect(getColor(legendPts.node())).toBe('rgb(0, 0, 0)', 'legend pt color');
1002+
expect(getMarkerSize(legendPts.node())).toBe(16, 'legend pt size');
9901003
})
9911004
.catch(failTest)
9921005
.then(done);

0 commit comments

Comments
 (0)