Skip to content

Commit b810e45

Browse files
committed
Fix handling of base64-encoded legendrank in get_legend_data.js
1 parent 08e79dd commit b810e45

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/components/legend/get_legend_data.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22

3+
const { isArrayOrTypedArray } = require('../../lib/array');
34
var Registry = require('../../registry');
45
var helpers = require('./helpers');
56

@@ -101,7 +102,7 @@ module.exports = function getLegendData(calcdata, opts, hasMultipleLegends) {
101102
var groupMinRank = Infinity;
102103
for(j = 0; j < legendData[i].length; j++) {
103104
var legendrank = legendData[i][j].trace.legendrank;
104-
var rank = Array.isArray(legendrank) ? Math.min(legendrank) : legendrank;
105+
var rank = isArrayOrTypedArray(legendrank) ? Math.min(legendrank) : legendrank;
105106
if(groupMinRank > rank) groupMinRank = rank;
106107
}
107108

@@ -118,8 +119,8 @@ module.exports = function getLegendData(calcdata, opts, hasMultipleLegends) {
118119
};
119120

120121
var orderFn2 = function(a, b) {
121-
var a_rank = Array.isArray(a.trace.legendrank) ? a.trace.legendrank[a.i] : a.trace.legendrank;
122-
var b_rank = Array.isArray(b.trace.legendrank) ? b.trace.legendrank[b.i] : b.trace.legendrank;
122+
var a_rank = isArrayOrTypedArray(a.trace.legendrank) ? a.trace.legendrank[a.i] : a.trace.legendrank;
123+
var b_rank = isArrayOrTypedArray(b.trace.legendrank) ? b.trace.legendrank[b.i] : b.trace.legendrank;
123124
return (
124125
(a_rank - b_rank) ||
125126
(a._preSort - b._preSort) // fallback for old Chrome < 70 https://bugs.chromium.org/p/v8/issues/detail?id=90

0 commit comments

Comments
 (0)