Skip to content

reuse trace type #774

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 1 commit into from
Oct 30, 2018
Merged

reuse trace type #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions src/EditorControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import DefaultEditor from './DefaultEditor';
import PropTypes from 'prop-types';
import React, {Component} from 'react';
import {bem, localizeString} from './lib';
import {bem, localizeString, plotlyTraceToCustomTrace, traceTypeToPlotlyInitFigure} from './lib';
import {
shamefullyClearAxisTypes,
shamefullyAdjustAxisRef,
Expand Down Expand Up @@ -143,14 +143,22 @@ class EditorControls extends Component {

// can't use default prop because plotly.js mutates it:
// https://github.com/plotly/react-chart-editor/issues/509
graphDiv.data.push(
this.props.makeDefaultTrace
? this.props.makeDefaultTrace()
: {
type: `scatter${this.props.glByDefault ? 'gl' : ''}`,
mode: 'markers',
}
);
if (graphDiv.data.length === 0) {
graphDiv.data.push(
this.props.makeDefaultTrace
? this.props.makeDefaultTrace()
: {
type: `scatter${this.props.glByDefault ? 'gl' : ''}`,
mode: 'markers',
}
);
} else {
const prevTrace = graphDiv.data[graphDiv.data.length - 1];
const prevTraceType = plotlyTraceToCustomTrace(prevTrace);
graphDiv.data.push(
traceTypeToPlotlyInitFigure(prevTraceType, prevTrace.type.endsWith('gl') ? 'gl' : '')
);
}

if (this.props.afterAddTrace) {
this.props.afterAddTrace(payload);
Expand Down
2 changes: 1 addition & 1 deletion src/components/fields/__tests__/TraceSelector-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe('TraceSelector', () => {

const payload = beforeUpdateTraces.mock.calls[0][0];
expect(payload.update).toEqual({
fill: 'none',
stackgroup: null,
mode: 'lines',
type: 'scatter',
});
Expand Down
4 changes: 2 additions & 2 deletions src/lib/customTraceType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export function plotlyTraceToCustomTrace(trace) {
export function traceTypeToPlotlyInitFigure(traceType, gl = '') {
switch (traceType) {
case 'line':
return {type: 'scatter' + gl, mode: 'lines', fill: 'none'};
return {type: 'scatter' + gl, mode: 'lines', stackgroup: null};
case 'scatter':
return {type: 'scatter' + gl, mode: 'markers', fill: 'none'};
return {type: 'scatter' + gl, mode: 'markers', stackgroup: null};
case 'area':
return {type: 'scatter' + gl, mode: 'lines', stackgroup: 1};
case 'scatterpolar':
Expand Down