@@ -12,6 +12,7 @@ var createGraphDiv = require('../assets/create_graph_div');
1212var destroyGraphDiv = require ( '../assets/destroy_graph_div' ) ;
1313var customAssertions = require ( '../assets/custom_assertions' ) ;
1414var negateIf = require ( '../assets/negate_if' ) ;
15+ var selectButton = require ( '../assets/modebar_button' ) ;
1516
1617var transitions = require ( '../assets/transitions' ) ;
1718
@@ -1226,6 +1227,150 @@ describe('end-to-end scatter tests', function() {
12261227 . then ( done , done . fail ) ;
12271228 } ) ;
12281229
1230+ describe ( 'in a plot area that several traces share' , ( ) => {
1231+ const x = Array . from ( { length : 12 } , ( _ , i ) => i ) ;
1232+ const y = x . map ( ( i ) => i % 3 ) ;
1233+ // A new object for every plot, because a relayout writes its ranges into the layout that the plot got
1234+ const size = ( ) => ( { width : 600 , height : 400 , showlegend : false } ) ;
1235+ const trace = ( name , shift , extra ) =>
1236+ Lib . extendFlat (
1237+ {
1238+ mode : 'markers+text' ,
1239+ x : x . map ( ( i ) => i + shift ) ,
1240+ y : y . map ( ( v ) => v + shift * 0.8 ) ,
1241+ text : x . map ( ( i ) => name + i ) ,
1242+ textposition : 'auto' ,
1243+ marker : { size : 12 }
1244+ } ,
1245+ extra
1246+ ) ;
1247+
1248+ // Labels that sit on a marker or on another label, among all the traces of the plot
1249+ function collisions ( ) {
1250+ const markers = [ ] ;
1251+ d3SelectAll ( '.point' ) . each ( function ( ) {
1252+ markers . push ( this . getBoundingClientRect ( ) ) ;
1253+ } ) ;
1254+ const labels = visibleLabelBoxes ( ) ;
1255+ let onMarkers = 0 ;
1256+ labels . forEach ( ( l ) =>
1257+ markers . forEach ( ( m ) => {
1258+ if ( l . left < m . right && l . right > m . left && l . top < m . bottom && l . bottom > m . top ) onMarkers ++ ;
1259+ } )
1260+ ) ;
1261+ return { labels : labels . length , onMarkers, onLabels : countOverlaps ( labels ) } ;
1262+ }
1263+
1264+ function expectClear ( msg ) {
1265+ const c = collisions ( ) ;
1266+ expect ( c . labels ) . toBe ( 24 , msg + ': visible labels' ) ;
1267+ expect ( c . onMarkers ) . toBe ( 0 , msg + ': labels on markers' ) ;
1268+ expect ( c . onLabels ) . toBe ( 0 , msg + ': labels on labels' ) ;
1269+ }
1270+
1271+ it ( 'should keep the labels of different zorder groups apart' , ( done ) => {
1272+ Plotly . newPlot ( gd , [ trace ( 'A' , 0 , { zorder : 0 } ) , trace ( 'B' , 0.15 , { zorder : 1 } ) ] , size ( ) )
1273+ . then ( ( ) => {
1274+ expectClear ( 'zorder groups' ) ;
1275+ return Plotly . relayout ( gd , 'xaxis.range' , [ - 1 , 8 ] ) ;
1276+ } )
1277+ . then ( ( ) => {
1278+ const c = collisions ( ) ;
1279+ expect ( c . onMarkers ) . toBe ( 0 , 'labels on markers after a zoom' ) ;
1280+ expect ( c . onLabels ) . toBe ( 0 , 'labels on labels after a zoom' ) ;
1281+ } )
1282+ . then ( done , done . fail ) ;
1283+ } ) ;
1284+
1285+ // Leaders whose label sits away from the end of the leader line
1286+ function detachedLeaders ( ) {
1287+ let n = 0 ;
1288+ d3SelectAll ( '.textpoint' ) . each ( function ( ) {
1289+ const leader = this . querySelector ( 'path.textleader' ) ;
1290+ if ( ! leader || this . style . display === 'none' ) return ;
1291+ const l = leader . getBoundingClientRect ( ) ;
1292+ const t = this . querySelector ( 'text' ) . getBoundingClientRect ( ) ;
1293+ const dx = Math . max ( t . left - l . right , l . left - t . right , 0 ) ;
1294+ const dy = Math . max ( t . top - l . bottom , l . top - t . bottom , 0 ) ;
1295+ if ( Math . hypot ( dx , dy ) > 3 ) n ++ ;
1296+ } ) ;
1297+ return n ;
1298+ }
1299+
1300+ it ( 'should place the labels again after a pan and a reset of the axes' , ( done ) => {
1301+ Plotly . newPlot ( gd , [ trace ( 'A' , 0 , { zorder : 0 } ) , trace ( 'B' , 0.15 , { zorder : 1 } ) ] , size ( ) )
1302+ . then ( ( ) => {
1303+ expectClear ( 'before the pan' ) ;
1304+ expect ( d3SelectAll ( '.textpoint path.textleader' ) . size ( ) ) . toBe ( 24 , 'leaders before the pan' ) ;
1305+ return Plotly . relayout ( gd , 'xaxis.range' , [ 3 , 15 ] ) ;
1306+ } )
1307+ . then (
1308+ ( ) =>
1309+ new Promise ( ( resolve ) => {
1310+ gd . once ( 'plotly_relayout' , resolve ) ;
1311+ selectButton ( gd . _fullLayout . _modeBar , 'resetScale2d' ) . click ( ) ;
1312+ } )
1313+ )
1314+ . then ( ( ) => {
1315+ expectClear ( 'after the reset' ) ;
1316+ expect ( d3SelectAll ( '.textpoint path.textleader' ) . size ( ) ) . toBe ( 24 , 'leaders after the reset' ) ;
1317+ expect ( detachedLeaders ( ) ) . toBe ( 0 , 'leaders away from their labels' ) ;
1318+ } )
1319+ . then ( done , done . fail ) ;
1320+ } ) ;
1321+
1322+ it ( 'should keep the labels of overlaid axes apart' , ( done ) => {
1323+ Plotly . newPlot ( gd , [ trace ( 'A' , 0 ) , trace ( 'B' , 0.15 , { yaxis : 'y2' } ) ] , {
1324+ ...size ( ) ,
1325+ yaxis2 : { overlaying : 'y' }
1326+ } )
1327+ . then ( ( ) => expectClear ( 'overlaid axes' ) )
1328+ . then ( done , done . fail ) ;
1329+ } ) ;
1330+
1331+ it ( 'should keep the labels of a scatter trace and a scattercarpet trace apart' , ( done ) => {
1332+ const carpet = { type : 'carpet' , carpet : 'c' , a : [ 1 , 2 , 3 ] , b : [ 1 , 2 , 3 ] , y : [ [ 1 , 2 , 3 ] , [ 2 , 3 , 4 ] , [ 3 , 4 , 5 ] ] } ;
1333+ const onCarpet = {
1334+ type : 'scattercarpet' ,
1335+ carpet : 'c' ,
1336+ a : x . map ( ( i ) => 1 + ( i % 6 ) / 3 ) ,
1337+ b : x . map ( ( i ) => 1 + Math . floor ( i / 6 ) ) ,
1338+ mode : 'markers+text' ,
1339+ text : x . map ( ( i ) => 'C' + i ) ,
1340+ textposition : 'auto' ,
1341+ marker : { size : 12 }
1342+ } ;
1343+
1344+ Plotly . newPlot ( gd , [ carpet , onCarpet ] , size ( ) )
1345+ . then ( ( ) => {
1346+ // Put a scatter point 7px to the right of and 5px below every carpet point
1347+ const xa = gd . _fullLayout . xaxis ;
1348+ const ya = gd . _fullLayout . yaxis ;
1349+ const cd = gd . calcdata . find ( ( c ) => c [ 0 ] . trace . type === 'scattercarpet' ) ;
1350+ const near = {
1351+ x : cd . map ( ( d ) => xa . p2c ( xa . c2p ( d . x ) + 7 ) ) ,
1352+ y : cd . map ( ( d ) => ya . p2c ( ya . c2p ( d . y ) + 5 ) ) ,
1353+ text : x . map ( ( i ) => 'S' + i )
1354+ } ;
1355+ return Plotly . newPlot ( gd , [ carpet , onCarpet , trace ( 'S' , 0 , near ) ] , size ( ) ) ;
1356+ } )
1357+ . then ( ( ) => expectClear ( 'scatter and scattercarpet' ) )
1358+ . then ( done , done . fail ) ;
1359+ } ) ;
1360+
1361+ it ( 'should leave no label of a trace that a redraw removes' , ( done ) => {
1362+ Plotly . newPlot ( gd , [ trace ( 'A' , 0 , { zorder : 0 } ) , trace ( 'B' , 0.15 , { zorder : 1 } ) ] , size ( ) )
1363+ . then ( ( ) => Plotly . react ( gd , [ trace ( 'A' , 0 , { zorder : 0 } ) ] , size ( ) ) )
1364+ . then ( ( ) => {
1365+ expect ( d3SelectAll ( '.textpoint' ) . size ( ) ) . toBe ( 12 , 'label nodes' ) ;
1366+ const c = collisions ( ) ;
1367+ expect ( c . labels ) . toBe ( 12 , 'visible labels' ) ;
1368+ expect ( c . onMarkers ) . toBe ( 0 , 'labels on markers' ) ;
1369+ } )
1370+ . then ( done , done . fail ) ;
1371+ } ) ;
1372+ } ) ;
1373+
12291374 describe ( 'in a subplot with axis labels inside the plot area' , ( ) => {
12301375 const size = { width : 480 , height : 440 , margin : { l : 50 , r : 50 , t : 50 , b : 50 } , showlegend : false } ;
12311376 const names = ( n ) => Array . from ( { length : n } , ( _ , i ) => 'pt ' + i ) ;
0 commit comments