Skip to content

Commit 4e5bcf6

Browse files
committed
eschewing convertToTspans if not need (though: formatting is now lost)
1 parent 9328dff commit 4e5bcf6

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/traces/table/plot.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ function renderCellText(cellText, tableControlView, allColumnBlock, columnCell,
429429
var format = latex ? null : gridPick(d.calcdata.cells.format, col, row) || null;
430430
var prefixSuffixedText = prefix + (format ? d3.format(format)(d.value) : d.value) + suffix;
431431
d.latex = latex;
432+
d.mayHaveMarkup = (typeof userSuppliedContent === 'string') && userSuppliedContent.match(/[<>]/);
432433
var hasWrapSplitCharacter;
433434
var hwsc = function(prefixSuffixedText) {return prefixSuffixedText.indexOf(c.wrapSplitCharacter) !== -1;};
434435
d.wrappingNeeded = !d.wrapped && !userBrokenText && !latex && (hasWrapSplitCharacter = hwsc(prefixSuffixedText));
@@ -460,7 +461,11 @@ function renderCellText(cellText, tableControlView, allColumnBlock, columnCell,
460461
Drawing.font(selection, d.font);
461462

462463
var renderCallback = d.wrappingNeeded ? wrapTextMaker : updateYPositionMaker;
463-
svgUtil.convertToTspans(selection, gd, renderCallback(allColumnBlock, element, tableControlView, d));
464+
if(d.mayHaveMarkup || d.wrappingNeeded || d.latex) {
465+
svgUtil.convertToTspans(selection, gd, renderCallback(allColumnBlock, element, tableControlView, d));
466+
} else {
467+
// renderCallback(allColumnBlock, element, tableControlView, d);
468+
}
464469
})
465470
columnCell.call(setCellHeightAndPositionY);
466471
}

test/image/mocks/table_one_cell.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
"cells": {
6868

6969
"values": [
70-
Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),
71-
Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),Array.from(Array(100).keys()),
70+
Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),
71+
Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),Array.from(Array(1000).keys()),
7272
]
7373
.slice(0, 20) || [
7474
[

0 commit comments

Comments
 (0)