Skip to content

Scatter <g textpoint> join fixup #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 16, 2017
Merged

Scatter <g textpoint> join fixup #1672

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
310e67a
add test case for point / text node removal on blank data
etpinard May 11, 2017
68959b3
add return boolean to translatePoint
etpinard May 11, 2017
49e5da5
use new Drawing.translatePoint return boolean to clear <g textpoint>
etpinard May 11, 2017
3f7601c
bypass marker node styling if removed during translatePoint
etpinard May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions test/jasmine/tests/scatter_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,60 @@ describe('end-to-end scatter tests', function() {
expect(Plotly.d3.selectAll('.textpoint').size()).toBe(3);
}).catch(fail).then(done);
});

it('should remove all point and text nodes on blank data', function(done) {
function assertNodeCnt(ptCnt, txCnt) {
expect(d3.selectAll('.point').size()).toEqual(ptCnt);
expect(d3.selectAll('.textpoint').size()).toEqual(txCnt);
}

function assertText(content) {
d3.selectAll('.textpoint').each(function(_, i) {
var tx = d3.select(this).select('text');
expect(tx.text()).toEqual(content[i]);
});
}

Plotly.plot(gd, [{
x: [150, 350, 650],
y: [100, 300, 600],
text: ['A', 'B', 'C'],
mode: 'markers+text',
marker: {
size: [100, 200, 300],
line: { width: [10, 20, 30] },
color: 'yellow',
sizeref: 3,
gradient: {
type: 'radial',
color: 'white'
}
}
}])
.then(function() {
assertNodeCnt(3, 3);
assertText(['A', 'B', 'C']);

return Plotly.restyle(gd, {
x: [[null, undefined, NaN]],
y: [[NaN, null, undefined]]
});
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On master, this restyle call results in

d3.selectAll('.point').size() // => 0 (as desired)
d3.selectAll('.textpoint').size() // => 3 (which messes up subsequent updates)

})
.then(function() {
assertNodeCnt(0, 0);

return Plotly.restyle(gd, {
x: [[150, 350, 650]],
y: [[100, 300, 600]]
});
})
.then(function() {
assertNodeCnt(3, 3);
assertText(['A', 'B', 'C']);
})
.catch(fail)
.then(done);
});
});

describe('scatter hoverPoints', function() {
Expand Down