Skip to content

Commit 42a2c98

Browse files
committed
Correct fill && correct tests
1 parent 5cff9aa commit 42a2c98

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

src/components/fields/TraceSelector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class TraceSelector extends Component {
8686
updateContainer({
8787
type: 'scatter',
8888
mode: fullContainer.mode,
89-
fill: 'none',
89+
fill: fullContainer.fill || container.fill,
9090
});
9191
}
9292
this.fullValue = plotlyTraceToCustomTrace(container);

src/components/fields/__tests__/TraceSelector-test.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,24 @@ describe('TraceSelector', () => {
2727
expect(innerDropdown.prop('value')).toEqual('area');
2828
});
2929

30+
it.only('takes mode from fullData if not present in data, and recognizes trace correctly', () => {
31+
const editorProps = {
32+
...fixtures.scatter({fullData: [{mode: 'lines'}]}),
33+
onUpdate: jest.fn(),
34+
};
35+
const wrapper = mount(
36+
<TestEditor {...editorProps} plotly={plotly}>
37+
<TraceSection traceIndex={0}>
38+
<TraceSelector attr="type" />
39+
</TraceSection>
40+
</TestEditor>
41+
).find(TraceSelector);
42+
43+
const innerDropdown = wrapper.find(Dropdown);
44+
45+
expect(innerDropdown.prop('value')).toEqual('line');
46+
});
47+
3048
it('interprets scatter + mode=lines as type=line', () => {
3149
const editorProps = {
3250
...fixtures.scatter({data: [{mode: 'lines'}]}),
@@ -81,7 +99,7 @@ describe('TraceSelector', () => {
8199
const innerDropdown = wrapper.find(Dropdown);
82100
innerDropdown.prop('onChange')('line');
83101

84-
const payload = onUpdateTraces.mock.calls[1][0];
102+
const payload = onUpdateTraces.mock.calls[0][0];
85103
expect(payload.update).toEqual({
86104
fill: 'none',
87105
mode: 'lines',
@@ -107,7 +125,7 @@ describe('TraceSelector', () => {
107125
const innerDropdown = wrapper.find(Dropdown);
108126
innerDropdown.prop('onChange')('area');
109127

110-
const payload = onUpdateTraces.mock.calls[1][0];
128+
const payload = onUpdateTraces.mock.calls[0][0];
111129
expect(payload.update).toEqual({fill: 'tozeroy', type: 'scatter'});
112130
});
113131
});

0 commit comments

Comments
 (0)