@@ -205,11 +205,6 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
205
205
var text = getText ( trace , i ) ;
206
206
textPosition = getTextPosition ( trace , i ) ;
207
207
208
- var layoutFont = fullLayout . font ;
209
- var barColor = style . getBarColor ( calcTrace [ i ] , trace ) ;
210
- var insideTextFont = style . getInsideTextFont ( trace , i , layoutFont , barColor ) ;
211
- var outsideTextFont = style . getOutsideTextFont ( trace , i , layoutFont ) ;
212
-
213
208
// compute text position
214
209
var prefix = trace . type === 'waterfall' ? 'waterfall' : 'bar' ;
215
210
var barmode = fullLayout [ prefix + 'mode' ] ;
@@ -218,16 +213,21 @@ function appendBarText(gd, bar, calcTrace, i, x0, x1, y0, y1) {
218
213
var calcBar = calcTrace [ i ] ;
219
214
var isOutmostBar = ! inStackOrRelativeMode || calcBar . _outmost ;
220
215
221
- // padding excluded
222
- var barWidth = Math . abs ( x1 - x0 ) - 2 * TEXTPAD ;
223
- var barHeight = Math . abs ( y1 - y0 ) - 2 * TEXTPAD ;
224
-
225
216
if ( ! text || textPosition === 'none' ||
226
217
( calcBar . isBlank && ( textPosition === 'auto' || textPosition === 'inside' ) ) ) {
227
218
bar . select ( 'text' ) . remove ( ) ;
228
219
return ;
229
220
}
230
221
222
+ var layoutFont = fullLayout . font ;
223
+ var barColor = style . getBarColor ( calcTrace [ i ] , trace ) ;
224
+ var insideTextFont = style . getInsideTextFont ( trace , i , layoutFont , barColor ) ;
225
+ var outsideTextFont = style . getOutsideTextFont ( trace , i , layoutFont ) ;
226
+
227
+ // padding excluded
228
+ var barWidth = Math . abs ( x1 - x0 ) - 2 * TEXTPAD ;
229
+ var barHeight = Math . abs ( y1 - y0 ) - 2 * TEXTPAD ;
230
+
231
231
var textSelection ;
232
232
var textBB ;
233
233
var textWidth ;
0 commit comments